diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
| commit | 92667c8edbaee9a252b1d5d221eb62849f76697c (patch) | |
| tree | 8f1d329f2259b7d5bff054bc14d0965637df6961 /svx | |
| parent | baecdfb578cb7bc992944857ad4d8882ef7e842c (diff) | |
| parent | 48b4a99ce2451f1ddf2e8e128bbfcd6683072999 (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
connectivity/source/cpool/Zregistration.cxx
connectivity/source/drivers/evoab/LCatalog.cxx
connectivity/source/drivers/evoab/LColumnAlias.cxx
connectivity/source/drivers/evoab/LColumnAlias.hxx
connectivity/source/drivers/evoab/LColumns.cxx
connectivity/source/drivers/evoab/LColumns.hxx
connectivity/source/drivers/evoab/LConfigAccess.cxx
connectivity/source/drivers/evoab/LConfigAccess.hxx
connectivity/source/drivers/evoab/LConnection.cxx
connectivity/source/drivers/evoab/LConnection.hxx
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
connectivity/source/drivers/evoab/LDriver.cxx
connectivity/source/drivers/evoab/LDriver.hxx
connectivity/source/drivers/evoab/LFolderList.cxx
connectivity/source/drivers/evoab/LFolderList.hxx
connectivity/source/drivers/evoab/LNoException.cxx
connectivity/source/drivers/evoab/LPreparedStatement.cxx
connectivity/source/drivers/evoab/LPreparedStatement.hxx
connectivity/source/drivers/evoab/LResultSet.cxx
connectivity/source/drivers/evoab/LResultSet.hxx
connectivity/source/drivers/evoab/LServices.cxx
connectivity/source/drivers/evoab/LStatement.cxx
connectivity/source/drivers/evoab/LStatement.hxx
connectivity/source/drivers/evoab/LTable.cxx
connectivity/source/drivers/evoab/LTable.hxx
connectivity/source/drivers/evoab/LTables.cxx
connectivity/source/drivers/evoab/LTables.hxx
connectivity/source/drivers/evoab/evoab.xml
connectivity/source/drivers/evoab/makefile.mk
editeng/Library_editeng.mk
framework/Library_fwe.mk
framework/test/test.cxx
idl/prj/d.lst
idl/util/idlpch.cxx
linguistic/Makefile
linguistic/Module_linguistic.mk
linguistic/inc/linguistic/lngdllapi.h
linguistic/inc/linguistic/lngprophelp.hxx
linguistic/inc/linguistic/misc.hxx
linguistic/prj/build.lst
linguistic/prj/d.lst
linguistic/qa/unoapi/Test.java
linguistic/source/grammarchecker.cxx
linguistic/source/grammarchecker.hxx
linguistic/source/hyphdta.cxx
linguistic/source/lngprophelp.cxx
linguistic/source/makefile.mk
linguistic/source/spelldta.cxx
sfx2/Library_qstart.mk
sfx2/Library_sfx.mk
sfx2/inc/sfx2/qswin32.h
sfx2/prj/build.lst
sfx2/qa/cppunit/makefile.mk
xmlscript/inc/xmlscript/xcrdllapi.h
xmlscript/prj/d.lst
xmlscript/util/makefile.mk
Diffstat (limited to 'svx')
1290 files changed, 16804 insertions, 21555 deletions
diff --git a/svx/AllLangResTarget_gal.mk b/svx/AllLangResTarget_gal.mk index eb0b5b15c444..986a110514a9 100755..100644 --- a/svx/AllLangResTarget_gal.mk +++ b/svx/AllLangResTarget_gal.mk @@ -36,8 +36,8 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/gal)) $(eval $(call gb_SrsTarget_set_include,svx/gal,\ $$(INCLUDE) \ -I$(OUTDIR)/inc \ - -I$(SRCDIR)/svx/source/gallery \ - -I$(SRCDIR)/svx/inc/ \ + -I$(realpath $(SRCDIR)/svx/source/gallery2) \ + -I$(realpath $(SRCDIR)/svx/inc/) \ )) $(eval $(call gb_SrsTarget_add_files,svx/gal,\ diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index b2707b01a637..ae19390676b3 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -40,9 +40,9 @@ $(eval $(call gb_SrsTarget_set_include,svx/res,\ -I$(OUTDIR)/inc \ -I$(WORKDIR)/inc \ -I$(WORKDIR)/inc/svx \ - -I$(SRCDIR)/svx/source/inc \ - -I$(SRCDIR)/svx/source/dialog \ - -I$(SRCDIR)/svx/inc/ \ + -I$(realpath $(SRCDIR)/svx/source/inc) \ + -I$(realpath $(SRCDIR)/svx/source/dialog) \ + -I$(realpath $(SRCDIR)/svx/inc/) \ )) $(eval $(call gb_SrsTarget_add_files,svx/res,\ @@ -55,10 +55,10 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\ svx/source/dialog/fontwork.src \ svx/source/dialog/frmsel.src \ svx/source/dialog/hdft.src \ - svx/source/dialog/hyprlink.src \ svx/source/dialog/imapdlg.src \ svx/source/dialog/langbox.src \ svx/source/dialog/language.src \ + svx/source/dialog/linkwarn.src \ svx/source/dialog/optgrid.src \ svx/source/dialog/passwd.src \ svx/source/dialog/prtqry.src \ @@ -106,31 +106,33 @@ $(call gb_SrsTarget_get_clean_target,svx/res) : $(WORKDIR)/inc/svx/globlmn.hrc_c # hack !!! # just a temporary - globlmn.hrc about to be removed! ifeq ($(strip $(WITH_LANG)),) -$(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc - echo copying $@ - -mkdir -p $(WORKDIR)/inc/svx - cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(WORKDIR)/inc/svx/globlmn.hrc - rm -f $(WORKDIR)/inc/svx/lastrun.mk +$(WORKDIR)/inc/svx/globlmn.hrc : $(realpath $(SRCDIR)/svx/inc/globlmn_tmpl.hrc) + echo copying $@ + -mkdir -p $(WORKDIR)/inc/svx + cp $< $@ + $(call gb_Deliver_deliver, $@, $(OUTDIR)/inc/svx/globlmn.hrc) + rm -f $(WORKDIR)/inc/svx/lastrun.mk else -include $(WORKDIR)/inc/svx/lastrun.mk ifneq ($(gb_lastrun_globlmn),MERGED) .PHONY : $(WORKDIR)/inc/svx/globlmn.hrc endif -$(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf - echo merging $@ - -mkdir -p $(WORKDIR)/inc/svx - rm -f $(WORKDIR)/inc/svx/lastrun.mk - echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk - $(call gb_Helper_abbreviate_dirs_native, \ - $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ - -p svx \ - -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all) +$(WORKDIR)/inc/svx/globlmn.hrc : $(realpath $(SRCDIR)/svx/inc/globlmn_tmpl.hrc) $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf) + echo merging $@ + -mkdir -p $(WORKDIR)/inc/svx + rm -f $(WORKDIR)/inc/svx/lastrun.mk + echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk + $(call gb_Helper_abbreviate_dirs_native, \ + $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ + -p svx \ + -i $< -o $@ -m $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf) -l all) + $(call gb_Deliver_deliver, $@, $(OUTDIR)/inc/svx/globlmn.hrc) endif .PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean $(WORKDIR)/inc/svx/globlmn.hrc_clean : - rm -f $(WORKDIR)/inc/svx/lastrun.mk \ - $(WORKDIR)/inc/svx/globlmn.hrc + rm -f $(WORKDIR)/inc/svx/lastrun.mk \ + $(WORKDIR)/inc/svx/globlmn.hrc # vim: set noet sw=4 ts=4: diff --git a/svx/JunitTest_svx_unoapi.mk b/svx/JunitTest_svx_unoapi.mk index a8b90a379103..d94858b4af9a 100755..100644 --- a/svx/JunitTest_svx_unoapi.mk +++ b/svx/JunitTest_svx_unoapi.mk @@ -42,12 +42,8 @@ $(eval $(call gb_JunitTest_add_jars,svx_unoapi,\ $(OUTDIR)/bin/jurt.jar \ )) -$(eval $(call gb_JunitTest_add_sourcefiles,svx_unoapi,\ - svx/qa/unoapi/Test \ -)) - $(eval $(call gb_JunitTest_add_classes,svx_unoapi,\ - org.openoffice.svx.qa.unoapi.Test \ + org.openoffice.test.UnoApiTest \ )) # vim: set noet sw=4 ts=4: diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index a537258c4990..2cc9b4a0663f 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -30,9 +30,9 @@ $(eval $(call gb_Library_Library,svx)) $(eval $(call gb_Library_set_componentfile,svx,svx/util/svx)) $(eval $(call gb_Library_set_include,svx,\ - -I$(SRCDIR)/svx/inc \ - -I$(SRCDIR)/svx/source/inc \ - -I$(SRCDIR)/svx/inc/pch \ + -I$(realpath $(SRCDIR)/svx/inc) \ + -I$(realpath $(SRCDIR)/svx/source/inc) \ + -I$(realpath $(SRCDIR)/svx/inc/pch) \ $$(SOLARINC) \ -I$(OUTDIR)/inc/offuh \ )) @@ -54,7 +54,6 @@ $(eval $(call gb_Library_add_linked_libs,svx,\ sal \ sfx \ sot \ - stl \ svl \ svt \ svxcore \ @@ -63,7 +62,6 @@ $(eval $(call gb_Library_add_linked_libs,svx,\ ucbhelper \ utl \ vcl \ - vos3 \ xo \ xcr \ $(gb_STDLIBS) \ @@ -117,9 +115,9 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/grfflt \ svx/source/dialog/hdft \ svx/source/dialog/hyperdlg \ - svx/source/dialog/hyprlink \ svx/source/dialog/imapdlg \ svx/source/dialog/imapwnd \ + svx/source/dialog/linkwarn \ svx/source/dialog/measctrl \ svx/source/dialog/optgrid \ svx/source/dialog/orienthelper \ @@ -214,7 +212,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/unogallery/unogalthemeprovider \ )) -ifeq ($(OS),LINUX) +ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/sendreportunx \ )) diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 8c5ec29535b3..d4bc81352f90 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -37,9 +37,9 @@ $(eval $(call gb_Library_add_package_headers,svxcore,\ )) $(eval $(call gb_Library_set_include,svxcore,\ - -I$(SRCDIR)/svx/inc \ - -I$(SRCDIR)/svx/inc/pch \ - -I$(SRCDIR)/svx/source/inc \ + -I$(realpath $(SRCDIR)/svx/inc) \ + -I$(realpath $(SRCDIR)/svx/inc/pch) \ + -I$(realpath $(SRCDIR)/svx/source/inc) \ $$(INCLUDE) \ -I$(OUTDIR)/inc/offuh \ -I$(WORKDIR)/SdiTarget/svx/sdi \ @@ -71,7 +71,6 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\ sal \ sfx \ sot \ - stl \ svl \ svt \ tk \ @@ -79,7 +78,6 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\ ucbhelper \ utl \ vcl \ - vos3 \ xo \ $(gb_STDLIBS) \ )) @@ -448,8 +446,8 @@ $(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 \ + -I$(realpath $(SRCDIR)/svx/inc) \ + -I$(realpath $(SRCDIR)/svx/sdi) \ )) # vim: set noet sw=4 ts=4: diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 1677d630faa5..69bb8c75c8ff 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -30,8 +30,8 @@ $(eval $(call gb_Library_Library,textconversiondlgs)) $(eval $(call gb_Library_set_componentfile,textconversiondlgs,svx/util/textconversiondlgs)) $(eval $(call gb_Library_set_include,textconversiondlgs,\ - -I$(SRCDIR)/svx/inc \ - -I$(SRCDIR)/svx/inc/pch \ + -I$(realpath $(SRCDIR)/svx/inc) \ + -I$(realpath $(SRCDIR)/svx/inc/pch) \ $$(INCLUDE) \ -I$(OUTDIR)/inc/offuh \ )) @@ -43,7 +43,6 @@ $(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\ sal \ svl \ svt \ - stl \ tk \ tl \ utl \ diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index d9288ea9e6b1..032f71ffa565 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_targets,svx,\ AllLangResTarget_svx \ AllLangResTarget_ofa \ AllLangResTarget_gal \ - AllLangResTarget_about \ AllLangResTarget_textconversiondlgs \ Package_inc \ Package_sdi \ diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk index 81066e9c7bff..9be0b4b5dce9 100644 --- a/svx/Package_inc.mk +++ b/svx/Package_inc.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftdiit.hxx,svx/xftdiit.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntctl.hxx,svx/fntctl.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdattr.hxx,svx/svdattr.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/imapdlg.hxx,svx/imapdlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/linkwarn.hxx,svx/linkwarn.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/formatpaintbrushctrl.hxx,svx/formatpaintbrushctrl.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xcolit.hxx,svx/xcolit.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftmrit.hxx,svx/xftmrit.hxx)) @@ -83,7 +84,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdasitm.hxx,svx/sdasitm.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrgmt.hxx,svx/svddrgmt.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnasit.hxx,svx/xlnasit.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlndsit.hxx,svx/xlndsit.hxx)) -$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hyprlink.hxx,svx/hyprlink.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/framelinkarray.hxx,svx/framelinkarray.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdetc.hxx,svx/svdetc.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmtit.hxx,svx/xflbmtit.hxx)) @@ -556,5 +556,4 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxdllapi.h,svx/svxdllapi.h)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/colrctrl.hxx,svx/colrctrl.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdpage.hxx,svx/fmdpage.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtpitm.hxx,svx/sxmtpitm.hxx)) -$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globlmn.hrc,globlmn_tmpl.hrc)) diff --git a/svx/doc/UML/edit_engine_UNO_implementation.zuml b/svx/doc/UML/edit_engine_UNO_implementation.zuml index d0faf5adeca4..d0faf5adeca4 100644..100755 --- a/svx/doc/UML/edit_engine_UNO_implementation.zuml +++ b/svx/doc/UML/edit_engine_UNO_implementation.zuml diff --git a/svx/doc/UML/grid_control_implementation.zuml b/svx/doc/UML/grid_control_implementation.zuml Binary files differindex 139cd3fd8b56..139cd3fd8b56 100644..100755 --- a/svx/doc/UML/grid_control_implementation.zuml +++ b/svx/doc/UML/grid_control_implementation.zuml diff --git a/svx/doc/UML/readme.txt b/svx/doc/UML/readme.txt index 7b9fc0a73a96..7b9fc0a73a96 100644..100755 --- a/svx/doc/UML/readme.txt +++ b/svx/doc/UML/readme.txt diff --git a/svx/inc/accessibility.hrc b/svx/inc/accessibility.hrc index 3e386be0daf1..3e386be0daf1 100644..100755 --- a/svx/inc/accessibility.hrc +++ b/svx/inc/accessibility.hrc diff --git a/svx/inc/dgdefs_.hxx b/svx/inc/dgdefs_.hxx index bf030e26d751..75e35ea376b8 100644 --- a/svx/inc/dgdefs_.hxx +++ b/svx/inc/dgdefs_.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -339,3 +340,5 @@ #define layctrl_0c SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) #define layctrl_0f SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) #define layctrl_10 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/dialdll.hxx b/svx/inc/dialdll.hxx index d76ff286eb9a..f7c60c7ae94c 100644 --- a/svx/inc/dialdll.hxx +++ b/svx/inc/dialdll.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx index a8560dbbb366..6044f7e4d14d 100644 --- a/svx/inc/dragmt3d.hxx +++ b/svx/inc/dragmt3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,7 @@ class E3dScene; /************************************************************************* |* -|* Parameter fuer Interaktion eines 3D-Objektes +|* Parameters for the interaction of a 3D object |* \************************************************************************/ class E3dDragMethodUnit @@ -67,7 +68,7 @@ public: /************************************************************************* |* -|* Ableitung von SdrDragMethod fuer 3D-Objekte +|* Derivative of SdrDragMethod for 3D objects |* \************************************************************************/ @@ -104,7 +105,7 @@ public: /************************************************************************* |* -|* Ableitung von SdrDragMethod zum Drehen von 3D-Objekten +|* Derivative of SdrDragMethod for spinning 3D objects |* \************************************************************************/ @@ -127,7 +128,7 @@ public: /************************************************************************* |* -|* Ableitung von SdrDragMethod zum Verschieben von 3D-Subobjekten +|* Derivative of SdrDragMethod for moving 3D sub-objects |* \************************************************************************/ @@ -151,3 +152,5 @@ public: #endif // _E3D_DRAGMT3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/drawuiks.hxx b/svx/inc/drawuiks.hxx index 19b7fe3cba97..322c7fa0d5c4 100644 --- a/svx/inc/drawuiks.hxx +++ b/svx/inc/drawuiks.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,5 @@ #define SD_UIK_PRESENTATION_STYLES UIK_DRAWING(60) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx index 600e646e8cb6..837b01de2dd0 100644 --- a/svx/inc/extrusiondepthdialog.hxx +++ b/svx/inc/extrusiondepthdialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,4 @@ public: #endif // _SVX_EXTRUSIONDEPTHDIALOG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc index 06b640ebff0e..7f2032123d12 100644..100755 --- a/svx/inc/float3d.hrc +++ b/svx/inc/float3d.hrc @@ -26,8 +26,6 @@ ************************************************************************/ #include <svx/dialogs.hrc> -//#define FLT_WIN_3D 827 - #define BTN_GEO 2 #define BTN_REPRESENTATION 3 #define BTN_LIGHT 4 @@ -43,12 +41,12 @@ #define CTL_PREVIEW 12 #define CTL_LIGHT_PREVIEW 13 -// Geometrie +// Geomerty #define FT_HORIZONTAL 24 #define NUM_HORIZONTAL 25 #define FT_VERTICAL 26 #define NUM_VERTICAL 27 -#define FL_SEGMENTS 28 +#define FL_SEGMENTS 28 #define FT_PERCENT_DIAGONAL 29 #define MTR_PERCENT_DIAGONAL 30 #define FT_BACKSCALE 31 @@ -57,32 +55,32 @@ #define MTR_END_ANGLE 34 #define FT_DEPTH 35 #define MTR_DEPTH 36 -#define FL_GEOMETRIE 37 +#define FL_GEOMETRIE 37 #define BTN_NORMALS_OBJ 38 #define BTN_NORMALS_FLAT 39 #define BTN_NORMALS_SPHERE 40 #define BTN_TWO_SIDED_LIGHTING 41 #define BTN_NORMALS_INVERT 42 -#define FL_NORMALS 43 +#define FL_NORMALS 43 #define BTN_DOUBLE_SIDED 44 -// Darstellung +// Depiction/Appearance #define FT_SHADEMODE 45 #define LB_SHADEMODE 46 #define BTN_SHADOW_3D 47 #define FT_SLANT 48 #define MTR_SLANT 49 -#define FL_SHADOW 50 +#define FL_SHADOW 50 #define FT_DISTANCE 51 #define MTR_DISTANCE 52 #define FT_FOCAL_LENGTH 53 #define MTR_FOCAL_LENGTH 54 -#define FL_CAMERA 55 -#define FL_REPRESENTATION 56 +#define FL_CAMERA 55 +#define FL_REPRESENTATION 56 -// Beleuchtung +// Lighting #define BTN_LIGHT_1 60 #define BTN_LIGHT_2 61 #define BTN_LIGHT_3 62 @@ -100,13 +98,13 @@ #define LB_LIGHT_7 74 #define LB_LIGHT_8 75 #define BTN_LIGHT_COLOR 76 -#define FT_LIGHTSOURCE 77 +#define FT_LIGHTSOURCE 77 #define LB_AMBIENTLIGHT 78 #define BTN_AMBIENT_COLOR 79 -#define FT_AMBIENTLIGHT 80 -#define FL_LIGHT 81 +#define FT_AMBIENTLIGHT 80 +#define FL_LIGHT 81 -// Texturen +// Textures #define FT_TEX_KIND 90 #define BTN_TEX_LUMINANCE 91 #define BTN_TEX_COLOR 92 @@ -124,11 +122,10 @@ #define BTN_TEX_OBJECT_Y 104 #define FT_TEX_FILTER 105 #define BTN_TEX_FILTER 106 -#define FL_TEXTURE 107 +#define FL_TEXTURE 107 // Material -//#define CTL_MATERIAL 110 -#define FL_MATERIAL 111 +#define FL_MATERIAL 111 #define FT_MAT_COLOR 112 #define LB_MAT_COLOR 113 @@ -141,46 +138,6 @@ #define BTN_SPECULAR_COLOR 120 #define FT_MAT_SPECULAR_INTENSITY 121 #define MTR_MAT_SPECULAR_INTENSITY 122 -#define FL_MAT_SPECULAR 123 +#define FL_MAT_SPECULAR 123 #define FT_MAT_FAVORITES 124 #define LB_MAT_FAVORITES 125 - - -//#define BTN_MAT_FAVORITES 125 -//#define BTN_MAT_EDITOR 126 - - -// high contrast -#define BMP_GEO_H 130 -#define BMP_REPRESENTATION_H 131 -#define BMP_LIGHT_H 132 -#define BMP_TEXTURE_H 133 -#define BMP_MATERIAL_H 134 -#define BMP_UPDATE_H 135 -#define BMP_ASSIGN_H 136 -#define BMP_CHANGE_TO_3D_H 137 -#define BMP_LATHE_OBJ_H 138 -#define BMP_PERSPECTIVE_H 139 -#define BMP_NORMALS_OBJ_H 142 -#define BMP_NORMALS_FLAT_H 143 -#define BMP_NORMALS_SPHERE_H 144 -#define BMP_NORMALS_INVERT_H 145 -#define BMP_TWO_SIDED_LIGHTING_H 146 -#define BMP_DOUBLE_SIDED_H 147 -#define BMP_SHADOW_3D_H 148 -#define BMP_3DLIGHT_H 149 -#define BMP_LIGHT_COLOR_H 150 -#define BMP_AMBIENT_COLOR_H 151 -#define BMP_TEX_LUMINANCE_H 152 -#define BMP_TEX_COLOR_H 153 -#define BMP_TEX_REPLACE_H 154 -#define BMP_TEX_MODULATE_H 155 -#define BMP_TEX_BLEND_H 156 -#define BMP_TEX_OBJECT_H 157 -#define BMP_TEX_PARALLEL_H 158 -#define BMP_TEX_CIRCLE_H 159 -#define BMP_TEX_FILTER_H 160 -#define BMP_COLORDLG_H 161 -// IAccessibility2 implementation 2009. ------ -#define STR_COLOR_LIGHT_PRE 162 -// ------ IAccessibility2 implementation 2009. diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index 7230df0c6da6..7230df0c6da6 100644..100755 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc diff --git a/svx/inc/fontworkgallery.hrc b/svx/inc/fontworkgallery.hrc index e03c04d0f1ca..7b2f93647217 100644..100755 --- a/svx/inc/fontworkgallery.hrc +++ b/svx/inc/fontworkgallery.hrc @@ -51,22 +51,12 @@ #define STR_CHARS_SPACING_KERN_PAIRS 12 #define IMG_FONTWORK_ALIGN_LEFT_16 1 -#define IMG_FONTWORK_ALIGN_LEFT_16_H 2 #define IMG_FONTWORK_ALIGN_LEFT_26 3 -#define IMG_FONTWORK_ALIGN_LEFT_26_H 4 #define IMG_FONTWORK_ALIGN_CENTER_16 5 -#define IMG_FONTWORK_ALIGN_CENTER_16_H 6 #define IMG_FONTWORK_ALIGN_CENTER_26 7 -#define IMG_FONTWORK_ALIGN_CENTER_26_H 8 #define IMG_FONTWORK_ALIGN_RIGHT_16 9 -#define IMG_FONTWORK_ALIGN_RIGHT_16_H 10 #define IMG_FONTWORK_ALIGN_RIGHT_26 11 -#define IMG_FONTWORK_ALIGN_RIGHT_26_H 12 #define IMG_FONTWORK_ALIGN_WORD_16 13 -#define IMG_FONTWORK_ALIGN_WORD_16_H 14 #define IMG_FONTWORK_ALIGN_WORD_26 15 -#define IMG_FONTWORK_ALIGN_WORD_26_H 16 #define IMG_FONTWORK_ALIGN_STRETCH_16 17 -#define IMG_FONTWORK_ALIGN_STRETCH_16_H 18 #define IMG_FONTWORK_ALIGN_STRETCH_26 19 -#define IMG_FONTWORK_ALIGN_STRETCH_26_H 20 diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 8e5ca04c6173..61226b4e37ac 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -179,3 +180,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc index 852b1f14c7de..8405bb2b6238 100644..100755 --- a/svx/inc/gallery.hrc +++ b/svx/inc/gallery.hrc @@ -81,8 +81,6 @@ #define RID_SVXBMP_THEME_DEFAULT (RID_SVX_GALLERY_START + 54) #define RID_SVXIMG_GALLERY_VIEW_ICON (RID_SVX_GALLERY_START + 56) #define RID_SVXIMG_GALLERY_VIEW_LIST (RID_SVX_GALLERY_START + 57) -#define RID_SVXIMG_GALLERY_VIEW_ICON_HC (RID_SVX_GALLERY_START + 58) -#define RID_SVXIMG_GALLERY_VIEW_LIST_HC (RID_SVX_GALLERY_START + 59) // Gallery-Bitmaps fuer Sounds #define RID_SVXBMP_GALLERY_SOUND_0 (RID_SVX_GALLERY_START + 61) diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx index 2f558c8679ce..46f018db4f7c 100644 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -236,3 +237,5 @@ public: virtual SgaObjKind GetObjKind() const { return SGA_OBJ_INET; } }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc index 483c397983ed..90b05abffe2b 100644..100755 --- a/svx/inc/galtheme.hrc +++ b/svx/inc/galtheme.hrc @@ -68,10 +68,116 @@ #define RID_GALLERYSTR_THEME_SCREENBEANS (RID_GALLERYSTR_THEME_START + 35) #define RID_GALLERYSTR_THEME_DUMMY5 (RID_GALLERYSTR_THEME_START + 36) + #define RID_GALLERYSTR_THEME_FONTWORK (RID_GALLERYSTR_THEME_START + 37) #define RID_GALLERYSTR_THEME_FONTWORK_VERTICAL (RID_GALLERYSTR_THEME_START + 38) +#define RID_GALLERYSTR_THEME_SHAPES_POLYGONS (RID_GALLERYSTR_THEME_START + 39) +#define RID_GALLERYSTR_THEME_SHAPES_1 (RID_GALLERYSTR_THEME_START + 40) +#define RID_GALLERYSTR_THEME_SHAPES_2 (RID_GALLERYSTR_THEME_START + 41) +#define RID_GALLERYSTR_THEME_ANIMALS (RID_GALLERYSTR_THEME_START + 42) +#define RID_GALLERYSTR_THEME_CARS (RID_GALLERYSTR_THEME_START + 43) +#define RID_GALLERYSTR_THEME_BUGS (RID_GALLERYSTR_THEME_START + 44) +#define RID_GALLERYSTR_THEME_CISCO_OTHER (RID_GALLERYSTR_THEME_START + 45) +#define RID_GALLERYSTR_THEME_CISCO_MEDIA (RID_GALLERYSTR_THEME_START + 46) +#define RID_GALLERYSTR_THEME_CISCO_PRODUCTS (RID_GALLERYSTR_THEME_START + 47) +#define RID_GALLERYSTR_THEME_CISCO_WAN_LAN (RID_GALLERYSTR_THEME_START + 48) +#define RID_GALLERYSTR_THEME_DOMINO_USUAL (RID_GALLERYSTR_THEME_START + 49) +#define RID_GALLERYSTR_THEME_DOMINO_NUMBERED (RID_GALLERYSTR_THEME_START + 50) +#define RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_1 (RID_GALLERYSTR_THEME_START + 51) +#define RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_2 (RID_GALLERYSTR_THEME_START + 52) +#define RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_3 (RID_GALLERYSTR_THEME_START + 53) +#define RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_4 (RID_GALLERYSTR_THEME_START + 54) +#define RID_GALLERYSTR_THEME_ELECTRONICS_CIRCUIT (RID_GALLERYSTR_THEME_START + 55) +#define RID_GALLERYSTR_THEME_ELECTRONICS_SIGNS (RID_GALLERYSTR_THEME_START + 56) +#define RID_GALLERYSTR_THEME_ELECTRONICS_GAUGES (RID_GALLERYSTR_THEME_START + 57) +#define RID_GALLERYSTR_THEME_PEOPLE_1 (RID_GALLERYSTR_THEME_START + 58) +#define RID_GALLERYSTR_THEME_ARCHITECTURE_OVERLAY (RID_GALLERYSTR_THEME_START + 59) +#define RID_GALLERYSTR_THEME_ARCHITECTURE_FURNITURES (RID_GALLERYSTR_THEME_START + 60) +#define RID_GALLERYSTR_THEME_ARCHITECTURE_BUILDINGS (RID_GALLERYSTR_THEME_START + 61) +#define RID_GALLERYSTR_THEME_ARCHITECTURE_BATHROOM_KITCHEN (RID_GALLERYSTR_THEME_START + 62) +#define RID_GALLERYSTR_THEME_ARCHITECTURE_KITCHEN (RID_GALLERYSTR_THEME_START + 63) +#define RID_GALLERYSTR_THEME_ARCHITECTURE_WINDOWS_DOORS (RID_GALLERYSTR_THEME_START + 64) +#define RID_GALLERYSTR_THEME_FLOWCHARTS_1 (RID_GALLERYSTR_THEME_START + 65) +#define RID_GALLERYSTR_THEME_FLOWCHARTS_2 (RID_GALLERYSTR_THEME_START + 66) +#define RID_GALLERYSTR_THEME_FORALSTUDIOA (RID_GALLERYSTR_THEME_START + 67) +#define RID_GALLERYSTR_THEME_PHOTOS_FAUNA (RID_GALLERYSTR_THEME_START + 68) +#define RID_GALLERYSTR_THEME_PHOTOS_BUILDINGS (RID_GALLERYSTR_THEME_START + 69) +#define RID_GALLERYSTR_THEME_PHOTOS_PLANTS (RID_GALLERYSTR_THEME_START + 70) +#define RID_GALLERYSTR_THEME_PHOTOS_STATUES (RID_GALLERYSTR_THEME_START + 71) +#define RID_GALLERYSTR_THEME_PHOTOS_LANDSCAPES (RID_GALLERYSTR_THEME_START + 72) +#define RID_GALLERYSTR_THEME_PHOTOS_CITIES (RID_GALLERYSTR_THEME_START + 73) +#define RID_GALLERYSTR_THEME_PHOTOS_FLOWERS (RID_GALLERYSTR_THEME_START + 74) +#define RID_GALLERYSTR_THEME_THERAPEUTICS_GENERAL (RID_GALLERYSTR_THEME_START + 75) +#define RID_GALLERYSTR_THEME_WEATHER (RID_GALLERYSTR_THEME_START + 76) +#define RID_GALLERYSTR_THEME_VECHILES (RID_GALLERYSTR_THEME_START + 77) +#define RID_GALLERYSTR_THEME_SIGNS (RID_GALLERYSTR_THEME_START + 78) +#define RID_GALLERYSTR_THEME_BLUE_MAN (RID_GALLERYSTR_THEME_START + 79) +#define RID_GALLERYSTR_THEME_CHEMISTRY_AMINO_ACIDS (RID_GALLERYSTR_THEME_START + 80) +#define RID_GALLERYSTR_THEME_LOGICAL_SIGNS (RID_GALLERYSTR_THEME_START + 81) +#define RID_GALLERYSTR_THEME_LOGICAL_GATES (RID_GALLERYSTR_THEME_START + 82) +#define RID_GALLERYSTR_THEME_LOGOS (RID_GALLERYSTR_THEME_START + 83) +#define RID_GALLERYSTR_THEME_SMILES (RID_GALLERYSTR_THEME_START + 84) +#define RID_GALLERYSTR_THEME_ARROWS_1 (RID_GALLERYSTR_THEME_START + 85) +#define RID_GALLERYSTR_THEME_CLOCK_01_CLOCK (RID_GALLERYSTR_THEME_START + 86) +#define RID_GALLERYSTR_THEME_CLOCK_02_CLOCK (RID_GALLERYSTR_THEME_START + 87) +#define RID_GALLERYSTR_THEME_CLOCK_03_CLOCK (RID_GALLERYSTR_THEME_START + 88) +#define RID_GALLERYSTR_THEME_CLOCK_04_CLOCK (RID_GALLERYSTR_THEME_START + 89) +#define RID_GALLERYSTR_THEME_CLOCK_05_CLOCK (RID_GALLERYSTR_THEME_START + 90) +#define RID_GALLERYSTR_THEME_CLOCK_06_CLOCK (RID_GALLERYSTR_THEME_START + 91) +#define RID_GALLERYSTR_THEME_CLOCK_07_CLOCK (RID_GALLERYSTR_THEME_START + 92) +#define RID_GALLERYSTR_THEME_CLOCK_08_CLOCK (RID_GALLERYSTR_THEME_START + 93) +#define RID_GALLERYSTR_THEME_CLOCK_09_CLOCK (RID_GALLERYSTR_THEME_START + 94) +#define RID_GALLERYSTR_THEME_CLOCK_10_CLOCK (RID_GALLERYSTR_THEME_START + 95) +#define RID_GALLERYSTR_THEME_CLOCK_11_CLOCK (RID_GALLERYSTR_THEME_START + 96) +#define RID_GALLERYSTR_THEME_CLOCK_12_CLOCK (RID_GALLERYSTR_THEME_START + 97) +#define RID_GALLERYSTR_THEME_PNEUMATIC_PARTS (RID_GALLERYSTR_THEME_START + 98) +#define RID_GALLERYSTR_THEME_COMPUTER_GENERAL (RID_GALLERYSTR_THEME_START + 99) +#define RID_GALLERYSTR_THEME_COMPUTER_NETWORK (RID_GALLERYSTR_THEME_START + 100) +#define RID_GALLERYSTR_THEME_COMPUTER_NETWORK_DEVICES (RID_GALLERYSTR_THEME_START + 101) +#define RID_GALLERYSTR_THEME_COMPUTER_WIFI (RID_GALLERYSTR_THEME_START + 102) +#define RID_GALLERYSTR_THEME_NUMBERS (RID_GALLERYSTR_THEME_START + 103) +#define RID_GALLERYSTR_THEME_SIGNS_DANGER (RID_GALLERYSTR_THEME_START + 104) +#define RID_GALLERYSTR_THEME_OBJECTS (RID_GALLERYSTR_THEME_START + 105) +#define RID_GALLERYSTR_THEME_MAPS_AFRICA (RID_GALLERYSTR_THEME_START + 106) +#define RID_GALLERYSTR_THEME_MAPS_UNITED_STATES_OF_AMERICA (RID_GALLERYSTR_THEME_START + 107) +#define RID_GALLERYSTR_THEME_MAPS_AUSTRALIA (RID_GALLERYSTR_THEME_START + 108) +#define RID_GALLERYSTR_THEME_MAPS_ASIA (RID_GALLERYSTR_THEME_START + 109) +#define RID_GALLERYSTR_THEME_MAPS_SOUTH_AMERICA (RID_GALLERYSTR_THEME_START + 110) +#define RID_GALLERYSTR_THEME_MAPS_EUROPE (RID_GALLERYSTR_THEME_START + 111) +#define RID_GALLERYSTR_THEME_MAPS_EUROPE_1 (RID_GALLERYSTR_THEME_START + 112) +#define RID_GALLERYSTR_THEME_MAPS_FRANCE (RID_GALLERYSTR_THEME_START + 113) +#define RID_GALLERYSTR_THEME_MAPS_FRANCE_COUNTRIES (RID_GALLERYSTR_THEME_START + 114) +#define RID_GALLERYSTR_THEME_MAPS_SIGNS (RID_GALLERYSTR_THEME_START + 115) +#define RID_GALLERYSTR_THEME_MAPS_CANADA (RID_GALLERYSTR_THEME_START + 116) +#define RID_GALLERYSTR_THEME_MAPS_CONTINENTS (RID_GALLERYSTR_THEME_START + 117) +#define RID_GALLERYSTR_THEME_MAPS_MIDDLE_EAST (RID_GALLERYSTR_THEME_START + 118) +#define RID_GALLERYSTR_THEME_MAPS_MIDDLE_AMERICA (RID_GALLERYSTR_THEME_START + 119) +#define RID_GALLERYSTR_THEME_MAPS_MIDDLE_AGES (RID_GALLERYSTR_THEME_START + 120) +#define RID_GALLERYSTR_THEME_MAPS_MEXICO (RID_GALLERYSTR_THEME_START + 121) +#define RID_GALLERYSTR_THEME_MAPS_ANCIENT_TIMES (RID_GALLERYSTR_THEME_START + 122) +#define RID_GALLERYSTR_THEME_MAPS_SYMBOLS (RID_GALLERYSTR_THEME_START + 123) +#define RID_GALLERYSTR_THEME_MAPS_HISTORY_1900 (RID_GALLERYSTR_THEME_START + 124) +#define RID_GALLERYSTR_THEME_MAPS_WORLD (RID_GALLERYSTR_THEME_START + 125) +#define RID_GALLERYSTR_THEME_CROPS (RID_GALLERYSTR_THEME_START + 126) +#define RID_GALLERYSTR_THEME_FRACTIONS (RID_GALLERYSTR_THEME_START + 127) +#define RID_GALLERYSTR_THEME_FLAGS_1 (RID_GALLERYSTR_THEME_START + 128) +#define RID_GALLERYSTR_THEME_MUSIC_INSTRUMENTS (RID_GALLERYSTR_THEME_START + 129) +#define RID_GALLERYSTR_THEME_MUSIC_SHEET_MUSIC (RID_GALLERYSTR_THEME_START + 130) +#define RID_GALLERYSTR_THEME_SPECIAL_PICTOGRAMM (RID_GALLERYSTR_THEME_START + 131) +#define RID_GALLERYSTR_THEME_PHOTOS_CELEBRATION (RID_GALLERYSTR_THEME_START + 132) +#define RID_GALLERYSTR_THEME_PHOTOS_FOODSANDDRINKS (RID_GALLERYSTR_THEME_START + 133) +#define RID_GALLERYSTR_THEME_PHOTOS_HUMANS (RID_GALLERYSTR_THEME_START + 134) +#define RID_GALLERYSTR_THEME_PHOTOS_OBJECTS (RID_GALLERYSTR_THEME_START + 135) +#define RID_GALLERYSTR_THEME_PHOTOS_SPACE (RID_GALLERYSTR_THEME_START + 136) +#define RID_GALLERYSTR_THEME_PHOTOS_TRAVEL (RID_GALLERYSTR_THEME_START + 137) +#define RID_GALLERYSTR_THEME_OPENOFFICEORG_LOGOS (RID_GALLERYSTR_THEME_START + 138) +#define RID_GALLERYSTR_THEME_RELIGION (RID_GALLERYSTR_THEME_START + 139) +#define RID_GALLERYSTR_THEME_BUILDINGS (RID_GALLERYSTR_THEME_START + 140) +#define RID_GALLERYSTR_THEME_HOMEPAGE2 (RID_GALLERYSTR_THEME_START + 141) +#define RID_GALLERYSTR_THEME_ELEMENTSBULLETS2 (RID_GALLERYSTR_THEME_START + 142) + #define RID_GALLERYSTR_THEME_FIRST RID_GALLERYSTR_THEME_3D -#define RID_GALLERYSTR_THEME_LAST RID_GALLERYSTR_THEME_FONTWORK_VERTICAL +#define RID_GALLERYSTR_THEME_LAST RID_GALLERYSTR_THEME_ELEMENTSBULLETS2 #endif diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index e86a684d93f2..227d57425e63 100644..100755 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -404,12 +404,12 @@ #define ITEM_EDIT_UNDO \ Identifier = SID_UNDO ; \ Command = ".uno:UndoAction" ; \ - Text [ en-US ] = "Can't Undo" ; \ + Text [ en-US ] = "Undo" ; \ #define ITEM_EDIT_REDO \ Identifier = SID_REDO ; \ Command = ".uno:Redo" ; \ - Text [ en-US ] = "Can't Restore" ; \ + Text [ en-US ] = "Redo" ; \ #define ITEM_EDIT_REPEAT \ Identifier = SID_REPEAT ; \ @@ -519,12 +519,6 @@ Command = ".uno:Beamer" ; \ Text [ en-US ] = "~Beamer" ; \ - -#define ITEM_INSERT_HYPERLINK_INSERT \ - Identifier = SID_HYPERLINK_INSERT ; \ - Command = ".uno:InsertHyperlink" ; \ - Text [ en-US ] = "~Hyperlink Bar" ; \ - #define ITEM_INSERT_INSERT_GRAPHIC \ Identifier = SID_INSERT_GRAPHIC ; \ Command = ".uno:InsertGraphic" ; \ @@ -660,7 +654,7 @@ MenuItem\ {\ Identifier = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \ - Text [ en-US ] = "~Numbering/Bullets..." ; \ + Text [ en-US ] = "~Bullets and Numbering..." ; \ }; @@ -904,10 +898,16 @@ Command = ".uno:ActiveHelp" ; \ Text [ en-US ] = "~Extended Tips" ; \ -#define ITEM_HELP_SUPPORTPAGE \ - Identifier = SID_HELP_SUPPORTPAGE ; \ - Command = ".uno:HelpSupport" ; \ - Text [ en-US ] = "~Support" ; \ +#define ITEM_SHOW_LICENSE \ + Identifier = SID_SHOW_LICENSE ; \ + Command = ".uno:ShowLicense" ; \ + Text [ en-US ] = "License information..." ; \ + +#define ITEM_SHOW_CREDITS \ + Identifier = SID_SHOW_CREDITS ; \ + Command = ".uno:ShowCredits" ; \ + HelpID = SID_SHOW_CREDITS ; \ + Text [ en-US ] = "%PRODUCTNAME Credits..." ; #define ITEM_HELP_ONLINE_REGISTRATION \ Identifier = SID_ONLINE_REGISTRATION ; \ @@ -958,15 +958,15 @@ };\ MenuItem\ {\ - ITEM_HELP_SUPPORTPAGE\ + ITEM_SHOW_LICENSE\ };\ MenuItem\ {\ - ITEM_HELP_ONLINE_REGISTRATION\ + Separator = TRUE ; \ };\ MenuItem\ {\ - Separator = TRUE ; \ + ITEM_SHOW_CREDITS\ };\ MenuItem\ {\ @@ -1209,7 +1209,7 @@ };\ };\ };\ - Text [ en-US ] = "Case/Characters";\ + Text [ en-US ] = "~Change Case";\ }; #define ITEM_OPEN_HYPERLINK \ diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index be75fe019f96..be75fe019f96 100644..100755 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc diff --git a/svx/inc/lightdlg.hxx b/svx/inc/lightdlg.hxx index 0e9afebb42b5..e770b8adea8e 100644 --- a/svx/inc/lightdlg.hxx +++ b/svx/inc/lightdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,14 +36,12 @@ #include <sfx2/tabdlg.hxx> #include <sfx2/basedlgs.hxx> -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <svx/dlgctrl.hxx> /************************************************************************* |* -|* 3D-Tab-Dialog +|* 3D TabDialog |* \************************************************************************/ @@ -58,7 +57,7 @@ public: /************************************************************************* |* -|* 3D-SingleTab-Dialog +|* 3D SingleTabDialog |* \************************************************************************/ class Svx3DSingleTabDialog : public SfxSingleTabDialog @@ -73,3 +72,4 @@ public: #endif // _SVX_LIGHT3D_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/pch/precompiled_svx.cxx b/svx/inc/pch/precompiled_svx.cxx index 71c3408c6f31..a90cff3b08b6 100644 --- a/svx/inc/pch/precompiled_svx.cxx +++ b/svx/inc/pch/precompiled_svx.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_svx.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index f6c1a594fdd5..787699cebc74 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -689,6 +690,7 @@ #include "osl/nlsupport.h" #include "osl/process.h" #include "osl/security.hxx" +#include "osl/thread.hxx" #include "rsc/rscsfx.hxx" #include "rtl/bootstrap.hxx" #include "rtl/cipher.h" @@ -698,6 +700,7 @@ #include "rtl/logfile.hxx" #include "rtl/math.hxx" #include "rtl/memory.h" +#include "rtl/ref.hxx" #include "rtl/tencinfo.h" #include "rtl/textenc.h" #include "rtl/ustrbuf.hxx" @@ -706,6 +709,7 @@ #include "sal/config.h" #include "sal/main.h" #include "sal/types.h" +#include "salhelper/simplereferenceobject.hxx" #include "sfx2/bindings.hxx" #include "sfx2/ctrlitem.hxx" #include "sfx2/dispatch.hxx" @@ -745,7 +749,7 @@ #include "sot/formats.hxx" #include <map> #include <set> -#include <slist> +#include <list> #include <vector> #include "svtools/FilterConfigItem.hxx" #include "svtools/accessibilityoptions.hxx" @@ -861,7 +865,6 @@ #include "tools/inetdef.hxx" #include "tools/line.hxx" #include "tools/link.hxx" -#include "tools/list.hxx" #include "tools/multisel.hxx" #include "tools/poly.hxx" #include "tools/rc.h" @@ -939,11 +942,7 @@ #include "vcl/unohelp2.hxx" #include "vcl/wall.hxx" #include "tools/wintypes.hxx" -#include "vos/mutex.hxx" -#include "vos/ref.hxx" -#include "vos/refernce.hxx" -#include "vos/thread.hxx" -#include "vos/xception.hxx" +#include "osl/mutex.hxx" #include "xmloff/DashStyle.hxx" #include "xmloff/GradientStyle.hxx" #include "xmloff/HatchStyle.hxx" @@ -960,3 +959,4 @@ //---MARKER--- #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sjctrl.hxx b/svx/inc/sjctrl.hxx index c0d49c6d0895..a4e3861039ec 100644 --- a/svx/inc/sjctrl.hxx +++ b/svx/inc/sjctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,33 +28,22 @@ #ifdef SOLAR_JAVA -#ifndef _SFXSFXJS_HXX #include <sfx2/sfxjs.hxx> -#endif class VCControl; class VCForm; class VCManager; class VCRadioManager; - -// Basis-Klasse aller VCControl-Wrapper-Klassen -// Haelt Verweis auf das Control und handelt einige gemeinsame Properties +// Base class of all VCControl wrapper classes +// Keeps reference to the Control and handles some common properties class ImpSjJScriptControlBase { protected: VCControl* pControl; public: - // Beibehalten bis zum Vollupdate - /* - String getName() const; - void setName( const String & aStrg ); - String getValue() const; - String getType() const; - */ - - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- String ImpGetName() const; void ImpSetName( const String & aStrg ); @@ -61,7 +51,7 @@ class ImpSjJScriptControlBase void ImpSetValue( const String & aStrg ); String ImpGetType() const; - // Konstruktor + // Constructor ImpSjJScriptControlBase::ImpSjJScriptControlBase( VCControl* _pControl ); }; @@ -71,40 +61,40 @@ class ImpSjJScriptControlBase class ImpSjJScriptButtonObject : public SjJScriptButtonObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; virtual void setValue( const String & aStrg ); virtual String getType() const; - // Methoden des Objektes + // Methods of the object virtual void click(); // Events (C++ --> Java) //---------------------- - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnClick_Fct() const; virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual String getOnClick() const; virtual void setOnClick( const String & aSourceStrg ); void onClick(); - // Konstruktor + // constructor ImpSjJScriptButtonObject( VCControl* _pControl, SjJSbxObject * p ); }; //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// PasswordControl (Edit-Control zur Password-Eingabe) +// PasswordControl (edit control for entering password) class ImpSjJScriptPasswordObject : public SjJScriptPasswordObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; @@ -114,16 +104,16 @@ class ImpSjJScriptPasswordObject : public SjJScriptPasswordObject, ImpSjJScriptC virtual void setDefaultValue( const String & aStrg ); virtual void setValue( const String & aStrg ); - // Methoden des Objektes + // Methods of the object virtual void focus(); virtual void blur(); virtual void select(); // Events (C++ --> Java) //---------------------- - // keine ! + // none! - // Konstruktor + // construktor ImpSjJScriptPasswordObject( VCControl* _pControl, SjJSbxObject * p ); }; @@ -132,9 +122,9 @@ class ImpSjJScriptPasswordObject : public SjJScriptPasswordObject, ImpSjJScriptC class ImpSjJScriptCheckboxObject : public SjJScriptCheckboxObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; @@ -144,28 +134,27 @@ class ImpSjJScriptCheckboxObject : public SjJScriptCheckboxObject, ImpSjJScriptC virtual void setChecked( sal_Bool bCheck ); virtual sal_Bool getDefaultChecked() const; virtual void setDefaultChecked( sal_Bool bCheck ); - // getValue() wird in der Basisklasse definiert virtual void setValue( const String & aStrg ); - // Methoden des Objektes + // Methods of the object virtual void click(); // Events (C++ --> Java) //---------------------- - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnClick_Fct() const; virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual String getOnClick() const; virtual void setOnClick( const String & aSourceStrg ); void onClick(); - // Konstruktor + // construktor ImpSjJScriptCheckboxObject( VCControl* _pControl, SjJSbxObject * p ); }; //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// Wrapper-Klasse fuer RadioArray +// Wrapper class for RadioArray class ImpSjJScriptRadioArray: public SjJSbxArrayObject { VCRadioManager* pMgr; @@ -174,7 +163,7 @@ public: SjJSbxObject* ImpSjJScriptRadioArray::getElement( sal_Int32 nIndex ) const; SjJSbxObject* ImpSjJScriptRadioArray::getElement_String( const String & aName ) const; - // Konstruktor + // construktor ImpSjJScriptRadioArray::ImpSjJScriptRadioArray( VCRadioManager* _pMgr, SjJSbxObject * p ); }; @@ -183,37 +172,33 @@ public: class ImpSjJScriptRadioObject : public SjJScriptRadioObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; virtual String getType() const; - // Properties von SjJScriptCheckboxObject + // Properties of SjJScriptCheckboxObject virtual sal_Bool getChecked() const; virtual void setChecked( sal_Bool bCheck ); virtual sal_Bool getDefaultChecked() const; virtual void setDefaultChecked( sal_Bool bCheck ); - // getValue() wird in der Basisklasse definiert virtual void setValue( const String & aStrg ); - // yyy Raus zum inkompatiblen - //virtual sal_Int32 getLength(); - - // Methoden des Objektes + // Methods of the object virtual void click(); // Events (C++ --> Java) - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnClick_Fct() const; virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual String getOnClick() const; virtual void setOnClick( const String & aSourceStrg ); void onClick(); - // Konstruktor + // Constructor ImpSjJScriptRadioObject( VCControl* _pControl, SjJSbxObject * p ); }; @@ -222,9 +207,9 @@ class ImpSjJScriptRadioObject : public SjJScriptRadioObject, ImpSjJScriptControl class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; @@ -234,17 +219,13 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr virtual sal_Int32 getSelectedIndex() const; virtual void setSelectedIndex( sal_Int32 nNo ); - // liefert eine Array von Option-Objekten - //yyy Raus zum inkompatiblen - //virtual SjJSbxArrayObject * getOptions(); - - // Methoden des Objektes + // Methods of the object virtual void focus(); virtual void blur(); // Events (C++ --> Java) //---------------------- - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnBlur_Fct() const; virtual void setOnBlur_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual SjJScriptFunctionObject* getOnChange_Fct() const; @@ -261,23 +242,20 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr virtual void setOnFocus( const String & aSourceStrg ); void onFocus(); - // SjJSbxArrayObject-Methoden + // SjJSbxArrayObject methods virtual sal_Int32 getLength() const; - // Zugriff "uber den Index + // Access through the index virtual SjJSbxObject * getElement( sal_Int32 nIndex ) const; - // Zugriff "uber den Namen - // native Java-Methoden k"onnen (noch) nicht "uberladen werden - //virtual SjJSbxObject * getElement_String( const String & aName ) const; - // Konstruktor + // Constructor ImpSjJScriptSelectObject( VCControl* _pControl, SjJSbxObject * p ); - // zum Setzen von Eintr"agen am Objket (zum Aufruf von Java aus) 15.1.1997 + // for setting entries of the object (to be called from Java) virtual void setOption( sal_Int32 nIndex, const String & aOptionText, const String & aOptionValue, sal_Bool bDefaultSelected, sal_Bool bSelected ); - // Schnittstelle fuer die Properties der Option-Objekte + // interface for the properties of the option objects virtual sal_Bool getOptionDefaultSelected( sal_Int32 nIndex ) const; virtual void setOptionDefaultSelected( sal_Bool bSelected, sal_Int32 nIndex ); virtual sal_Bool getOptionSelected( sal_Int32 nIndex ) const; @@ -290,13 +268,11 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// Wieso von Controlbase abgeleitet? - class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptControlBase { sal_uInt16 nListBoxIndex; public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- virtual sal_Bool getdefaultSelected() const; virtual void setdefaultSelected( sal_Bool bSelected ); @@ -304,53 +280,44 @@ class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptContr virtual sal_Bool getSelected() const; virtual void setSelected( sal_Bool bSelected ); - - //yyy Zum Vollupdate raus: - /* - virtual sal_Int32 getSelectedIndex() const; - virtual void setSelectedIndex( sal_Int32 nNo ); - */ - - virtual String getText() const; virtual void setText( const String & sText ); - // getValue() wird in der Basisklasse definiert virtual String getValue() const; virtual void setValue( const String & aStrg ); - // DUMMY-Methoden + // DUMMY methods virtual String getName() const { return "";} virtual void setName( const String &s) { } virtual String getType() const { return "";} - // Methoden des Objektes - // keine ! + // Methods of the object + // none ! // Events (C++ --> Java) //---------------------- - // keine ! + // none ! - // Konstruktor + // Constructor ImpSjJScriptOptionObject( VCControl* _pControl, SjJSbxObject * p, sal_uInt16 _nListBoxIndex ); }; //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// Eigene Klasse fuer forms-Array anlegen +// Separate class for forms array class SjJSbxFormsArray: public SfxJSArray { VCManager* pManager; public: - // SjJSbxArrayObject-Methoden + // SjJSbxArrayObject methods virtual sal_Int32 getLength() const; - // Zugriff "uber den Index + // access through the index virtual SjJSbxObject * getElement( sal_Int32 nIndex ) const; - // Zugriff "uber den Namen - // native Java-Methoden k"onnen (noch) nicht "uberladen werden + // access through the name + // cannot overload native java methods (yet) virtual SjJSbxObject * getElement_String( const String & aName ) const; - // Konstruktor + // Constructor SjJSbxFormsArray( VCManager * _pManager, SjJSbxObject * p ); }; @@ -359,9 +326,9 @@ class SjJSbxFormsArray: public SfxJSArray class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; @@ -369,17 +336,16 @@ class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBa virtual String getDefaultValue() const; virtual void setDefaultValue( const String & aStrg ); - // getValue() wird in der Basisklasse definiert virtual void setValue( const String & aStrg ); - // Methoden des Objektes + // Methods of the object virtual void focus(); virtual void blur(); virtual void select(); // Events (C++ --> Java) //---------------------- - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnBlur_Fct() const; virtual void setOnBlur_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual SjJScriptFunctionObject* getOnChange_Fct() const; @@ -401,7 +367,7 @@ class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBa virtual void setOnSelect( const String & aSourceStrg ); void onSelect(); - // Konstruktor + // Constructor ImpSjJScriptTextObject( VCControl* _pControl, SjJSbxObject * p ); }; @@ -410,9 +376,9 @@ class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBa class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; @@ -420,17 +386,16 @@ class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject, ImpSjJScriptC virtual String getDefaultValue() const; virtual void setDefaultValue( const String & aStrg ); - // getValue() wird in der Basisklasse definiert virtual void setValue( const String & aStrg ); - // Methoden des Objektes + // Methods of the object virtual void focus(); virtual void blur(); virtual void select(); // Events (C++ --> Java) //---------------------- - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnBlur_Fct() const; virtual void setOnBlur_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual SjJScriptFunctionObject* getOnChange_Fct() const; @@ -452,7 +417,7 @@ class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject, ImpSjJScriptC virtual void setOnSelect( const String & aSourceStrg ); void onSelect(); - // Konstruktor + // Constructor ImpSjJScriptTextareaObject( VCControl* _pControl, SjJSbxObject * p ); }; @@ -460,30 +425,30 @@ class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject, ImpSjJScriptC class ImpSjJScriptSubmitObject : public SjJScriptSubmitObject, ImpSjJScriptControlBase { - // Identisch mit ButtonObject + // identically equal to ButtonObject public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; virtual void setValue( const String & aStrg ); virtual String getType() const; - // Methoden des Objektes + // Methods of the object virtual void click(); // Events (C++ --> Java) //---------------------- - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnClick_Fct() const; virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual String getOnClick() const; virtual void setOnClick( const String & aSourceStrg ); void onClick(); - // Konstruktor + // Constructor ImpSjJScriptSubmitObject( VCControl* _pControl, SjJSbxObject * p ); }; @@ -491,30 +456,30 @@ class ImpSjJScriptSubmitObject : public SjJScriptSubmitObject, ImpSjJScriptContr class ImpSjJScriptResetObject : public SjJScriptResetObject, ImpSjJScriptControlBase { - // Identisch mit ButtonObject + // identically equal to ButtonObject public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; virtual void setValue( const String & aStrg ); virtual String getType() const; - // Methoden des Objektes + // Methods of the object virtual void click(); // Events (C++ --> Java) //---------------------- - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnClick_Fct() const; virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual String getOnClick() const; virtual void setOnClick( const String & aSourceStrg ); void onClick(); - // Konstruktor + // Constructor ImpSjJScriptResetObject( VCControl* _pControl, SjJSbxObject * p ); }; @@ -523,25 +488,24 @@ class ImpSjJScriptResetObject : public SjJScriptResetObject, ImpSjJScriptControl class ImpSjJScriptHiddenObject : public SjJScriptHiddenObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; virtual String getType() const; - // getValue() wird in der Basisklasse definiert virtual void setValue( const String & aStrg ); - // Methoden des Objektes - // keine ! + // Methods of the object + // none ! // Events (C++ --> Java) //---------------------- - // keine ! + // none ! - // Konstruktor + // Constructor ImpSjJScriptHiddenObject( VCControl* _pControl, SjJSbxObject * p ); }; @@ -550,22 +514,22 @@ class ImpSjJScriptHiddenObject : public SjJScriptHiddenObject, ImpSjJScriptContr class ImpSjJScriptFileUploadObject : public SjJScriptFileUploadObject, ImpSjJScriptControlBase { public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- - // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht + // Base class properties, are passed through to ImpSjJScriptControlBase virtual String getName() const; virtual void setName( const String & aStrg ); virtual String getValue() const; virtual String getType() const; - // Methoden des Objektes - // keine ! + // Methods of the object + // none ! // Events (C++ --> Java) //---------------------- - // keine ! + // none ! - // Konstruktor + // Constructor ImpSjJScriptFileUploadObject( VCControl* _pControl, SjJSbxObject * p ); }; @@ -576,7 +540,7 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject VCForm* pVCForm; public: - // Methoden von Java --> C++ (f"ur Properties) + // Methods from Java --> C++ (for properties) //-------------------------------------------- virtual String getName() const; virtual void setName( const String & aStrg ); @@ -592,26 +556,18 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject virtual String getTarget() const; virtual void setTarget( const String & sValue ); - // SjJSbxArrayObject-Methoden + // SjJSbxArrayObject methods sal_Int32 getLength() const; SjJSbxObject* getElement( sal_Int32 nIndex ) const; SjJSbxObject* getElement_String( const String & aName ) const; - // liefert ein Array-Objekt mit Elementen vom Typ JScriptAbstractControlsObject - // yyy Raus zum inkompatiblen - //virtual SjJSbxArrayObject * getElements(); - - // Zugriff ueber den Namen eines Controls (falls ein Name zugeordnet ist) - // yyy Raus zum inkompatiblen - //virtual SjJSbxObject * getElement( const String & aName ); - - // Methoden des Objektes + // Methods of the object virtual void submit(); virtual void reset(); // Events (C++ --> Java) //---------------------- - // Neue Event-Schnittstelle mit Function-Objekten + // New event interface with function objects virtual SjJScriptFunctionObject* getOnSubmit_Fct() const; virtual void setOnSubmit_Fct( SjJScriptFunctionObject* pFunctionObject ); virtual SjJScriptFunctionObject* getOnReset_Fct() const; @@ -623,8 +579,10 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject virtual void setOnReset( const String & aSourceStrg ); void onReset(); - // Konstruktor + // Constructor ImpSjJScriptFormObject( VCForm* _pVCForm, SjJSbxObject * p ); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index 0d20b950a49c..968a5b1a4d31 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,11 +51,11 @@ friend class ImpItemEdit; sal_uInt16 nLastWhich; sal_uInt16 nLastWhichOben; sal_uInt16 nLastWhichUnten; - FASTBOOL bWhichesButNames; - FASTBOOL bDontHideIneffectiveItems; - FASTBOOL bDontSortItems; - FASTBOOL bShowWhichIds; - FASTBOOL bShowRealValues; + bool bWhichesButNames; + bool bDontHideIneffectiveItems; + bool bDontSortItems; + bool bShowWhichIds; + bool bShowRealValues; private: #if _SOLAR__PRIVATE void ImpCtor(); @@ -70,7 +71,7 @@ protected: virtual void DoubleClick(const BrowserMouseEvent&); virtual void KeyInput(const KeyEvent& rEvt); virtual void Select(); - virtual void SetDirty(); // wird z.B. bei Modusumschaltungen gerufen + virtual void SetDirty(); // is called for example in mode switches virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex); virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); public: @@ -80,8 +81,8 @@ public: void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL); sal_uIntPtr GetCurrentPos() const; sal_uInt16 GetCurrentWhich() const; - virtual FASTBOOL BegChangeEntry(sal_uIntPtr nPos); - virtual FASTBOOL EndChangeEntry(); + virtual bool BegChangeEntry(sal_uIntPtr nPos); + virtual bool EndChangeEntry(); virtual void BrkChangeEntry(); /** GetCellText returns the text at the given position @@ -114,7 +115,7 @@ public: virtual void GetFocus(); void Clear() { aBrowse.Clear(); } void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL) { aBrowse.SetAttributes(pAttr,p2ndSet); } - void SetFloatingMode(FASTBOOL /*bOn*/) {} + void SetFloatingMode(bool /*bOn*/) {} const _SdrItemBrowserControl& GetBrowserControl() const { return aBrowse; } _SdrItemBrowserControl& GetBrowserControl() { return aBrowse; } }; @@ -124,7 +125,7 @@ class SdrView; class SdrItemBrowser: public _SdrItemBrowserWindow { Timer aIdleTimer; SdrView* pView; - FASTBOOL bDirty; + bool bDirty; private: static Window* ImpGetViewWin(SdrView& rView); DECL_LINK(IdleHdl,Timer*); @@ -142,3 +143,4 @@ public: #endif //_SVDIBROW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svdpomv.hxx b/svx/inc/svdpomv.hxx index 5ed76f739c68..ca417842915e 100644 --- a/svx/inc/svdpomv.hxx +++ b/svx/inc/svdpomv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ public: #endif //_SVDPOMV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svdshort.hxx b/svx/inc/svdshort.hxx deleted file mode 100644 index 2b28525cbb51..000000000000 --- a/svx/inc/svdshort.hxx +++ /dev/null @@ -1,91 +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. - * - ************************************************************************/ - -#error svdshort wird nicht mehr verwendet! - -#ifndef _SVDSHORT_HXX -#define _SVDSHORT_HXX - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef Weg_Mit_Den_Doofen_Abkuerzungen - // Statistik - Stand 02-03-1995 - // Haeufigkeit Ersparnis -#define SdrHelpLineKind SdrFLK /* HL ist schon besetzt */ -#define SdrHelpLineList SdrFLL /* HL ist schon besetzt */ -#define SdrHelpLine SdrFL /* HL ist schon besetzt */ -#define SdrObjTransformInfoRec SdrTI -#define SdrDragCrook SdrDC -#define SdrDragMirror SdrDI -#define SdrDragMovHdl SdrDH -#define SdrDragResize SdrDZ -#define SdrDragRotate SdrDR -#define SdrDragShear SdrDE -#define SdrDragMove SdrDM -#define SdrCreateCmd SdrCC -#define SdrUndoAttrObj SdrAU -#define SdrObjKind SdrOK -#define SdrUndoGroup SdrUG -#define SdrUndoAction SdrUA -#define SdrAttrObj SdrAO -#define SdrGrafObj SdrGO -#define SdrMarkList SdrML -#define SdrHdlList SdrHL -#define SdrLayerAdmin SdrLA -#define SdrObjUserCall SdrUC -#define SdrObjUnknown SdrUO -#define SdrExchangeView SdrXV -#define SdrCreateView SdrCV -#define SdrOle2Obj SdrOO -#define SdrObjGeoData SdrGD -#define SdrDragView SdrDV -#define SdrSnapView SdrSV -#define SdrObjList SdrOL -#define SdrEdgeObj SdrEO -#define SdrCircObj SdrCO -#define SdrObjGroup SdrOG -#define SdrPage SdrPg -#define SdrObjEditView SdrOV -#define SdrModel SdrMD -#define SdrEditView SdrEV -#define SdrPaintView SdrNV -#define SdrPolyObj SdrPO -#define SdrRectObj SdrRO -#define SdrTextObj SdrTO -#define SdrMarkView SdrMV -#define SdrPathObj SdrBO -#define SdrPageView SdrPV -#define SdrDragStat SdrDS -#define SdrVirtObj SdrVO -#define SdrObject SdrO - -#endif - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -#endif //_SVDSHORT_HXX - diff --git a/svx/inc/svx/AccessibleControlShape.hxx b/svx/inc/svx/AccessibleControlShape.hxx index 60158c0a55d3..65bf19460e11 100644 --- a/svx/inc/svx/AccessibleControlShape.hxx +++ b/svx/inc/svx/AccessibleControlShape.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -214,3 +215,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/AccessibleGraphicShape.hxx b/svx/inc/svx/AccessibleGraphicShape.hxx index 09cee5c069ad..aab1ac52493a 100644 --- a/svx/inc/svx/AccessibleGraphicShape.hxx +++ b/svx/inc/svx/AccessibleGraphicShape.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,3 +122,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/AccessibleOLEShape.hxx b/svx/inc/svx/AccessibleOLEShape.hxx index 27cd0f5fe237..0baa9bd6d49d 100644 --- a/svx/inc/svx/AccessibleOLEShape.hxx +++ b/svx/inc/svx/AccessibleOLEShape.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,13 +29,9 @@ #ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_OLE_SHAPE_HXX #define _SVX_ACCESSIBILITY_ACCESSIBLE_OLE_SHAPE_HXX -#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_MANAGER_HXX #include <svx/AccessibleShape.hxx> -#endif -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_ #include <com/sun/star/accessibility/XAccessibleAction.hpp> -#endif #include "svx/svxdllapi.h" namespace accessibility { @@ -131,3 +128,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx index e1979294b2d8..ac444459ace6 100755..100644 --- a/svx/inc/svx/AccessibleShape.hxx +++ b/svx/inc/svx/AccessibleShape.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -408,3 +409,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/AccessibleShapeInfo.hxx b/svx/inc/svx/AccessibleShapeInfo.hxx index 3aa8908087dd..377628f14479 100644 --- a/svx/inc/svx/AccessibleShapeInfo.hxx +++ b/svx/inc/svx/AccessibleShapeInfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,3 +108,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/AccessibleShapeTreeInfo.hxx b/svx/inc/svx/AccessibleShapeTreeInfo.hxx index f43f0666a437..37066a003dd5 100644 --- a/svx/inc/svx/AccessibleShapeTreeInfo.hxx +++ b/svx/inc/svx/AccessibleShapeTreeInfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -214,3 +215,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/AccessibleTableShape.hxx b/svx/inc/svx/AccessibleTableShape.hxx index 9f3edef84a3c..be6f29d59128 100644 --- a/svx/inc/svx/AccessibleTableShape.hxx +++ b/svx/inc/svx/AccessibleTableShape.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,3 +131,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/AccessibleTextHelper.hxx b/svx/inc/svx/AccessibleTextHelper.hxx index 1d0b8cdf8cfb..41104684c7e6 100644 --- a/svx/inc/svx/AccessibleTextHelper.hxx +++ b/svx/inc/svx/AccessibleTextHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -429,3 +430,5 @@ namespace accessibility } // end of namespace accessibility #endif /* _SVX_ACCESSILE_TEXT_HELPER_HXX_ */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ActionDescriptionProvider.hxx b/svx/inc/svx/ActionDescriptionProvider.hxx index 5b6e0ab9ab35..6236a6572a5e 100644 --- a/svx/inc/svx/ActionDescriptionProvider.hxx +++ b/svx/inc/svx/ActionDescriptionProvider.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ChildrenManager.hxx b/svx/inc/svx/ChildrenManager.hxx index 131f834eac03..b9caef64f4d1 100644 --- a/svx/inc/svx/ChildrenManager.hxx +++ b/svx/inc/svx/ChildrenManager.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -214,3 +215,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/DescriptionGenerator.hxx b/svx/inc/svx/DescriptionGenerator.hxx index 501b350eef05..f7236d1dc5fa 100644 --- a/svx/inc/svx/DescriptionGenerator.hxx +++ b/svx/inc/svx/DescriptionGenerator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -215,3 +216,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx index b3b944513e60..867aac13fa3c 100644 --- a/svx/inc/svx/EnhancedCustomShape2d.hxx +++ b/svx/inc/svx/EnhancedCustomShape2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -219,3 +220,4 @@ class EnhancedCustomShape2d : public SfxItemSet }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx index fa529bca8494..534b24a049cb 100644 --- a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx +++ b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -212,3 +213,5 @@ private: } #endif /* _ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/EnhancedCustomShapeGeometry.hxx b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx index 2ee9824ce547..218770bd706a 100644 --- a/svx/inc/svx/EnhancedCustomShapeGeometry.hxx +++ b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ SVX_DLLPUBLIC sal_Bool IsCustomShapeStrokedByDefault( MSO_SPT eSpType ) SVX_DLLPUBLIC const mso_CustomShape* GetCustomShapeContent( MSO_SPT eSpType ); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx index 054af2e3af41..982994ae6e32 100644 --- a/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx +++ b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,3 +38,5 @@ namespace EnhancedCustomShapeTypeNames } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/IAccessibleParent.hxx b/svx/inc/svx/IAccessibleParent.hxx index be97a49e982b..ea6c54d251cf 100644 --- a/svx/inc/svx/IAccessibleParent.hxx +++ b/svx/inc/svx/IAccessibleParent.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,5 @@ public: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/IAccessibleViewForwarder.hxx b/svx/inc/svx/IAccessibleViewForwarder.hxx index e9d099edf4a9..8084dd846e9f 100644 --- a/svx/inc/svx/IAccessibleViewForwarder.hxx +++ b/svx/inc/svx/IAccessibleViewForwarder.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,3 +131,5 @@ public: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/IAccessibleViewForwarderListener.hxx b/svx/inc/svx/IAccessibleViewForwarderListener.hxx index 6c876a64bc70..ac8a94a6d821 100644 --- a/svx/inc/svx/IAccessibleViewForwarderListener.hxx +++ b/svx/inc/svx/IAccessibleViewForwarderListener.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,3 +73,5 @@ public: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ParseContext.hxx b/svx/inc/svx/ParseContext.hxx index 6b0ec247a39e..b8ccaf717a63 100644 --- a/svx/inc/svx/ParseContext.hxx +++ b/svx/inc/svx/ParseContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,4 @@ namespace svxform +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/svx/inc/svx/ShapeTypeHandler.hxx index 1b8a7b6947c6..a12351436872 100755..100644 --- a/svx/inc/svx/ShapeTypeHandler.hxx +++ b/svx/inc/svx/ShapeTypeHandler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,7 +41,7 @@ #include <rtl/ustring.hxx> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace accessibility { @@ -203,7 +204,7 @@ private: /** This hash map allows the fast look up of a type descriptor for a given service name. */ - typedef ::std::hash_map< + typedef ::boost::unordered_map< ::rtl::OUString,ShapeTypeId, ::rtl::OUStringHash, // ::comphelper::UStringHash, @@ -235,3 +236,5 @@ private: } // end of namespace accessible #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/SmartTagCtl.hxx b/svx/inc/svx/SmartTagCtl.hxx index 87c6d69ebaaf..f12dc412af3e 100644 --- a/svx/inc/svx/SmartTagCtl.hxx +++ b/svx/inc/svx/SmartTagCtl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx index 666160b3a745..1bda18a0f883 100644 --- a/svx/inc/svx/SmartTagItem.hxx +++ b/svx/inc/svx/SmartTagItem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,8 +79,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; // leer virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; // leer - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; // leer - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // leer + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& GetActionComponentsSequence() const { return maActionComponentsSequence; } const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& GetActionIndicesSequence() const { return maActionIndicesSequence; } @@ -94,3 +95,4 @@ public: #endif // #ifndef _SVX_SMARTTAGITEM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/SmartTagMgr.hxx b/svx/inc/svx/SmartTagMgr.hxx index 3dc7233bbc4e..221e93798337 100644 --- a/svx/inc/svx/SmartTagMgr.hxx +++ b/svx/inc/svx/SmartTagMgr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -232,3 +233,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/SpellDialogChildWindow.hxx b/svx/inc/svx/SpellDialogChildWindow.hxx index 016def2576dc..b65075807129 100644 --- a/svx/inc/svx/SpellDialogChildWindow.hxx +++ b/svx/inc/svx/SpellDialogChildWindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -123,3 +124,5 @@ protected: } // end of namespace ::svx #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/SvxShapeTypes.hxx b/svx/inc/svx/SvxShapeTypes.hxx index b4c76f19354b..2424224b5a16 100644 --- a/svx/inc/svx/SvxShapeTypes.hxx +++ b/svx/inc/svx/SvxShapeTypes.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX #define _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX -#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX #include <svx/ShapeTypeHandler.hxx> -#endif #include <com/sun/star/accessibility/XAccessible.hpp> namespace accessibility { @@ -78,11 +77,8 @@ enum SvxShapeTypes DRAWING_END = DRAWING_MEDIA }; -/** List of shape type descriptors corresponding to the - <type>SvxShapeTypes</type> enum. -*/ -extern ShapeTypeDescriptor aSvxShapeTypeList[]; - } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/UnoNamespaceMap.hxx b/svx/inc/svx/UnoNamespaceMap.hxx index 7e3a1be005b8..e62dfce0ad09 100644 --- a/svx/inc/svx/UnoNamespaceMap.hxx +++ b/svx/inc/svx/UnoNamespaceMap.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,5 @@ SVX_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > } #endif // _SVX_UNONAMESPACEMAP_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/XPropertyTable.hxx b/svx/inc/svx/XPropertyTable.hxx index 59ca1e1e086a..691784ad51c7 100644 --- a/svx/inc/svx/XPropertyTable.hxx +++ b/svx/inc/svx/XPropertyTable.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,4 @@ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< com::sun::star::uno::XInterface #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx index 6d4f92571dc0..d1d5c4a5ae7a 100644 --- a/svx/inc/svx/algitem.hxx +++ b/svx/inc/svx/algitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,77 +40,6 @@ class SvStream; //------------------------------------------------------------------------ - - -class SVX_DLLPUBLIC SvxHorJustifyItem: public SfxEnumItem -{ -public: - TYPEINFO(); - - SvxHorJustifyItem( const sal_uInt16 nId ); - - SvxHorJustifyItem( - const SvxCellHorJustify eJustify /*= SVX_HOR_JUSTIFY_STANDARD*/, - const sal_uInt16 nId ); - - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - - virtual sal_uInt16 GetValueCount() const; - virtual String GetValueText( sal_uInt16 nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; - - inline SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify) - { - SetValue( rHorJustify.GetValue() ); - return *this; - } -}; - - -//------------------------------------------------------------------------ - - -class SVX_DLLPUBLIC SvxVerJustifyItem: public SfxEnumItem -{ -public: - TYPEINFO(); - - SvxVerJustifyItem( const sal_uInt16 nId ); - - SvxVerJustifyItem( - const SvxCellVerJustify eJustify /*= SVX_VER_JUSTIFY_STANDARD*/, - const sal_uInt16 nId ); - - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - - virtual sal_uInt16 GetValueCount() const; - virtual String GetValueText( sal_uInt16 nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; - - inline SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify) - { - SetValue( rVerJustify.GetValue() ); - return *this; - } -}; - - -//------------------------------------------------------------------------ - class SVX_DLLPUBLIC SvxOrientationItem: public SfxEnumItem { public: @@ -128,8 +58,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual sal_uInt16 GetValueCount() const; virtual String GetValueText( sal_uInt16 nVal ) const; @@ -176,8 +106,8 @@ public: virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); sal_Int16 GetLeftMargin() const {return nLeftMargin; } sal_Bool SetLeftMargin(sal_Int16 nLeft); @@ -200,3 +130,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/anchorid.hxx b/svx/inc/svx/anchorid.hxx index 976d0dc504c6..ef30c6e02173 100644 --- a/svx/inc/svx/anchorid.hxx +++ b/svx/inc/svx/anchorid.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,13 +31,15 @@ enum SvxAnchorIds { - SVX_OBJ_AT_CNTNT = 0x01, //Absatzgebundener Rahmen - SVX_OBJ_IN_CNTNT = 0x02, //Zeichengebundener Rahmen - SVX_OBJ_PAGE = 0x04, //Seitengebundener Rahmen - SVX_OBJ_AT_FLY = 0x08 //Rahmengebundener Rahmen -// SVX_OBJ_AUTO_CNTNT = 0x10 //Automatisch positionierter, absatzgebundener Rahmen + SVX_OBJ_AT_CNTNT = 0x01, // Frame bound to paragraph + SVX_OBJ_IN_CNTNT = 0x02, // Frame bound to character + SVX_OBJ_PAGE = 0x04, // Frame bound to page + SVX_OBJ_AT_FLY = 0x08 // Frame bound to other frame +// SVX_OBJ_AUTO_CNTNT = 0x10 // Automatically positioned frame bound to paragraph }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx index ae0ac7b9d630..3236078794ac 100644 --- a/svx/inc/svx/bmpmask.hxx +++ b/svx/inc/svx/bmpmask.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,7 +61,7 @@ public: /************************************************************************* |* -|* Ableitung vom SfxChildWindow als 'Beh"alter' f"ur Float +|* Derivative from SfxChildWindow as 'container' for Float |* \************************************************************************/ @@ -128,7 +129,6 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow SvxBmpMaskSelectItem aSelItem; Image maImgPipette; - Image maImgPipetteH; virtual sal_Bool Close(); @@ -199,3 +199,4 @@ private: #endif // _BMPMASK_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/camera3d.hxx b/svx/inc/svx/camera3d.hxx index 73cd1824933f..3775adbc4be2 100644 --- a/svx/inc/svx/camera3d.hxx +++ b/svx/inc/svx/camera3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ /************************************************************************* |* -|* Kamera-Ableitung +|* Camera derivative |* \************************************************************************/ @@ -50,14 +51,14 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D double fFocalLength; double fBankAngle; - FASTBOOL bAutoAdjustProjection; + bool bAutoAdjustProjection; public: Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt, double fFocalLen = 35.0, double fBankAng = 0); Camera3D(); - // Anfangswerte wieder herstellen + // Reset to default values void Reset(); void SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt, @@ -71,24 +72,26 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D const basegfx::B3DPoint& GetLookAt() const { return aLookAt; } void SetPosAndLookAt(const basegfx::B3DPoint& rNewPos, const basegfx::B3DPoint& rNewLookAt); - // Brennweite in mm + // Focal length in mm void SetFocalLength(double fLen); void SetFocalLengthWithCorrect(double fLen); double GetFocalLength() const { return fFocalLength; } - // Neigung links/rechts + // Bank angle links/rechts void SetBankAngle(double fAngle); double GetBankAngle() const { return fBankAngle; } - // Um die Kameraposition drehen, LookAt wird dabei veraendert + // For rotating the camera position. Changes LookAt. void Rotate(double fHAngle, double fVAngle); - // Um den Blickpunkt drehen, Position wird dabei veraendert + // For changing the point of view. Changes the position. void RotateAroundLookAt(double fHAngle, double fVAngle); - void SetAutoAdjustProjection(FASTBOOL bAdjust = sal_True) + void SetAutoAdjustProjection(bool bAdjust = true) { bAutoAdjustProjection = bAdjust; } - FASTBOOL IsAutoAdjustProjection() const { return bAutoAdjustProjection; } + bool IsAutoAdjustProjection() const { return bAutoAdjustProjection; } }; #endif // _CAMERA3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx index 88662b3b4cdd..db15ceff56dd 100644 --- a/svx/inc/svx/charmap.hxx +++ b/svx/inc/svx/charmap.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,8 +34,8 @@ #include <vcl/metric.hxx> #include <vcl/scrbar.hxx> #include <map> -#include <tools/shl.hxx> //add CHINA001 -#include <tools/debug.hxx> //add CHINA001 +#include <tools/shl.hxx> +#include <tools/debug.hxx> #include "svx/svxdllapi.h" // define ---------------------------------------------------------------- @@ -138,3 +139,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx index 073284d02617..8b44b74096ce 100644 --- a/svx/inc/svx/checklbx.hxx +++ b/svx/inc/svx/checklbx.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ #include <svtools/svtreebx.hxx> #include <svtools/svlbitm.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include "svx/svxdllapi.h" // class SvxCheckListBox ------------------------------------------------- @@ -62,8 +61,7 @@ public: SvxCheckListBox( Window* pParent, WinBits nWinStyle = 0 ); SvxCheckListBox( Window* pParent, const ResId& rResId ); SvxCheckListBox( Window* pParent, const ResId& rResId, - const Image& rNormalStaticImage, - const Image& rHighContrastStaticImage ); + const Image& rNormalStaticImage ); ~SvxCheckListBox(); void InsertEntry ( const String& rStr, @@ -92,3 +90,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx index ce1f5ea0753f..71bf1dfeda90 100644 --- a/svx/inc/svx/chrtitem.hxx +++ b/svx/inc/svx/chrtitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -240,8 +241,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); sal_uInt16 GetValueCount() const { return CHTXTORDER_COUNT; } SvxChartTextOrder GetValue() const @@ -321,11 +322,8 @@ public: SvxDoubleItem(SvStream& rIn, sal_uInt16 nId ); SvxDoubleItem(const SvxDoubleItem& rItem); - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - - + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, @@ -349,3 +347,4 @@ public: #endif // _SVX_CHRTITEM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/clipboardctl.hxx b/svx/inc/svx/clipboardctl.hxx index bcfafe6c93f7..c9a697bc9e5c 100644 --- a/svx/inc/svx/clipboardctl.hxx +++ b/svx/inc/svx/clipboardctl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/clipfmtitem.hxx b/svx/inc/svx/clipfmtitem.hxx index 79a430892e89..acff3d8807c2 100644 --- a/svx/inc/svx/clipfmtitem.hxx +++ b/svx/inc/svx/clipfmtitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,8 +51,8 @@ public: SvxClipboardFmtItem( const SvxClipboardFmtItem& ); virtual ~SvxClipboardFmtItem(); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); void AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos = USHRT_MAX ); void AddClipbrdFormat( sal_uIntPtr nId, const String& rName, @@ -65,3 +66,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx index c13d01c8a768..9d91a424b444 100644 --- a/svx/inc/svx/colrctrl.hxx +++ b/svx/inc/svx/colrctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,7 +76,7 @@ public: /************************************************************************* |* -|* Ableitung vom SfxChildWindow als "Behaelter" fuer Controller +|* Derivation from SfxChildWindow as "container" for Controller |* \************************************************************************/ @@ -109,7 +110,6 @@ private: Size aColorSize; Size aItemSize; -//#if 0 // _SOLAR__PRIVATE void FillValueSet(); void SetSize(); DECL_LINK( SelectHdl, void * ); @@ -119,7 +119,6 @@ private: the keyboard. */ virtual void GetFocus (void); -//#endif protected: virtual sal_Bool Close(); @@ -143,3 +142,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/connctrl.hxx b/svx/inc/svx/connctrl.hxx index daab7e093ef1..e60c93aa1578 100644 --- a/svx/inc/svx/connctrl.hxx +++ b/svx/inc/svx/connctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ // include --------------------------------------------------------------- -#ifndef _CTRL_HXX //autogen #include <vcl/ctrl.hxx> -#endif #include "svx/svxdllapi.h" class SfxItemSet; @@ -75,3 +74,4 @@ public: #endif // _SVX_CONNCTRL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx index c0e78425dcdd..26e30a83ed4a 100644 --- a/svx/inc/svx/contdlg.hxx +++ b/svx/inc/svx/contdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,7 +36,7 @@ /************************************************************************* |* -|* Ableitung vom SfxChildWindow als "Behaelter" fuer Float +|* Derivation from SfxChildWindow as "container" for Float |* \************************************************************************/ @@ -59,12 +60,6 @@ class SVX_DLLPUBLIC SvxContourDlgChildWindow : public SfxChildWindow class SvxSuperContourDlg; -/************************************************************************* -|* -|* -|* -\************************************************************************/ - class SvxContourDlgItem : public SfxControllerItem { SvxSuperContourDlg& rDlg; @@ -78,26 +73,17 @@ public: SvxContourDlgItem( sal_uInt16 nId, SvxSuperContourDlg& rDlg, SfxBindings& rBindings ); }; -/************************************************************************* -|* -|* -|* -\************************************************************************/ - class SVX_DLLPUBLIC SvxContourDlg : public SfxFloatingWindow { using Window::Update; SvxSuperContourDlg* pSuperClass; -//#if 0 // _SOLAR__PRIVATE protected: void SetSuperClass( SvxSuperContourDlg& rSuperClass ) { pSuperClass = &rSuperClass; } -//#endif // __PRIVATE - public: SvxContourDlg( SfxBindings *pBindings, SfxChildWindow *pCW, @@ -140,3 +126,4 @@ public: #endif // _REDUCED_CONTDLG_HXX_ #endif // _CONTDLG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx index 1189a7a8a7be..e7d5d46ed83d 100644 --- a/svx/inc/svx/ctredlin.hxx +++ b/svx/inc/svx/ctredlin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,12 +29,8 @@ #ifndef _SVX_CTREDLIN_HXX #define _SVX_CTREDLIN_HXX -#ifndef _MOREBTN_HXX //autogen #include <vcl/morebtn.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif #include <svtools/headbar.hxx> #include <svtools/svtabbx.hxx> #include <vcl/lstbox.hxx> @@ -57,7 +54,7 @@ #define FLT_DATE_SAVE 5 -// Struct fuer Datums-Sortierung +// Struct for sorting data class SVX_DLLPUBLIC RedlinData { @@ -76,7 +73,7 @@ public: virtual ~SvxRedlinEntry(); }; -// Klasse fuer die Darstellung von schriftabhaengigen Strings +// Class for the representation of Strings depending on the font class SvLBoxColorString : public SvLBoxString { private: @@ -147,7 +144,7 @@ public: sal_Bool IsValidCalcEntry(const String& ,RedlinData *pUserData); sal_Bool IsValidWriterEntry(const String& ,RedlinData *pUserData); - // keine NULL-Ptr. ueberpruefung { + // no NULL-pointer checking { sal_Bool IsValidEntry(const String* pAuthor,const DateTime *pDateTime,const String* pComment); sal_Bool IsValidEntry(const String* pAuthor,const DateTime *pDateTime); sal_Bool IsValidComment(const String* pComment); @@ -250,13 +247,13 @@ public: String GetComment()const; - // Methoden fuer Calc { + // Methods for Calc { void SetRange(const String& rString); String GetRange() const; void HideRange(sal_Bool bHide=sal_True); void DisableRange(sal_Bool bFlag=sal_True); void SetFocusToRange(); - // } Methoden fuer Calc + // } Methods for Calc void HideClocks(sal_Bool bHide=sal_True); void DisableRef(sal_Bool bFlag); @@ -293,7 +290,7 @@ public: const Link& GetModifyCommentHdl() const { return aModifyComLink; } - // Methoden fuer Calc { + // Methods for Calc { void SetModifyRangeHdl( const Link& rLink ) { aModifyRefLink = rLink; } const Link& GetModifyRangeHdl() const { return aModifyRefLink; } @@ -303,7 +300,7 @@ public: void Enable( bool bEnable = true, bool bChild = true ); void Disable( bool bChild = true ); - // } Methoden fuer Calc + // } Methods for Calc }; @@ -429,3 +426,4 @@ public: #endif // _SVX_CTREDLIN_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/cube3d.hxx b/svx/inc/svx/cube3d.hxx index a69a06ab721c..a5f1ce6c807c 100644 --- a/svx/inc/svx/cube3d.hxx +++ b/svx/inc/svx/cube3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,13 +35,13 @@ /************************************************************************* |* |* | -|* 3D-Quader erzeugen; aPos: Zentrum oder links, unten, hinten |__ -|* (abhaengig von bPosIsCenter) / -|* Mit nSideFlags kann angegeben werden, ob nur ein Teil der -|* Quaderflaechen erzeugt werden kann; die entsprechenden Bits -|* sind in dem enum definiert. Das Flag bDblSided legt fest, -|* ob die erzeugten Flaechen doppelseitig sind (nur sinnvoll, -|* wenn nicht alle Flaechen erzeugt wurden). +|* Create a 3D cuboid; aPos: Center oder left, bottom, behind |__ +|* (depending on bPosIsCenter) / +|* nSideFlags indicates, if only some of the cuboid surfaces can +|* be created; the corresponding bits are defined in the enum. +|* The flag bDblSided indicates whether the created surfaces are +|* two-sided (which only makes sense if not all of the surfaces were +|* created). |* \************************************************************************/ @@ -72,9 +73,9 @@ public: virtual sal_uInt16 GetObjIdentifier() const; virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; - virtual void operator=(const SdrObject&); + virtual E3dCubeObj* Clone() const; - // Lokale Parameter setzen mit Geometrieneuerzeugung + // Set local parameters with geometry recreation void SetCubePos(const basegfx::B3DPoint& rNew); const basegfx::B3DPoint& GetCubePos() { return aCubePos; } @@ -87,9 +88,11 @@ public: void SetSideFlags(sal_uInt16 nNew); sal_uInt16 GetSideFlags() { return nSideFlags; } - // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert". + // TakeObjName...() is for the display in the UI, for example "3 frames selected". virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; }; #endif // _E3D_CUBE3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dataaccessdescriptor.hxx b/svx/inc/svx/dataaccessdescriptor.hxx index f765b1fce2b9..063424661ddc 100644 --- a/svx/inc/svx/dataaccessdescriptor.hxx +++ b/svx/inc/svx/dataaccessdescriptor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -162,3 +163,4 @@ namespace svx #endif // _SVX_DATACCESSDESCRIPTOR_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/databaselocationinput.hxx b/svx/inc/svx/databaselocationinput.hxx index 694a679bb7a9..361c48928b1a 100644 --- a/svx/inc/svx/databaselocationinput.hxx +++ b/svx/inc/svx/databaselocationinput.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,5 @@ namespace svx //........................................................................ #endif // SVX_DATABASELOCATIONINPUT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dbaexchange.hxx b/svx/inc/svx/dbaexchange.hxx index a5a178f68389..ba0a092439ea 100644 --- a/svx/inc/svx/dbaexchange.hxx +++ b/svx/inc/svx/dbaexchange.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -297,3 +298,4 @@ namespace svx #endif // _SVX_DBAEXCHANGE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dbaobjectex.hxx b/svx/inc/svx/dbaobjectex.hxx index a1c7867e0a5d..cd1d78a1657b 100644 --- a/svx/inc/svx/dbaobjectex.hxx +++ b/svx/inc/svx/dbaobjectex.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,4 @@ namespace svx #endif // SVX_DBAOBJECTEX_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dbcharsethelper.hxx b/svx/inc/svx/dbcharsethelper.hxx index 40ec31c37d85..39d76d4fe400 100755..100644 --- a/svx/inc/svx/dbcharsethelper.hxx +++ b/svx/inc/svx/dbcharsethelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ namespace svxform #endif // SVX_DBCHARSETCLIENT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dbexch.hrc b/svx/inc/svx/dbexch.hrc index faa2274987cd..faa2274987cd 100644..100755 --- a/svx/inc/svx/dbexch.hrc +++ b/svx/inc/svx/dbexch.hrc diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx index 7df0dd5c38cb..909bd1306cd8 100755..100644 --- a/svx/inc/svx/dbtoolsclient.hxx +++ b/svx/inc/svx/dbtoolsclient.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,7 +57,7 @@ namespace svxform static oslModule s_hDbtoolsModule; static ::connectivity::simple::createDataAccessToolsFactoryFunction s_pFactoryCreationFunc; - //add by BerryJia for fixing Bug97420 Time:2002-9-12-11:00(PRC time) + mutable sal_Bool m_bCreateAlready; private: @@ -233,3 +234,4 @@ namespace svxform #endif // SVX_DBTOOLSCLIENT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/def3d.hxx b/svx/inc/svx/def3d.hxx index 57f68cd7805b..408ec5ea1d00 100644 --- a/svx/inc/svx/def3d.hxx +++ b/svx/inc/svx/def3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,7 +40,7 @@ const double EPSILON = 1e-06; #define DEG2RAD(fAngle) (fPiDiv180 * (fAngle)) //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -//+++ 3D-Hilfsfunktionen +++++++++++++++++++++++++++++++++++++++++++++++++ +//+++ 3D helper functions ++++++++++++++++++++++++++++++++++++++++++++++++ //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ enum E3dDragConstraint { E3DDRAG_CONSTR_X = 0x0001, @@ -52,3 +53,5 @@ enum E3dDragConstraint { E3DDRAG_CONSTR_X = 0x0001, }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/deflt3d.hxx b/svx/inc/svx/deflt3d.hxx index c09cbafd8e1f..ed735e0a71d2 100644 --- a/svx/inc/svx/deflt3d.hxx +++ b/svx/inc/svx/deflt3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,29 +36,29 @@ /************************************************************************* |* -|* Klasse zum verwalten der 3D-Default Attribute +|* Class for managing the 3D default attributes |* \************************************************************************/ class SVX_DLLPUBLIC E3dDefaultAttributes { private: - // Compound-Objekt + // Compound object Color aDefaultAmbientColor; sal_Bool bDefaultCreateNormals; sal_Bool bDefaultCreateTexture; - // Cube-Objekt + // Cube object basegfx::B3DPoint aDefaultCubePos; basegfx::B3DVector aDefaultCubeSize; sal_uInt16 nDefaultCubeSideFlags; sal_Bool bDefaultCubePosIsCenter; - // Sphere-Objekt + // Sphere object basegfx::B3DPoint aDefaultSphereCenter; basegfx::B3DVector aDefaultSphereSize; - // Lathe-Objekt + // Lathe object long nDefaultLatheEndAngle; sal_Bool bDefaultLatheSmoothed; sal_Bool bDefaultLatheSmoothFrontBack; @@ -65,7 +66,7 @@ private: sal_Bool bDefaultLatheCloseFront; sal_Bool bDefaultLatheCloseBack; - // Extrude-Objekt + // Extrude object sal_Bool bDefaultExtrudeSmoothed; sal_Bool bDefaultExtrudeSmoothFrontBack; sal_Bool bDefaultExtrudeCharacterMode; @@ -73,14 +74,14 @@ private: sal_Bool bDefaultExtrudeCloseBack; public: - // Konstruktor + // Construktor E3dDefaultAttributes(); - // Defaults zuruecksetzen + // Reset to defaults void Reset(); - // Getter/Setter fuer Default-Werte aller 3D-Objekte - // Compound-Objekt + // Getter/Setter for default values of all 3D objects + // Compound object const Color& GetDefaultAmbientColor() { return aDefaultAmbientColor; } void SetDefaultAmbientColor(const Color& rNew) { aDefaultAmbientColor = rNew; } @@ -89,7 +90,7 @@ public: sal_Bool GetDefaultCreateTexture() const { return bDefaultCreateTexture; } void SetDefaultCreateTexture(const sal_Bool bNew) { bDefaultCreateTexture = bNew; } - // Cube-Objekt + // Cube object const basegfx::B3DPoint& GetDefaultCubePos() { return aDefaultCubePos; } void SetDefaultCubePos(const basegfx::B3DPoint& rNew) { aDefaultCubePos = rNew; } const basegfx::B3DVector& GetDefaultCubeSize() { return aDefaultCubeSize; } @@ -99,13 +100,13 @@ public: sal_Bool GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; } void SetDefaultCubePosIsCenter(const sal_Bool bNew) { bDefaultCubePosIsCenter = bNew; } - // Sphere-Objekt + // Sphere object const basegfx::B3DPoint& GetDefaultSphereCenter() { return aDefaultSphereCenter; } void SetDefaultSphereCenter(const basegfx::B3DPoint& rNew) { aDefaultSphereCenter = rNew; } const basegfx::B3DVector& GetDefaultSphereSize() { return aDefaultSphereSize; } void SetDefaultSphereSize(const basegfx::B3DPoint& rNew) { aDefaultSphereSize = rNew; } - // Lathe-Objekt + // Lathe object long GetDefaultLatheEndAngle() const { return nDefaultLatheEndAngle; } void SetDefaultLatheEndAngle(const long nNew) { nDefaultLatheEndAngle = nNew; } sal_Bool GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; } @@ -119,7 +120,7 @@ public: sal_Bool GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; } void SetDefaultLatheCloseBack(const sal_Bool bNew) { bDefaultLatheCloseBack = bNew; } - // Extrude-Objekt + // Extrude object sal_Bool GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; } void SetDefaultExtrudeSmoothed(const sal_Bool bNew) { bDefaultExtrudeSmoothed = bNew; } sal_Bool GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; } @@ -133,3 +134,5 @@ public: }; #endif // _E3D_DEFLT3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dialcontrol.hxx b/svx/inc/svx/dialcontrol.hxx index 3b63ac1f4b4d..ff79216b341f 100644 --- a/svx/inc/svx/dialcontrol.hxx +++ b/svx/inc/svx/dialcontrol.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -136,3 +137,4 @@ typedef sfx::ItemControlConnection< sfx::Int32ItemWrapper, DialControlWrapper > #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dialmgr.hxx b/svx/inc/svx/dialmgr.hxx index 8c29edc04620..2dbe32f32303 100644 --- a/svx/inc/svx/dialmgr.hxx +++ b/svx/inc/svx/dialmgr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,4 @@ struct SVX_DLLPUBLIC DialogsResMgr #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index 3bca44105edd..b10c4b3bb195 100755 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -34,8 +34,8 @@ // Resource-Id's ------------------------------------------------------------ -// Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings) -#define RID_SVX_FIRSTFREE 305 +// Please maintain FIRSTFREE (does not apply to strings) +#define RID_SVX_FIRSTFREE 314 // some strings also used in CUI #define RID_SVXERRCTX (RID_SVX_START + 351) @@ -166,6 +166,7 @@ #define RID_OFA_TP_INTERNATIONAL_SD (RID_OFA_START + 253) #define RID_OFA_TP_INTERNATIONAL_IMPR (RID_OFA_START + 254) #define RID_OFA_TP_INTERNATIONAL (RID_OFA_START + 252) // calc +#define RID_SC_TP_DEFAULTS (RID_OFA_START + 253) //--------------------------------------------------------------------- // ResId's fuer die Zeichen-TabPages @@ -188,7 +189,6 @@ #define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289) #define RID_SVXIL_FRAME (RID_SVX_START + 65) -#define RID_SVXIL_FRAME_HC (RID_SVX_START + 66) #define RID_SVXDLG_3D (RID_SVX_START + 70) #define RID_SVXPAGE_LIGHT3D (RID_SVX_START + 71) @@ -197,11 +197,9 @@ #define RID_SVXIMAGE_LIGHT_ON (RID_SVX_START + 210) #define RID_SVXIMAGE_LIGHT_OFF (RID_SVX_START + 211) -#define RID_SVXIMAGE_LIGHT_ON_H (RID_SVX_START + 212) -#define RID_SVXIMAGE_LIGHT_OFF_H (RID_SVX_START + 213) #define RID_SVXIMAGE_COLORDLG (RID_SVX_START + 214) -#define RID_SVXIMAGE_COLORDLG_H (RID_SVX_START + 215) +#define RID_SVXFLOAT3D_COLOR_LIGHT_PRE (RID_SVX_START + 72) #define RID_SVXFLOAT3D_FAVORITE (RID_SVX_START + 73) #define RID_SVXFLOAT3D_FIX_X (RID_SVX_START + 74) #define RID_SVXFLOAT3D_FIX_Y (RID_SVX_START + 75) @@ -210,53 +208,46 @@ #define RID_SVXFLOAT3D_FIX_G (RID_SVX_START + 78) #define RID_SVXFLOAT3D_FIX_B (RID_SVX_START + 84) -// Ids fuer FrameBitmaps durch ImageList ersetzt -// 67 bis 72 frei +// 67 to 71 free -// ResId fuer den Gitter- und Raster-Dialog +// ResId for the grid dialog #define RID_SVXDLG_GRID (RID_SVX_START + 79) -// ResId's fuer FontMenu-Controls +// ResId's for the FontMenu controls #define RID_MN_FONTSIZE (RID_SVX_START + 80) -// ResId's fuer Undo-TbxControls +// ResId's for Undo-TbxControls #define RID_SVXTBX_UNDO (RID_SVX_START + 81) -// ResId fuer Zoom-Popup-Menue +// ResId for zoom popup menu #define RID_SVXMNU_ZOOM (RID_SVX_START + 82) -// ResId fuer Funktions-Popup-Menue +// ResId for funktion popup menue #define RID_SVXMNU_PSZ_FUNC (RID_SVX_START + 83) #define RID_SVXMNU_XMLSECSTATBAR (RID_SVX_START + 84) -// ResId fuer Position- und Size-Bitmap +// ResId for position and size bitmap #define RID_SVXBMP_POSITION (RID_SVX_START + 85) #define RID_SVXBMP_SIZE (RID_SVX_START + 86) #define RID_SVXBMP_SIGNET (RID_SVX_START + 87) -#define RID_SVXBMP_SIGNET_H (RID_SVX_START + 88) #define RID_SVXBMP_SIGNET_BROKEN (RID_SVX_START + 89) -#define RID_SVXBMP_SIGNET_BROKEN_H (RID_SVX_START + 90) #define RID_SVXBMP_SIGNET_NOTVALIDATED (RID_SVX_START + 91) -#define RID_SVXBMP_SIGNET_NOTVALIDATED_H (RID_SVX_START + 92) -#define RID_SVXBMP_SLIDERBUTTON (RID_SVX_START + 67) -#define RID_SVXBMP_SLIDERDECREASE (RID_SVX_START + 68) -#define RID_SVXBMP_SLIDERINCREASE (RID_SVX_START + 69) -#define RID_SVXBMP_SLIDERBUTTON_HC (RID_SVX_START + 70) -#define RID_SVXBMP_SLIDERDECREASE_HC (RID_SVX_START + 71) -#define RID_SVXBMP_SLIDERINCREASE_HC (RID_SVX_START + 72) +#define RID_SVXBMP_SLIDERBUTTON (RID_SVX_START + 67) +#define RID_SVXBMP_SLIDERDECREASE (RID_SVX_START + 68) +#define RID_SVXBMP_SLIDERINCREASE (RID_SVX_START + 69) -// Resource mit Bitmaps fuer die CheckListBox +// Resource with bitmaps for the CheckListBox #define RID_CHECKLISTBOX_BITMAPS (RID_SVX_START + 91) -// Menu fuers Lineal +// Menu for the ruler #define RID_SVXMN_RULER (RID_SVX_START + 92) -// FontWork-Dialog +// FontWork dialog #define RID_SVXDLG_FONTWORK (RID_SVX_START + 93) -// FontWork-ValueSet-Bitmaps +// FontWork ValueSet bitmaps #define RID_SVXBMP_FONTWORK_FORM1 (RID_SVX_START + 94) #define RID_SVXBMP_FONTWORK_FORM2 (RID_SVX_START + 95) #define RID_SVXBMP_FONTWORK_FORM3 (RID_SVX_START + 96) @@ -277,13 +268,13 @@ #define RID_SVXCTRL_COLOR (RID_SVX_START + 117) -// fuer ToolboxControl-Style +// for Toolbox-Control style #define RID_SVXTBX_STYLE (RID_SVX_START + 120) #define RID_SVXDLG_HYPERLINK (RID_SVX_START + 140) #define RID_SVXDLG_PASSWORD (RID_SVX_START + 141) -// ResId fuer InternetPage +// ResId for InternetPage #define RID_SVXPAGE_INTERNET (RID_SVX_START + 154) //InetDlg @@ -302,7 +293,7 @@ #define RID_SVXPAGE_REGISTER_5 (RID_SVX_START + 198) #define RID_SVXPAGE_REGISTER_6 (RID_SVX_START + 199) -// 3D-Entfernung/Perspektive Bitmaps +// 3D distance/perspective bitmaps #define RID_SVXBMP_3D_DISTANCE_01 (RID_SVX_START + 162) #define RID_SVXBMP_3D_DISTANCE_02 (RID_SVX_START + 163) #define RID_SVXBMP_3D_DISTANCE_03 (RID_SVX_START + 164) @@ -325,29 +316,29 @@ #define RID_SVXBMP_3D_FOCAL_LENGTH_09 (RID_SVX_START + 180) #define RID_SVXBMP_3D_FOCAL_LENGTH_10 (RID_SVX_START + 181) -// Ids fuer Autokorrektur +// Ids fuer auto correction #define RID_SVX_AUTOCORR (RID_SVX_START + 192) -// Auswahl ext. Linguitik +// Choice for external linguistics #define RID_SVX_OPT_EXT_LINGU (RID_SVX_START + 193) -// TabPage und Dialog f"ur LDAP-Server +// TabPage and dialog for LDAP server #define RID_SVXPAGE_LDAP (RID_SVX_START + 204) #define RID_SVXDLG_LDAP (RID_SVX_START + 205) -// Dialog fuer Funktionen +// Dialog for functions #define RID_SVXDLG_CALCFUNC (RID_SVX_START + 206) // QueryBox for Exit Recovery Wizard #define RID_SVXQB_EXIT_RECOVERY (RID_SVX_START + 215) -// ResId fuer den ImportGraphic-Dialog +// ResId for the ImportGraphic dialog #define RID_SVXRES_IMPORTGRAPHIC (RID_SVX_START + 499) #define RID_SVXCTRL_RECTBTNS (RID_SVX_START + 226) -// ResId's f???r Hyperlink-Dialog-Tabpages +// ResId's for hyperlink dialog tabpages // ResId's for Starone impl. bitmaps #define RID_UNODRAW_OBJECTS (RID_SVX_START + 233) @@ -359,40 +350,20 @@ #define RID_SVXDLG_RUBY (RID_SVX_START + 247) -#define RID_SVXBMP_FONTWORK_FORM1_H (RID_SVX_START + 260) -#define RID_SVXBMP_FONTWORK_FORM2_H (RID_SVX_START + 261) -#define RID_SVXBMP_FONTWORK_FORM3_H (RID_SVX_START + 262) -#define RID_SVXBMP_FONTWORK_FORM4_H (RID_SVX_START + 263) -#define RID_SVXBMP_FONTWORK_FORM5_H (RID_SVX_START + 264) -#define RID_SVXBMP_FONTWORK_FORM6_H (RID_SVX_START + 265) -#define RID_SVXBMP_FONTWORK_FORM7_H (RID_SVX_START + 266) -#define RID_SVXBMP_FONTWORK_FORM8_H (RID_SVX_START + 267) -#define RID_SVXBMP_FONTWORK_FORM9_H (RID_SVX_START + 268) -#define RID_SVXBMP_FONTWORK_FORM10_H (RID_SVX_START + 269) -#define RID_SVXBMP_FONTWORK_FORM11_H (RID_SVX_START + 270) -#define RID_SVXBMP_FONTWORK_FORM12_H (RID_SVX_START + 271) -#define RID_SVXIMG_GRAF_RED_H (RID_SVX_START + 276) -#define RID_SVXIMG_GRAF_GREEN_H (RID_SVX_START + 277) -#define RID_SVXIMG_GRAF_BLUE_H (RID_SVX_START + 278) -#define RID_SVXIMG_GRAF_LUMINANCE_H (RID_SVX_START + 279) -#define RID_SVXIMG_GRAF_CONTRAST_H (RID_SVX_START + 280) -#define RID_SVXIMG_GRAF_GAMMA_H (RID_SVX_START + 281) -#define RID_SVXIMG_GRAF_TRANSPARENCE_H (RID_SVX_START + 282) -#define RID_SVXIMG_CHECKED_H (RID_SVX_START + 285) - #define RID_SVXDLG_TEXTCONTROL_CHARATTR (RID_SVX_START + 286) #define RID_SVXDLG_TEXTCONTROL_PARAATTR (RID_SVX_START + 287) +#define RID_SVXDLG_LINK_WARNING (RID_SVX_START + 313) // !!! please update RID_SVX_FIRSTFREE !!! see line 46 // Strings ------------------------------------------------------------------ -// Strings fuer die Sprachen (HM-Abhaengig) +// Strings for the language #define RID_SVXSTR_LANGUAGE_BEGIN (RID_SVX_START + 0) #define RID_SVXSTR_LANGUAGE_ALL (RID_SVX_START + 15) -// Messages im DBMgr-Bereich +// Messages for the DBMgr #define RID_SVXSTR_DBINI (RID_SVX_START + 60) #define RID_SVXSTR_DBDRV (RID_SVX_START + 61) #define RID_SVXSTR_NODBDRV (RID_SVX_START + 62) @@ -407,18 +378,18 @@ #define RID_SVXSTR_INVALID_RECORD (RID_SVX_START + 71) #define RID_SVXSTR_NOSET_MATCHING (RID_SVX_START + 72) -// Strings aus dem Suchen-Dialog +// Strings from the search dialog #define RID_SVXSTR_SEARCH_STYLES (RID_SVX_START + 80) #define RID_SVXSTR_SEARCH (RID_SVX_START + 81) #define RID_SVXSTR_REPLACE (RID_SVX_START + 82) #define RID_SVXSTR_FULLSIZE (RID_SVX_START + 144) -// ResIds fuer die verschiedenen Strings des PageDlgs +// ResIds for the PageDialog #define RID_SVXSTR_CALC_PAGE (RID_SVX_START + 146) #define RID_SVXSTR_DRAW_PAGE (RID_SVX_START + 147) -// Strings der ToolBox-Controls aus tbcontrl.cxx +// Strings of the ToolBox-Controls from tbcontrl.cxx #define RID_SVXSTR_FILLPATTERN (RID_SVX_START + 191) #define RID_SVXSTR_FRAME (RID_SVX_START + 192) #define RID_SVXSTR_FRAME_COLOR (RID_SVX_START + 194) @@ -428,17 +399,17 @@ #define RID_SVXSTR_MORE (RID_SVX_START + 198) -// Strings der UndoTbxControls +// Strings for the UndoTbxControls #define RID_SVXSTR_UNDO (RID_SVX_START + 200) #define RID_SVXSTR_REDO (RID_SVX_START + 201) #define RID_SVXSTR_ACTION (RID_SVX_START + 202) #define RID_SVXSTR_ACTIONS (RID_SVX_START + 203) -// Strings fuer Insert/Overwrite +// Strings for insert/overwrite #define RID_SVXSTR_INSERT_TEXT (RID_SVX_START + 210) #define RID_SVXSTR_OVERWRITE_TEXT (RID_SVX_START + 211) -// Strings fuer Selection Mode +// Strings for the selection mode #define RID_SVXSTR_SELMODE_STD (RID_SVX_START + 212) #define RID_SVXSTR_SELMODE_ER (RID_SVX_START + 213) #define RID_SVXSTR_SELMODE_ERG (RID_SVX_START + 214) @@ -449,19 +420,19 @@ #define RID_SVXSTR_XMLSEC_NO_SIG (RID_SVX_START + 225) #define RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG (RID_SVX_START + 226) -// weitere ID bei 219 +// further ID at 219 -// String-ResId fuer den ImportGraphic-Dialog +// String-ResId for the ImportGraphic dialog #define RID_SVXSTR_ALL_FILES (RID_SVX_START + 241) -// Strings des Lineals +// Strings for the ruler #define RID_SVXSTR_RULER_START (RID_SVX_START + 245) #define RID_SVXSTR_RULER_TAB_LEFT (RID_SVX_START + 245) #define RID_SVXSTR_RULER_TAB_RIGHT (RID_SVX_START + 246) #define RID_SVXSTR_RULER_TAB_DECIMAL (RID_SVX_START + 247) #define RID_SVXSTR_RULER_TAB_CENTER (RID_SVX_START + 248) -// Schlie"ssen (im TabDialog Line/Area) +// Close (in TabDialog line/aria) #define RID_SVXSTR_CLOSE (RID_SVX_START + 260) // FontWork-ValueSet-Strings @@ -479,7 +450,7 @@ #define RID_SVXSTR_FONTWORK_FORM12 (RID_SVX_START + 272) #define RID_SVXSTR_FONTWORK_UNDOCREATE (RID_SVX_START + 273) -// Farben-Strings +// Color strings #define RID_SVXSTR_BLACK (RID_SVX_START + 275) #define RID_SVXSTR_BLUE (RID_SVX_START + 276) #define RID_SVXSTR_GREEN (RID_SVX_START + 277) @@ -499,7 +470,7 @@ #define RID_SVXSTR_BLUEGREY (RID_SVX_START + 291) #define RID_SVXSTR_ORANGE (RID_SVX_START + 292) -// Linienenden-Strings +// Line endings strings #define RID_SVXSTR_ARROW (RID_SVX_START + 300) #define RID_SVXSTR_SQUARE (RID_SVX_START + 301) #define RID_SVXSTR_CIRCLE (RID_SVX_START + 302) @@ -511,9 +482,9 @@ // String-Arrays #define RID_SVXSTR_TEXTENCODING_TABLE (RID_SVX_START + 312) -// Hyperlink-Dlg +// Hyperlink dialog #define RID_SVXMN_HYPERLINK (RID_SVX_START + 321) -// Hyperlink-QueryBoxen +// Hyperlink query boxes #define RID_SVXQB_NOCONNECT (RID_SVX_START + 322) #define RID_SVXQB_DONTEXIST (RID_SVX_START + 323) //color configuration @@ -531,18 +502,18 @@ #define RID_SVXSTR_MEM_ERROR (RID_SVX_START + 415) #define RID_SVXSTR_DLG_TITLE_INFO (RID_SVX_START + 416) -// Define - Bereich fuer BmpMaskierung -// !!! aus diesem Bereich keine Defines benutzen !!! +// Define - Region for bitmap masking +// !!! don't use defines from this region !!! #define RID_SVX_BMPMASK_START (RID_SVX_START + 420) #define RID_SVX_BMPMASK_END (RID_SVX_START + 440) -// Define - Bereich fuer IMAP-Editor -// !!! aus diesem Bereich keine Defines benutzen !!! +// Define - Region for IMAP editor +// !!! don't use defines from this region !!! #define RID_SVX_IMAP_START (RID_SVX_START + 450) #define RID_SVX_IMAP_END (RID_SVX_START + 460) -// Define - Bereich fuer Contour-Editor -// !!! aus diesem Bereich keine Defines benutzen !!! +// Define - Region for contour editor +// !!! don't use defines from this region !!! #define RID_SVX_CONTOUR_START (RID_SVX_START + 461) #define RID_SVX_CONTOUR_END (RID_SVX_START + 471) @@ -557,7 +528,7 @@ #define RID_SVX_RELOAD_NORMAL (RID_SVX_START + 480) #define RID_SVX_RELOAD_SPECIAL (RID_SVX_START + 481) -// Defines fuer die 3D-Engine +// Defines for the 3D engine #define RID_SVX_3D_UNDO_EXCHANGE_PASTE (RID_SVX_START + 489) #define RID_SVX_3D_CREATE_LATHE (RID_SVX_START + 490) #define RID_SVX_3D_UNDO_SEGMENTS (RID_SVX_START + 491) @@ -581,10 +552,6 @@ #define RID_STR_FULLNUMS_8 (RID_STR_FULLNUMS_START + 7)//? #define RID_STR_FULLNUMS_7_HTML (RID_SVX_START + 510)//? -// RID_SVX_END == (RID_SVX_START + 499) !!! -// am besten ab 520 frei (RB) -// seit der Erfindung eigener Resourcen fuer jedes Projekt kann es hier keine -// Obergrenze geben (abgesehen von USHRT_MAX) (os) #define RID_STR_BULLET_THEME (RID_SVX_START + 508) @@ -616,6 +583,15 @@ #define RID_SVXSTR_SEABLUE (RID_SVX_START + 546) #define RID_SVXSTR_COLOR_SUN (RID_SVX_START + 547) +// LibreOffice palette colors +#define RID_SVXSTR_LIBRE_GREEN_1 (RID_SVX_START + 548) +#define RID_SVXSTR_LIBRE_GREEN_ACCENT (RID_SVX_START + 549) +#define RID_SVXSTR_LIBRE_BLUE_ACCENT (RID_SVX_START + 550) +#define RID_SVXSTR_LIBRE_ORANGE_ACCENT (RID_SVX_START + 551) +#define RID_SVXSTR_LIBRE_PURPLE (RID_SVX_START + 552) +#define RID_SVXSTR_LIBRE_PURPLE_ACCENT (RID_SVX_START + 553) +#define RID_SVXSTR_LIBRE_YELLOW_ACCENT (RID_SVX_START + 554) + // JP: string resource ids for table-autoformat-names, used in SW/SC // !!! Urgent: the order of Ids is persistent. New Ids have to append !!! #define RID_SVXSTR_TBLAFMT_BEGIN (RID_SVX_START + 560) @@ -673,32 +649,156 @@ #define RID_SVXSTR_COLOR_SUN_DEF (RID_SVX_START + 620) #define RID_SVXSTR_COLOR_CHART (RID_SVX_START + 621) #define RID_SVXSTR_COLOR_CHART_DEF (RID_SVX_START + 622) +// LibreOffice palette colors +#define RID_SVXSTR_LIBRE_GREEN_1_DEF (RID_SVX_START + 623) +#define RID_SVXSTR_LIBRE_GREEN_ACCENT_DEF (RID_SVX_START + 624) +#define RID_SVXSTR_LIBRE_BLUE_ACCENT_DEF (RID_SVX_START + 625) +#define RID_SVXSTR_LIBRE_ORANGE_ACCENT_DEF (RID_SVX_START + 626) +#define RID_SVXSTR_LIBRE_PURPLE_DEF (RID_SVX_START + 627) +#define RID_SVXSTR_LIBRE_PURPLE_ACCENT_DEF (RID_SVX_START + 628) +#define RID_SVXSTR_LIBRE_YELLOW_ACCENT_DEF (RID_SVX_START + 629) + +// Tango palette colors +#define RID_SVXSTR_TANGO_BUTTER (RID_SVX_START + 630) +#define RID_SVXSTR_TANGO_ORANGE (RID_SVX_START + 631) +#define RID_SVXSTR_TANGO_CHOCOLATE (RID_SVX_START + 632) +#define RID_SVXSTR_TANGO_CHAMELEON (RID_SVX_START + 633) +#define RID_SVXSTR_TANGO_SKY_BLUE (RID_SVX_START + 634) +#define RID_SVXSTR_TANGO_PLUM (RID_SVX_START + 635) +#define RID_SVXSTR_TANGO_SCARLET_RED (RID_SVX_START + 636) +#define RID_SVXSTR_TANGO_ALUMINIUM (RID_SVX_START + 637) +#define RID_SVXSTR_TANGO_BUTTER_DEF (RID_SVX_START + 638) +#define RID_SVXSTR_TANGO_ORANGE_DEF (RID_SVX_START + 639) +#define RID_SVXSTR_TANGO_CHOCOLATE_DEF (RID_SVX_START + 640) +#define RID_SVXSTR_TANGO_CHAMELEON_DEF (RID_SVX_START + 641) +#define RID_SVXSTR_TANGO_SKY_BLUE_DEF (RID_SVX_START + 642) +#define RID_SVXSTR_TANGO_PLUM_DEF (RID_SVX_START + 643) +#define RID_SVXSTR_TANGO_SCARLET_RED_DEF (RID_SVX_START + 644) +#define RID_SVXSTR_TANGO_ALUMINIUM_DEF (RID_SVX_START + 645) // Default-Gradient-Names -#define RID_SVXSTR_GRDT0_DEF (RID_SVX_START + 631) -#define RID_SVXSTR_GRDT1_DEF (RID_SVX_START + 632) -#define RID_SVXSTR_GRDT2_DEF (RID_SVX_START + 633) -#define RID_SVXSTR_GRDT3_DEF (RID_SVX_START + 634) -#define RID_SVXSTR_GRDT4_DEF (RID_SVX_START + 635) -#define RID_SVXSTR_GRDT5_DEF (RID_SVX_START + 636) -#define RID_SVXSTR_GRDT6_DEF (RID_SVX_START + 637) -#define RID_SVXSTR_GRDT7_DEF (RID_SVX_START + 638) -#define RID_SVXSTR_GRDT8_DEF (RID_SVX_START + 639) -#define RID_SVXSTR_GRDT9_DEF (RID_SVX_START + 640) -#define RID_SVXSTR_GRDT0 (RID_SVX_START + 641) -#define RID_SVXSTR_GRDT1 (RID_SVX_START + 642) -#define RID_SVXSTR_GRDT2 (RID_SVX_START + 643) -#define RID_SVXSTR_GRDT3 (RID_SVX_START + 644) -#define RID_SVXSTR_GRDT4 (RID_SVX_START + 645) -#define RID_SVXSTR_GRDT5 (RID_SVX_START + 646) -#define RID_SVXSTR_GRDT6 (RID_SVX_START + 647) -#define RID_SVXSTR_GRDT7 (RID_SVX_START + 648) -#define RID_SVXSTR_GRDT8 (RID_SVX_START + 649) -#define RID_SVXSTR_GRDT9 (RID_SVX_START + 650) -#define RID_SVXSTR_GRDT_DEF_START RID_SVXSTR_GRDT0_DEF -#define RID_SVXSTR_GRDT_DEF_END RID_SVXSTR_GRDT9_DEF -#define RID_SVXSTR_GRDT_START RID_SVXSTR_GRDT0 -#define RID_SVXSTR_GRDT_END RID_SVXSTR_GRDT9 +#define RID_SVXSTR_GRDT0_DEF (RID_SVX_START + 2000) +#define RID_SVXSTR_GRDT1_DEF (RID_SVX_START + 2001) +#define RID_SVXSTR_GRDT2_DEF (RID_SVX_START + 2002) +#define RID_SVXSTR_GRDT3_DEF (RID_SVX_START + 2003) +#define RID_SVXSTR_GRDT4_DEF (RID_SVX_START + 2004) +#define RID_SVXSTR_GRDT5_DEF (RID_SVX_START + 2005) +#define RID_SVXSTR_GRDT6_DEF (RID_SVX_START + 2006) +#define RID_SVXSTR_GRDT7_DEF (RID_SVX_START + 2007) +#define RID_SVXSTR_GRDT8_DEF (RID_SVX_START + 2008) +#define RID_SVXSTR_GRDT9_DEF (RID_SVX_START + 2009) +#define RID_SVXSTR_GRDT10_DEF (RID_SVX_START + 2010) +#define RID_SVXSTR_GRDT11_DEF (RID_SVX_START + 2011) +#define RID_SVXSTR_GRDT12_DEF (RID_SVX_START + 2012) +#define RID_SVXSTR_GRDT13_DEF (RID_SVX_START + 2013) +#define RID_SVXSTR_GRDT14_DEF (RID_SVX_START + 2014) +#define RID_SVXSTR_GRDT15_DEF (RID_SVX_START + 2015) +#define RID_SVXSTR_GRDT16_DEF (RID_SVX_START + 2016) +#define RID_SVXSTR_GRDT17_DEF (RID_SVX_START + 2017) +#define RID_SVXSTR_GRDT18_DEF (RID_SVX_START + 2018) +#define RID_SVXSTR_GRDT19_DEF (RID_SVX_START + 2019) +#define RID_SVXSTR_GRDT20_DEF (RID_SVX_START + 2020) +#define RID_SVXSTR_GRDT21_DEF (RID_SVX_START + 2021) +#define RID_SVXSTR_GRDT22_DEF (RID_SVX_START + 2022) +#define RID_SVXSTR_GRDT23_DEF (RID_SVX_START + 2023) +#define RID_SVXSTR_GRDT24_DEF (RID_SVX_START + 2024) +#define RID_SVXSTR_GRDT25_DEF (RID_SVX_START + 2025) +#define RID_SVXSTR_GRDT26_DEF (RID_SVX_START + 2026) +#define RID_SVXSTR_GRDT27_DEF (RID_SVX_START + 2027) +#define RID_SVXSTR_GRDT28_DEF (RID_SVX_START + 2028) +#define RID_SVXSTR_GRDT29_DEF (RID_SVX_START + 2029) +#define RID_SVXSTR_GRDT30_DEF (RID_SVX_START + 2030) +#define RID_SVXSTR_GRDT31_DEF (RID_SVX_START + 2031) +#define RID_SVXSTR_GRDT32_DEF (RID_SVX_START + 2032) +#define RID_SVXSTR_GRDT33_DEF (RID_SVX_START + 2033) +#define RID_SVXSTR_GRDT34_DEF (RID_SVX_START + 2034) +#define RID_SVXSTR_GRDT35_DEF (RID_SVX_START + 2035) +#define RID_SVXSTR_GRDT36_DEF (RID_SVX_START + 2036) +#define RID_SVXSTR_GRDT37_DEF (RID_SVX_START + 2037) +#define RID_SVXSTR_GRDT38_DEF (RID_SVX_START + 2038) +#define RID_SVXSTR_GRDT39_DEF (RID_SVX_START + 2039) +#define RID_SVXSTR_GRDT40_DEF (RID_SVX_START + 2040) +#define RID_SVXSTR_GRDT41_DEF (RID_SVX_START + 2041) +#define RID_SVXSTR_GRDT42_DEF (RID_SVX_START + 2042) +#define RID_SVXSTR_GRDT43_DEF (RID_SVX_START + 2043) +#define RID_SVXSTR_GRDT44_DEF (RID_SVX_START + 2044) +#define RID_SVXSTR_GRDT45_DEF (RID_SVX_START + 2045) +#define RID_SVXSTR_GRDT46_DEF (RID_SVX_START + 2046) +#define RID_SVXSTR_GRDT47_DEF (RID_SVX_START + 2047) +#define RID_SVXSTR_GRDT48_DEF (RID_SVX_START + 2048) +#define RID_SVXSTR_GRDT49_DEF (RID_SVX_START + 2049) +#define RID_SVXSTR_GRDT50_DEF (RID_SVX_START + 2050) +#define RID_SVXSTR_GRDT51_DEF (RID_SVX_START + 2051) +#define RID_SVXSTR_GRDT52_DEF (RID_SVX_START + 2052) +#define RID_SVXSTR_GRDT53_DEF (RID_SVX_START + 2053) +#define RID_SVXSTR_GRDT54_DEF (RID_SVX_START + 2054) +#define RID_SVXSTR_GRDT55_DEF (RID_SVX_START + 2055) +#define RID_SVXSTR_GRDT56_DEF (RID_SVX_START + 2056) +#define RID_SVXSTR_GRDT57_DEF (RID_SVX_START + 2057) +#define RID_SVXSTR_GRDT58_DEF (RID_SVX_START + 2058) +#define RID_SVXSTR_GRDT0 (RID_SVX_START + 2060) +#define RID_SVXSTR_GRDT1 (RID_SVX_START + 2061) +#define RID_SVXSTR_GRDT2 (RID_SVX_START + 2062) +#define RID_SVXSTR_GRDT3 (RID_SVX_START + 2063) +#define RID_SVXSTR_GRDT4 (RID_SVX_START + 2064) +#define RID_SVXSTR_GRDT5 (RID_SVX_START + 2065) +#define RID_SVXSTR_GRDT6 (RID_SVX_START + 2066) +#define RID_SVXSTR_GRDT7 (RID_SVX_START + 2067) +#define RID_SVXSTR_GRDT8 (RID_SVX_START + 2068) +#define RID_SVXSTR_GRDT9 (RID_SVX_START + 2069) +#define RID_SVXSTR_GRDT10 (RID_SVX_START + 2070) +#define RID_SVXSTR_GRDT11 (RID_SVX_START + 2071) +#define RID_SVXSTR_GRDT12 (RID_SVX_START + 2072) +#define RID_SVXSTR_GRDT13 (RID_SVX_START + 2073) +#define RID_SVXSTR_GRDT14 (RID_SVX_START + 2074) +#define RID_SVXSTR_GRDT15 (RID_SVX_START + 2075) +#define RID_SVXSTR_GRDT16 (RID_SVX_START + 2076) +#define RID_SVXSTR_GRDT17 (RID_SVX_START + 2077) +#define RID_SVXSTR_GRDT18 (RID_SVX_START + 2078) +#define RID_SVXSTR_GRDT19 (RID_SVX_START + 2079) +#define RID_SVXSTR_GRDT20 (RID_SVX_START + 2080) +#define RID_SVXSTR_GRDT21 (RID_SVX_START + 2081) +#define RID_SVXSTR_GRDT22 (RID_SVX_START + 2082) +#define RID_SVXSTR_GRDT23 (RID_SVX_START + 2083) +#define RID_SVXSTR_GRDT24 (RID_SVX_START + 2084) +#define RID_SVXSTR_GRDT25 (RID_SVX_START + 2085) +#define RID_SVXSTR_GRDT26 (RID_SVX_START + 2086) +#define RID_SVXSTR_GRDT27 (RID_SVX_START + 2087) +#define RID_SVXSTR_GRDT28 (RID_SVX_START + 2088) +#define RID_SVXSTR_GRDT29 (RID_SVX_START + 2089) +#define RID_SVXSTR_GRDT30 (RID_SVX_START + 2090) +#define RID_SVXSTR_GRDT31 (RID_SVX_START + 2091) +#define RID_SVXSTR_GRDT32 (RID_SVX_START + 2092) +#define RID_SVXSTR_GRDT33 (RID_SVX_START + 2093) +#define RID_SVXSTR_GRDT34 (RID_SVX_START + 2094) +#define RID_SVXSTR_GRDT35 (RID_SVX_START + 2095) +#define RID_SVXSTR_GRDT36 (RID_SVX_START + 2096) +#define RID_SVXSTR_GRDT37 (RID_SVX_START + 2097) +#define RID_SVXSTR_GRDT38 (RID_SVX_START + 2098) +#define RID_SVXSTR_GRDT39 (RID_SVX_START + 2099) +#define RID_SVXSTR_GRDT40 (RID_SVX_START + 2100) +#define RID_SVXSTR_GRDT41 (RID_SVX_START + 2101) +#define RID_SVXSTR_GRDT42 (RID_SVX_START + 2102) +#define RID_SVXSTR_GRDT43 (RID_SVX_START + 2103) +#define RID_SVXSTR_GRDT44 (RID_SVX_START + 2104) +#define RID_SVXSTR_GRDT45 (RID_SVX_START + 2105) +#define RID_SVXSTR_GRDT46 (RID_SVX_START + 2106) +#define RID_SVXSTR_GRDT47 (RID_SVX_START + 2107) +#define RID_SVXSTR_GRDT48 (RID_SVX_START + 2108) +#define RID_SVXSTR_GRDT49 (RID_SVX_START + 2109) +#define RID_SVXSTR_GRDT50 (RID_SVX_START + 2110) +#define RID_SVXSTR_GRDT51 (RID_SVX_START + 2111) +#define RID_SVXSTR_GRDT52 (RID_SVX_START + 2112) +#define RID_SVXSTR_GRDT53 (RID_SVX_START + 2113) +#define RID_SVXSTR_GRDT54 (RID_SVX_START + 2114) +#define RID_SVXSTR_GRDT55 (RID_SVX_START + 2115) +#define RID_SVXSTR_GRDT56 (RID_SVX_START + 2116) +#define RID_SVXSTR_GRDT57 (RID_SVX_START + 2117) +#define RID_SVXSTR_GRDT58 (RID_SVX_START + 2118) +#define RID_SVXSTR_GRDT_DEF_START RID_SVXSTR_GRDT0_DEF +#define RID_SVXSTR_GRDT_DEF_END RID_SVXSTR_GRDT58_DEF +#define RID_SVXSTR_GRDT_START RID_SVXSTR_GRDT0 +#define RID_SVXSTR_GRDT_END RID_SVXSTR_GRDT58 // Default-Hatch-Names #define RID_SVXSTR_HATCH0_DEF (RID_SVX_START + 661) @@ -791,22 +891,24 @@ #define RID_SVXSTR_DASH9_DEF (RID_SVX_START + 749) #define RID_SVXSTR_DASH10_DEF (RID_SVX_START + 750) #define RID_SVXSTR_DASH11_DEF (RID_SVX_START + 751) -#define RID_SVXSTR_DASH0 (RID_SVX_START + 752) -#define RID_SVXSTR_DASH1 (RID_SVX_START + 753) -#define RID_SVXSTR_DASH2 (RID_SVX_START + 754) -#define RID_SVXSTR_DASH3 (RID_SVX_START + 755) -#define RID_SVXSTR_DASH4 (RID_SVX_START + 756) -#define RID_SVXSTR_DASH5 (RID_SVX_START + 757) -#define RID_SVXSTR_DASH6 (RID_SVX_START + 758) -#define RID_SVXSTR_DASH7 (RID_SVX_START + 759) -#define RID_SVXSTR_DASH8 (RID_SVX_START + 760) -#define RID_SVXSTR_DASH9 (RID_SVX_START + 761) -#define RID_SVXSTR_DASH10 (RID_SVX_START + 762) -#define RID_SVXSTR_DASH11 (RID_SVX_START + 763) +#define RID_SVXSTR_DASH12_DEF (RID_SVX_START + 752) +#define RID_SVXSTR_DASH0 (RID_SVX_START + 753) +#define RID_SVXSTR_DASH1 (RID_SVX_START + 754) +#define RID_SVXSTR_DASH2 (RID_SVX_START + 755) +#define RID_SVXSTR_DASH3 (RID_SVX_START + 756) +#define RID_SVXSTR_DASH4 (RID_SVX_START + 757) +#define RID_SVXSTR_DASH5 (RID_SVX_START + 758) +#define RID_SVXSTR_DASH6 (RID_SVX_START + 759) +#define RID_SVXSTR_DASH7 (RID_SVX_START + 760) +#define RID_SVXSTR_DASH8 (RID_SVX_START + 761) +#define RID_SVXSTR_DASH9 (RID_SVX_START + 762) +#define RID_SVXSTR_DASH10 (RID_SVX_START + 763) +#define RID_SVXSTR_DASH11 (RID_SVX_START + 764) +#define RID_SVXSTR_DASH12 (RID_SVX_START + 765) #define RID_SVXSTR_DASH_DEF_START RID_SVXSTR_DASH0_DEF -#define RID_SVXSTR_DASH_DEF_END RID_SVXSTR_DASH11_DEF +#define RID_SVXSTR_DASH_DEF_END RID_SVXSTR_DASH12_DEF #define RID_SVXSTR_DASH_START RID_SVXSTR_DASH0 -#define RID_SVXSTR_DASH_END RID_SVXSTR_DASH11 +#define RID_SVXSTR_DASH_END RID_SVXSTR_DASH12 // Default-Line-End-Names #define RID_SVXSTR_LEND0_DEF (RID_SVX_START + 770) @@ -821,22 +923,24 @@ #define RID_SVXSTR_LEND9_DEF (RID_SVX_START + 779) #define RID_SVXSTR_LEND10_DEF (RID_SVX_START + 780) #define RID_SVXSTR_LEND11_DEF (RID_SVX_START + 781) -#define RID_SVXSTR_LEND0 (RID_SVX_START + 782) -#define RID_SVXSTR_LEND1 (RID_SVX_START + 783) -#define RID_SVXSTR_LEND2 (RID_SVX_START + 784) -#define RID_SVXSTR_LEND3 (RID_SVX_START + 785) -#define RID_SVXSTR_LEND4 (RID_SVX_START + 786) -#define RID_SVXSTR_LEND5 (RID_SVX_START + 787) -#define RID_SVXSTR_LEND6 (RID_SVX_START + 788) -#define RID_SVXSTR_LEND7 (RID_SVX_START + 789) -#define RID_SVXSTR_LEND8 (RID_SVX_START + 790) -#define RID_SVXSTR_LEND9 (RID_SVX_START + 791) -#define RID_SVXSTR_LEND10 (RID_SVX_START + 792) -#define RID_SVXSTR_LEND11 (RID_SVX_START + 793) +#define RID_SVXSTR_LEND12_DEF (RID_SVX_START + 782) +#define RID_SVXSTR_LEND0 (RID_SVX_START + 783) +#define RID_SVXSTR_LEND1 (RID_SVX_START + 784) +#define RID_SVXSTR_LEND2 (RID_SVX_START + 785) +#define RID_SVXSTR_LEND3 (RID_SVX_START + 786) +#define RID_SVXSTR_LEND4 (RID_SVX_START + 787) +#define RID_SVXSTR_LEND5 (RID_SVX_START + 788) +#define RID_SVXSTR_LEND6 (RID_SVX_START + 789) +#define RID_SVXSTR_LEND7 (RID_SVX_START + 790) +#define RID_SVXSTR_LEND8 (RID_SVX_START + 791) +#define RID_SVXSTR_LEND9 (RID_SVX_START + 792) +#define RID_SVXSTR_LEND10 (RID_SVX_START + 793) +#define RID_SVXSTR_LEND11 (RID_SVX_START + 794) +#define RID_SVXSTR_LEND12 (RID_SVX_START + 795) #define RID_SVXSTR_LEND_DEF_START RID_SVXSTR_LEND0_DEF -#define RID_SVXSTR_LEND_DEF_END RID_SVXSTR_LEND11_DEF +#define RID_SVXSTR_LEND_DEF_END RID_SVXSTR_LEND12_DEF #define RID_SVXSTR_LEND_START RID_SVXSTR_LEND0 -#define RID_SVXSTR_LEND_END RID_SVXSTR_LEND11 +#define RID_SVXSTR_LEND_END RID_SVXSTR_LEND12 #define RID_SVXSTR_QRY_PRINT_TITLE (RID_SVX_START + 802) #define RID_SVXSTR_QRY_PRINT_MSG (RID_SVX_START + 803) @@ -975,7 +1079,6 @@ // a dialog and a string, both with the same id) // I suggest sticking to per-type ids instead of per-semantic ids, this is // better maintainable (IMO), and does not waste that much ids -// fs@openoffice.org // ---------------------------------------------------------------------------- // "Window" resource ids @@ -992,22 +1095,6 @@ #define RID_SVX_MDLG_SCRIPTORG_NEWLIB ( RID_SVX_START + 7 ) #define RID_SVX_MDLG_FONTWORK_CHARSPACING ( RID_SVX_START + 19 ) -// ResId fuer den ImportClipboard-Dialog -// depricated -//#define RID_SVXDLG_CLIPBOARD ( RID_SVX_START + 9 ) - -// ResId fuer den Sonderzeichen-Dialog - -// allgemeine DBMgr-Dialoge -// depricated -//#define RID_SVX_DBSELDLG ( RID_SVX_START + 11 ) -//#define RID_SVX_DBEDDLG ( RID_SVX_START + 12 ) -//#define RID_SVX_DBLOGON ( RID_SVX_START + 13 ) -//#define RID_SVX_RECDLG ( RID_SVX_START + 14 ) -//#define RID_SVX_BRSEEKDLG ( RID_SVX_START + 15 ) -//#define RID_SVX_BRCFGDLG ( RID_SVX_START + 16 ) -//#define RID_SVX_BRSORTDLG ( RID_SVX_START + 17 ) - // document recovery and error report // recycling ids from DBMgr #define RID_SVX_MDLG_DOCRECOVERY_PROGR ( RID_SVX_START + 11 ) @@ -1043,7 +1130,7 @@ #define OFA_TP_APPEARANCE (RID_OFA_START + 203) #define OFA_TP_TABPROPERTIES_GENERAL (RID_OFA_START + 204) -//die RID_??_TP_* stehen nochmal im offids.hrc +//the RID_??_TP_* are duplicate in offids.hrc #define RID_SW_TP_LAYOUT_OPT (RID_OFA_START + 207) #define RID_SW_TP_OPTINSERT_PAGE (RID_OFA_START + 213) @@ -1059,11 +1146,19 @@ #define SID_SC_TP_MISC (RID_OFA_START + 239) #define OFA_TP_TABPROPERTIES_TEXT (RID_OFA_START + 245) #define OFA_TP_HELPERPROG (RID_OFA_START + 249) - -// IAccessibility2 implementation 2009. ------ #define STR_COLORTABLE (RID_OFA_START + 257) #define STR_SWITCH (RID_OFA_START + 258) -// ------ IAccessibility2 implementation 2009. +#define SID_SC_TP_FORMULA (RID_OFA_START + 259) +#define SID_SC_TP_COMPATIBILITY (RID_OFA_START + 260) -#endif +// ---------------------------------------------------------------------------- +// ooo-build specific resources + +#define SVX_OOO_BUILD_START (RID_SVX_START + 1200) +#define RID_SVXBMP_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 1) +#define RID_SVXBMP_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 2) +#define RID_SVXSTR_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 3) +#define RID_SVXSTR_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 4) + +#endif diff --git a/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx index aa85b4e6a391..2f910dd4d1e4 100644 --- a/svx/inc/svx/dlgctl3d.hxx +++ b/svx/inc/svx/dlgctl3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,7 +131,7 @@ public: virtual void SetObjectType(sal_uInt16 nType); - // User Callback eintragen + // register user callback void SetUserInteractiveChangeCallback(Link aNew) { maUserInteractiveChangeCallback = aNew; } void SetUserSelectionChangeCallback(Link aNew) { maUserSelectionChangeCallback = aNew; } void SetChangeCallback(Link aNew) { maChangeCallback = aNew; } @@ -169,7 +170,7 @@ private: ScrollBar maVerScroller; PushButton maSwitcher; - // Callback bei interaktiven Aenderungen + // callback for interactive changes Link maUserInteractiveChangeCallback; Link maUserSelectionChangeCallback; @@ -178,17 +179,17 @@ public: SvxLightCtl3D( Window* pParent, WinBits nStyle = 0); ~SvxLightCtl3D(); - // Reagiere auf Groessenaenderungen + // react to size changes virtual void Resize(); void NewLayout(); - // Selektion auf Gueltigkeit pruefen + // check the selection for validity void CheckSelection(); - // Um weitere Einstellungen nach Aussen zu bringen... + // bring further settings to the outside world Svx3DLightControl& GetSvx3DLightControl() { return maLightControl; } - // User Callback eintragen + // register user callback void SetUserInteractiveChangeCallback(Link aNew) { maUserInteractiveChangeCallback = aNew; } void SetUserSelectionChangeCallback(Link aNew) { maUserSelectionChangeCallback = aNew; } @@ -203,7 +204,7 @@ protected: DECL_LINK( ScrollBarMove, void*); DECL_LINK( ButtonPress, void*); - // Lokale Parameter Initialisieren + // initialize local parameters void Init(); void move( double fDeltaHor, double fDeltaVer ); @@ -213,3 +214,5 @@ protected: ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx index a6c2ce21829e..75303629b64a 100644 --- a/svx/inc/svx/dlgctrl.hxx +++ b/svx/inc/svx/dlgctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,8 +63,8 @@ namespace com { namespace sun { namespace star { namespace awt { /************************************************************************* |* -|* Von SfxTabPage abgeleitet, um vom Control ueber virtuelle Methode -|* benachrichtigt werden zu koennen. +|* Derived from SfxTabPage for being able to get notified through the +|* virtual method from the control. |* \************************************************************************/ class SvxTabPage : public SfxTabPage @@ -78,8 +79,8 @@ public: /************************************************************************* |* -|* Control zur Darstellung und Auswahl der Eckpunkte (und Mittelpunkt) -|* eines Objekts +|* Control for display and selection of the corner and center points of +|* an object |* \************************************************************************/ typedef sal_uInt16 CTL_STATE; @@ -110,7 +111,6 @@ protected: Bitmap* pBitmap; CTL_STATE m_nState; - // #103516# Added a possibility to completely disable this control sal_Bool mbCompleteDisable; RECT_POINT GetRPFromPoint( Point ) const; @@ -149,15 +149,14 @@ public: RECT_POINT GetApproxRPFromPixPt( const ::com::sun::star::awt::Point& rPixelPoint ) const; - // #103516# Added a possibility to completely disable this control sal_Bool IsCompletelyDisabled() const { return mbCompleteDisable; } void DoCompletelyDisable(sal_Bool bNew); }; /************************************************************************* |* -|* Control zur Darstellung und Auswahl des Winkels der Eckpunkte -|* eines Objekts +|* Control for display and selecton of the angle of the corner points +|* of an object |* \************************************************************************/ class SvxAngleCtl : public SvxRectCtl @@ -181,7 +180,7 @@ public: /************************************************************************* |* -|* Preview-Control zur Darstellung von Bitmaps +|* Preview control for the display of bitmaps |* \************************************************************************/ @@ -207,7 +206,7 @@ public: /************************************************************************* |* -|* Control zum Editieren von Bitmaps +|* Control for editing bitmaps |* \************************************************************************/ class SVX_DLLPUBLIC SvxPixelCtl : public Control @@ -253,7 +252,7 @@ public: /************************************************************************* |* -|* ColorLB kann mit Farben und Namen gefuellt werden +|* ColorLB can be filled with colors and names |* \************************************************************************/ class SVX_DLLPUBLIC ColorLB : public ColorListBox @@ -348,7 +347,7 @@ private: /************************************************************************* |* -|* FillAttrLB vereint alle Fuellattribute in einer ListBox +|* FillAttrLB unites all fill attributes an a ListBox |* \************************************************************************/ class FillAttrLB : public ColorListBox @@ -474,7 +473,6 @@ private: SdrObject* mpLineObjB; SdrObject* mpLineObjC; - //#58425# Symbole auf einer Linie (z.B. StarChart) Graphic* mpGraphic; sal_Bool mbWithSymbol; Size maSymbolSize; @@ -537,3 +535,4 @@ public: #endif // _SVX_DLG_CTRL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dlgutil.hxx b/svx/inc/svx/dlgutil.hxx index 9f0d5190daed..5393b6e9dc97 100644 --- a/svx/inc/svx/dlgutil.hxx +++ b/svx/inc/svx/dlgutil.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,9 +40,11 @@ class SfxItemSet; SVX_DLLPUBLIC FieldUnit GetModuleFieldUnit( const SfxItemSet& ); +SVX_DLLPUBLIC bool GetApplyCharUnit( const SfxItemSet& ); #define OUTPUT_DRAWMODE_COLOR (DRAWMODE_DEFAULT) #define OUTPUT_DRAWMODE_CONTRAST (DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT) #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/drawitem.hxx b/svx/inc/svx/drawitem.hxx index 1f8536068c76..ae864cc442af 100644 --- a/svx/inc/svx/drawitem.hxx +++ b/svx/inc/svx/drawitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,8 +59,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XColorTable* GetColorTable() const { return pColorTable; } void SetColorTable( XColorTable* pTable ) { @@ -92,8 +93,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XGradientList* GetGradientList() const { return pGradientList; } void SetGradientList( XGradientList* pList ) { @@ -127,8 +128,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XHatchList* GetHatchList() const { return pHatchList; } void SetHatchList( XHatchList* pList ) { @@ -162,8 +163,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XBitmapList* GetBitmapList() const { return pBitmapList; } void SetBitmapList( XBitmapList* pList ) { @@ -197,8 +198,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XDashList* GetDashList() const { return pDashList; } void SetDashList( XDashList* pList ); @@ -231,8 +232,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XLineEndList* GetLineEndList() const { return pLineEndList; } void SetLineEndList( XLineEndList* pList ) { @@ -244,3 +245,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dstribut_enum.hxx b/svx/inc/svx/dstribut_enum.hxx index 23001f888e70..0aa57f5901ff 100644 --- a/svx/inc/svx/dstribut_enum.hxx +++ b/svx/inc/svx/dstribut_enum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,10 +28,6 @@ #ifndef _SVX_DSTRIBUT_ENUM_HXX #define _SVX_DSTRIBUT_ENUM_HXX -/************************************************************************* -|* -\************************************************************************/ - enum SvxDistributeHorizontal { SvxDistributeHorizontalNone = 0, @@ -51,3 +48,4 @@ enum SvxDistributeVertical #endif // _SVX_DSTRIBUT_ENUM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx index aef5de313ed9..c2a37462696a 100644 --- a/svx/inc/svx/e3ditem.hxx +++ b/svx/inc/svx/e3ditem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,8 +55,8 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); const basegfx::B3DVector& GetValue() const { return aVal; } void SetValue( const basegfx::B3DVector& rNewVal ) { @@ -71,3 +72,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/e3dsceneupdater.hxx b/svx/inc/svx/e3dsceneupdater.hxx index ad38491945d5..2fe52e03bae4 100644 --- a/svx/inc/svx/e3dsceneupdater.hxx +++ b/svx/inc/svx/e3dsceneupdater.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,3 +73,5 @@ public: }; #endif // _E3D_SCENEUPDATER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/e3dundo.hxx b/svx/inc/svx/e3dundo.hxx index 4c087ff4f88e..e76a71cb49fb 100644 --- a/svx/inc/svx/e3dundo.hxx +++ b/svx/inc/svx/e3dundo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,7 +38,7 @@ class E3dView; /************************************************************************\ |* -|* Basisklasse fuer alle 3D-Undo-Aktionen. +|* Base class for all 3D undo actions. |* \************************************************************************/ class E3dUndoAction : public SdrUndoAction @@ -62,7 +63,7 @@ class E3dUndoAction : public SdrUndoAction /************************************************************************\ |* -|* Undo fuer 3D-Rotation ueber die Rotationsmatrizen (ob das wohl klappt ?) +|* Undo for 3D rotation through the rotation matrices |* \************************************************************************/ class E3dRotateUndoAction : public E3dUndoAction @@ -91,7 +92,7 @@ class E3dRotateUndoAction : public E3dUndoAction /************************************************************************\ |* -|* Undo fuer 3D-Attribute (Implementiert ueber Set3DAttributes()) +|* Undo for 3D attributes (implemented using Set3DAttributes()) |* \************************************************************************/ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction @@ -122,3 +123,5 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction }; #endif // _E3D_CUBE3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/exthelpid.hrc b/svx/inc/svx/exthelpid.hrc index 360a4914c10e..360a4914c10e 100644..100755 --- a/svx/inc/svx/exthelpid.hrc +++ b/svx/inc/svx/exthelpid.hrc diff --git a/svx/inc/svx/extrud3d.hxx b/svx/inc/svx/extrud3d.hxx index 0d4372fba6a3..ac1b630ece46 100644 --- a/svx/inc/svx/extrud3d.hxx +++ b/svx/inc/svx/extrud3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,20 +92,20 @@ public: virtual sal_uInt16 GetObjIdentifier() const; - virtual void operator=(const SdrObject&); + virtual E3dExtrudeObj* Clone() const; - // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert". + // TakeObjName...() is for the display in the UI (for example "3 frames selected") virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; - // Lokale Parameter setzen/lesen mit Geometrieneuerzeugung + // set/get local parameters with geometry regeneration void SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew); const basegfx::B2DPolyPolygon &GetExtrudePolygon() { return maExtrudePolygon; } - // Aufbrechen virtual sal_Bool IsBreakObjPossible(); virtual SdrAttrObj* GetBreakObj(); }; #endif // _E3D_EXTRUD3D_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/extrusionbar.hxx b/svx/inc/svx/extrusionbar.hxx index 44a2c5e2f917..02a246e7f99d 100644 --- a/svx/inc/svx/extrusionbar.hxx +++ b/svx/inc/svx/extrusionbar.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,5 @@ public: } #endif // _SVX_EXTRUSION_BAR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/extrusioncolorcontrol.hxx b/svx/inc/svx/extrusioncolorcontrol.hxx index a592d8646a6f..a7f0a3edcb5f 100644 --- a/svx/inc/svx/extrusioncolorcontrol.hxx +++ b/svx/inc/svx/extrusioncolorcontrol.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,7 +38,8 @@ namespace svx { class SVX_DLLPUBLIC ExtrusionColorControl : public SfxToolBoxControl { private: - ToolboxButtonColorUpdater* mpBtnUpdater; + ToolboxButtonColorUpdater* mpBtnUpdater; + Color mLastColor; public: SFX_DECL_TOOLBOX_CONTROL(); @@ -54,3 +56,4 @@ public: #endif // _SVX_EXTRUSIONCOLORCONTROL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/f3dchild.hxx b/svx/inc/svx/f3dchild.hxx index ebc85d1fc6c5..b523c86752fe 100644 --- a/svx/inc/svx/f3dchild.hxx +++ b/svx/inc/svx/f3dchild.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,7 +36,7 @@ /************************************************************************* |* -|* Ableitung vom SfxChildWindow als "Behaelter" fuer 3D Window +|* Derived from SfxChildWindow as "container" for 3D Window |* \************************************************************************/ @@ -49,3 +50,4 @@ class SVX_DLLPUBLIC Svx3DChildWindow : public SfxChildWindow #endif // _SVX_F3DCHILD_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx index ebca73fc7a06..895036f7f3eb 100644 --- a/svx/inc/svx/fillctrl.hxx +++ b/svx/inc/svx/fillctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,7 +45,7 @@ class ListBox; /************************************************************************* |* -|* Klassen fuer Flaechenattribute (Controls und Controller) +|* Class for surface attributes (controls and controller) |* \************************************************************************/ @@ -91,11 +92,9 @@ private: Size aLogicalAttrSize; Timer aDelayTimer; -//#if 0 // _SOLAR__PRIVATE DECL_LINK( DelayHdl, Timer * ); DECL_LINK( SelectFillTypeHdl, ListBox * ); DECL_LINK( SelectFillAttrHdl, ListBox * ); -//#endif virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: FillControl( Window* pParent, WinBits nStyle = 0 ); @@ -106,3 +105,4 @@ public: #endif // _FILLCTRL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/flagsdef.hxx b/svx/inc/svx/flagsdef.hxx index 9a6ca6f838e6..2b1b30dee90e 100644 --- a/svx/inc/svx/flagsdef.hxx +++ b/svx/inc/svx/flagsdef.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,22 +30,22 @@ // defines --------------------------------------------------------------- -//CHINA001 copy from border.hxx +// copy from border.hxx // Border-Modes for paragraphs, textframes and tables #define SW_BORDER_MODE_PARA 0x01 #define SW_BORDER_MODE_TABLE 0x02 #define SW_BORDER_MODE_FRAME 0x04 -//CHINA001 flags for SvxBackgroundTabPage +// flags for SvxBackgroundTabPage #define SVX_SHOW_SELECTOR 0x01 #define SVX_SHOW_PARACTL 0x02 #define SVX_ENABLE_TRANSPARENCY 0x04 #define SVX_SHOW_TBLCTL 0x08 -//CHINA001 flags for SvxBorderTabPage +// flags for SvxBorderTabPage #define SVX_HIDESHADOWCTL 0x01 -//CHINA001 copy from chardlg.hxx +// copy from chardlg.hxx #define DISABLE_CASEMAP ((sal_uInt16)0x0001) #define DISABLE_WORDLINE ((sal_uInt16)0x0002) #define DISABLE_BLINK ((sal_uInt16)0x0004) @@ -53,15 +54,15 @@ #define DISABLE_LANGUAGE ((sal_uInt16)0x0010) #define DISABLE_HIDE_LANGUAGE ((sal_uInt16)0x0020) -//CHINA001 flags for SvxCharBasePage's child class +// flags for SvxCharBasePage's child class #define SVX_PREVIEW_CHARACTER 0x01 -//CHINA001 flags for SvxCharNamePage +// flags for SvxCharNamePage #define SVX_RELATIVE_MODE 0x02 -//CHINA001 flags for SvxCharEffectsPage +// flags for SvxCharEffectsPage #define SVX_ENABLE_FLASH 0x04 -//CHINA001 copy from numfmt.hxx +// copy from numfmt.hxx #define SVX_NUMVAL_STANDARD -1234.12345678901234 #define SVX_NUMVAL_CURRENCY -1234 #define SVX_NUMVAL_PERCENT -0.1295 @@ -69,7 +70,7 @@ #define SVX_NUMVAL_DATE 36525.5678935185 #define SVX_NUMVAL_BOOLEAN 1 -//CHINA001 copy from page.hxx +// copy from page.hxx // enum ------------------------------------------------------------------ enum SvxModeType @@ -81,7 +82,7 @@ enum SvxModeType // define ---------------------------------------------------------------- // 1/2 cm in TWIPS -// wird auch fuer Minimalgrosse der LayFrms aller Arten benutzt +// Is also used for minimum size of LayFrms of any kind #define MM50 283 //from original svx/inc/paragrph.hxx //--------------from original svx/inc/tabstpge.hxx @@ -101,3 +102,5 @@ enum SvxModeType //----- #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx index 8ad3d618d271..9a2b7dacf333 100644 --- a/svx/inc/svx/float3d.hxx +++ b/svx/inc/svx/float3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,16 +30,10 @@ #define _SVX_FLOAT3D_HXX #include <sfx2/ctrlitem.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <sfx2/dockwin.hxx> -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/button.hxx> -#endif #include <svtools/valueset.hxx> #include <svtools/stdctrl.hxx> #include "svx/svxdllapi.h" @@ -84,8 +79,8 @@ private: ImageButton aBtnUpdate; ImageButton aBtnAssign; +// geometry FixedLine aFLGeometrie; -// Geometrie FixedText aFtPercentDiagonal; MetricField aMtrPercentDiagonal; FixedText aFtBackscale; @@ -110,7 +105,7 @@ private: ImageButton aBtnDoubleSided; FixedLine aFLRepresentation; -// Darstellung +// presentation FixedText aFtShademode; ListBox aLbShademode; FixedLine aFLShadow; @@ -124,7 +119,7 @@ private: FixedLine aFLCamera; FixedLine aFLLight; -// Beleuchtung +// lighting ImageButton aBtnLight1; ImageButton aBtnLight2; ImageButton aBtnLight3; @@ -153,7 +148,7 @@ private: FixedLine aFLTexture; -// Texturen +// Textures FixedText aFtTexKind; ImageButton aBtnTexLuminance; ImageButton aBtnTexColor; @@ -172,9 +167,9 @@ private: FixedText aFtTexFilter; ImageButton aBtnTexFilter; -// Material +// material +// material editor FixedLine aFLMaterial; -// Materialeditor FixedText aFtMatFavorites; ListBox aLbMatFavorites; FixedText aFtMatColor; @@ -193,19 +188,19 @@ private: Svx3DPreviewControl aCtlPreview; SvxLightCtl3D aCtlLightPreview; -// Unterer Teil +// bottom part ImageButton aBtnConvertTo3D; ImageButton aBtnLatheObject; ImageButton aBtnPerspective; -// der Rest ... +// the rest ... Image aImgLightOn; Image aImgLightOff; sal_Bool bUpdate; ViewType3D eViewType; Size aSize; - // Model, Page, View etc. fuer Favoriten + // Model, Page, View etc. for favourites FmFormModel* pModel; FmFormPage* pFmPage; VirtualDevice* pVDev; @@ -274,7 +269,7 @@ public: /************************************************************************* |* -|* ControllerItem fuer 3D-Window (Floating/Docking) +|* Controller item for 3D Window (Floating/Docking) |* \************************************************************************/ @@ -292,7 +287,7 @@ class Svx3DCtrlItem : public SfxControllerItem /************************************************************************* |* -|* ControllerItem fuer Status eines Slots +|* ControllerItem for State of a Slot |* (SID_CONVERT_TO_3D, SID_CONVERT_TO_3D_LATHE_FAST) |* \************************************************************************/ @@ -311,3 +306,4 @@ public: #endif // _SVX_FLOAT3D_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmdmod.hxx b/svx/inc/svx/fmdmod.hxx index 26af5971be03..6c951ec98e72 100644 --- a/svx/inc/svx/fmdmod.hxx +++ b/svx/inc/svx/fmdmod.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,4 @@ public: #endif // _SVX_FMDMOD_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmdpage.hxx b/svx/inc/svx/fmdpage.hxx index 70fe7eb74eaf..8ee078c47f1c 100644 --- a/svx/inc/svx/fmdpage.hxx +++ b/svx/inc/svx/fmdpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,21 +41,19 @@ class SVX_DLLPUBLIC SvxFmDrawPage :public SvxDrawPage { protected: - // Erzeugen eines SdrObjects anhand einer Description. Kann von - // abgeleiteten Klassen dazu benutzt werden, eigene ::com::sun::star::drawing::Shapes zu - // unterstuetzen (z.B. Controls) + // Creating a SdrObject based on a Description. Cann be used by derived classes to + // support own ::com::sun::star::drawing::Shapes (for example Controls) virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape )throw (); - // Die folgende Methode wird gerufen, wenn ein SvxShape-Objekt angelegt - // werden soll. abgeleitete Klassen koennen hier eine Ableitung oder - // ein ein SvxShape aggregierendes Objekt anlegen. + // The following method is called when a SvxShape object should be created. + // Derived classes can create a derivation or an object aggregating SvxShape. virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (); public: SvxFmDrawPage( SdrPage* pPage ); virtual ~SvxFmDrawPage() throw (); - // UNO Anbindung + // UNO connection DECLARE_UNO3_AGG_DEFAULTS(SvxFmDrawPage, SvxDrawPage); virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); @@ -74,3 +73,4 @@ public: #endif // _SVX_FMDPAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmglob.hxx b/svx/inc/svx/fmglob.hxx index c361e13a759a..1e1c09532f47 100644 --- a/svx/inc/svx/fmglob.hxx +++ b/svx/inc/svx/fmglob.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,7 @@ const sal_uInt32 FmFormInventor = sal_uInt32('F')*0x00000001+ sal_uInt32('1')*0x01000000; const sal_uInt16 OBJ_FM_CONTROL = ::com::sun::star::form::FormComponentType::CONTROL; - // fuer FormularKomponenten + // for form components const sal_uInt16 OBJ_FM_EDIT = ::com::sun::star::form::FormComponentType::TEXTFIELD; const sal_uInt16 OBJ_FM_BUTTON = ::com::sun::star::form::FormComponentType::COMMANDBUTTON; const sal_uInt16 OBJ_FM_FIXEDTEXT = ::com::sun::star::form::FormComponentType::FIXEDTEXT; @@ -64,3 +65,4 @@ const sal_uInt16 OBJ_FM_NAVIGATIONBAR = ::com::sun::star::form::FormComponen #endif // _FM_FMGLOB_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmgridcl.hxx b/svx/inc/svx/fmgridcl.hxx index c0e9e7e34d78..3f5f2a5bdc6b 100644 --- a/svx/inc/svx/fmgridcl.hxx +++ b/svx/inc/svx/fmgridcl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -214,3 +215,4 @@ protected: #endif // _SVX_FMGRIDCL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx index df21245bc99b..1cf98bae02e3 100644 --- a/svx/inc/svx/fmgridif.hxx +++ b/svx/inc/svx/fmgridif.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -232,7 +233,7 @@ public: FmXGridControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); virtual ~FmXGridControl(); - // UNO Anbindung + // UNO connection DECLARE_UNO3_AGG_DEFAULTS(FmXGridControl, UnoControl); virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); @@ -317,12 +318,12 @@ public: protected: virtual FmXGridPeer* imp_CreatePeer(Window* pParent); - // ImplCreatePeer waere besser ;) geht aber nicht, da dann nicht exportiert + // ImplCreatePeer would be better, but doesn't work because it's not exported }; //================================================================== -// FmXGridPeer -> Peer fuers Gridcontrol +// FmXGridPeer -> Peer for the Gridcontrol //================================================================== typedef ::comphelper::ImplHelper19 < ::com::sun::star::form::XGridPeer, ::com::sun::star::form::XBoundComponent, @@ -385,7 +386,7 @@ public: // spaeter Constructor, immer nach dem realen Constructor zu rufen ! void Create(Window* pParent, WinBits nStyle); -// UNO Anbindung +// UNO connection DECLARE_UNO3_DEFAULTS(FmXGridPeer, VCLXWindow); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); @@ -549,3 +550,4 @@ protected: #endif // _SVX_FMGRID_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmmodel.hxx b/svx/inc/svx/fmmodel.hxx index b5308510229a..8f9ee82a04d6 100644 --- a/svx/inc/svx/fmmodel.hxx +++ b/svx/inc/svx/fmmodel.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,13 +61,13 @@ public: FmFormModel(SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL ); FmFormModel(const XubString& rPath, SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL ); - FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, FASTBOOL bUseExtColorTable); + FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, bool bUseExtColorTable); FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, - FASTBOOL bUseExtColorTable); + bool bUseExtColorTable); virtual ~FmFormModel(); - virtual SdrPage* AllocPage(FASTBOOL bMasterPage); + virtual SdrPage* AllocPage(bool bMasterPage); virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); virtual SdrPage* RemovePage(sal_uInt16 nPgNum); virtual void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos); @@ -100,3 +101,4 @@ private: #endif // _FM_FMMODEL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmpage.hxx b/svx/inc/svx/fmpage.hxx index d50187f7b81b..8c32e46073a4 100644 --- a/svx/inc/svx/fmpage.hxx +++ b/svx/inc/svx/fmpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,7 +35,7 @@ class StarBASIC; class FmFormModel; -class FmFormPageImpl; // haelt die Liste aller Forms +class FmFormPageImpl; // contains a list of all forms FORWARD_DECLARE_INTERFACE(container,XNameContainer) @@ -52,7 +53,7 @@ class SVX_DLLPUBLIC FmFormPage : public SdrPage public: TYPEINFO(); - FmFormPage(FmFormModel& rModel,StarBASIC*, FASTBOOL bMasterPage=sal_False); + FmFormPage(FmFormModel& rModel,StarBASIC*, bool bMasterPage=sal_False); FmFormPage(const FmFormPage& rPage); ~FmFormPage(); @@ -66,12 +67,10 @@ public: virtual SdrObject* RemoveObject(sal_uLong nObjNum); - // Zugriff auf alle Formulare + // access to all forms const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& GetForms( bool _bForceCreate = true ) const; -#ifndef SVX_LIGHT FmFormPageImpl& GetImpl() const { return *m_pImpl; } -#endif // SVX_LIGHT public: const String& GetName() const { return m_sPageName; } @@ -85,3 +84,4 @@ public: #endif // _SVX_FMPAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmresids.hrc b/svx/inc/svx/fmresids.hrc index f6843801e522..24637babb057 100644..100755 --- a/svx/inc/svx/fmresids.hrc +++ b/svx/inc/svx/fmresids.hrc @@ -35,7 +35,6 @@ // ImageList-Id's ----------------------------------------------------------- #define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0) -#define RID_SVXIMGLIST_FMEXPL_HC (RID_FORMS_START + 2) // Image-Id's ----------------------------------------------------------- //#define SID_FMSLOTS_START (SID_SVX_START + 592) -> svxids.hrc diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx index b2722c7016b9..c74592c18caa 100644 --- a/svx/inc/svx/fmsearch.hxx +++ b/svx/inc/svx/fmsearch.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,21 +34,13 @@ #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <vcl/combobox.hxx> #include <vcl/lstbox.hxx> #include <tools/link.hxx> @@ -71,25 +64,27 @@ SVX_DLLPUBLIC sal_Bool IsSearchableControl( const ::com::sun::star::uno::Referen struct FmFoundRecordInformation { - ::com::sun::star::uno::Any aPosition; // Bookmark des Datensatzes, in dem der Text gefunden wurde - sal_Int16 nFieldPos; // dito : die relative Position der Spalte (im Stringnamen in Feldliste im Constructor) - sal_Int16 nContext; // Kontext, in dem gesucht und gefunden wurde (falls die aktuelle Suche verschiedene solche kennt) + ::com::sun::star::uno::Any aPosition; // bookmark of the record in which the text was found + sal_Int16 nFieldPos; // ditto : the relative position of the column (in the string name of the field list in the constructor) + sal_Int16 nContext; // the context in which was searched and found (if the current search knows several contexts) }; // =================================================================================================== -// = struct FmSearchContext - Informationen fuer Suche in verschiedenen Kontexten +// = struct FmSearchContext - informations for the search in different contexts // =================================================================================================== struct FmSearchContext { // [in] - sal_Int16 nContext; // die Nummer des Kontextes + sal_Int16 nContext; // the number of the context // [out] - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xCursor; // der Iterator fuer diesen Kontext - String strUsedFields; // eine Liste von durch ';' getrennten Feldnamen + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xCursor; // the iterator for the context + String strUsedFields; // a list of field names separeted by ';' ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > - arrFields; // die korrespondierenden Text-Interfaces fuer die Felder in strUsedFields + arrFields; // the corresponding text interfaces for the fields in strUsedFields String sFieldDisplayNames; // if not empty : names to be displayed for the searchable fields (must have the same token count as strUsedFields !) }; #endif // _FMSEARCH_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmshell.hxx b/svx/inc/svx/fmshell.hxx index f37eeab8c5e6..b0d94146c0a9 100644 --- a/svx/inc/svx/fmshell.hxx +++ b/svx/inc/svx/fmshell.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,9 +36,7 @@ #include <sfx2/module.hxx> #include <vcl/event.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/fmview.hxx> #include "svx/svxdllapi.h" @@ -91,14 +90,13 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell sal_uInt16 m_nLastSlot; sal_Bool m_bDesignMode : 1; - sal_Bool m_bHasForms : 1; // Flag welches festhaelt, ob Formulare auf einer Seite - // vorhanden sind, nur fr den DesignMode, siehe UIFeatureChanged! + sal_Bool m_bHasForms : 1; // flag storing if the forms on a page exist, + // only for the DesignMode, see UIFeatureChanged! - // die Markierungen einer FormView haben sich geaendert ... + // the marks of a FormView have changed... void NotifyMarkListChanged(FmFormView*); - // (die FormView selber ist kein Broadcaster, deshalb kann sie den Formular-Explorer, den dieses - // Ereignis interesiert, nicht sauber verstaendigen (sie koennte sich lediglich von der Application - // das Navigator-Fenster geben lassen, aber das wollen wir ja nicht, ge ? ...)) + // (the FormView itself is not a broadcaster, therefore it can't always correctly notify the + // form explorer who is interested in the event) class FormShellWaitObject { @@ -179,7 +177,7 @@ public: protected: void GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich); - // gibt es ein Formular auf der aktuellen Seite? + // is there a form on the current page? void DetermineForms(sal_Bool bInvalidate); void impl_setDesignMode( sal_Bool bDesign); }; @@ -189,3 +187,5 @@ protected: // *************************************************************************************************** #endif // _SVX_FMSHELL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmsrccfg.hxx b/svx/inc/svx/fmsrccfg.hxx index 3705f32b7494..89ad20bef6f9 100644 --- a/svx/inc/svx/fmsrccfg.hxx +++ b/svx/inc/svx/fmsrccfg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -154,3 +155,4 @@ namespace svxform #endif // _FMSRCCF_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmsrcimp.hxx b/svx/inc/svx/fmsrcimp.hxx index 3a3af0ac7d8f..85983401e554 100644 --- a/svx/inc/svx/fmsrcimp.hxx +++ b/svx/inc/svx/fmsrcimp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,7 +45,7 @@ #include <osl/mutex.hxx> #include <unotools/charclass.hxx> #include <unotools/collatorwrapper.hxx> -#include <vos/thread.hxx> +#include <osl/thread.hxx> #include <deque> @@ -53,7 +54,7 @@ // =================================================================================================== class FmSearchEngine; -class FmSearchThread : public ::vos::OThread +class FmSearchThread : public ::osl::Thread { FmSearchEngine* m_pEngine; Link m_aTerminationHdl; @@ -227,7 +228,7 @@ class SVX_DLLPUBLIC FmSearchEngine sal_Bool m_bCancelAsynchRequest : 1; // soll abgebrochen werden ? ::osl::Mutex m_aCancelAsynchAccess; // Zugriff auf m_bCancelAsynchRequest (eigentlich nur bei // m_eMode == SM_USETHREAD interesant) - FMSEARCH_MODE m_eMode; //CHINA001 FmSearchDialog::SEARCH_MODE m_eMode; // der aktuelle Modus + FMSEARCH_MODE m_eMode; // der aktuelle Modus // der aktuelle Modus // Parameter fuer die Suche @@ -310,13 +311,13 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor, const ::rtl::OUString& strVisibleFields, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xFormat, - FMSEARCH_MODE eMode);//CHINA001 FmSearchDialog::SEARCH_MODE eMode); + FMSEARCH_MODE eMode); FmSearchEngine( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor, const ::rtl::OUString& strVisibleFields, const InterfaceArray& arrFields, - FMSEARCH_MODE eMode); //CHINA001 FmSearchDialog::SEARCH_MODE eMode); + FMSEARCH_MODE eMode); virtual ~FmSearchEngine(); @@ -399,3 +400,4 @@ private: #endif // _FMSRCIMP_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmtools.hxx b/svx/inc/svx/fmtools.hxx index f98919fe47d8..2856e822b28e 100644 --- a/svx/inc/svx/fmtools.hxx +++ b/svx/inc/svx/fmtools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,7 +84,7 @@ class Window; //================================================================== -// allgemeine Typen +// common types //================================================================== // displaying a database exception for the user // display info about a simple ::com::sun::star::sdbc::SQLException @@ -98,8 +99,8 @@ sal_Int32 getElementPos(const ::com::sun::star::uno::Reference< ::com::sun::star SVX_DLLPUBLIC ::rtl::OUString getLabelName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xControlModel); // =================================================================================================== -// = class CursorWrapper - eine Hilfsklasse, die parallel mit je einem ::com::sun::star::uno::Reference<XDatabaseUpdateCursor>, -// XDatabaseBookmarkCursor und XDatabaseDirectCursor arbeitet +// = class CursorWrapper - a helper class which works in common with a ::com::sun::star::uno::Reference<XDatabaseUpdateCursor>, +// XDatabaseBookmarkCursor and XDatabaseDirectCursor each // =================================================================================================== class CursorWrapper @@ -116,8 +117,8 @@ public: CursorWrapper() { } CursorWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxCursor, sal_Bool bUseCloned = sal_False); SVX_DLLPUBLIC CursorWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, sal_Bool bUseCloned = sal_False); - // bei bUseCloned == sal_True wird der Cursor ueber das XCloneable-Interface (dass er besitzen muss) gedoubled und - // erst dann benutzt + // if bUseCloned == sal_True, the cursor is first doubled over the XCloneable interface (which it must implement) + // and then used friend bool operator==(const CursorWrapper& lhs, const CursorWrapper& rhs) { @@ -130,7 +131,7 @@ public: CursorWrapper* operator ->() { return this; } operator const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& () const{ return m_xGeneric; } - // 'Konvertierungen' + // 'Conversions' const CursorWrapper& operator=(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& xCursor); operator const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& () const { return m_xMoveOperations; } operator const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XRowLocate>& () const { return m_xBookmarkOperations; } @@ -141,7 +142,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XRowLocate >& getRowLocate() const { return m_xBookmarkOperations; } const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >& getColumnsSupplier() const { return m_xColumnsSupplier; } - // das normale queryInterface + // the usual queryInterface ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException ) { return m_xMoveOperations->queryInterface(type); } @@ -232,3 +233,4 @@ typedef ::std::set < ::com::sun::star::uno::Reference< ::com::sun::star::uno::X #endif // _SVX_FMTOOLS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx index 52fa30650184..f9dd40edbd8e 100644 --- a/svx/inc/svx/fmview.hxx +++ b/svx/inc/svx/fmview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -164,3 +165,4 @@ private: #endif // _FML_FMVIEW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx index 57bcdc0c6705..380dd33a5c32 100644 --- a/svx/inc/svx/fntctl.hxx +++ b/svx/inc/svx/fntctl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,13 +47,11 @@ private: FontNameMenu* pMenu; Menu& rParent; -//#if 0 // _SOLAR__PRIVATE SVX_DLLPRIVATE void FillMenu(); DECL_LINK( MenuSelect, FontNameMenu * ); SVX_DLLPRIVATE virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); SVX_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); -//#endif public: SvxFontMenuControl( sal_uInt16 nId, Menu&, SfxBindings& ); @@ -67,3 +66,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx index 4be1173db44c..7adc049fcc54 100644 --- a/svx/inc/svx/fntctrl.hxx +++ b/svx/inc/svx/fntctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,13 +33,14 @@ #include <vcl/window.hxx> #include <editeng/svxfont.hxx> #include "svx/svxdllapi.h" +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif // forward --------------------------------------------------------------- +class SfxItemSet; class FontPrevWin_Impl; // class SvxFontPrevWindow ----------------------------------------------- @@ -49,16 +51,21 @@ class SVX_DLLPUBLIC SvxFontPrevWindow : public Window private: FontPrevWin_Impl* pImpl; - SVX_DLLPRIVATE void InitSettings( sal_Bool bForeground, sal_Bool bBackground ); + SVX_DLLPRIVATE void InitSettings( sal_Bool bForeground, sal_Bool bBackground ); + SVX_DLLPRIVATE void Init (); + SVX_DLLPRIVATE void SetFontSize( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont ); public: + SvxFontPrevWindow( Window* pParent ); SvxFontPrevWindow( Window* pParent, const ResId& rId ); virtual ~SvxFontPrevWindow(); virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - // Aus Effizienz-gr"unden nicht const + void Init( const SfxItemSet& rSet ); + + // for reasons of efficiency not const SvxFont& GetFont(); const SvxFont& GetFont() const; void SetFont( const SvxFont& rFont ); @@ -71,10 +78,13 @@ public: void ResetColor(); void SetBackColor( const Color& rColor ); void UseResourceText( sal_Bool bUse = sal_True ); + void SetDrawBaseLine( sal_Bool bSet = sal_True ); + void SetPreviewBackgroundToCharacter( sal_Bool bSet = sal_True ); void Paint( const Rectangle& ); - sal_Bool IsTwoLines() const; + sal_Bool IsTwoLines() const; void SetTwoLines(sal_Bool bSet); + void SetNoLines(sal_Bool bSet); void SetBrackets(sal_Unicode cStart, sal_Unicode cEnd); @@ -84,7 +94,16 @@ public: void SetPreviewText( const ::rtl::OUString& rString ); void SetFontNameAsPreviewText(); + + void SetFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont ); + void SetFontStyle( const SfxItemSet& rSet, sal_uInt16 nSlotPosture, sal_uInt16 nSlotWeight, SvxFont& rFont ); // posture/weight + void SetFontWidthScale( const SfxItemSet& rSet ); + void SetFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ); + + void SetFromItemSet( const SfxItemSet &rSet, + bool bPreviewBackgroundToCharacter = false ); }; #endif // #ifndef _SVX_FNTCTRL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fntszctl.hxx b/svx/inc/svx/fntszctl.hxx index 9ae8da4a27d7..9a77bb48f8fe 100644 --- a/svx/inc/svx/fntszctl.hxx +++ b/svx/inc/svx/fntszctl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,9 +47,7 @@ private: Menu& rParent; SfxStatusForwarder aFontNameForwarder; -//#if 0 // _SOLAR__PRIVATE DECL_LINK( MenuSelect, FontSizeMenu * ); -//#endif protected: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, @@ -67,3 +66,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fontlb.hxx b/svx/inc/svx/fontlb.hxx index 8051eded95b6..dd2ca4e867f7 100644 --- a/svx/inc/svx/fontlb.hxx +++ b/svx/inc/svx/fontlb.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef SVX_FONTLB_HXX #define SVX_FONTLB_HXX -#ifndef _SVTABBOX_HXX #include <svtools/svtabbx.hxx> -#endif #include <vcl/virdev.hxx> #include "svx/svxdllapi.h" #include <layout/layout.hxx> @@ -136,3 +135,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx index 2e696fdaaee6..86d29f6184bc 100644 --- a/svx/inc/svx/fontwork.hxx +++ b/svx/inc/svx/fontwork.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,12 +30,8 @@ // include --------------------------------------------------------------- -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/valueset.hxx> #include <sfx2/dockwin.hxx> #include <sfx2/ctrlitem.hxx> @@ -62,7 +59,7 @@ class XFormTextShadowYValItem; /************************************************************************* |* -|* ControllerItem fuer Fontwork +|* ControllerItem for Fontwork |* \************************************************************************/ @@ -82,7 +79,7 @@ public: /************************************************************************* |* -|* Ableitung vom SfxChildWindow als "Behaelter" fuer Fontwork-Dialog +|* Derived from SfxChildWindow as "container" for fontwork dialog |* \************************************************************************/ @@ -95,7 +92,7 @@ class SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWindow /************************************************************************* |* -|* Floating Window zur Attributierung von Texteffekten +|* Floating window for setting attributes of text effects |* \************************************************************************/ @@ -137,7 +134,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow long nSaveShadowSize; ImageList maImageList; - ImageList maImageListH; const XColorTable* pColorTable; @@ -195,3 +191,4 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow #endif // _SVX_FONTWORK_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fontworkbar.hxx b/svx/inc/svx/fontworkbar.hxx index 95d5135075bb..3764b3859d84 100644 --- a/svx/inc/svx/fontworkbar.hxx +++ b/svx/inc/svx/fontworkbar.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,5 @@ public: } #endif // _SVX_FONTWORK_BAR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fontworkgallery.hxx b/svx/inc/svx/fontworkgallery.hxx index 53c5b9b7bf38..48b43186b4a2 100644 --- a/svx/inc/svx/fontworkgallery.hxx +++ b/svx/inc/svx/fontworkgallery.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -129,3 +130,5 @@ public: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/formatpaintbrushctrl.hxx b/svx/inc/svx/formatpaintbrushctrl.hxx index 9f06a58c8b1d..d80c453d8d17 100644 --- a/svx/inc/svx/formatpaintbrushctrl.hxx +++ b/svx/inc/svx/formatpaintbrushctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,5 @@ private: } //namespace svx //............................................................................. #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/framebordertype.hxx b/svx/inc/svx/framebordertype.hxx index f720c215fffc..8d6de8f2edfc 100644 --- a/svx/inc/svx/framebordertype.hxx +++ b/svx/inc/svx/framebordertype.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,4 @@ size_t GetIndexFromFrameBorderType( FrameBorderType eBorder ); #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx index 9d5e2cd3b1c6..6418e47d285a 100644 --- a/svx/inc/svx/framelink.hxx +++ b/svx/inc/svx/framelink.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,12 @@ #include <tools/gen.hxx> #include <tools/color.hxx> #include "svx/svxdllapi.h" +#include <vcl/outdev.hxx> +#include <editeng/borderline.hxx> + +#include <drawinglayer/primitive2d/baseprimitive2d.hxx> class OutputDevice; -class SvxBorderLine; namespace svx { namespace frame { @@ -112,50 +116,56 @@ class SVX_DLLPUBLIC Style { public: /** Constructs an invisible frame style. */ - inline explicit Style() : meRefMode( REFMODE_CENTERED ), mnPrim( 0 ), mnDist( 0 ), mnSecn( 0 ), mbDotted( false ) {} + inline explicit Style() : meRefMode( REFMODE_CENTERED ), mnType( editeng::SOLID ) { Clear(); } /** Constructs a frame style with passed line widths. */ - inline explicit Style( sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS ) : - meRefMode( REFMODE_CENTERED ), mbDotted( false ) - { Set( nP, nD, nS ); } + inline explicit Style( sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS, editeng::SvxBorderStyle nType ) : + meRefMode( REFMODE_CENTERED ), mnType( nType ) + { Clear(); Set( nP, nD, nS ); } /** Constructs a frame style with passed color and line widths. */ - inline explicit Style( const Color& rColor, sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS ) : - meRefMode( REFMODE_CENTERED ), mbDotted( false ) - { Set( rColor, nP, nD, nS ); } + inline explicit Style( const Color& rColorPrim, const Color& rColorSecn, const Color& rColorGap, bool bUseGapColor, + sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS, editeng::SvxBorderStyle nType ) : + meRefMode( REFMODE_CENTERED ), mnType( nType ) + { Set( rColorPrim, rColorSecn, rColorGap, bUseGapColor, nP, nD, nS ); } /** Constructs a frame style from the passed SvxBorderLine struct. */ - inline explicit Style( const SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16, bool /*bUseDots*/ = false ) : + inline explicit Style( const editeng::SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ) : meRefMode( REFMODE_CENTERED ) { Set( rBorder, fScale, nMaxWidth ); } /** Constructs a frame style from the passed SvxBorderLine struct. Clears the style, if pBorder is 0. */ - inline explicit Style( const SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16, bool /*bUseDots*/ = false ) : + inline explicit Style( const editeng::SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ) : meRefMode( REFMODE_CENTERED ) { Set( pBorder, fScale, nMaxWidth ); } inline RefMode GetRefMode() const { return meRefMode; } - inline const Color& GetColor() const { return maColor; } + inline const Color& GetColorPrim() const { return maColorPrim; } + inline const Color& GetColorSecn() const { return maColorSecn; } + inline const Color& GetColorGap() const { return maColorGap; } + inline bool UseGapColor() const { return mbUseGapColor; } inline sal_uInt16 Prim() const { return mnPrim; } inline sal_uInt16 Dist() const { return mnDist; } inline sal_uInt16 Secn() const { return mnSecn; } - inline bool Dotted() const { return mbDotted; } + inline editeng::SvxBorderStyle Type() const { return mnType; } /** Returns the total width of this frame style. */ inline sal_uInt16 GetWidth() const { return mnPrim + mnDist + mnSecn; } - /** Sets the frame style to invisible state. */ void Clear(); /** Sets the frame style to the passed line widths. */ void Set( sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS ); /** Sets the frame style to the passed line widths. */ - void Set( const Color& rColor, sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS ); + void Set( const Color& rColorPrim, const Color& rColorSecn, const Color& rColorGap, bool bUseGapColor, + sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS ); /** Sets the frame style to the passed SvxBorderLine struct. */ - void Set( const SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16, bool /*bUseDots*/ = false ); + void Set( const editeng::SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ); /** Sets the frame style to the passed SvxBorderLine struct. Clears the style, if pBorder is 0. */ - void Set( const SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16, bool /*bUseDots*/ = false ); + void Set( const editeng::SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ); /** Sets a new reference point handling mode, does not modify other settings. */ inline void SetRefMode( RefMode eRefMode ) { meRefMode = eRefMode; } /** Sets a new color, does not modify other settings. */ - inline void SetColor( const Color& rColor ) { maColor = rColor; } + inline void SetColorPrim( const Color& rColor ) { maColorPrim = rColor; } + inline void SetColorSecn( const Color& rColor ) { maColorSecn = rColor; } + inline void SetColorGap( bool bUseIt, const Color& rColor ) { maColorGap = rColor; mbUseGapColor = bUseIt; } /** Sets whether to use dotted style for single hair lines. */ - inline void SetDotted( bool bDotted ) { mbDotted = bDotted; } + inline void SetType( editeng::SvxBorderStyle nType ) { mnType = nType; } /** Scales the style by the specified scaling factor. Ensures that visible lines keep visible. */ Style& ScaleSelf( double fScale, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ); @@ -168,12 +178,15 @@ public: Style Mirror() const; private: - Color maColor; /// The color of the line(s) of this frame border. + Color maColorPrim; + Color maColorSecn; + Color maColorGap; + bool mbUseGapColor; RefMode meRefMode; /// Reference point handling for this frame border. sal_uInt16 mnPrim; /// Width of primary (single, left, or top) line. sal_uInt16 mnDist; /// Distance between primary and secondary line. sal_uInt16 mnSecn; /// Width of secondary (right or bottom) line. - bool mbDotted; /// true = Draw dotted lines; false = Draw solid lines. + editeng::SvxBorderStyle mnType; }; bool operator==( const Style& rL, const Style& rR ); @@ -483,6 +496,85 @@ SVX_DLLPUBLIC bool CheckFrameBorderConnectable( | \ / | rLFromB \ / rRFromB */ +SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DSequence CreateBorderPrimitives( + const Point& rLPos, /// Reference point for left end of the processed frame border. + const Point& rRPos, /// Reference point for right end of the processed frame border. + const Style& rBorder, /// Style of the processed frame border. + + const DiagStyle& rLFromTR, /// Diagonal frame border from top-right to left end of rBorder. + const Style& rLFromT, /// Vertical frame border from top to left end of rBorder. + const Style& rLFromL, /// Horizontal frame border from left to left end of rBorder. + const Style& rLFromB, /// Vertical frame border from bottom to left end of rBorder. + const DiagStyle& rLFromBR, /// Diagonal frame border from bottom-right to left end of rBorder. + + const DiagStyle& rRFromTL, /// Diagonal frame border from top-left to right end of rBorder. + const Style& rRFromT, /// Vertical frame border from top to right end of rBorder. + const Style& rRFromR, /// Horizontal frame border from right to right end of rBorder. + const Style& rRFromB, /// Vertical frame border from bottom to right end of rBorder. + const DiagStyle& rRFromBL, /// Diagonal frame border from bottom-left to right end of rBorder. + + const Color* pForceColor = 0,/// If specified, overrides frame border color. + const long& rRotationT = 9000, /// Angle of the top slanted frames in 100th of degree + const long& rRotationB = 9000 /// Angle of the bottom slanted frames in 100th of degree +); + +SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DSequence CreateBorderPrimitives( + const Point& rLPos, /// Reference point for left end of the processed frame border. + const Point& rRPos, /// Reference point for right end of the processed frame border. + const Style& rBorder, /// Style of the processed frame border. + + const Style& rLFromT, /// Vertical frame border from top to left end of rBorder. + const Style& rLFromL, /// Horizontal frame border from left to left end of rBorder. + const Style& rLFromB, /// Vertical frame border from bottom to left end of rBorder. + + const Style& rRFromT, /// Vertical frame border from top to right end of rBorder. + const Style& rRFromR, /// Horizontal frame border from right to right end of rBorder. + const Style& rRFromB, /// Vertical frame border from bottom to right end of rBorder. + + const Color* pForceColor = 0,/// If specified, overrides frame border color. + const long& rRotationT = 9000, /// Angle of the top slanted frame in 100th of degrees + const long& rRotationB = 9000 /// Angle of the bottom slanted frame in 100th of degrees +); + +SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DSequence CreateClippedBorderPrimitives ( + const Point& rStart, const Point& rEnd, const Style& rBorder, + const Rectangle& rClipRect ); + +/** Draws a horizontal frame border, regards all connected frame styles. + + The frame style to draw is passed as parameter rBorder. The function + calculates the adjustment in X direction for left and right end of primary + and secondary line of the frame border (the style may present a double + line). The line ends may differ according to the connected frame styles + coming from top, bottom, left, right, and/or diagonal. + + Thick frame styles are always drawn centered (in width) to the passed + reference points. The Y coordinates of both reference points must be equal + (the line cannot be drawn slanted). + + The function preserves all settings of the passed output device. + + All parameters starting with "rL" refer to the left end of the processed + frame border, all parameters starting with "rR" refer to the right end. + The following part of the parameter name starting with "From" specifies + where the frame border comes from. Example: "rLFromTR" means the frame + border coming from top-right, connected to the left end of rBorder (and + therefore a diagonal frame border). + + The follong picture shows the meaning of all passed parameters: + + rLFromT / \ rRFromT + | / \ | + | rLFromTR rRFromTL | + | / \ | + | / \ | + --- rLFromL --- ============== rBorder ============== --- rRFromR --- + | \ / | + | \ / | + | rLFromBR rRFromBL | + | \ / | + rLFromB \ / rRFromB + */ SVX_DLLPUBLIC void DrawHorFrameBorder( OutputDevice& rDev, /// The output device used to draw the frame border. @@ -668,25 +760,6 @@ void SVX_DLLPUBLIC DrawVerFrameBorder( const Color* pForceColor = 0 /// If specified, overrides frame border color. ); -// ---------------------------------------------------------------------------- - -/** Draws a vertical slanted frame border without connected frame styles. - - This is an extended version of the simple DrawVerFrameBorder() function - described above. It accepts start and end reference points with different - X coordinates. See description above for additional details about the - parameters (except the restriction on the reference points). - - The function preserves all settings of the passed output device. - */ -void SVX_DLLPUBLIC DrawVerFrameBorderSlanted( - OutputDevice& rDev, /// The output device used to draw the frame border. - const Point& rTPos, /// Reference point for top end of the processed frame border. - const Point& rBPos, /// Reference point for bottom end of the processed frame border. - const Style& rBorder, /// Style of the frame border to draw. - const Color* pForceColor = 0 /// If specified, overrides frame border color. -); - // ============================================================================ /** Draws both diagonal frame borders, regards all connected frame styles. @@ -725,3 +798,4 @@ SVX_DLLPUBLIC void DrawDiagFrameBorders( #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/framelinkarray.hxx b/svx/inc/svx/framelinkarray.hxx index cebb4e0395e4..5b082024ca45 100644 --- a/svx/inc/svx/framelinkarray.hxx +++ b/svx/inc/svx/framelinkarray.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,6 +30,7 @@ #define SVX_FRAMELINKARRAY_HXX #include <svx/framelink.hxx> +#include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <memory> @@ -506,6 +508,13 @@ public: If not NULL, only this color will be used to draw all frame borders. */ void DrawCell( OutputDevice& rDev, size_t nCol, size_t nRow, const Color* pForceColor = 0 ) const; + /** Draws the part of the specified range, that is inside the clipping range. + @param pForceColor + If not NULL, only this color will be used to draw all frame borders. */ + void DrawRange( drawinglayer::processor2d::BaseProcessor2D* rDev, + size_t nFirstCol, size_t nFirstRow, + size_t nLastCol, size_t nLastRow, + const Color* pForceColor = 0 ) const; /** Draws the part of the specified range, that is inside the clipping range. @param pForceColor @@ -535,3 +544,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/frmdirlbox.hxx b/svx/inc/svx/frmdirlbox.hxx index 24eb27362e45..b44343466d03 100644 --- a/svx/inc/svx/frmdirlbox.hxx +++ b/svx/inc/svx/frmdirlbox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SVX_FRMDIRLBOX_HXX #define _SVX_FRMDIRLBOX_HXX -#ifndef _LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif #include <sfx2/itemconnect.hxx> #include <editeng/frmdir.hxx> #include "svx/svxdllapi.h" @@ -104,3 +103,4 @@ typedef sfx::ItemControlConnection< FrameDirItemWrapper, FrameDirListBoxWrapper #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/frmsel.hxx b/svx/inc/svx/frmsel.hxx index 2b2613226b85..192e0ade6acb 100644 --- a/svx/inc/svx/frmsel.hxx +++ b/svx/inc/svx/frmsel.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,10 +33,13 @@ #include <tools/color.hxx> #include <vcl/ctrl.hxx> #include <vcl/bitmap.hxx> +#include <editeng/borderline.hxx> #include <svx/framebordertype.hxx> #include "svx/svxdllapi.h" -class SvxBorderLine; +namespace editeng { + class SvxBorderLine; +} namespace svx { @@ -113,10 +117,10 @@ public: /** Returns the state (visible/hidden/don't care) of the specified frame border. */ FrameBorderState GetFrameBorderState( FrameBorderType eBorder ) const; /** Returns the style of the specified frame border, if it is visible. */ - const SvxBorderLine* GetFrameBorderStyle( FrameBorderType eBorder ) const; + const editeng::SvxBorderLine* GetFrameBorderStyle( FrameBorderType eBorder ) const; /** Shows the specified frame border using the passed style, or hides it, if pStyle is 0. */ - void ShowBorder( FrameBorderType eBorder, const SvxBorderLine* pStyle ); + void ShowBorder( FrameBorderType eBorder, const editeng::SvxBorderLine* pStyle ); /** Sets the specified frame border to "don't care" state. */ void SetBorderDontCare( FrameBorderType eBorder ); @@ -127,8 +131,8 @@ public: /** Returns true, if all visible frame borders have equal widths. @descr Ignores hidden and "don't care" frame borders. On success, - returns the widths in the passed parameters. */ - bool GetVisibleWidth( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal_uInt16& rnSec ) const; + returns the width in the passed parameter. */ + bool GetVisibleWidth( long& rnWidth, editeng::SvxBorderStyle& rnStyle ) const; /** Returns true, if all visible frame borders have equal color. @descr Ignores hidden and "don't care" frame borders. On success, returns the color in the passed parameter. */ @@ -159,7 +163,7 @@ public: void SelectAllVisibleBorders( bool bSelect = true ); /** Sets the passed line widths to all selected frame borders (in twips). */ - void SetStyleToSelection( sal_uInt16 nPrim, sal_uInt16 nDist, sal_uInt16 nSec ); + void SetStyleToSelection( long nWidth, editeng::SvxBorderStyle nStyle ); /** Sets the passed color to all selected frame borders. */ void SetColorToSelection( const Color& rColor ); @@ -202,3 +206,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/galbrws.hxx b/svx/inc/svx/galbrws.hxx index 1a19e773baa9..1fd7c5e5bc8f 100644 --- a/svx/inc/svx/galbrws.hxx +++ b/svx/inc/svx/galbrws.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,5 @@ public: }; #endif // _SVX_GALBRWS_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/galctrl.hxx b/svx/inc/svx/galctrl.hxx index 53fce03cd6c9..2d850dee4ef2 100644 --- a/svx/inc/svx/galctrl.hxx +++ b/svx/inc/svx/galctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -189,3 +190,5 @@ public: }; #endif // _SVX_GALCTRL_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx index d87d93f8cc22..bb7b9abbdef6 100644 --- a/svx/inc/svx/gallery.hxx +++ b/svx/inc/svx/gallery.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,16 +85,121 @@ #define GALLERY_THEME_EDUCATION 33 #define GALLERY_THEME_TROUBLE 34 #define GALLERY_THEME_SCREENBEANS 35 -#define GALLERY_THEME_FONTWORK 36 -#define GALLERY_THEME_FONTWORK_VERTICAL 37 -#define GALLERY_THEME_DUMMY5 38 +#define GALLERY_THEME_DUMMY5 36 + +#define GALLERY_THEME_FONTWORK 37 +#define GALLERY_THEME_FONTWORK_VERTICAL 38 + +#define GALLERY_THEME_SHAPES_POLYGONS 39 +#define GALLERY_THEME_SHAPES_1 40 +#define GALLERY_THEME_SHAPES_2 41 +#define GALLERY_THEME_ANIMALS 42 +#define GALLERY_THEME_CARS 43 +#define GALLERY_THEME_BUGS 44 +#define GALLERY_THEME_CISCO_OTHER 45 +#define GALLERY_THEME_CISCO_MEDIA 46 +#define GALLERY_THEME_CISCO_PRODUCTS 47 +#define GALLERY_THEME_CISCO_WAN_LAN 48 +#define GALLERY_THEME_DOMINO_USUAL 49 +#define GALLERY_THEME_DOMINO_NUMBERED 50 +#define GALLERY_THEME_ELECTRONICS_PARTS_1 51 +#define GALLERY_THEME_ELECTRONICS_PARTS_2 52 +#define GALLERY_THEME_ELECTRONICS_PARTS_3 53 +#define GALLERY_THEME_ELECTRONICS_PARTS_4 54 +#define GALLERY_THEME_ELECTRONICS_CIRCUIT 55 +#define GALLERY_THEME_ELECTRONICS_SIGNS 56 +#define GALLERY_THEME_ELECTRONICS_GAUGES 57 +#define GALLERY_THEME_PEOPLE_1 58 +#define GALLERY_THEME_ARCHITECTURE_OVERLAY 59 +#define GALLERY_THEME_ARCHITECTURE_FURNITURES 60 +#define GALLERY_THEME_ARCHITECTURE_BUILDINGS 61 +#define GALLERY_THEME_ARCHITECTURE_BATHROOM_KITCHEN 62 +#define GALLERY_THEME_ARCHITECTURE_KITCHEN 63 +#define GALLERY_THEME_ARCHITECTURE_WINDOWS_DOORS 64 +#define GALLERY_THEME_FLOWCHARTS_1 65 +#define GALLERY_THEME_FLOWCHARTS_2 66 +#define GALLERY_THEME_FORALSTUDIOA 67 +#define GALLERY_THEME_PHOTOS_FAUNA 68 +#define GALLERY_THEME_PHOTOS_BUILDINGS 69 +#define GALLERY_THEME_PHOTOS_PLANTS 70 +#define GALLERY_THEME_PHOTOS_STATUES 71 +#define GALLERY_THEME_PHOTOS_LANDSCAPES 72 +#define GALLERY_THEME_PHOTOS_CITIES 73 +#define GALLERY_THEME_PHOTOS_FLOWERS 74 +#define GALLERY_THEME_THERAPEUTICS_GENERAL 75 +#define GALLERY_THEME_WEATHER 76 +#define GALLERY_THEME_VECHILES 77 +#define GALLERY_THEME_SIGNS 78 +#define GALLERY_THEME_BLUE_MAN 79 +#define GALLERY_THEME_CHEMISTRY_AMINO_ACIDS 80 +#define GALLERY_THEME_LOGICAL_SIGNS 81 +#define GALLERY_THEME_LOGICAL_GATES 82 +#define GALLERY_THEME_LOGOS 83 +#define GALLERY_THEME_SMILES 84 +#define GALLERY_THEME_ARROWS_1 85 +#define GALLERY_THEME_CLOCK_01_CLOCK 86 +#define GALLERY_THEME_CLOCK_02_CLOCK 87 +#define GALLERY_THEME_CLOCK_03_CLOCK 88 +#define GALLERY_THEME_CLOCK_04_CLOCK 89 +#define GALLERY_THEME_CLOCK_05_CLOCK 90 +#define GALLERY_THEME_CLOCK_06_CLOCK 91 +#define GALLERY_THEME_CLOCK_07_CLOCK 92 +#define GALLERY_THEME_CLOCK_08_CLOCK 93 +#define GALLERY_THEME_CLOCK_09_CLOCK 94 +#define GALLERY_THEME_CLOCK_10_CLOCK 95 +#define GALLERY_THEME_CLOCK_11_CLOCK 96 +#define GALLERY_THEME_CLOCK_12_CLOCK 97 +#define GALLERY_THEME_PNEUMATIC_PARTS 98 +#define GALLERY_THEME_COMPUTER_GENERAL 99 +#define GALLERY_THEME_COMPUTER_NETWORK 100 +#define GALLERY_THEME_COMPUTER_NETWORK_DEVICES 101 +#define GALLERY_THEME_COMPUTER_WIFI 102 +#define GALLERY_THEME_NUMBERS 103 +#define GALLERY_THEME_SIGNS_DANGER 104 +#define GALLERY_THEME_OBJECTS 105 +#define GALLERY_THEME_MAPS_AFRICA 106 +#define GALLERY_THEME_MAPS_UNITED_STATES_OF_AMERICA 107 +#define GALLERY_THEME_MAPS_AUSTRALIA 108 +#define GALLERY_THEME_MAPS_ASIA 109 +#define GALLERY_THEME_MAPS_SOUTH_AMERICA 110 +#define GALLERY_THEME_MAPS_EUROPE 111 +#define GALLERY_THEME_MAPS_EUROPE_1 112 +#define GALLERY_THEME_MAPS_FRANCE 113 +#define GALLERY_THEME_MAPS_FRANCE_COUNTRIES 114 +#define GALLERY_THEME_MAPS_SIGNS 115 +#define GALLERY_THEME_MAPS_CANADA 116 +#define GALLERY_THEME_MAPS_CONTINENTS 117 +#define GALLERY_THEME_MAPS_MIDDLE_EAST 118 +#define GALLERY_THEME_MAPS_MIDDLE_AMERICA 119 +#define GALLERY_THEME_MAPS_MIDDLE_AGES 120 +#define GALLERY_THEME_MAPS_MEXICO 121 +#define GALLERY_THEME_MAPS_ANCIENT_TIMES 122 +#define GALLERY_THEME_MAPS_SYMBOLS 123 +#define GALLERY_THEME_MAPS_HISTORY_1900 124 +#define GALLERY_THEME_MAPS_WORLD 125 +#define GALLERY_THEME_CROPS 126 +#define GALLERY_THEME_FRACTIONS 127 +#define GALLERY_THEME_FLAGS_1 128 +#define GALLERY_THEME_MUSIC_INSTRUMENTS 129 +#define GALLERY_THEME_MUSIC_SHEET_MUSIC 130 +#define GALLERY_THEME_SPECIAL_PICTOGRAMM 131 +#define GALLERY_THEME_PHOTOS_CELEBRATION 132 +#define GALLERY_THEME_PHOTOS_FOODSANDDRINKS 133 +#define GALLERY_THEME_PHOTOS_HUMANS 134 +#define GALLERY_THEME_PHOTOS_OBJECTS 135 +#define GALLERY_THEME_PHOTOS_SPACE 136 +#define GALLERY_THEME_PHOTOS_TRAVEL 137 +#define GALLERY_THEME_OPENOFFICEORG_LOGOS 138 +#define GALLERY_THEME_RELIGION 139 +#define GALLERY_THEME_BUILDINGS 140 +#define GALLERY_THEME_HOMEPAGE2 141 +#define GALLERY_THEME_ELEMENTSBULLETS2 142 // ------------------- // - GalleryExplorer - // ------------------- -class List; class Gallery; class VCDrawModel; class FmFormModel; @@ -121,11 +227,11 @@ public: sal_Bool GetVCDrawModel( FmFormModel& rModel ) const; sal_Bool IsLinkage() const; - static sal_Bool FillThemeList( List& rThemeList ); + static bool FillThemeList( std::vector<String>& rThemeList ); // FillObjList is filling rObjList with Strings of the internal Gallery Object URL - static sal_Bool FillObjList( const String& rThemeName, List& rObjList ); - static sal_Bool FillObjList( sal_uIntPtr nThemeId, List& rObjList ); + static sal_Bool FillObjList( const String& rThemeName, std::vector<String> &rObjList ); + static sal_Bool FillObjList( const sal_uInt32 nThemeId, std::vector<String> &rObjList ); // FillObjTitleList is filling the rList with the title for each gallery object static sal_Bool FillObjListTitle( const sal_uInt32 nThemeId, std::vector< rtl::OUString >& rList ); @@ -172,3 +278,5 @@ public: }; #endif // _GALLERY_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx index 40888a095536..b858b042d0ce 100644 --- a/svx/inc/svx/gallery1.hxx +++ b/svx/inc/svx/gallery1.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,14 +30,12 @@ #define _SVX_GALLERY1_HXX_ #include <tools/string.hxx> -#include <tools/list.hxx> #include <tools/urlobj.hxx> #include <svl/brdcst.hxx> #include "svx/svxdllapi.h" -//#include "gallery.hrc" #include <cstdio> -#include <list> +#include <vector> // --------------------- // - GalleryThemeEntry - @@ -92,7 +91,7 @@ public: void SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ); }; -DECLARE_LIST( GalleryThemeList, GalleryThemeEntry* ) +typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList; // --------------------------- // - GalleryImportThemeEntry - @@ -105,7 +104,8 @@ struct GalleryImportThemeEntry INetURLObject aURL; String aImportName; }; -DECLARE_LIST( GalleryImportThemeList, GalleryImportThemeEntry* ) + +typedef ::std::vector< GalleryImportThemeEntry* > GalleryImportThemeList; // ----------------------------------------------------------------------------- @@ -118,6 +118,7 @@ SvStream& operator>>( SvStream& rIn, GalleryImportThemeEntry& rEntry ); class SfxListener; class GalleryTheme; +class GalleryThemeCacheEntry; class Gallery : public SfxBroadcaster { @@ -125,11 +126,13 @@ class Gallery : public SfxBroadcaster friend Gallery* createGallery( const rtl::OUString& ); friend void disposeGallery( Gallery* ); + typedef std::vector<GalleryThemeCacheEntry*> GalleryCacheThemeList; + private: GalleryThemeList aThemeList; GalleryImportThemeList aImportList; - List aThemeCache; + GalleryCacheThemeList aThemeCache; INetURLObject aRelURL; INetURLObject aUserURL; rtl_TextEncoding nReadTextEncoding; @@ -155,8 +158,9 @@ public: SVX_DLLPUBLIC static Gallery* GetGalleryInstance(); - sal_uIntPtr GetThemeCount() const { return aThemeList.Count(); } - const GalleryThemeEntry* GetThemeInfo( sal_uIntPtr nPos ) { return aThemeList.GetObject( nPos ); } + size_t GetThemeCount() const { return aThemeList.size(); } + const GalleryThemeEntry* GetThemeInfo( size_t nPos ) + { return nPos < aThemeList.size() ? aThemeList[ nPos ] : NULL; } const GalleryThemeEntry* GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); } SVX_DLLPUBLIC sal_Bool HasTheme( const String& rThemeName ); @@ -181,3 +185,5 @@ public: }; #endif // _SVX_GALLERY1_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx index f807ca6908de..e6f6c8edd23f 100644 --- a/svx/inc/svx/galmisc.hxx +++ b/svx/inc/svx/galmisc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,13 +61,13 @@ struct ExchangeData enum SgaObjKind { - SGA_OBJ_NONE = 0, // Abstraktes Objekt - SGA_OBJ_BMP = 1, // Bitmap-Objekt - SGA_OBJ_SOUND = 2, // Sound-Objekt - SGA_OBJ_VIDEO = 3, // Video-Objekt - SGA_OBJ_ANIM = 4, // Animations-Objekt - SGA_OBJ_SVDRAW = 5, // Svdraw-Objekt - SGA_OBJ_INET = 6 // Grafik aus dem Internet + SGA_OBJ_NONE = 0, // abstract object + SGA_OBJ_BMP = 1, // bitmap object + SGA_OBJ_SOUND = 2, // sound object + SGA_OBJ_VIDEO = 3, // video object + SGA_OBJ_ANIM = 4, // animation object + SGA_OBJ_SVDRAW = 5, // Svdraw object + SGA_OBJ_INET = 6 // graphics from the internet }; // ----------- @@ -260,3 +261,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/galtheme.hxx b/svx/inc/svx/galtheme.hxx index 566372ddb41b..4d5f7bf7c313 100644 --- a/svx/inc/svx/galtheme.hxx +++ b/svx/inc/svx/galtheme.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,9 +41,8 @@ #include <svtools/transfer.hxx> #include <sot/storage.hxx> #include <svx/svdmodel.hxx> -//#include <svx/galobj.hxx> #include <svx/galmisc.hxx> -//#include <svx/gallery1.hxx> +#include <vector> // ----------------- // - GalleryObject - @@ -59,7 +59,7 @@ struct GalleryObject sal_Bool bDummy; }; -DECLARE_LIST( GalleryObjectList, GalleryObject* ) +typedef ::std::vector< GalleryObject* > GalleryObjectList; class GalleryThemeEntry; class SgaObject; @@ -114,12 +114,20 @@ private: void ImplCreateSvDrawStorage(); SVX_DLLPUBLIC SgaObject* ImplReadSgaObject( GalleryObject* pEntry ); - sal_Bool ImplWriteSgaObject( const SgaObject& rObj, sal_uIntPtr nPos, GalleryObject* pExistentEntry ); + sal_Bool ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry ); void ImplRead(); void ImplWrite(); - const GalleryObject* ImplGetGalleryObject( sal_uIntPtr nPos ) const { return aObjectList.GetObject( nPos ); } + const GalleryObject* ImplGetGalleryObject( size_t nPos ) const + { return ( nPos < aObjectList.size() ) ? aObjectList[ nPos ] : NULL; } SVX_DLLPUBLIC const GalleryObject* ImplGetGalleryObject( const INetURLObject& rURL ); - sal_uIntPtr ImplGetGalleryObjectPos( const GalleryObject* pObj ) const { return aObjectList.GetPos( pObj ); } + + size_t ImplGetGalleryObjectPos( const GalleryObject* pObj ) const + { + for ( size_t i = 0, n = aObjectList.size(); i < n; ++i ) + if ( pObj == aObjectList[ i ] ) + return i; + return size_t(-1); + } INetURLObject ImplGetURL( const GalleryObject* pObject ) const; INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPtr nFormat = CVT_UNKNOWN ); void ImplSetModified( sal_Bool bModified ); @@ -133,14 +141,14 @@ public: static GalleryThemeEntry* CreateThemeEntry( const INetURLObject& rURL, sal_Bool bReadOnly ); - sal_uIntPtr GetObjectCount() const { return aObjectList.Count(); } + size_t GetObjectCount() const { return aObjectList.size(); } - SVX_DLLPUBLIC SgaObject* AcquireObject( sal_uIntPtr nPos ); - SVX_DLLPUBLIC void ReleaseObject( SgaObject* pObj ); + SVX_DLLPUBLIC SgaObject* AcquireObject( size_t nPos ); + SVX_DLLPUBLIC void ReleaseObject( SgaObject* pObj ); - SVX_DLLPUBLIC sal_Bool InsertObject( const SgaObject& rObj, sal_uIntPtr nPos = LIST_APPEND ); - SVX_DLLPUBLIC sal_Bool RemoveObject( sal_uIntPtr nPos ); - sal_Bool ChangeObjectPos( sal_uIntPtr nOldPos, sal_uIntPtr nNewPos ); + SVX_DLLPUBLIC bool InsertObject( const SgaObject& rObj, sal_uIntPtr nPos = LIST_APPEND ); + SVX_DLLPUBLIC bool RemoveObject( size_t nPos ); + bool ChangeObjectPos( size_t nOldPos, size_t nNewPos ); SVX_DLLPUBLIC const String& GetName() const; const String& GetRealName() const; @@ -229,3 +237,5 @@ SvStream& operator<<( SvStream& rOut, const GalleryTheme& rTheme ); SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme ); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/globl3d.hxx b/svx/inc/svx/globl3d.hxx index 7445259d9989..d45adc1bc991 100644 --- a/svx/inc/svx/globl3d.hxx +++ b/svx/inc/svx/globl3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,6 @@ #include <tools/solar.h> -//#define ESODEBUG #define E3D_STREAMING const double PrecisionLimit = 1.0e-14; @@ -51,3 +51,5 @@ const sal_uInt16 E3D_COMPOUNDOBJ_ID = 8; const sal_uInt16 E3D_POLYGONOBJ_ID = 9; #endif // _E3D_GLOBL3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx index bd63bae43cf4..ee5ffa0c2b54 100644 --- a/svx/inc/svx/grafctrl.hxx +++ b/svx/inc/svx/grafctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -189,3 +190,5 @@ public: }; #endif // _SVX_GRAFCTRL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/graphctl.hxx b/svx/inc/svx/graphctl.hxx index a06cbbab8aa6..3c3f7cb626e3 100644 --- a/svx/inc/svx/graphctl.hxx +++ b/svx/inc/svx/graphctl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,12 +37,6 @@ #include <svx/svdview.hxx> #include <svx/svdobj.hxx> -/************************************************************************* -|* -|* -|* -\************************************************************************/ - class GraphCtrlUserCall; class SvxGraphCtrlAccessibleContext; @@ -140,13 +135,6 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); }; -//#if 0 // _SOLAR__PRIVATE - -/************************************************************************* -|* -|* -|* -\************************************************************************/ class GraphCtrlUserCall : public SdrObjUserCall { @@ -160,12 +148,6 @@ public: virtual void Changed( const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect ); }; -/************************************************************************* -|* -|* -|* -\************************************************************************/ - class GraphCtrlView : public SdrView { GraphCtrl& rGraphCtrl; @@ -187,7 +169,6 @@ public: virtual ~GraphCtrlView() {}; }; -//#endif // __PRIVATE - #endif // _GRAPHCTL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx index c382ca01e6eb..bd7bd7164c59 100644 --- a/svx/inc/svx/grfcrop.hxx +++ b/svx/inc/svx/grfcrop.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,7 +45,7 @@ public: sal_uInt16 ); virtual ~SvxGrfCrop(); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" from SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const; virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const; @@ -53,10 +54,10 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, + sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, + sal_uInt8 nMemberId = 0 ); void SetLeft( sal_Int32 nVal ) { nLeft = nVal; } void SetRight( sal_Int32 nVal ) { nRight = nVal; } @@ -78,3 +79,5 @@ public: #endif // _GRFATR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/grfflt.hxx b/svx/inc/svx/grfflt.hxx index 584245a78cf2..1ac4ac16b435 100644 --- a/svx/inc/svx/grfflt.hxx +++ b/svx/inc/svx/grfflt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/timer.hxx> #include <vcl/dialog.hxx> #include <vcl/group.hxx> @@ -67,3 +66,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx index 4efb5d2c86ad..cbdba4004550 100644 --- a/svx/inc/svx/gridctrl.hxx +++ b/svx/inc/svx/gridctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,7 +28,6 @@ #ifndef _SVX_GRIDCTRL_HXX #define _SVX_GRIDCTRL_HXX -#include <tools/list.hxx> #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/sdbc/XRowSetListener.hpp> #include <com/sun/star/sdb/XRowsChangeListener.hpp> @@ -38,16 +38,15 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <tools/date.hxx> #include <tools/ref.hxx> #include <svtools/editbrowsebox.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <comphelper/propmultiplex.hxx> #include <svtools/transfer.hxx> #include "svx/svxdllapi.h" +#include <vector> class DbGridControl; class CursorWrapper; @@ -58,7 +57,7 @@ namespace svxform { class DataColumn; } -DECLARE_LIST(DbDataColumns, ::svxform::DataColumn*) +typedef ::std::vector< ::svxform::DataColumn* > DbDataColumns; enum GridRowStatus { @@ -69,17 +68,17 @@ enum GridRowStatus }; //================================================================== -// DbGridRow, Zeilenbeschreibung +// DbGridRow, description of rows //================================================================== class DbGridRow : public SvRefBase { - ::com::sun::star::uno::Any m_aBookmark; // ::com::sun::star::text::Bookmark der Zeile, kann gesetzt sein + ::com::sun::star::uno::Any m_aBookmark; // ::com::sun::star::text::Bookmark of the row, can be set DbDataColumns m_aVariants; GridRowStatus m_eStatus; - sal_Bool m_bIsNew; - // Zeile ist nicht mehr gueltig, - // wird bei der naechsten positionierung entfernt + sal_Bool m_bIsNew; + // row is no longer valid + // is removed on the next positioning public: DbGridRow():m_eStatus(GRS_CLEAN), m_bIsNew(sal_True) { } DbGridRow(CursorWrapper* pCur, sal_Bool bPaintCursor); @@ -87,9 +86,8 @@ public: ~DbGridRow(); - // da GetField auf Geschwindigkeit getuned ist vorher immer noch hasField verwenden - sal_Bool HasField(sal_uInt32 nPos) const {return nPos < m_aVariants.Count();} - const ::svxform::DataColumn& GetField(sal_uInt32 nPos) const { return *m_aVariants.GetObject(nPos); } + sal_Bool HasField(sal_uInt32 nPos) const { return nPos < m_aVariants.size(); } + const ::svxform::DataColumn& GetField(sal_uInt32 nPos) const { return *m_aVariants[ nPos ]; } void SetStatus(GridRowStatus _eStat) { m_eStatus = _eStat; } GridRowStatus GetStatus() const { return m_eStatus; } @@ -108,7 +106,7 @@ SV_DECL_REF(DbGridRow) // DbGridControl //================================================================== class DbGridColumn; -DECLARE_LIST(DbGridColumns, DbGridColumn*) +typedef ::std::vector< DbGridColumn* > DbGridColumns; //================================================================== class FmGridListener @@ -118,7 +116,7 @@ public: virtual void columnChanged() = 0; }; -#define GRID_COLUMN_NOT_FOUND ((sal_uInt16)-1) +#define GRID_COLUMN_NOT_FOUND SAL_MAX_UINT16 //================================================================== // InitWindowFacet, describing which aspect of a column's Window to (re-)initialize @@ -161,23 +159,23 @@ public: // zusaetzliche Controls FixedText m_aRecordText; - AbsolutePos m_aAbsolute; // AbsolutePositionierung + AbsolutePos m_aAbsolute; // absolute positioning FixedText m_aRecordOf; FixedText m_aRecordCount; - ImageButton m_aFirstBtn; // ImageButton fuer 'gehe zum ersten Datensatz' - ImageButton m_aPrevBtn; // ImageButton fuer 'gehe zum vorhergehenden Datensatz' - ImageButton m_aNextBtn; // ImageButton fuer 'gehe zum naechsten Datensatz' - ImageButton m_aLastBtn; // ImageButton fuer 'gehe zum letzten Datensatz' - ImageButton m_aNewBtn; // ImageButton fuer 'gehe zum neuen Datensatz' + ImageButton m_aFirstBtn; // ImageButton for 'go to the first record' + ImageButton m_aPrevBtn; // ImageButton for 'go to the previous record' + ImageButton m_aNextBtn; // ImageButton for 'go to the next record' + ImageButton m_aLastBtn; // ImageButton for 'go to the last record' + ImageButton m_aNewBtn; // ImageButton for 'go to a new record' sal_uInt16 m_nDefaultWidth; sal_Int32 m_nCurrentPos; sal_Bool m_bPositioning; // protect PositionDataSource against recursion public: - // StatusIds fuer Controls der Bar - // wichtig fuers Invalidieren + // StatusIds for Controls of the Bar + // important for invalidation enum State { RECORD_TEXT = 1, @@ -193,7 +191,7 @@ public: NavigationBar(Window* pParent, WinBits nStyle = 0); - // Status Methoden fuer Controls + // Status methods for Controls void InvalidateAll(sal_Int32 nCurrentPos = -1, sal_Bool bAll = sal_False); void InvalidateState(sal_uInt16 nWhich) {SetState(nWhich);} void SetState(sal_uInt16 nWhich); @@ -215,8 +213,8 @@ public: friend class DbGridControl::NavigationBar; public: - // diese Optionen werden verodert und geben an, welche der einzelnen feature - // freigegeben werden koennen, default ist readonly also 0 + // these options are or'ed and indicate, which of the single + // features can be released, default is readonly which means 0 enum Option { OPT_READONLY = 0x00, @@ -233,14 +231,14 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; - DbGridColumns m_aColumns; // Spaltenbeschreibung + DbGridColumns m_aColumns; // Column description NavigationBar m_aBar; - DbGridRowRef m_xDataRow; // Zeile die modifiziert werden kann - // kommt vom DatenCursor - DbGridRowRef m_xSeekRow, // Zeile die von Iterator gesetzt wird - // kommt vom DatenCursor + DbGridRowRef m_xDataRow; // Row which can be modified + // comes from the data cursor + DbGridRowRef m_xSeekRow, // Row to which the iterator can set + // comes from the data cursor - m_xEmptyRow; // Datensatz zum einfuegen + m_xEmptyRow; // record set to insert sal_uInt32 m_nAsynAdjustEvent; @@ -263,17 +261,16 @@ private: FmGridListener* m_pGridListener; protected: - CursorWrapper* m_pDataCursor; // Cursor fuer Updates - CursorWrapper* m_pSeekCursor; // Cursor zum Seeken + CursorWrapper* m_pDataCursor; // Cursor for Updates + CursorWrapper* m_pSeekCursor; // Cursor for Seeking private: - // dieses sind Laufvariablen - DbGridRowRef m_xCurrentRow; // Row an der aktuellen Zeile - DbGridRowRef m_xPaintRow; // Row die gerade drgestellt werden soll - sal_Int32 m_nSeekPos; // Position des SeekCursors - sal_Int32 m_nTotalCount; // wird gesetzt, wenn der DatenCursor mit dem Zhlen der - // Datenstze fertig ist - // initial Wert ist -1 + // iteration variables + DbGridRowRef m_xCurrentRow; + DbGridRowRef m_xPaintRow; // Row to be displayed + sal_Int32 m_nSeekPos; // Position of the SeekCursor + sal_Int32 m_nTotalCount; // is set when the data cursor finished counting the + // records. Initial value is -1 osl::Mutex m_aDestructionSafety; osl::Mutex m_aAdjustSafety; @@ -281,9 +278,9 @@ private: m_aNullDate; // NullDate of the Numberformatter; BrowserMode m_nMode; - sal_Int32 m_nCurrentPos; // Aktuelle Position; - sal_uInt32 m_nDeleteEvent; // EventId fuer asychrone Loeschen von Zeilen - sal_uInt16 m_nOptions; // Was kann das Control (Insert, Update, Delete) + sal_Int32 m_nCurrentPos; // Current position; + sal_uInt32 m_nDeleteEvent; // EventId for asychronous deletion of rows + sal_uInt16 m_nOptions; // What is the able to do (Insert, Update, Delete) // default readonly sal_uInt16 m_nOptionMask; // the mask of options to be enabled in setDataSource // (with respect to the data source capabilities) @@ -306,7 +303,7 @@ private: sal_Bool m_bHideScrollbars : 1; protected: - sal_Bool m_bUpdating : 1; // werden gerade updates durchgefuehrt + sal_Bool m_bUpdating : 1; // are any updates being executed right now? protected: virtual sal_Bool SeekRow(long nRow); @@ -401,8 +398,8 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& getNumberFormatter() const {return m_xFormatter;} - // die Datenquelle - // die Optionen koennen die Updatefaehigkeiten noch einschraenken, nicht erweitern + // the data source + // the options can restrict but not extend the update abilities virtual void setDataSource(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& rCursor, sal_uInt16 nOpts = OPT_INSERT | OPT_UPDATE | OPT_DELETE); virtual void Dispatch(sal_uInt16 nId); @@ -414,18 +411,18 @@ public: sal_Bool HasHandle() const {return m_bHandle;} void InsertHandleColumn(); - /// welche Position hat die Spalte mit der Id in der ::com::sun::star::sdbcx::View, die Handle-Column zahelt nicht mit + // which position does the column with the id in the ::com::sun::star::sdbcx::View have, the handle column doesn't count sal_uInt16 GetViewColumnPos( sal_uInt16 nId ) const { sal_uInt16 nPos = GetColumnPos(nId); return (nPos==(sal_uInt16)-1) ? GRID_COLUMN_NOT_FOUND : nPos-1; } - /** welche Position hat die Spalte mit der Id in m_aColumns, also dem von GetColumns gelieferten ::com::sun::star::sdbcx::Container ? - (unterscheidet sich u.U. von der von GetViewColumnPos gelieferten, wenn es versteckt Spalten gibt) - */ + // which position does the column with the id in m_aColumns have, that means the ::com::sun::star::sdbcx::Container + // returned from the GetColumns (may be different from the position returned by GetViewColumnPos + // if there are hidden columns) sal_uInt16 GetModelColumnPos( sal_uInt16 nId ) const; - /// Anzahl der Spalten im Model + // the number of columns in the model sal_uInt16 GetViewColCount() const { return ColCount() - 1; } - sal_uInt16 GetModelColCount() const { return (sal_uInt16)m_aColumns.Count(); } - /// umgekehrt zu GetViewColumnPos : Id zu Position, die erste Nicht-Handle-Column hat die Position 0 + sal_uInt16 GetModelColCount() const { return (sal_uInt16)m_aColumns.size(); } + // reverse to GetViewColumnPos: Id of position, the first non-handle column has position 0 sal_uInt16 GetColumnIdFromViewPos( sal_uInt16 nPos ) const { return GetColumnId(nPos + 1); } sal_uInt16 GetColumnIdFromModelPos( sal_uInt16 nPos ) const; @@ -452,7 +449,7 @@ public: const com::sun::star::util::Date& getNullDate() const {return m_aNullDate;} - // Positionierung + // positioning void MoveToPosition(sal_uInt32 nPos); void MoveToFirst(); void MoveToNext(); @@ -460,15 +457,17 @@ public: void MoveToLast(); void AppendNew(); - // Abgleich der Cursor falls von auen der DatenCursor verschoben wurde - // Flag bedeutet ob ein Abgleich es Rowcounts vorgenommen werden soll + // adjustment of the cursors in case the data cursor has been + // moved from the outside. + // the flag indicates if an adjustment of the row count should be + // done as well void AdjustDataSource(sal_Bool bFull = sal_False); void Undo(); virtual void BeginCursorAction(); virtual void EndCursorAction(); - // wird die aktuelle Zeile neu gesetzt + // is the current line being updated sal_Bool IsUpdating() const {return m_bUpdating;} virtual void RowRemoved( long nRow, long nNumRows = 1, sal_Bool bDoPaint = sal_True ); @@ -480,15 +479,16 @@ public: sal_Bool getDisplaySynchron() const { return m_bSynchDisplay; } void setDisplaySynchron(sal_Bool bSync); void forceSyncDisplay(); - // wenn das auf sal_False gesetzt wird, laeuft die Anzeige nicht mehr mit der aktuellen Cursor-Position synchron - // (soll heissen, in AdjustDataSource wird nicht in die zur CursorPosition gehoerenden Zeile gesprungen) - // wer das benutzt, sollte bitte wissen, was er tut, da zum Beispiel die Eingabe von Daten in einer Zeile auf der Anzeige, - // die gar nicht mit der Position des Cursors synchron ist, ziemlich kritisch sein koennte + // when set to sal_False, the display is no longer in sync with the current cursor position + // (means that in AdjustDataSource we are jumping to a row not belonging to CursorPosition) + // when using this, you should know what you are doing, because for example entering data + // in a row in the display that is not in sync with the position of the cursor can be very critical sal_Bool isForcedROController() const { return m_bForceROController; } void forceROController(sal_Bool bForce); - // Setzt man das auf sal_True, hat das GridControl immer einen ::com::sun::star::frame::Controller, der allerdings read-only ist. Ausserdem - // wird die Edit-Zeile des Controllers so eingestellt, dass sie ihre Selektion bei Fokus-Verlust weiterhin anzeigt. + // when set to sal_True, the GridControl always has a ::com::sun::star::frame::Controler which is + // read-only though. Additionally, the edit row of the controller is configured in a way + // that its selection stays displayed on focus loss. const DbGridRowRef& GetCurrentRow() const {return m_xCurrentRow;} @@ -570,7 +570,7 @@ public: protected: void RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, sal_Bool bUpdateCursor); sal_Bool SeekCursor(long nRow, sal_Bool bAbsolute = sal_False); - void RemoveColumns(); // aufraeumen eigener strukturen + void RemoveColumns(); // cleaning of own structures void AdjustRows(); sal_Int32 AlignSeekCursor(); sal_Bool SetCurrent(long nNewRow); @@ -579,10 +579,10 @@ protected: virtual void DeleteSelectedRows(); sal_Bool IsValid(const DbGridRowRef& _xRow) const {return _xRow && _xRow->IsValid();} - // Zeile an der gerade eingefuegt wird + // row which is currently being appended sal_Bool IsCurrentAppending() const; - // Leerzeile zum Einfuegen + // empty row for insertion sal_Bool IsInsertionRow(long nRow) const; void SetSeekPos(sal_Int32 nPos) {m_nSeekPos = nPos;} @@ -621,3 +621,4 @@ SV_IMPL_REF(DbGridRow); #endif // _SVX_GRIDCTRL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx index d30189ce81a0..b1dd6b82e58c 100644 --- a/svx/inc/svx/hdft.hxx +++ b/svx/inc/svx/hdft.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,17 +32,11 @@ #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <svx/pagectrl.hxx> #include "svx/svxdllapi.h" @@ -90,7 +85,7 @@ protected: SfxItemSet* pBBSet; sal_Bool bDisableQueryBox; sal_Bool bEnableBackgroundSelector; - FASTBOOL bInReset; + bool bInReset; void InitHandler(); DECL_LINK( TurnOnHdl, CheckBox*); @@ -134,3 +129,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/helperhittest3d.hxx b/svx/inc/svx/helperhittest3d.hxx index eae61aa253c5..fb7e353836a2 100644 --- a/svx/inc/svx/helperhittest3d.hxx +++ b/svx/inc/svx/helperhittest3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,3 +109,5 @@ bool checkHitSingle3DObject( #endif // INCLUDED_SVX_HELPERHITTEST_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/hlnkitem.hxx b/svx/inc/svx/hlnkitem.hxx index bdc0e1ff0e05..57b33bb576c1 100644 --- a/svx/inc/svx/hlnkitem.hxx +++ b/svx/inc/svx/hlnkitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,8 +75,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); const String& GetName() const { return sName; } void SetName(const String& rName) { sName = rName; } @@ -108,3 +109,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/htmlmode.hxx b/svx/inc/svx/htmlmode.hxx index dab1b5b1db70..20430e972321 100644 --- a/svx/inc/svx/htmlmode.hxx +++ b/svx/inc/svx/htmlmode.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,4 @@ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/hyperdlg.hxx b/svx/inc/svx/hyperdlg.hxx index f35df8dc73a8..88b828c662cc 100644 --- a/svx/inc/svx/hyperdlg.hxx +++ b/svx/inc/svx/hyperdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ public: #endif // _SVX_TAB_HYPERLINK_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ifaceids.hxx b/svx/inc/svx/ifaceids.hxx index a2be904d89a3..23ef1c1094fd 100644 --- a/svx/inc/svx/ifaceids.hxx +++ b/svx/inc/svx/ifaceids.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx index 7e82f0bc36e2..0c3ea0489153 100644 --- a/svx/inc/svx/imapdlg.hxx +++ b/svx/inc/svx/imapdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,26 +35,17 @@ #include <sfx2/ctrlitem.hxx> #include <sfx2/basedlgs.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif #include "svx/svxdllapi.h" +#include <vector> #ifndef _GOMISC_HXX @@ -63,12 +55,12 @@ class ImageMap; /************************************************************************* |* -|* Ableitung vom SfxChildWindow als "Behaelter" fuer Float +|* Derivation from SfxChildWindow as "container" for float |* \************************************************************************/ class Graphic; -class TargetList; +typedef ::std::vector< String* > TargetList; class SVX_DLLPUBLIC SvxIMapDlgChildWindow : public SfxChildWindow { @@ -135,7 +127,6 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow ComboBox maCbbTarget; StatusBar aStbStatus; ImageList maImageList; - ImageList maImageListH; Size aLastSize; IMapWindow* pIMapWnd; @@ -209,3 +200,4 @@ public: #endif // _IMAPDLG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/insctrl.hxx b/svx/inc/svx/insctrl.hxx index dd5baa6bcc74..45fef75641b5 100644 --- a/svx/inc/svx/insctrl.hxx +++ b/svx/inc/svx/insctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ipolypolygoneditorcontroller.hxx b/svx/inc/svx/ipolypolygoneditorcontroller.hxx index 205f8f7e7254..8df1c2ae05e6 100644 --- a/svx/inc/svx/ipolypolygoneditorcontroller.hxx +++ b/svx/inc/svx/ipolypolygoneditorcontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,20 +36,20 @@ // Defines //************************************************************ -enum SdrPathSmoothKind {SDRPATHSMOOTH_DONTCARE, // nur fuer Statusabfrage - SDRPATHSMOOTH_ANGULAR, // Eckig - SDRPATHSMOOTH_ASYMMETRIC, // unsymmetrisch, normales Smooth - SDRPATHSMOOTH_SYMMETRIC}; // symmetrisch +enum SdrPathSmoothKind {SDRPATHSMOOTH_DONTCARE, // only for status query + SDRPATHSMOOTH_ANGULAR, // angular + SDRPATHSMOOTH_ASYMMETRIC, // asymmetric, normal Smooth + SDRPATHSMOOTH_SYMMETRIC}; // symmetric -enum SdrPathSegmentKind {SDRPATHSEGMENT_DONTCARE, // nur fuer Statusabfrage - SDRPATHSEGMENT_LINE, // gerader Streckenabschnitt - SDRPATHSEGMENT_CURVE, // Kurvenabschnitt (Bezier) - SDRPATHSEGMENT_TOGGLE}; // nur fuer Set: Toggle +enum SdrPathSegmentKind {SDRPATHSEGMENT_DONTCARE, // only for status query + SDRPATHSEGMENT_LINE, // straight path segment + SDRPATHSEGMENT_CURVE, // curve path segment (Bezier) + SDRPATHSEGMENT_TOGGLE}; // only for Set: Toggle -enum SdrObjClosedKind {SDROBJCLOSED_DONTCARE, // nur fuer Statusabfrage - SDROBJCLOSED_OPEN, // Objekte geoeffnet (Linie, Polyline, ...) - SDROBJCLOSED_CLOSED, // Objekte geschlossen (Polygon, ...) - SDROBJCLOSED_TOGGLE}; // nur fuer Set: Toggle (not implemented yet) +enum SdrObjClosedKind {SDROBJCLOSED_DONTCARE, // only for status query + SDROBJCLOSED_OPEN, // non-closed object (line, polyline, ...) + SDROBJCLOSED_CLOSED, // closed object (polygon, ...) + SDROBJCLOSED_TOGGLE}; // only for Set: Toggle (not implemented yet) class IPolyPolygonEditorController { @@ -74,3 +75,4 @@ public: #endif //_SDR_IPOLYPOLYGONEDITORCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx index 8f02fdc2ef3e..11f370f03e82 100644 --- a/svx/inc/svx/itemwin.hxx +++ b/svx/inc/svx/itemwin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,7 +43,6 @@ class SfxObjectShell; class SvxLineBox : public LineLB { - BmpColorMode meBmpMode; sal_uInt16 nCurPos; Timer aDelayTimer; Size aLogicalSize; @@ -127,7 +127,7 @@ class SVX_DLLPUBLIC SvxMetricField : public MetricField protected: virtual void Modify(); virtual void Down(); - virtual void Up(); // Nur zur Sicherheit + virtual void Up(); // just to be sure virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); @@ -195,3 +195,4 @@ private: #endif // #ifndef _SVX_ITEMWIN_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx index 862a442517e7..3fad0c4f7979 100644 --- a/svx/inc/svx/langbox.hxx +++ b/svx/inc/svx/langbox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,7 +68,6 @@ public: private: Image m_aNotCheckedImage; Image m_aCheckedImage; - Image m_aCheckedImageHC; String m_aAllString; com::sun::star::uno::Sequence< sal_Int16 > *m_pSpellUsedLang; SvtLanguageTable* m_pLangTable; @@ -105,10 +105,6 @@ namespace layout class SvxLanguageBoxImpl; class SVX_DLLPUBLIC SvxLanguageBox : public ListBox { - /*DECL_GET_IMPL( SvxLanguageBox ); - DECL_CONSTRUCTORS( SvxLanguageBox, ListBox, WB_BORDER ); - DECL_GET_WINDOW (SvxLanguageBox);*/ - public: SvxLanguageBox( Context*, const char*, sal_Bool bCheck = sal_False ); ~SvxLanguageBox (); @@ -126,3 +122,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/lathe3d.hxx b/svx/inc/svx/lathe3d.hxx index 714475038fd0..7755c385e42e 100644 --- a/svx/inc/svx/lathe3d.hxx +++ b/svx/inc/svx/lathe3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,18 +34,18 @@ /************************************************************************* |* -|* 3D-Rotationsobjekt aus uebergebenem 2D-Polygon erzeugen +|* Create a 3D rotation object from a passed 2D polygon |* -|* Das aPolyPoly3D wird in nHSegments-Schritten um die Achse rotiert. -|* nVSegments gibt die Anzahl der Linien von aPolyPoly3D an und stellt damit -|* quasi eine vertikale Segmentierung dar. +|* The aPolyPoly3D is rotated around its axis in nHSegments steps. +|* nVSegments contains the number of lines of aPolyPoly3D and therefore +|* is effectively a vertical segmentation. |* \************************************************************************/ class SVX_DLLPUBLIC E3dLatheObj : public E3dCompoundObject { private: - // Partcodes fuer Wireframe-Generierung: Standard oder Deckelflaeche + // Part codes for Wireframe generation: standard oder cover surface enum { LATHE_PART_STD = 1, LATHE_PART_COVER = 2 }; basegfx::B2DPolyPolygon maPolyPoly2D; @@ -101,22 +102,23 @@ private: virtual sal_uInt16 GetObjIdentifier() const; void ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs); - virtual void operator=(const SdrObject&); + virtual E3dLatheObj* Clone() const; virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; - // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert". + // TakeObjName...() is for the display in the UI, for example "3 frames selected". virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; - // Lokale Parameter setzen/lesen mit Geometrieneuerzeugung + // set/get local parameters with geometry recreation void SetPolyPoly2D(const basegfx::B2DPolyPolygon& rNew); const basegfx::B2DPolyPolygon& GetPolyPoly2D() { return maPolyPoly2D; } - // Aufbrechen + // break up virtual sal_Bool IsBreakObjPossible(); virtual SdrAttrObj* GetBreakObj(); }; #endif // _E3D_LATHE3D_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/layctrl.hxx b/svx/inc/svx/layctrl.hxx index 6137c33a0eb2..c95db517c1dd 100644 --- a/svx/inc/svx/layctrl.hxx +++ b/svx/inc/svx/layctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,7 @@ class SVX_DLLPUBLIC SvxTableToolBoxControl : public SfxToolBoxControl { private: - FASTBOOL bEnabled; + bool bEnabled; public: virtual SfxPopupWindowType GetPopupWindowType() const; @@ -58,7 +59,7 @@ public: class SVX_DLLPUBLIC SvxColumnsToolBoxControl : public SfxToolBoxControl { - FASTBOOL bEnabled; + bool bEnabled; public: virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); @@ -77,3 +78,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx index 6129a17d9c28..1e5058854bd0 100644 --- a/svx/inc/svx/lboxctrl.hxx +++ b/svx/inc/svx/lboxctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/linectrl.hxx b/svx/inc/svx/linectrl.hxx index ea553d20aef5..c5a3ca384bb9 100644 --- a/svx/inc/svx/linectrl.hxx +++ b/svx/inc/svx/linectrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -173,3 +174,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/hyprlink.hrc b/svx/inc/svx/linkwarn.hxx index add71ece3bcc..4be65cc75afc 100644 --- a/svx/source/dialog/hyprlink.hrc +++ b/svx/inc/svx/linkwarn.hxx @@ -1,8 +1,10 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * Copyright 2000, 2010 Oracle and/or its affiliates. + * Copyright 2010 Novell, Inc. * * OpenOffice.org - a multi-platform office productivity suite * @@ -24,35 +26,32 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _SVX_HYPERLINK_HRC -#define _SVX_HYPERLINK_HRC -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif +#ifndef _SFX_LINKWARN_HXX +#define _SFX_LINKWARN_HXX -#ifndef _SFXSIDS_HRC -#include <sfx2/sfxsids.hrc> -#endif +#include <vcl/button.hxx> +#include <vcl/fixed.hxx> +#include <sfx2/basedlgs.hxx> +#include "svx/svxdllapi.h" -// defines ------------------------------------------------------------------ +class SVX_DLLPUBLIC SvxLinkWarningDialog : public SfxModalDialog +{ +private: + FixedImage m_aQueryImage; + FixedText m_aInfoText; + OKButton m_aLinkGraphicBtn; + CancelButton m_aEmbedGraphicBtn; + FixedLine m_aOptionLine; + CheckBox m_aWarningOnBox; -#define CB_NAME 1 -#define FT_URL 2 -#define CB_URL 3 -#define BTN_LINK SID_HLINKBAR_LINK -#define BTN_INSERT_BOOKMARK SID_HLINKBAR_BOOKMARK -#define BTN_INET_SEARCH SID_HLINKBAR_SEARCH -#define TB 7 -#define MN_FIELD 8 -#define MN_BUTTON 9 -#define BTN_TARGET SID_HLINKBAR_TARGET -#define STR_ADDRESS 11 -#define STR_EXPLORER 12 -#define STR_BOOKMARK_SEARCH 13 + void InitSize(); -#define BTN_OPENDIALOG SID_HYPERLINK_DIALOG +public: + SvxLinkWarningDialog( Window* pParent, const String& _rFileName ); + virtual ~SvxLinkWarningDialog(); +}; +#endif // #ifndef _SFX_LINKWARN_HXX -#endif - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/measctrl.hxx b/svx/inc/svx/measctrl.hxx index d45dc134cf19..35839b69d51d 100644 --- a/svx/inc/svx/measctrl.hxx +++ b/svx/inc/svx/measctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ // include --------------------------------------------------------------- -#ifndef _CTRL_HXX //autogen #include <vcl/ctrl.hxx> -#endif #include "svx/svxdllapi.h" @@ -68,3 +67,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/modctrl.hxx b/svx/inc/svx/modctrl.hxx index 8b7702341dbc..ef2859e4b60c 100644 --- a/svx/inc/svx/modctrl.hxx +++ b/svx/inc/svx/modctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,6 +33,8 @@ #include <sfx2/stbitem.hxx> #include "svx/svxdllapi.h" +#include <boost/shared_ptr.hpp> + // class SvxModifyControl ------------------------------------------------ class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl @@ -39,7 +42,8 @@ class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); + virtual void Paint( const UserDrawEvent& rUsrEvt ); + virtual void DoubleClick(); SFX_DECL_STATUSBAR_CONTROL(); @@ -48,13 +52,11 @@ public: static sal_uIntPtr GetDefItemWidth(const StatusBar& rStb); private: - sal_Bool bState; - -#ifdef _SVX_MODCTRL_CXX - SVX_DLLPRIVATE void DrawItemText_Impl(); -#endif + struct ImplData; + ::boost::shared_ptr<ImplData> mpImpl; }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx index 92f00114edf4..112d662c0bf7 100644 --- a/svx/inc/svx/msdffdef.hxx +++ b/svx/inc/svx/msdffdef.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ #include <tools/solar.h> #include <tools/stream.hxx> -#ifndef _TABLE_HXX #include <tools/table.hxx> -#endif #include <tools/string.hxx> #include <tools/gen.hxx> #include "svx/svxdllapi.h" @@ -249,7 +248,7 @@ #define DFF_msofbtSelection 0xF119 // an FDGSL followed by the SPIDs of the shapes in the selection X 0 -// Werte fuer den sal_uIntPtr im DFF_PST_TextHeaderAtom +// Values for the ULONG in DFF_PST_TextHeaderAtom enum DFF_TextHeader { DFFTH_TITLE, DFFTH_BODY, @@ -580,7 +579,7 @@ enum DFF_TextHeader { #define DFF_PBit_Print 0x00000001 //--------------------------------------------------------------------------- -// Dreh- und Angelpunkt: der Shape-Typ +// linchpin: the shape type //--------------------------------------------------------------------------- typedef enum { @@ -792,10 +791,10 @@ typedef enum mso_sptNil = mso_sptMax } MSO_SPT; -// verschiedene enums aus der OfficeDraw-Doku, Appendix D - Anfang +// different enums from the OfficeDraw documentation, Appendix D - beginning // -// beachte: in Abweichung von der MS-Doku beginnen alle -// mit "mso_" statt mit "mso" +// note: in opposite to the MS documentation, they all +// start with "mso_" instead of "mso" // enum MSO_ShapePath { mso_shapeLines, // A line of straight segments @@ -1098,7 +1097,7 @@ typedef enum { } MSO_BLIPUSAGE; typedef enum { // GEL provided types... - mso_blipERROR = 0, // An error occured during loading + mso_blipERROR = 0, // An error occurred during loading mso_blipUNKNOWN, // An unknown blip type mso_blipEMF, // Windows Enhanced Metafile mso_blipWMF, // Windows Metafile @@ -1186,38 +1185,6 @@ typedef enum { mso_colorBParamShift = 16 // To extract the parameter value } MSO_SYSCOLORINDEX; -#ifdef Hier_noch_was_aus_der_Doku -/* The secondary, or data, UID - should always be set. */ -sal_uInt8 m_rgbUid[16]; -/* The primary UID - this defaults to 0, in which case the primary ID is - that of the internal data. NOTE!: The primary UID is only saved to disk - if (blip_instance ^ blip_signature == 1). Blip_instance is MSO_FBH.inst and - blip_signature is one of the values defined in MSO_BI */ -sal_uInt8 m_rgbUidPrimary[16]; // optional based on the above check - -/* Metafile Blip overhead = 34 bytes. m_cb gives the number of - bytes required to store an uncompressed version of the file, m_cbSave - is the compressed size. m_mfBounds gives the boundary of all the - drawing calls within the metafile (this may just be the bounding box - or it may allow some whitespace, for a WMF this comes from the - SetWindowOrg and SetWindowExt records of the metafile). */ -int m_cb; // Cache of the metafile size -RECT m_rcBounds; // Boundary of metafile drawing commands -POINT m_ptSize; // Size of metafile in EMUs -int m_cbSave; // Cache of saved size (size of m_pvBits) -sal_uInt8 m_fCompression; // MSO_BLIPCOMPRESSION -sal_uInt8 m_fFilter; // always mso_filterNone -void *m_pvBits; // Compressed bits of metafile. - -/* The secondary, or data, UID - should always be set. */ -sal_uInt8 m_rgbUid[16]; -/* The primary UID - this defaults to 0, in which case the primary ID is - that of the internal data. NOTE!: The primary UID is only saved to disk - if (blip_instance ^ blip_signature == 1). Blip_instance is MSO_FBH.finst and - blip_signature is one of the values defined in MSO_BI*/ -sal_uInt8 m_rgbUidPrimary[16]; // optional based on the above check -sal_uInt8 m_bTag; -void *m_pvBits; // raster bits of the blip. #endif -#endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx index 00a423d8b46c..a9253c04858d 100644 --- a/svx/inc/svx/numfmtsh.hxx +++ b/svx/inc/svx/numfmtsh.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,8 +65,9 @@ enum SvxNumberValueType // define ---------------------------------------------------------------- -#define CAT_ALL 0 // Reihenfolge der Kategorie- -#define CAT_USERDEFINED 1 // ListBox-Eintraege in der TabPage +// sort order of the category ListBox entries in the TabPage +#define CAT_ALL 0 +#define CAT_USERDEFINED 1 #define CAT_NUMBER 2 #define CAT_PERCENT 3 #define CAT_CURRENCY 4 @@ -171,7 +173,7 @@ public: String& rPreviewStr, Color*& rpFontColor ); - void MakePrevStringFromVal( const String& rFormatStr, //@ 19.09.97 + void MakePrevStringFromVal( const String& rFormatStr, String& rPreviewStr, Color*& rpFontColor, double nValue); @@ -218,7 +220,7 @@ public: void GetCurrencyFormats(SvStrings& rList); private: - static const double DEFAULT_NUMVALUE; // 123456789 + static const double DEFAULT_NUMVALUE; SvNumberFormatter* pFormatter; SvNumberFormatTable* pCurFmtTable; @@ -265,3 +267,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx index 6b3793d2aea9..32b021f079b5 100644 --- a/svx/inc/svx/numinf.hxx +++ b/svx/inc/svx/numinf.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,8 +39,7 @@ /* -[Beschreibung] -Dieses Item dient als Transport-Medium fuer einen Number-Formatter. +This item is used as a transport medium for a number formatter */ class SVX_DLLPUBLIC SvxNumberInfoItem : public SfxPoolItem @@ -98,3 +98,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/numvset.hxx b/svx/inc/svx/numvset.hxx index 6118460a8356..0bf764bf5847 100644 --- a/svx/inc/svx/numvset.hxx +++ b/svx/inc/svx/numvset.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,9 +59,6 @@ struct SvxBmpItemInfo sal_uInt16 nItemId; }; -/*-----------------09/09/97 01:05pm----------------- - ---------------------------------------------------*/ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet { Color aLineColor; @@ -101,10 +99,6 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet const com::sun::star::lang::Locale& rLocale); }; -/*-----------------13.02.97 09.32------------------- - ---------------------------------------------------*/ - class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet { String sBullets; @@ -120,15 +114,12 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet Timer& GetFormatTimer() {return aFormatTimer;} public: - SvxBmpNumValueSet( Window* pParent, const ResId& rResId/*, const List& rStrNames*/); + SvxBmpNumValueSet( Window* pParent, const ResId& rResId); ~SvxBmpNumValueSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); }; -/*-----------------02.12.97 10:31------------------- - ---------------------------------------------------*/ class SvxNumberingPreview : public Window { @@ -163,3 +154,4 @@ class SvxNumberingPreview : public Window #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx index 5c25582a1c7b..188839e4e1af 100644 --- a/svx/inc/svx/obj3d.hxx +++ b/svx/inc/svx/obj3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,7 +46,7 @@ #include "svx/svxdllapi.h" //************************************************************ -// Vorausdeklarationen +// Forward declaration //************************************************************ class SfxPoolItem; @@ -65,22 +66,22 @@ namespace sdr { namespace properties { /************************************************************************* |* -|* GeoData relevant fuer Undo-Actions +|* GeoData relevant for undo actions |* \************************************************************************/ class E3DObjGeoData : public SdrObjGeoData { public: - basegfx::B3DRange maLocalBoundVol; // umschliessendes Volumen des Objekts - basegfx::B3DHomMatrix maTransformation; // lokale Transformation + basegfx::B3DRange maLocalBoundVol; // surrounding volume of the object + basegfx::B3DHomMatrix maTransformation; // lokal transformations E3DObjGeoData() {} }; /************************************************************************* |* -|* Liste fuer 3D-Objekte +|* List for 3D objects |* \************************************************************************/ @@ -100,7 +101,7 @@ public: /************************************************************************* |* -|* Basisklasse fuer 3D-Objekte +|* Base class for 3D objects |* \************************************************************************/ @@ -110,18 +111,18 @@ private: // to allow sdr::properties::E3dProperties access to StructureChanged() friend class sdr::properties::E3dProperties; - // Aus der E3dObjList und E3dDragMethod alles erlauben + // Allow everything for E3dObjList and E3dDragMethod friend class E3dObjList; friend class E3dDragMethod; protected: virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); - E3dObjList maSubList; // Subliste (Childobjekte) + E3dObjList maSubList; // child objekts - basegfx::B3DRange maLocalBoundVol; // umschliessendes Volumen des Objekts (aus geometrieerzeugung) - basegfx::B3DHomMatrix maTransformation; // lokale Transformation - basegfx::B3DHomMatrix maFullTransform; // globale Transformation (inkl. Parents) + basegfx::B3DRange maLocalBoundVol; // surrounding volume of the object (from the geometry generation) + basegfx::B3DHomMatrix maTransformation; // local transformation + basegfx::B3DHomMatrix maFullTransform; // global transformation (including. parents) // Flags unsigned mbTfHasChanged : 1; @@ -164,7 +165,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual SdrObjList* GetSubList() const; - // 3D-Objekt in die Gruppe einfuegen; Eigentumsuebergang! + // Insert 3D object into the group; transfer to other owner! virtual void Insert3DObj(E3dObject* p3DObj); void Remove3DObj(E3dObject* p3DObj); @@ -174,48 +175,50 @@ public: const basegfx::B3DRange& GetBoundVolume() const; void InvalidateBoundVolume(); - // komplette Transformation inklusive aller Parents berechnen + // calculate complete transformation including all parents const basegfx::B3DHomMatrix& GetFullTransform() const; - // Transformationsmatrix abfragen bzw. (zurueck)setzen + // get and (re)set transformation matrix const basegfx::B3DHomMatrix& GetTransform() const; virtual void NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix); virtual void SetTransform(const basegfx::B3DHomMatrix& rMatrix); - // [FG] 2D-Rotationen, werden hier als Rotationen um die Z-Achse, die in den Bildschirm zeigt, - // implementiert plus eine Verschiebung der Scene. Dies bedeutet auch die Scene (E3dScene) - // muss diese Routine in der Klasse als virtual definieren. + // 2D rotations, are implemented as a rotation around the Z axis + // which is vertical to the screen, plus a shift of the scene. + // This means that also the scene (E3dScene) must define this + // routine as virtual in its class. virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); // get wireframe polygon for local object. No transform is applied. basegfx::B3DPolyPolygon CreateWireframe() const; - // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert". + // TakeObjName...() is for the display in the UI, for example "3 frames selected". virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; sal_uInt16 GetLogicalGroup() { return 0; } - virtual void operator=(const SdrObject&); + virtual E3dObject* Clone() const; + E3dObject& operator=( const E3dObject& rObj ); virtual SdrObjGeoData *NewGeoData() const; virtual void SaveGeoData(SdrObjGeoData& rGeo) const; virtual void RestGeoData(const SdrObjGeoData& rGeo); - // Selektion Setzen/Lesen + // get/set the selection bool GetSelected() const { return mbIsSelected; } void SetSelected(bool bNew); - // Aufbrechen + // break up virtual sal_Bool IsBreakObjPossible(); virtual SdrAttrObj* GetBreakObj(); }; /************************************************************************* |* -|* Klasse fuer alle zusammengesetzen Objekte (Cube, Lathe, Scene, Extrude) -|* Diese Klasse erspart ein paar ISA-Abfragen und sie beschleunigt das -|* Verhalten ungemein, da alle Attribute usw. fuer die untergeordneten -|* Polygone hierueber gehalten werden. Die Polygone duerfen nur Attribute -|* halten, wenn sie direkt einer Szene untergeordnet sind. +|* Class for all compound objects (Cube, Lathe, Scene, Extrude) +|* This class saves some ISA queries and accelerates the behaviour +|* significantly, because all the attributes etc. are kept through this. +|* The polygons may only keep attributes if they are directly +|* subordinated to the scene. |* \************************************************************************/ @@ -231,10 +234,10 @@ private: protected: virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); - // Material des Objektes + // material of the object Color aMaterialAmbientColor; - // Attribute zur Geometrieerzeugung + // attributes for geometry creation unsigned bCreateNormals : 1; unsigned bCreateTexture : 1; @@ -307,22 +310,22 @@ public : virtual sal_uInt16 GetObjIdentifier() const; virtual void RecalcSnapRect(); - // Parameter Geometrieerzeugung setzen/lesen + // set/get parameters for geometry creation sal_Bool GetCreateNormals() const { return bCreateNormals; } void SetCreateNormals(sal_Bool bNew); sal_Bool GetCreateTexture() const { return bCreateTexture; } void SetCreateTexture(sal_Bool bNew); - // Copy-Operator - virtual void operator=(const SdrObject&); + virtual E3dCompoundObject* Clone() const; - // Material des Objektes + // material of the object const Color& GetMaterialAmbientColor() const { return aMaterialAmbientColor; } void SetMaterialAmbientColor(const Color& rColor); - // #110988# sal_Bool IsAOrdNumRemapCandidate(E3dScene*& prScene) const; }; #endif // _E3D_OBJ3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/objfac3d.hxx b/svx/inc/svx/objfac3d.hxx index 6ce30853f441..0b17197b4404 100644 --- a/svx/inc/svx/objfac3d.hxx +++ b/svx/inc/svx/objfac3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ /************************************************************************* |* -|* Factory fuer Chart-spezifische Objekte +|* Factory for chart-specific objects |* \************************************************************************/ @@ -54,3 +55,5 @@ public: #endif // _OBJFAC3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ofaitem.hxx b/svx/inc/svx/ofaitem.hxx index 8e58cb5ef742..9f9610cbf7ad 100644 --- a/svx/inc/svx/ofaitem.hxx +++ b/svx/inc/svx/ofaitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,3 +52,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/optgenrl.hxx b/svx/inc/svx/optgenrl.hxx index bea7ae38def5..ba4876eed3a3 100644 --- a/svx/inc/svx/optgenrl.hxx +++ b/svx/inc/svx/optgenrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,7 +28,7 @@ #ifndef _SVX_OPTGENRL_HXX #define _SVX_OPTGENRL_HXX -// Defines for setting the fokus of a Edit via a slot from external. +// Defines for setting the focus of a Edit via a slot from external. #define UNKNOWN_EDIT ((sal_uInt16)0) #define COMPANY_EDIT ((sal_uInt16)1) #define FIRSTNAME_EDIT ((sal_uInt16)2) @@ -47,4 +48,4 @@ #endif // #ifndef _SVX_OPTGENRL_HXX - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/optgrid.hxx b/svx/inc/svx/optgrid.hxx index dda6afae6104..5877be34af07 100644 --- a/svx/inc/svx/optgrid.hxx +++ b/svx/inc/svx/optgrid.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -140,7 +141,7 @@ private: FixedText aDivisionPointY; CheckBox aCbxSynchronize; - FixedLine aGrpDrawGrid; // Neu + FixedLine aGrpDrawGrid; protected: //these controls are used in draw and impress @@ -164,7 +165,6 @@ protected: private: sal_Bool bAttrModified; -// sal_Bool bEqualGrid; // Neu #ifdef _SVX_OPTGRID_CXX DECL_LINK( ClickRotateHdl_Impl, void * ); @@ -178,3 +178,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/orienthelper.hxx b/svx/inc/svx/orienthelper.hxx index 7508740b62d6..752821e870f8 100644 --- a/svx/inc/svx/orienthelper.hxx +++ b/svx/inc/svx/orienthelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,3 +131,4 @@ typedef sfx::ItemControlConnection< sfx::BoolItemWrapper, OrientStackedWrapper > #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/pagectrl.hxx b/svx/inc/svx/pagectrl.hxx index c7554b4a445a..14054b20c2df 100644 --- a/svx/inc/svx/pagectrl.hxx +++ b/svx/inc/svx/pagectrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -168,3 +169,4 @@ public: #endif // #ifndef _SVX_PAGECTRL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx index 50c7c8f86b59..ee4054cd030c 100644 --- a/svx/inc/svx/pageitem.hxx +++ b/svx/inc/svx/pageitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,10 +35,6 @@ #include "svx/svxdllapi.h" -/*-------------------------------------------------------------------- - Beschreibung: SvxNumType - --------------------------------------------------------------------*/ - enum SvxNumType { SVX_CHARS_UPPER_LETTER, @@ -51,7 +48,7 @@ enum SvxNumType }; /*-------------------------------------------------------------------- - Beschreibung: Benutzung der Seite + usage of the page --------------------------------------------------------------------*/ enum SvxPageUsage @@ -65,22 +62,19 @@ enum SvxPageUsage }; /*-------------------------------------------------------------------- - Beschreibung: Teile der Seitenbeschreibung + parts of the page description --------------------------------------------------------------------*/ - - /* -[Beschreibung] -Dieses Item beschreibt ein Seiten-Attribut (Name der Vorlage, Numerierung, -Portrait oder Landscape, Layout). +This item describes a page attribute (name of the template, enumeration, +portait or landscape, layout) */ class SVX_DLLPUBLIC SvxPageItem: public SfxPoolItem { private: - String aDescName; // Name der Vorlage - SvxNumType eNumType; // Numerierung + String aDescName; // name of the template + SvxNumType eNumType; // enumeration sal_Bool bLandscape; // Portrait / Landscape sal_uInt16 eUse; // Layout @@ -98,23 +92,23 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const; virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; - // Ausrichtung + // orientation sal_uInt16 GetPageUsage() const { return eUse; } void SetPageUsage(sal_uInt16 eU) { eUse= eU; } sal_Bool IsLandscape() const { return bLandscape; } void SetLandscape(sal_Bool bL) { bLandscape = bL; } - // Numerierung + // enumeration SvxNumType GetNumType() const { return eNumType; } void SetNumType(SvxNumType eNum) { eNumType = eNum; } - // Name des Descriptors + // name of the descriptor const String& GetDescName() const { return aDescName; } void SetDescName(const String& rStr) { aDescName = rStr; } }; @@ -122,16 +116,9 @@ public: /*-------------------------------------------------------------------- - Beschreibung: Container fuer Header/Footer-Attribute + container for header/footer attributes --------------------------------------------------------------------*/ - - -/* -[Beschreibung] -Dieses Item dient als Container fuer Header- und Footer-Attribute. -*/ - class SVX_DLLPUBLIC SvxSetItem: public SfxSetItem { public: @@ -155,3 +142,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/paraprev.hxx b/svx/inc/svx/paraprev.hxx index f01c9f4948b5..8dc7c61e2bee 100644 --- a/svx/inc/svx/paraprev.hxx +++ b/svx/inc/svx/paraprev.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,18 +55,18 @@ private: Size aWinSize; Size aSize; - // Einzuege + // indentation long nLeftMargin; long nRightMargin; short nFirstLineOfst; - // Abstaende + // distances sal_uInt16 nUpper; sal_uInt16 nLower; - // Ausrichtung + // adjustment SvxAdjust eAdjust; - // Letzte Zeile im Blocksatz + // last line in justification SvxAdjust eLastLine; - // Zeilenabstand + // line distance SvxPrevLineSpace eLine; sal_uInt16 nLineVal; @@ -111,3 +112,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/passwd.hxx b/svx/inc/svx/passwd.hxx index a52caa23335e..a412807c80cd 100644 --- a/svx/inc/svx/passwd.hxx +++ b/svx/inc/svx/passwd.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,17 +32,11 @@ #include <sfx2/basedlgs.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include "svx/svxdllapi.h" // class SvxPasswordDialog ----------------------------------------------- @@ -84,3 +79,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/pfiledlg.hxx b/svx/inc/svx/pfiledlg.hxx index a3ed8bf6b050..6c62149ea4eb 100644 --- a/svx/inc/svx/pfiledlg.hxx +++ b/svx/inc/svx/pfiledlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ public: #endif // _SVX_PFILEDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/polygn3d.hxx b/svx/inc/svx/polygn3d.hxx index 9b2b469d3dac..4e1c7c001118 100644 --- a/svx/inc/svx/polygn3d.hxx +++ b/svx/inc/svx/polygn3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,7 +35,7 @@ class SVX_DLLPUBLIC E3dPolygonObj : public E3dCompoundObject { private: - // Parameter + // parameters basegfx::B3DPolyPolygon aPolyPoly3D; basegfx::B3DPolyPolygon aPolyNormals3D; basegfx::B2DPolyPolygon aPolyTexture2D; @@ -79,7 +80,7 @@ public: virtual sal_uInt16 GetObjIdentifier() const; virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; - virtual void operator=(const SdrObject&); + virtual E3dPolygonObj* Clone() const; // LineOnly? sal_Bool GetLineOnly() { return bLineOnly; } @@ -87,3 +88,5 @@ public: }; #endif // _E3D_POLYGON3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/polypolygoneditor.hxx b/svx/inc/svx/polypolygoneditor.hxx index adc8eb0cbeaf..67cd3d3acfbb 100644 --- a/svx/inc/svx/polypolygoneditor.hxx +++ b/svx/inc/svx/polypolygoneditor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ private: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/polysc3d.hxx b/svx/inc/svx/polysc3d.hxx index 2375a85ecb9b..d1ada0084301 100644 --- a/svx/inc/svx/polysc3d.hxx +++ b/svx/inc/svx/polysc3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ /************************************************************************* |* -|* 3D-Szene mit Darstellung durch 2D-Polygone +|* 3D scene displayed through 2D polygons |* \************************************************************************/ @@ -45,6 +46,9 @@ public: E3dPolyScene(E3dDefaultAttributes& rDefault); virtual sal_uInt16 GetObjIdentifier() const; + virtual E3dPolyScene* Clone() const; }; #endif // _E3D_POLYSC3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/postattr.hxx b/svx/inc/svx/postattr.hxx index 5d75187b58b5..4d2e66400408 100644 --- a/svx/inc/svx/postattr.hxx +++ b/svx/inc/svx/postattr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,8 +38,7 @@ /* -[Beschreibung] -Dieses Item beschreibt das Autoren-Kuerzel eines Notizzettels. +The author shorthand symbol of a note */ class SVX_DLLPUBLIC SvxPostItAuthorItem: public SfxStringItem @@ -69,8 +69,7 @@ public: /* -[Beschreibung] -Dieses Item beschreibt das Datum eines Notizzettels. +The date of a note */ class SVX_DLLPUBLIC SvxPostItDateItem: public SfxStringItem @@ -100,8 +99,7 @@ public: /* -[Beschreibung] -Dieses Item beschreibt den Text eines Notizzettels. +The text of a note */ class SVX_DLLPUBLIC SvxPostItTextItem: public SfxStringItem @@ -112,7 +110,7 @@ public: SvxPostItTextItem( sal_uInt16 nWhich ); SvxPostItTextItem( const String& rText, sal_uInt16 nWhich ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" vom SfxPoolItem virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -131,3 +129,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/prtqry.hxx b/svx/inc/svx/prtqry.hxx index ce7ae239215f..12413b0f1357 100644 --- a/svx/inc/svx/prtqry.hxx +++ b/svx/inc/svx/prtqry.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/pszctrl.hxx b/svx/inc/svx/pszctrl.hxx index 4d6e8d29d49d..918cf8878357 100644 --- a/svx/inc/svx/pszctrl.hxx +++ b/svx/inc/svx/pszctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/rectenum.hxx b/svx/inc/svx/rectenum.hxx index 98a00c3a1154..b19d9814e3c9 100644 --- a/svx/inc/svx/rectenum.hxx +++ b/svx/inc/svx/rectenum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,3 +45,5 @@ enum CTL_STYLE #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/relfld.hxx b/svx/inc/svx/relfld.hxx index 192870b1d1b9..2dd554cbbbab 100644 --- a/svx/inc/svx/relfld.hxx +++ b/svx/inc/svx/relfld.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,19 +30,11 @@ // include --------------------------------------------------------------- -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include "svx/svxdllapi.h" // class SvxRelativeField ------------------------------------------------ -/* - [Beschreibung] - - "Ahnlich der Klasse FontSizeBox. Abgeleitet von der Klasse MetricField. - Zus"atzliche Funktionalit"at: relative Angaben. -*/ class SVX_DLLPUBLIC SvxRelativeField : public MetricField { @@ -71,3 +64,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/rotmodit.hxx b/svx/inc/svx/rotmodit.hxx index d379713e9a37..d0fb4169fd97 100644 --- a/svx/inc/svx/rotmodit.hxx +++ b/svx/inc/svx/rotmodit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,7 +33,7 @@ #include "svx/svxdllapi.h" //---------------------------------------------------------------------------- -// Ausrichtung bei gedrehtem Text +// Alignment with rotated text enum SvxRotateMode { @@ -60,10 +61,11 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx index 6b37b0cb85b0..1c74ad3224a3 100644 --- a/svx/inc/svx/rubydialog.hxx +++ b/svx/inc/svx/rubydialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,12 +33,8 @@ #include <sfx2/childwin.hxx> #include <sfx2/basedlgs.hxx> #include <vcl/lstbox.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/edit.hxx> #include <vcl/scrbar.hxx> #include <com/sun/star/uno/Reference.h> @@ -202,3 +199,4 @@ public: #endif // _SVX_RUBYDLG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx index 8031dbbd3112..e1a17dc8d388 100644 --- a/svx/inc/svx/ruler.hxx +++ b/svx/inc/svx/ruler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,33 +53,33 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener using Window::Notify; SvxRulerItem **pCtrlItem; - SvxLongLRSpaceItem *pLRSpaceItem; //Linker und Rechter Rand - SfxRectangleItem *pMinMaxItem; //Maxima fuers Draggen - SvxLongULSpaceItem *pULSpaceItem; //Oberer und Unterer Rand - SvxTabStopItem *pTabStopItem; //Tabstops - SvxLRSpaceItem *pParaItem; //Absaetze - SvxLRSpaceItem *pParaBorderItem; //Border distance - SvxPagePosSizeItem *pPagePosItem; //Seitenabstaende zum Lineal - SvxColumnItem *pColumnItem; //Spalten - SvxObjectItem *pObjectItem; //Objekt + SvxLongLRSpaceItem *pLRSpaceItem; // left and right edge + SfxRectangleItem *pMinMaxItem; // maxima for dragging + SvxLongULSpaceItem *pULSpaceItem; // upper and lower edge + SvxTabStopItem *pTabStopItem; // tab stops + SvxLRSpaceItem *pParaItem; // paragraphs + SvxLRSpaceItem *pParaBorderItem; // border distance + SvxPagePosSizeItem *pPagePosItem; // page distance to the rule + SvxColumnItem *pColumnItem; // columns + SvxObjectItem *pObjectItem; // object Window *pEditWin; SvxRuler_Impl *pRuler_Imp; sal_Bool bAppSetNullOffset :1; sal_Bool bHorz :1; - long lLogicNullOffset; // in logischen Koordinaten - long lAppNullOffset; // in logischen Koordinaten - long lMinFrame; // minimale Framebreite in Pixel + long lLogicNullOffset; // in logic coordinates + long lAppNullOffset; // in logic coordinates + long lMinFrame; // minimal frame width in pixels long lInitialDragPos; sal_uInt16 nFlags; enum { NONE = 0x0000, DRAG_OBJECT = 0x0001, - // letzte Spalte verkleinern, Shift + // reduce size of the last column, shift DRAG_OBJECT_SIZE_LINEAR = 0x0002, DRAG_OBJECT_SIZE_PROPORTIONAL = 0x0004, // proportional, Ctrl - // nur aktuelle Zeile (Tabelle; Shift-Ctrl) + // only current line (table; Shift-Ctrl) DRAG_OBJECT_ACTLINE_ONLY = 0x0008, - // aktuell gleiche Tastenbelegung + // currently same key assignment DRAG_OBJECT_LEFT_INDENT_ONLY = DRAG_OBJECT_SIZE_PROPORTIONAL } nDragType; @@ -87,8 +88,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener sal_uInt16 nTabBufSize; long lDefTabDist; long lTabPos; - RulerTab *pTabs; // Tabpositionen in Pixel - RulerIndent *pIndents; // Absatzraender in Pixel + RulerTab *pTabs; // tab positions in pixel + RulerIndent *pIndents; // paragraph margins in pixel RulerBorder *pBorders; sal_uInt16 nBorderCount; RulerBorder *pObjectBorders; @@ -99,33 +100,32 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener sal_Bool bValid; sal_Bool bListening; sal_Bool bActive; -//#if 0 // _SOLAR__PRIVATE void StartListening_Impl(); long GetCorrectedDragPos( sal_Bool bLeft = sal_True, sal_Bool bRight = sal_True ); void DrawLine_Impl(long &lTabPos, int, sal_Bool Hori=sal_True); sal_uInt16 GetObjectBordersOff(sal_uInt16 nIdx) const; - // Seitenr"ander oder umgebender Rahmen + // page borders or surrounding frame void UpdateFrame(const SvxLongLRSpaceItem *); void UpdateFrame(const SvxLongULSpaceItem *); void UpdateFrameMinMax(const SfxRectangleItem *); - // Absatzeinzuege + // paragraph indentations void UpdatePara(const SvxLRSpaceItem *); // Border distance void UpdateParaBorder(const SvxLRSpaceItem *); // Tabs void Update(const SvxTabStopItem *); - // Seitenposition und -breite + // page position and width void Update(const SvxPagePosSizeItem *); - // Spalten + // columns void Update(const SvxColumnItem *, sal_uInt16 nSID); - // Object Selektion + // object selection void Update(const SvxObjectItem *); - // Protect + // protect void Update( const SvxProtectItem* ); // left-to-right text void UpdateTextRTL( const SfxBoolItem* ); - // Absatzeinzuege + // paragraph indentations void UpdatePara(); void UpdateTabs(); void UpdatePage(); @@ -154,9 +154,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener long ConvertSizeLogic(long lSize) const; long GetFirstLineIndent() const; -// long GetLogicFirstLineIndent() const; long GetLeftIndent() const; -// long GetLogicLeftIndent() const; long GetRightIndent() const; long GetLogicRightIndent() const; long GetPageWidth() const; @@ -194,7 +192,6 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener sal_uInt16 GetNextVisible(sal_uInt16 nColumn); sal_uInt16 GetPrevVisible(sal_uInt16 nColumn); -//#endif void Update(); @@ -215,8 +212,8 @@ protected: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - // Berechnung der Grenzwerte fuer Objectgrenzen - // Werte sind bezogen auf die Seite + // calculation of boundary values for object borders + // values refer to the page virtual sal_Bool CalcLimits(long &nMax1, long &nMax2, sal_Bool bFirst) const; sal_Bool IsActLastColumn( sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX) const ; @@ -253,7 +250,7 @@ public: void SetDefTabDist(long); long GetDefTabDist() const; - // Setzen / Erfragen NullOffset in logischen Einheiten + // set/get NullOffset in logic units void SetNullOffsetLogic(long lOff = 0); long GetNullOffsetLogic() const { return lAppNullOffset; } @@ -268,3 +265,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/rulritem.hxx b/svx/inc/svx/rulritem.hxx index 753422f609c2..4689665a82a8 100644 --- a/svx/inc/svx/rulritem.hxx +++ b/svx/inc/svx/rulritem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,14 +39,14 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem { - long lLeft; // nLeft oder der neg. Erstzeileneinzug - long lRight; // der unproblematische rechte Rand + long lLeft; // nLeft or the negativ first-line indentation + long lRight; // the unproblematic right edge protected: virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -74,14 +75,14 @@ public: class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem { - long lLeft; // nLeft oder der neg. Erstzeileneinzug - long lRight; // der unproblematische rechte Rand + long lLeft; // nLeft or the negative first-line indentation + long lRight; // the unproblematic right edge protected: virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -115,8 +116,8 @@ class SVX_DLLPUBLIC SvxPagePosSizeItem : public SfxPoolItem long lHeight; protected: virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -143,9 +144,9 @@ public: struct SvxColumnDescription { - long nStart; /* Spaltenbeginn */ - long nEnd; /* Spaltenende */ - sal_Bool bVisible; /* Sichtbarkeit */ + long nStart; /* Start of the column */ + long nEnd; /* End of the column */ + sal_Bool bVisible; /* Visibility */ long nEndMin; //min. possible position of end long nEndMax; //max. possible position of end @@ -190,13 +191,13 @@ typedef SvPtrarr SvxColumns; class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem { - SvxColumns aColumns;// Spaltenarray - long nLeft, // Linker Rand bei Tabelle - nRight; // Rechter Rand bei Tabelle; bei Spalten immer gleich - // zum umgebenden Rahmen - sal_uInt16 nActColumn; // die aktuelle Spalte - sal_Bool bTable; // Tabelle? - sal_Bool bOrtho; // Gleichverteilte Spalten + SvxColumns aColumns;// Column array + long nLeft, // Left edge for the table + nRight; // Right edge for the table; for columns always + // equal to the surrounding frame + sal_uInt16 nActColumn; // the current column + sal_uInt8 bTable; // table? + sal_uInt8 bOrtho; // evenly spread columns void DeleteAndDestroyColumns(); @@ -210,15 +211,15 @@ protected: String &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); public: TYPEINFO(); - // rechter Rand des umgebenden Rahmens - // nLeft, nRight jeweils der Abstand zum umgebenden Rahmen - SvxColumnItem(sal_uInt16 nAct = 0); // Spalten + // right edge of the surrounding frame + // nLeft, nRight each the distance to the surrounding frame + SvxColumnItem(sal_uInt16 nAct = 0); // columns SvxColumnItem(sal_uInt16 nActCol, - sal_uInt16 nLeft, sal_uInt16 nRight = 0); // Tabelle mit Raendern + sal_uInt16 nLeft, sal_uInt16 nRight = 0); // Table with borders SvxColumnItem(const SvxColumnItem &); ~SvxColumnItem(); @@ -251,7 +252,7 @@ public: sal_Bool IsOrtho () const { return sal_False ; } sal_Bool IsConsistent() const { return nActColumn < aColumns.Count(); } - long GetVisibleRight() const;// rechter sichtbare Rand der aktuellen Spalte + long GetVisibleRight() const;// right visible edge of the current column }; // class SvxObjectItem --------------------------------------------------- @@ -259,11 +260,11 @@ public: class SVX_DLLPUBLIC SvxObjectItem : public SfxPoolItem { private: - long nStartX; /* Beginn in X-Richtung */ - long nEndX; /* Ende in X-Richtung */ - long nStartY; /* Beginn in Y-Richtung */ - long nEndY; /* Ende in Y-Richtung */ - sal_Bool bLimits; /* Grenzwertkontrolle durch die Applikation */ + long nStartX; /* Start in x direction */ + long nEndX; /* End in x direction */ + long nStartY; /* Start in y direction */ + long nEndY; /* Ende in y direction */ + sal_Bool bLimits; /* boundary limit control by the application */ protected: virtual int operator==( const SfxPoolItem& ) const; @@ -274,8 +275,8 @@ protected: String &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); private: SVX_DLLPRIVATE const SvxObjectItem &operator=(const SvxObjectItem &); // n.i. public: @@ -301,3 +302,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx index a55eac577419..c29b4676da53 100644 --- a/svx/inc/svx/scene3d.hxx +++ b/svx/inc/svx/scene3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,7 +46,7 @@ namespace drawinglayer { namespace geometry { /************************************************************************* |* -|* GeoData relevant fuer Undo-Actions +|* GeoData relevant for undo actions |* \************************************************************************/ @@ -57,12 +58,11 @@ public: E3DSceneGeoData() {} }; -// #110988# class Imp3DDepthRemapper; /************************************************************************* |* -|* Basisklasse fuer 3D-Szenen +|* base class for 3D scenes |* \************************************************************************/ @@ -76,11 +76,10 @@ protected: virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - // Transformationen + // transformations B3dCamera aCameraSet; Camera3D aCamera; - // #110988# Imp3DDepthRemapper* mp3DDepthRemapper; // Flag to determine if only selected objects should be drawn @@ -96,7 +95,6 @@ protected: protected: void SetDefaultAttributes(E3dDefaultAttributes& rDefault); - // #110988# void ImpCleanup3DDepthMapper(); public: @@ -112,7 +110,6 @@ public: virtual basegfx::B2DPolyPolygon TakeXorPoly() const; - // #110988# sal_uInt32 RemapOrdNum(sal_uInt32 nOrdNum) const; // Perspective: enum ProjectionType { PR_PARALLEL, PR_PERSPECTIVE } @@ -213,7 +210,8 @@ public: const Camera3D& GetCamera() const { return aCamera; } void removeAllNonSelectedObjects(); - virtual void operator=(const SdrObject&); + virtual E3dScene* Clone() const; + E3dScene& operator=(const E3dScene&); virtual SdrObjGeoData *NewGeoData() const; virtual void SaveGeoData(SdrObjGeoData& rGeo) const; @@ -225,28 +223,30 @@ public: virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); void RotateScene(const Point& rRef, long nWink, double sn, double cs); - // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert". + // TakeObjName...() is for the display in the UI, for example "3 frames selected". virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; - // Transformationen rausgeben + // get transformations B3dCamera& GetCameraSet() { return aCameraSet; } - // Aufbrechen + // break up virtual sal_Bool IsBreakObjPossible(); basegfx::B3DVector GetShadowPlaneDirection() const; void SetShadowPlaneDirection(const basegfx::B3DVector& rVec); - // Polygon das waehrend des Erzeugens aufgezogen wird + // polygon which is built during creation virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; // create moves - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); // sal_True=Xor muss repainted werden - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); // true=Xor muss repainted werden + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); }; #endif // _E3D_SCENE3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx index 381221354397..d24b6174fdee 100644 --- a/svx/inc/svx/sdangitm.hxx +++ b/svx/inc/svx/sdangitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,11 +50,9 @@ public: String& rText, const IntlWrapper * pIntlWrapper = 0) const; - -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx index 889207e22d5e..2967e7fa5a27 100644 --- a/svx/inc/svx/sdasaitm.hxx +++ b/svx/inc/svx/sdasaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,8 +29,9 @@ #ifndef _SDASAITM_HXX #define _SDASAITM_HXX +#include <vector> + #include <svl/poolitem.hxx> -#include <tools/list.hxx> class SdrCustomShapeAdjustmentValue { @@ -46,7 +48,7 @@ class SdrCustomShapeAdjustmentValue class SdrCustomShapeAdjustmentItem : public SfxPoolItem { - List aAdjustmentValueList; + std::vector<SdrCustomShapeAdjustmentValue> aAdjustmentValueList; public : @@ -64,15 +66,10 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - - -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - sal_uInt32 GetCount() const { return aAdjustmentValueList.Count(); }; + sal_uInt32 GetCount() const { return aAdjustmentValueList.size(); }; SVX_DLLPUBLIC const SdrCustomShapeAdjustmentValue& GetValue( sal_uInt32 nIndex ) const; SVX_DLLPUBLIC void SetValue( sal_uInt32 nIndex, const SdrCustomShapeAdjustmentValue& rVal ); @@ -80,3 +77,4 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx index 41218bd401f7..caa88b2f9f14 100644 --- a/svx/inc/svx/sdasitm.hxx +++ b/svx/inc/svx/sdasitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,7 +36,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Any.hxx> #include <rtl/ustring.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <map> #include "svx/svxdllapi.h" @@ -59,20 +60,20 @@ public: typedef std::pair < const ::rtl::OUString, const ::rtl::OUString > PropertyPair; private: - struct SVX_DLLPRIVATE PropertyEq + struct SVX_DLLPUBLIC PropertyEq { bool operator()( const rtl::OUString&, const rtl::OUString& ) const; }; - struct SVX_DLLPRIVATE PropertyPairEq + struct SVX_DLLPUBLIC PropertyPairEq { bool operator()( const SdrCustomShapeGeometryItem::PropertyPair&, const SdrCustomShapeGeometryItem::PropertyPair& ) const; }; - struct SVX_DLLPRIVATE PropertyPairHash + struct SVX_DLLPUBLIC PropertyPairHash { - size_t operator()( const SdrCustomShapeGeometryItem::PropertyPair &r1 ) const; + size_t operator()( const SdrCustomShapeGeometryItem::PropertyPair& ) const; }; - typedef std::hash_map < PropertyPair, sal_Int32, PropertyPairHash, PropertyPairEq > PropertyPairHashMap; - typedef std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash, PropertyEq > PropertyHashMap; + typedef boost::unordered_map < PropertyPair, sal_Int32, PropertyPairHash, PropertyPairEq > PropertyPairHashMap; + typedef boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash, PropertyEq > PropertyHashMap; PropertyHashMap aPropHashMap; PropertyPairHashMap aPropPairHashMap; @@ -99,14 +100,11 @@ private: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const; -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif com::sun::star::uno::Any* GetPropertyValueByName( const rtl::OUString& rPropName ); com::sun::star::uno::Any* GetPropertyValueByName( const rtl::OUString& rPropName, const rtl::OUString& rPropName2 ); @@ -144,3 +142,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sderitm.hxx b/svx/inc/svx/sderitm.hxx index 37c63a2cbc35..89d5af671f8d 100644 --- a/svx/inc/svx/sderitm.hxx +++ b/svx/inc/svx/sderitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdgcoitm.hxx b/svx/inc/svx/sdgcoitm.hxx index 83a0f7806db1..98da8b675d14 100644 --- a/svx/inc/svx/sdgcoitm.hxx +++ b/svx/inc/svx/sdgcoitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ public: }; #endif // _SDGCOITM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdgcpitm.hxx b/svx/inc/svx/sdgcpitm.hxx index 0a14d64a9c53..7b15df1954ef 100644 --- a/svx/inc/svx/sdgcpitm.hxx +++ b/svx/inc/svx/sdgcpitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ public: }; #endif // _SDGCPITM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdggaitm.hxx b/svx/inc/svx/sdggaitm.hxx index 8a3a17bdad4e..f7e679c42615 100644 --- a/svx/inc/svx/sdggaitm.hxx +++ b/svx/inc/svx/sdggaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,8 +49,10 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif // _SDGGAITM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdginitm.hxx b/svx/inc/svx/sdginitm.hxx index 41d37fbe5642..5363e17edf47 100644 --- a/svx/inc/svx/sdginitm.hxx +++ b/svx/inc/svx/sdginitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,3 +51,5 @@ public: }; #endif // _SDGINITM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdgluitm.hxx b/svx/inc/svx/sdgluitm.hxx index afa5eea3fd19..08e2b8df3e08 100644 --- a/svx/inc/svx/sdgluitm.hxx +++ b/svx/inc/svx/sdgluitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ public: }; #endif // _SDGLUITM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx index 7e79d6020ab1..eeb2834125f8 100644 --- a/svx/inc/svx/sdgmoitm.hxx +++ b/svx/inc/svx/sdgmoitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ public: }; #endif // _SDGMOITM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdgtritm.hxx b/svx/inc/svx/sdgtritm.hxx index af80263dba00..fc3452dabbf8 100644 --- a/svx/inc/svx/sdgtritm.hxx +++ b/svx/inc/svx/sdgtritm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif // _SDGTRITM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx index a92e9f0944b8..6dde4fbfd75f 100644 --- a/svx/inc/svx/sdmetitm.hxx +++ b/svx/inc/svx/sdmetitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,8 +34,8 @@ //------------------------------------------------------------ // class SdrAngleItem -// Fuer alle Metriken. GetPresentation liefert dann bei -// Value=2500 z.B. ein "25mm". +// For all metrics. GetPresentation returns for example for +// Value=2500 a "25mm". //------------------------------------------------------------ class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item { public: @@ -44,18 +45,16 @@ public: SdrMetricItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual FASTBOOL HasMetrics() const; - virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); + virtual bool HasMetrics() const; + virtual bool ScaleMetrics(long nMul, long nDiv); virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; - -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx index b5bb0b877189..1bb3977df997 100644 --- a/svx/inc/svx/sdooitm.hxx +++ b/svx/inc/svx/sdooitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,8 +34,8 @@ //------------------------------------------------------------ // class SdrOnOffItem -// hier liefert GetValueTextByVal() "an" oder "aus" -// anstelle von "TRUE" und "FALSE" +// here GetValueTextByVal() returns "an" or "aus" instead +// of "TRUE" or "FALSE" //------------------------------------------------------------ class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem { public: @@ -48,11 +49,9 @@ public: virtual String GetValueTextByVal(sal_Bool bVal) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; - -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx index 39b102f0b4ac..fd93052370e7 100644 --- a/svx/inc/svx/sdprcitm.hxx +++ b/svx/inc/svx/sdprcitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ //------------------------------------------------------------ // class SdrPercentItem -// Ganze Prozente von 0 +// Integer percents of 0 //------------------------------------------------------------ class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item @@ -47,15 +48,11 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; - -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif }; //------------------------------------------------------------ // class SdrSignedPercentItem -// Ganze Prozente von +/- +// Integer percents of +/- //------------------------------------------------------------ class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item @@ -69,11 +66,9 @@ public: virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0 ) const; - -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/animation/animationstate.hxx b/svx/inc/svx/sdr/animation/animationstate.hxx index 3728d1724cd2..831085abdae8 100644 --- a/svx/inc/svx/sdr/animation/animationstate.hxx +++ b/svx/inc/svx/sdr/animation/animationstate.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,3 +82,5 @@ namespace sdr #endif //_SDR_ANIMATION_ANIMATIONSTATE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/animation/objectanimator.hxx b/svx/inc/svx/sdr/animation/objectanimator.hxx index adc7f8ffebaf..60496ab5b1b5 100644 --- a/svx/inc/svx/sdr/animation/objectanimator.hxx +++ b/svx/inc/svx/sdr/animation/objectanimator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,5 @@ namespace sdr #endif //_SDR_ANIMATION_OBJECTANIMATOR_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/animation/scheduler.hxx b/svx/inc/svx/sdr/animation/scheduler.hxx index 21547ed51da0..61bcaf647372 100644 --- a/svx/inc/svx/sdr/animation/scheduler.hxx +++ b/svx/inc/svx/sdr/animation/scheduler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,7 +59,7 @@ namespace sdr // get/set time sal_uInt32 GetTime() const; - void SetTime(sal_uInt32 nNew); + void SVX_DLLPUBLIC SetTime(sal_uInt32 nNew); // execute event virtual void Trigger(sal_uInt32 nTime) = 0; @@ -142,7 +143,7 @@ namespace sdr void checkTimeout(); // insert/remove events, wrapper to EventList methods - void InsertEvent(Event* pNew); + void SVX_DLLPUBLIC InsertEvent(Event* pNew); void RemoveEvent(Event* pOld); // get/set pause @@ -157,3 +158,5 @@ namespace sdr #endif //_SDR_ANIMATION_SCHEDULER_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx index df8ee7c666a9..30fad2d951ee 100644 --- a/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,10 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrallattribute.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -78,3 +75,5 @@ namespace drawinglayer #endif // _SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx index 03b86ff33a0f..af9536285788 100644 --- a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,5 @@ namespace drawinglayer #endif // _SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx b/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx index fd72607b2f08..9bafe2a5f832 100644 --- a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ namespace drawinglayer #endif // _SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx index c2fa9200dfe8..4ded352a8f1d 100644 --- a/svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,10 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrallattribute.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -79,3 +76,5 @@ namespace drawinglayer #endif // _SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx index e5d19cef5f4e..40321dcd5196 100644 --- a/svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,10 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrallattribute.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -77,3 +74,5 @@ namespace drawinglayer #endif // _SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx index f71a74d6a580..003b0eacf0e4 100644 --- a/svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,10 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrallattribute.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -74,3 +71,5 @@ namespace drawinglayer #endif // _SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx index f202eabbfbff..bf8f14b401e8 100644 --- a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,6 +76,7 @@ namespace drawinglayer SdrTextVertAdjust aSdrTextVertAdjust, bool bContour, bool bFitToSize, + bool bAutoFit, bool bHideContour, bool bBlink, bool bScroll, @@ -97,6 +99,7 @@ namespace drawinglayer const OutlinerParaObject& getOutlinerParaObject() const; bool isContour() const; bool isFitToSize() const; + bool isAutoFit() const; bool isHideContour() const; bool isBlink() const; bool isScroll() const; @@ -128,3 +131,5 @@ namespace drawinglayer #endif // _SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/displayinfo.hxx b/svx/inc/svx/sdr/contact/displayinfo.hxx index 777e0abdd09b..319bd8972d13 100644 --- a/svx/inc/svx/sdr/contact/displayinfo.hxx +++ b/svx/inc/svx/sdr/contact/displayinfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -127,3 +128,5 @@ namespace sdr #endif //_SDR_CONTACT_DISPLAYINFO_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/objectcontact.hxx b/svx/inc/svx/sdr/contact/objectcontact.hxx index d88ea3dc2a12..eb1246cfef27 100644 --- a/svx/inc/svx/sdr/contact/objectcontact.hxx +++ b/svx/inc/svx/sdr/contact/objectcontact.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -227,3 +228,5 @@ namespace sdr #endif //_SDR_CONTACT_OBJECTCONTACT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx index 870192c9b151..8ba4668ebd98 100644 --- a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -151,3 +152,5 @@ namespace sdr #endif //_SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx index fc0a51c9eea8..189e6ac94233 100644 --- a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx +++ b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -151,3 +152,5 @@ namespace sdr #endif //_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/objectcontacttools.hxx b/svx/inc/svx/sdr/contact/objectcontacttools.hxx index b7f22868ec57..83f704004555 100644 --- a/svx/inc/svx/sdr/contact/objectcontacttools.hxx +++ b/svx/inc/svx/sdr/contact/objectcontacttools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,6 +30,7 @@ #define _SDR_CONTACT_OBJECTCONTACTTOOLS_HXX #include <drawinglayer/geometry/viewinformation2d.hxx> +#include "svx/svxdllapi.h" ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -48,7 +50,7 @@ namespace sdr // create a mating VCL-Provessor for given OutputDevice. This includes // looking for MetaFile-recording. The returned renderer changes owner, // deletion is duty of the caller - drawinglayer::processor2d::BaseProcessor2D* createBaseProcessor2DFromOutputDevice( + SVX_DLLPUBLIC drawinglayer::processor2d::BaseProcessor2D* createBaseProcessor2DFromOutputDevice( OutputDevice& rTargetOutDev, const drawinglayer::geometry::ViewInformation2D& rViewInformation2D); @@ -60,3 +62,5 @@ namespace sdr #endif //_SDR_CONTACT_OBJECTCONTACTTOOLS_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontact.hxx b/svx/inc/svx/sdr/contact/viewcontact.hxx index f4675f2728fc..1271ebf09f20 100644 --- a/svx/inc/svx/sdr/contact/viewcontact.hxx +++ b/svx/inc/svx/sdr/contact/viewcontact.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -170,3 +171,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx index b8e30b320a79..950ef0639c89 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -118,3 +119,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFE3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx index cccb51a4b8cc..6e7b11018ca3 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX #define _SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX -#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX #include <svx/sdr/contact/viewcontactofe3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -69,3 +68,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx index 4fa152af362d..3c04d6440a15 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX #define _SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX -#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX #include <svx/sdr/contact/viewcontactofe3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -69,3 +68,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx index 5c8502348b00..660c2ddda270 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX #define _SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX -#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX #include <svx/sdr/contact/viewcontactofe3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -69,3 +68,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx index f681655888aa..e8d958ef0244 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX #define _SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX -#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX #include <svx/sdr/contact/viewcontactofe3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -69,3 +68,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx index 0b2efdc3d313..539734864145 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -120,3 +121,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFE3DSCENE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx index 68a64e888d91..d4dc0ab51d74 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX #define _SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX -#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX #include <svx/sdr/contact/viewcontactofe3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -69,3 +68,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx index b207c3e7fbde..6122df208400 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx b/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx index 189f69a7311b..6f3dec253792 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx index c408f1373e4c..767242b9608c 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx index 54d188d198cc..ba7f940bcbae 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx index 5171ce75204f..b3ecfa45e878 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx index 3d0ed6b56a59..ca1459d45544 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx index 97ccf16c8c0a..fcf8360696ac 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx index 97f258b2cda5..ebe9dbc09cc6 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index 975ce214f3e8..5a3de115110a 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// #endif //_SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx index c9ac57389799..9ae4bbcea0c6 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDROBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx index b58356283e57..76584727336f 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx index 76ff4f8e5632..c67fae1e9173 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,7 +65,7 @@ namespace sdr // scaling (e.g. for EmptyPresObj's), the correct graphic and other stuff. It is used from // createViewIndependentPrimitive2DSequence with false, and with evtl. HighContrast true // from the VOC which knows that - drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceWithParameters(bool bHighContrast) const; + drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceWithParameters() const; protected: // This method is responsible for creating the graphical visualisation data @@ -79,3 +80,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx index 54ddb9c299b3..8a2748488e2f 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -309,3 +310,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx index 1d2127a3ab80..cc9d113d9117 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx index dddedd4e9f5b..7a59cf5b8a4b 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx b/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx index 933199761f5a..6382edafd227 100644 --- a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx index d0263ce60506..1abc0e6f3c37 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ namespace sdr { namespace contact { #endif // SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx index 7aef09535149..0b88193dc410 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWCONTACTOFVIRTOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx index 3917caebef0e..49fec4091d54 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -155,3 +156,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx index 9306f76a5371..1589a5d7be7d 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx index 49d35b90d03f..101263f0f9cf 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx index ee0620353765..486ae55fb03e 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx index da92072fef18..e189a63f1a73 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx index 3cb7ba2a7f84..1a4e8840a8e3 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx index 747f25cba3b6..7efde1c888d5 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx index d0fcfd6698f9..86a96caef404 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// #endif // _SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx index 88245c46399e..e366bbda02f3 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx index db3020023198..bec0c9c309a6 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx index 379112a35d30..ebfa29247233 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -244,3 +245,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx index 9e70771e5844..b52fa263c9c4 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -140,3 +141,4 @@ namespace sdr { namespace contact { #endif // SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx index 00f18751fb81..697782219133 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,3 +73,5 @@ namespace sdr #endif //_SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/event/eventhandler.hxx b/svx/inc/svx/sdr/event/eventhandler.hxx index f8c07c2d84e5..a5c3b0df4ec4 100644 --- a/svx/inc/svx/sdr/event/eventhandler.hxx +++ b/svx/inc/svx/sdr/event/eventhandler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -138,3 +139,5 @@ namespace sdr #endif //_SDR_EVENT_EVENTHANDLER_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx index dd22a50480de..6a839100ada0 100644 --- a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYANIMATEDBITMAPEX_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx index 1fbf0b6add3d..1892ff2632ec 100644 --- a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx +++ b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYBITMAPEX_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx b/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx index 13e45fa47baf..c95f6a069f89 100644 --- a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx +++ b/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx index ce17ef86d881..cd1bcb4da127 100644 --- a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx +++ b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYHATCHRECT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayhelpline.hxx b/svx/inc/svx/sdr/overlay/overlayhelpline.hxx index c8f26639f032..7622a46e36c2 100644 --- a/svx/inc/svx/sdr/overlay/overlayhelpline.hxx +++ b/svx/inc/svx/sdr/overlay/overlayhelpline.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYHELPLINE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayline.hxx b/svx/inc/svx/sdr/overlay/overlayline.hxx index 3df8dc0f4f05..fc235b70b241 100644 --- a/svx/inc/svx/sdr/overlay/overlayline.hxx +++ b/svx/inc/svx/sdr/overlay/overlayline.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYLINE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlaymanager.hxx b/svx/inc/svx/sdr/overlay/overlaymanager.hxx index 379086211cbf..532b481e81f9 100644 --- a/svx/inc/svx/sdr/overlay/overlaymanager.hxx +++ b/svx/inc/svx/sdr/overlay/overlaymanager.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -148,3 +149,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYMANAGER_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx index fb21fa328232..0d0a1a5d8d26 100644 --- a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx +++ b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayobject.hxx b/svx/inc/svx/sdr/overlay/overlayobject.hxx index 0200e859d370..321190931a58 100644 --- a/svx/inc/svx/sdr/overlay/overlayobject.hxx +++ b/svx/inc/svx/sdr/overlay/overlayobject.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -201,3 +202,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYOBJECT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx b/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx index 5d43983a57b0..4357d298c0b0 100644 --- a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx +++ b/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYLINE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx index 181ccdfb7831..43374b9ac359 100644 --- a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx +++ b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYOBJECTLIST_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx index 7107a92c286c..3622e7322df5 100644 --- a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx +++ b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYPOLYPOLYGON_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx index 049dfefe585d..165968176e5b 100644 --- a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx +++ b/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYPRIMITIVE2DSEQUENCEOBJECT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx index 0dec8ac62fd9..5a0b7adb1921 100644 --- a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx +++ b/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYROOLINGRECTANGLE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlayselection.hxx b/svx/inc/svx/sdr/overlay/overlayselection.hxx index 4372929d4317..153073dceaa2 100644 --- a/svx/inc/svx/sdr/overlay/overlayselection.hxx +++ b/svx/inc/svx/sdr/overlay/overlayselection.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYSELECTION_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlaytools.hxx b/svx/inc/svx/sdr/overlay/overlaytools.hxx index 4142e326a910..bf32a4934702 100644 --- a/svx/inc/svx/sdr/overlay/overlaytools.hxx +++ b/svx/inc/svx/sdr/overlay/overlaytools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -276,3 +277,5 @@ namespace drawinglayer #endif //_SDR_OVERLAY_OVERLAYTOOLS_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx b/svx/inc/svx/sdr/overlay/overlaytriangle.hxx index 5479f65984ea..25e942908075 100644 --- a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx +++ b/svx/inc/svx/sdr/overlay/overlaytriangle.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ namespace sdr #endif //_SDR_OVERLAY_OVERLAYTRIANGLE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx index 09ba09a12f04..1e944e89cedc 100644 --- a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_PRIMITIVEFACTORY2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx b/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx index 9ea424217757..c50ec38dc5c7 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -138,3 +139,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx index b8039fd33c61..d078b90c4546 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,3 +86,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx index d532d733e60e..1e94f2bc8a99 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx index 9b2a12e5d386..9e55c0601bb7 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDCUSTOMSHAPEPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx index 7ef8f3a3f476..c959da50220f 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx index 84f1dfad9b00..c8d6b3c6ced1 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -118,3 +119,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx index f488dfaa2ee4..1b07fb228c8b 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx index 943cbbf65940..275e93e3cedd 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -131,3 +132,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx index 45702d3300e3..5667aed11dda 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx index 9aa5c854abfd..314c15436b0a 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,7 +26,7 @@ * ************************************************************************/ -#ifndef INCLUDED_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX +#ifndef INCLUDED_SDR_PRIMITIVE2D_SdrOleContentPrimitive2D_HXX #define INCLUDED_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX #include <drawinglayer/primitive2d/baseprimitive2d.hxx> @@ -54,9 +55,6 @@ namespace drawinglayer // be expensive, e.g. triggering chart creation) sal_uInt32 mnGraphicVersion; - // bitfield - unsigned mbHighContrast : 1; - protected: // local decomposition. virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; @@ -65,8 +63,8 @@ namespace drawinglayer SdrOleContentPrimitive2D( const SdrOle2Obj& rSdrOle2Obj, const basegfx::B2DHomMatrix& rObjectTransform, - sal_uInt32 nGraphicVersion, - bool bHighContrast); + sal_uInt32 nGraphicVersion + ); // compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const; @@ -77,7 +75,6 @@ namespace drawinglayer // data access const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; } sal_uInt32 getGraphicVersion() const { return mnGraphicVersion; } - bool getHighContrast() const { return mbHighContrast; } // provide unique ID DeclPrimitrive2DIDBlock() @@ -90,3 +87,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx index 0601a0696c49..b3476bbeee7f 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx index b3472b4f13ba..8bd35f2d5233 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_PRIMITIVETOOLS_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx index b5c42d850be0..86fd6b453ea4 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,5 @@ namespace drawinglayer #endif //INCLUDED_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx index a6e963c7ef13..46e1a683f9c9 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -300,6 +301,49 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// +namespace drawinglayer +{ + namespace primitive2d + { + class SdrAutoFitTextPrimitive2D : public SdrTextPrimitive2D + { + private: + ::basegfx::B2DHomMatrix maTextRangeTransform; // text range transformation from unit range ([0.0 .. 1.0]) to text range + + // bitfield + unsigned mbWordWrap : 1; // for CustomShapes text layout + + protected: + // local decomposition. + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + + public: + SdrAutoFitTextPrimitive2D( + const SdrText* pSdrText, + const OutlinerParaObject& rOutlinerParaObjectPtr, + const ::basegfx::B2DHomMatrix& rTextRangeTransform, + bool bWordWrap); + + // get data + const basegfx::B2DHomMatrix& getTextRangeTransform() const { return maTextRangeTransform; } + bool getWordWrap() const { return mbWordWrap; } + + // compare operator + virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + + // transformed clone operator + virtual SdrTextPrimitive2D* createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const; + + // provide unique ID + DeclPrimitrive2DIDBlock() + }; + } // end of namespace primitive2d +} // end of namespace drawinglayer + +////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx b/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx index 53707f18fa4b..225fb2302b62 100644 --- a/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,6 +56,7 @@ #define PRIMITIVE2D_ID_OVERLAYROLLINGRECTANGLEPRIMITIVE (PRIMITIVE2D_ID_RANGE_SVX| 20) #define PRIMITIVE2D_ID_SDRCONTROLPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 21) #define PRIMITIVE2D_ID_SDROLECONTENTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 22) +#define PRIMITIVE2D_ID_SDRAUTOFITTEXTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 23) ////////////////////////////////////////////////////////////////////////////// @@ -62,3 +64,5 @@ ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx b/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx index 809d3f71b11c..193ec4d0a1cb 100644 --- a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx +++ b/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ namespace drawinglayer #endif //_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/attributeproperties.hxx b/svx/inc/svx/sdr/properties/attributeproperties.hxx index a8df62b52a67..0646373e5289 100644 --- a/svx/inc/svx/sdr/properties/attributeproperties.hxx +++ b/svx/inc/svx/sdr/properties/attributeproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ namespace sdr #endif //_SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/captionproperties.hxx b/svx/inc/svx/sdr/properties/captionproperties.hxx index 124bc19b67f1..3ce2a5ac1def 100644 --- a/svx/inc/svx/sdr/properties/captionproperties.hxx +++ b/svx/inc/svx/sdr/properties/captionproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ namespace sdr #endif // _SDR_PROPERTIES_CAPTIONPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/circleproperties.hxx b/svx/inc/svx/sdr/properties/circleproperties.hxx index 57efd50b0e01..17d85e975479 100644 --- a/svx/inc/svx/sdr/properties/circleproperties.hxx +++ b/svx/inc/svx/sdr/properties/circleproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ namespace sdr #endif //_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/connectorproperties.hxx b/svx/inc/svx/sdr/properties/connectorproperties.hxx index 30752f149200..e95f99f05215 100644 --- a/svx/inc/svx/sdr/properties/connectorproperties.hxx +++ b/svx/inc/svx/sdr/properties/connectorproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,5 @@ namespace sdr #endif //_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/customshapeproperties.hxx b/svx/inc/svx/sdr/properties/customshapeproperties.hxx index 8adbf10107d9..dd779e5711b9 100644 --- a/svx/inc/svx/sdr/properties/customshapeproperties.hxx +++ b/svx/inc/svx/sdr/properties/customshapeproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ namespace sdr #endif //_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/defaultproperties.hxx b/svx/inc/svx/sdr/properties/defaultproperties.hxx index 58aceccadf1a..dab2804ad15b 100644 --- a/svx/inc/svx/sdr/properties/defaultproperties.hxx +++ b/svx/inc/svx/sdr/properties/defaultproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,3 +111,5 @@ namespace sdr #endif //_SDR_PROPERTIES_DEFAULTPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx index 085da6720382..9d5fcdfe230b 100644 --- a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ namespace sdr #endif // _SDR_PROPERTIES_E3DCOMPOUNDPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx b/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx index f6baf589d642..3d4ab5f7fd8e 100644 --- a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,5 @@ namespace sdr #endif // _SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx b/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx index 37810b36de0e..d338fcdeba3d 100644 --- a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,5 @@ namespace sdr #endif // _SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/e3dproperties.hxx b/svx/inc/svx/sdr/properties/e3dproperties.hxx index 957e37cac0b6..a94b27aa2503 100644 --- a/svx/inc/svx/sdr/properties/e3dproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ namespace sdr #endif // _SDR_PROPERTIES_E3DPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx b/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx index 0ef471999fb6..cb38bc5aed65 100644 --- a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,5 @@ namespace sdr #endif // _SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx b/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx index 73b68b04e418..c97681619e7a 100644 --- a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ namespace sdr // eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/emptyproperties.hxx b/svx/inc/svx/sdr/properties/emptyproperties.hxx index 8cab0b03ca41..c4aea4dcf8f7 100644 --- a/svx/inc/svx/sdr/properties/emptyproperties.hxx +++ b/svx/inc/svx/sdr/properties/emptyproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,5 @@ namespace sdr #endif //_SDR_PROPERTIES_EMPTYPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/graphicproperties.hxx b/svx/inc/svx/sdr/properties/graphicproperties.hxx index b3e04a67da55..1f76f8c4c1c9 100644 --- a/svx/inc/svx/sdr/properties/graphicproperties.hxx +++ b/svx/inc/svx/sdr/properties/graphicproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ namespace sdr #endif //_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/groupproperties.hxx b/svx/inc/svx/sdr/properties/groupproperties.hxx index f91f91db42d4..27d31fd2d8ac 100644 --- a/svx/inc/svx/sdr/properties/groupproperties.hxx +++ b/svx/inc/svx/sdr/properties/groupproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -127,3 +128,5 @@ namespace sdr #endif //_SDR_PROPERTIES_GROUPPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/itemsettools.hxx b/svx/inc/svx/sdr/properties/itemsettools.hxx index d52189ae93cc..d5368b0ec3c9 100644 --- a/svx/inc/svx/sdr/properties/itemsettools.hxx +++ b/svx/inc/svx/sdr/properties/itemsettools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ namespace sdr #endif //_SDR_PROPERTIES_ITEMSETTOOLS_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/measureproperties.hxx b/svx/inc/svx/sdr/properties/measureproperties.hxx index a204ebfe9949..7ca66b83686f 100644 --- a/svx/inc/svx/sdr/properties/measureproperties.hxx +++ b/svx/inc/svx/sdr/properties/measureproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ namespace sdr #endif //_SDR_PROPERTIES_MEASUREPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/oleproperties.hxx b/svx/inc/svx/sdr/properties/oleproperties.hxx index 009c375dff99..6e1b0c88ae83 100644 --- a/svx/inc/svx/sdr/properties/oleproperties.hxx +++ b/svx/inc/svx/sdr/properties/oleproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,9 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: graphicproperties.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -67,3 +65,5 @@ namespace sdr #endif //_SDR_PROPERTIES_OLEPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/pageproperties.hxx b/svx/inc/svx/sdr/properties/pageproperties.hxx index d85686b3bc5b..592bc38612f5 100644 --- a/svx/inc/svx/sdr/properties/pageproperties.hxx +++ b/svx/inc/svx/sdr/properties/pageproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,4 @@ namespace sdr // eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/properties.hxx b/svx/inc/svx/sdr/properties/properties.hxx index 311c2ccfd1a5..eb4cb69fb33a 100644 --- a/svx/inc/svx/sdr/properties/properties.hxx +++ b/svx/inc/svx/sdr/properties/properties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -195,3 +196,5 @@ namespace sdr #endif //_SDR_PROPERTIES_PROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/rectangleproperties.hxx b/svx/inc/svx/sdr/properties/rectangleproperties.hxx index ea61a3bdf1b2..2fd717b16e0e 100644 --- a/svx/inc/svx/sdr/properties/rectangleproperties.hxx +++ b/svx/inc/svx/sdr/properties/rectangleproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ namespace sdr #endif //_SDR_PROPERTIES_RECTANGLEPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/properties/textproperties.hxx b/svx/inc/svx/sdr/properties/textproperties.hxx index 9a891f424461..243ef156ed31 100644 --- a/svx/inc/svx/sdr/properties/textproperties.hxx +++ b/svx/inc/svx/sdr/properties/textproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,5 @@ namespace sdr #endif //_SDR_PROPERTIES_TEXTPROPERTIES_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdr/table/tabledesign.hxx b/svx/inc/svx/sdr/table/tabledesign.hxx index a062ec5210fb..8488b425ddc8 100644 --- a/svx/inc/svx/sdr/table/tabledesign.hxx +++ b/svx/inc/svx/sdr/table/tabledesign.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ extern SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::contain #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdrcomment.hxx b/svx/inc/svx/sdrcomment.hxx index 1c087d3f445d..f89e9ac9196b 100644 --- a/svx/inc/svx/sdrcomment.hxx +++ b/svx/inc/svx/sdrcomment.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,5 @@ namespace sdr #endif //_SDR_COMMENT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdrhittesthelper.hxx b/svx/inc/svx/sdrhittesthelper.hxx index cc57aec9cfb6..88e08a49a362 100644 --- a/svx/inc/svx/sdrhittesthelper.hxx +++ b/svx/inc/svx/sdrhittesthelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,5 @@ SVX_DLLPUBLIC bool ViewObjectContactPrimitiveHit( ///////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdrmasterpagedescriptor.hxx b/svx/inc/svx/sdrmasterpagedescriptor.hxx index 3a31c3d11206..db41ca8390cd 100644 --- a/svx/inc/svx/sdrmasterpagedescriptor.hxx +++ b/svx/inc/svx/sdrmasterpagedescriptor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ namespace sdr #endif //_SDR_MASTERPAGEDESCRIPTOR_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdrobjectfilter.hxx b/svx/inc/svx/sdrobjectfilter.hxx index 55eda09c99af..442970fab754 100644 --- a/svx/inc/svx/sdrobjectfilter.hxx +++ b/svx/inc/svx/sdrobjectfilter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -28,9 +29,6 @@ #include "svx/svxdllapi.h" -/** === begin UNO includes === **/ -/** === end UNO includes === **/ - class SdrObject; //........................................................................ @@ -56,3 +54,5 @@ namespace svx //........................................................................ #endif // SDROBJECTFILTER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdrobjectuser.hxx b/svx/inc/svx/sdrobjectuser.hxx index 6d3112d15484..73499ab2aaa5 100644 --- a/svx/inc/svx/sdrobjectuser.hxx +++ b/svx/inc/svx/sdrobjectuser.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ namespace sdr #endif //_SDR_OBJECTUSER_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdrpageuser.hxx b/svx/inc/svx/sdrpageuser.hxx index d3f35e059fbd..42d9b4b34993 100644 --- a/svx/inc/svx/sdrpageuser.hxx +++ b/svx/inc/svx/sdrpageuser.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ namespace sdr #endif //_SDR_PAGEUSER_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx index 29c08d6335e3..c073a91fd77f 100644 --- a/svx/inc/svx/sdrpagewindow.hxx +++ b/svx/inc/svx/sdrpagewindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,7 +93,6 @@ class SVX_DLLPUBLIC SdrPageWindow void* mpDummy; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > mxControlContainer; - // #110094# ObjectContact section sdr::contact::ObjectContact* CreateViewSpecificObjectContact(); public: @@ -141,3 +141,5 @@ typedef ::std::vector< SdrPageWindow* > SdrPageWindowVector; //////////////////////////////////////////////////////////////////////////////////////////////////// #endif //_SDRPAGEWINDOW_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdrpaintwindow.hxx b/svx/inc/svx/sdrpaintwindow.hxx index fef8c2e604d0..f16fd5a6ef96 100644 --- a/svx/inc/svx/sdrpaintwindow.hxx +++ b/svx/inc/svx/sdrpaintwindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SDRPAINTWINDOW_HXX #define _SDRPAINTWINDOW_HXX -#ifndef _VIRDEV_HXX //autogen #include <vcl/virdev.hxx> -#endif #include "svx/svxdllapi.h" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -165,3 +164,4 @@ typedef ::std::vector< SdrPaintWindow* > SdrPaintWindowVector; #endif //_SDRPAINTWINDOW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdshcitm.hxx b/svx/inc/svx/sdshcitm.hxx index 0c8812c96575..570cbb51dfe6 100644 --- a/svx/inc/svx/sdshcitm.hxx +++ b/svx/inc/svx/sdshcitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,7 +41,8 @@ public: SdrShadowColorItem(const String& rName, const Color& rTheColor): XColorItem(SDRATTR_SHADOWCOLOR,rName,rTheColor) {} -// SdrShadowColorItem(SvStream& rIn): XColorItem(SDRATTR_SHADOWCOLOR,rIn) {} }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdshitm.hxx b/svx/inc/svx/sdshitm.hxx index 6201fbeb833c..0b75c81acf14 100644 --- a/svx/inc/svx/sdshitm.hxx +++ b/svx/inc/svx/sdshitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,9 +28,7 @@ #ifndef _SDSHITM_HXX #define _SDSHITM_HXX -#ifndef _SDOOITEM_HXX #include <svx/sdooitm.hxx> -#endif #include <svx/svddef.hxx> //------------------------------ @@ -42,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdshtitm.hxx b/svx/inc/svx/sdshtitm.hxx index 787ed8b3c355..245f586bb299 100644 --- a/svx/inc/svx/sdshtitm.hxx +++ b/svx/inc/svx/sdshtitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdsxyitm.hxx b/svx/inc/svx/sdsxyitm.hxx index 3afc487b3a26..2745400c1911 100644 --- a/svx/inc/svx/sdsxyitm.hxx +++ b/svx/inc/svx/sdsxyitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx index d60e83859eaf..891f7442de98 100644 --- a/svx/inc/svx/sdtaaitm.hxx +++ b/svx/inc/svx/sdtaaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,10 +39,12 @@ public: SdrTextAniAmountItem(SvStream& rIn): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual FASTBOOL HasMetrics() const; - virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); + virtual bool HasMetrics() const; + virtual bool ScaleMetrics(long nMul, long nDiv); virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtacitm.hxx b/svx/inc/svx/sdtacitm.hxx index 05f58b6abd20..a1ab05e71efb 100644 --- a/svx/inc/svx/sdtacitm.hxx +++ b/svx/inc/svx/sdtacitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,7 @@ #include <svl/intitem.hxx> #include <svx/svddef.hxx> -// Anzahl der Durchlaeufe. 0=Endlos. +// Number of loops. 0=infinite. class SdrTextAniCountItem: public SfxUInt16Item { public: SdrTextAniCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {} @@ -38,3 +39,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx index f7d92cf97d14..1fa7e5b452c3 100644 --- a/svx/inc/svx/sdtaditm.hxx +++ b/svx/inc/svx/sdtaditm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,11 +48,11 @@ public: SdrTextAniDirectionItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; // { return 4; } + virtual sal_uInt16 GetValueCount() const; SdrTextAniDirection GetValue() const { return (SdrTextAniDirection)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueTextByPos(sal_uInt16 nPos) const; @@ -59,3 +60,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtagitm.hxx b/svx/inc/svx/sdtagitm.hxx index 77168575ff14..ed6253b71e26 100644 --- a/svx/inc/svx/sdtagitm.hxx +++ b/svx/inc/svx/sdtagitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtaiitm.hxx b/svx/inc/svx/sdtaiitm.hxx index 7e59841c92c4..99f2094adab2 100644 --- a/svx/inc/svx/sdtaiitm.hxx +++ b/svx/inc/svx/sdtaiitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx index e1ca695d2169..a0b9dc388d96 100644 --- a/svx/inc/svx/sdtaitm.hxx +++ b/svx/inc/svx/sdtaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,12 +36,11 @@ // class SdrTextVertAdjustItem //------------------------------ -// Implementiert werden zunaechst nur TOP und CENTER, neustens auch BOTTOM -enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // Kopfbuendig (so wie man es normalerweise kennt) - SDRTEXTVERTADJUST_CENTER, // Zentriert (z.B. fuer die Titeltexte im Draw) - SDRTEXTVERTADJUST_BOTTOM, // Fussbuendig - SDRTEXTVERTADJUST_BLOCK // #103516# support vertical full with supported now - /*,SDRTEXTVERTADJUST_STRETCH*/}; // Auch die Buchstaben in der Hoehe verzerren (ni) +enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // aligned to top (normally used) + SDRTEXTVERTADJUST_CENTER, // centered (for example for the title texts in Draw) + SDRTEXTVERTADJUST_BOTTOM, // aligned to bottom + SDRTEXTVERTADJUST_BLOCK // support vertical full with supported now + /*,SDRTEXTVERTADJUST_STRETCH*/}; // also stretch letters in their height (ni) class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem { public: @@ -52,8 +52,8 @@ public: virtual sal_uInt16 GetValueCount() const; // { return 5; } SdrTextVertAdjust GetValue() const { return (SdrTextVertAdjust)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; @@ -63,11 +63,11 @@ public: // class SdrTextHorzAdjustItem //------------------------------ -enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // Linksbuendig verankert - SDRTEXTHORZADJUST_CENTER, // Zentriert (z.B. fuer die Titeltexte im Draw) - SDRTEXTHORZADJUST_RIGHT, // Rechtsbuendig verankert - SDRTEXTHORZADJUST_BLOCK // So wie es frueher war: Gesamte Textrahmenbreite verwenden, Absatzformatierung macht wieder Sinn - /*,SDRTEXTHORZADJUST_STRETCH*/}; // FitToSize in X-Richtung (ni). +enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted + SDRTEXTHORZADJUST_CENTER, // centered (for example for title texts in Draw) + SDRTEXTHORZADJUST_RIGHT, // right adjusted + SDRTEXTHORZADJUST_BLOCK // use the whole text frame width + /*,SDRTEXTHORZADJUST_STRETCH*/}; // FitToSize in X direction (ni). class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem { public: @@ -76,14 +76,16 @@ public: SdrTextHorzAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_HORZADJUST,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; // { return 5; } + virtual sal_uInt16 GetValueCount() const; SdrTextHorzAdjust GetValue() const { return (SdrTextHorzAdjust)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx index 90a163d426b5..a8690039805d 100644 --- a/svx/inc/svx/sdtakitm.hxx +++ b/svx/inc/svx/sdtakitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,11 +96,13 @@ public: virtual sal_uInt16 GetValueCount() const; // { return 5; } SdrTextAniKind GetValue() const { return (SdrTextAniKind)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtayitm.hxx b/svx/inc/svx/sdtayitm.hxx index eeb1ca587ffb..5089d62c6b05 100644 --- a/svx/inc/svx/sdtayitm.hxx +++ b/svx/inc/svx/sdtayitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtcfitm.hxx b/svx/inc/svx/sdtcfitm.hxx index 17d2e49a8499..d0dd89c01d94 100644 --- a/svx/inc/svx/sdtcfitm.hxx +++ b/svx/inc/svx/sdtcfitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtditm.hxx b/svx/inc/svx/sdtditm.hxx index 5bd53138bd85..5b43059b66a9 100644 --- a/svx/inc/svx/sdtditm.hxx +++ b/svx/inc/svx/sdtditm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtfchim.hxx b/svx/inc/svx/sdtfchim.hxx index a47daa354b76..ca5c8f41975c 100644 --- a/svx/inc/svx/sdtfchim.hxx +++ b/svx/inc/svx/sdtfchim.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,12 +47,10 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - -#ifdef SDR_ISPOOLABLE - SVX_DLLPRIVATE virtual int IsPoolable() const; -#endif + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx index f3f18ed8acac..9af3cf6197dc 100644 --- a/svx/inc/svx/sdtfsitm.hxx +++ b/svx/inc/svx/sdtfsitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,19 +32,21 @@ #include <svx/svddef.hxx> #include "svx/svxdllapi.h" -enum SdrFitToSizeType {SDRTEXTFIT_NONE, // - kein FitToSize - SDRTEXTFIT_PROPORTIONAL, // - Alle Buchstaben proportional umgroessern - SDRTEXTFIT_ALLLINES, // - Zus. jede Zeile separat in der Breite stretchen - SDRTEXTFIT_RESIZEATTR}; // - Bei Rahmenumgroesserung (ausser Autogrow) wird - // die Schriftgroesse umattributiert (hart) +enum SdrFitToSizeType { + SDRTEXTFIT_NONE, // - no fit-to-size + SDRTEXTFIT_PROPORTIONAL, // - resize all glyhs proportionally + // (might scale anisotrophically) + SDRTEXTFIT_ALLLINES, // - like SDRTEXTFIT_PROPORTIONAL, but + // scales each line separately + SDRTEXTFIT_AUTOFIT}; // - mimics PPT's automatic adaption of + // font size to text rect - comparable + // to SDRTEXTFIT_PROPORTIONAL, but + // scales isotrophically -// Bei SDRTEXTFIT_PROPORTIONAL und SDRTEXTFIT_ALLLINES gibt es kein AutoGrow und -// keine automatischen Umbrueche. -// Ist SDRTEXTFIT_RESIZEATTR gesetzt, so wird beim umgroessern des Textrahmens -// (ausser bei AutoGrow) die Schrift durch harte Attributierung ebenfalls -// umgegroessert. -// Bei AutoGrowingWidth gibt es ebenfalls keine automatischen Umbrueche (erst bei -// TextMaxFrameWidth). +// No AutoGrow and no automatic line breaks for +// SDRTEXTFIT_PROPORTIONAL and SDRTEXTFIT_ALLLINES. +// No automatic line breaks for AutoGrowingWidth as well (only if +// TextMaxFrameWidth is reached). //-------------------------------- // class SdrTextFitToSizeTypeItem @@ -58,8 +61,8 @@ public: virtual sal_uInt16 GetValueCount() const; // { return 4; } SdrFitToSizeType GetValue() const { return (SdrFitToSizeType)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; @@ -69,3 +72,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdtmfitm.hxx b/svx/inc/svx/sdtmfitm.hxx index 9cd82fc5870c..a7ae8a3b3a6a 100644 --- a/svx/inc/svx/sdtmfitm.hxx +++ b/svx/inc/svx/sdtmfitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx index 29e13913df06..860f9e09ea17 100644 --- a/svx/inc/svx/sdynitm.hxx +++ b/svx/inc/svx/sdynitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,10 +47,9 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual String GetValueTextByVal(sal_Bool bVal) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/selctrl.hxx b/svx/inc/svx/selctrl.hxx index 792b4862bf04..7ba8e19bd71d 100644 --- a/svx/inc/svx/selctrl.hxx +++ b/svx/inc/svx/selctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/selectioncontroller.hxx b/svx/inc/svx/selectioncontroller.hxx index bd26f9f2df42..cb682e95f21c 100644 --- a/svx/inc/svx/selectioncontroller.hxx +++ b/svx/inc/svx/selectioncontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,4 @@ public: #endif //_SELECTIONCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/shapeproperty.hxx b/svx/inc/svx/shapeproperty.hxx index 9b08d9c741b4..ef2d97d7a5fd 100755..100644 --- a/svx/inc/svx/shapeproperty.hxx +++ b/svx/inc/svx/shapeproperty.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -57,3 +58,5 @@ namespace svx //........................................................................ #endif // SVX_SHAPEPROPERTY_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/shapepropertynotifier.hxx b/svx/inc/svx/shapepropertynotifier.hxx index 573af71bdc2a..684588be0fcd 100644 --- a/svx/inc/svx/shapepropertynotifier.hxx +++ b/svx/inc/svx/shapepropertynotifier.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -146,3 +147,5 @@ namespace svx //........................................................................ #endif // SVX_PROPERTYCHANGENOTIFIER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index c9c59c64f6c3..98020a97fcc4 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,17 +29,11 @@ #ifndef _SVX_SIMPTABL_HXX #define _SVX_SIMPTABL_HXX -#ifndef _MOREBTN_HXX //autogen #include <vcl/morebtn.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <svtools/headbar.hxx> #include <svtools/svtabbx.hxx> #include <vcl/lstbox.hxx> @@ -178,3 +173,4 @@ public: #endif // _SVX_SIMPTABL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sphere3d.hxx b/svx/inc/svx/sphere3d.hxx index 08c5c4eff7f1..7b416d7465c5 100644 --- a/svx/inc/svx/sphere3d.hxx +++ b/svx/inc/svx/sphere3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,7 +71,7 @@ public: virtual sal_uInt16 GetObjIdentifier() const; virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; - virtual void operator=(const SdrObject&); + virtual E3dSphereObj* Clone() const; void ReSegment(sal_uInt32 nHorzSegments, sal_uInt32 nVertSegments); const basegfx::B3DPoint& Center() const { return aCenter; } @@ -86,3 +87,5 @@ public: }; #endif // _E3D_SPHERE3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/splitcelldlg.hxx b/svx/inc/svx/splitcelldlg.hxx index 85ba02eb0e41..4d3e4b1ebdeb 100644 --- a/svx/inc/svx/splitcelldlg.hxx +++ b/svx/inc/svx/splitcelldlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx index c2a7893be044..fc42ce81c067 100644 --- a/svx/inc/svx/srchdlg.hxx +++ b/svx/inc/svx/srchdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,10 +89,10 @@ public: SearchAttrItem& GetObject( sal_uInt16 nPos ) const { return SrchAttrItemList::GetObject( nPos ); } - // der Pointer auf das Item wird nicht kopiert!!! (also nicht l"oschen) + // the pointer to the item is not being copierd, so don't delete void Insert( const SearchAttrItem& rItem ) { SrchAttrItemList::Insert( rItem, SrchAttrItemList::Count() ); } - // l"oscht die Pointer auf die Items + // deletes the pointer to the items void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ); }; @@ -120,10 +121,10 @@ public: /* {k:\svx\prototyp\dialog\svx/srchdlg.hxx} - [Beschreibung] - In diesem Modeless-Dialog werden die Attribute einer Suche eingestellt - und damit eine Suche gestartet. Es sind mehrere Sucharten - ( Suchen, Alle suchen, Ersetzen, Alle ersetzen ) m"oglich. + [Description] + In this modeless dialog the attributes for a search are configured + and a search is started from it. Several search types + (search, search all, replace, replace all) are possible. [Items] <SvxSearchItem><SID_ATTR_SEARCH> @@ -160,6 +161,8 @@ public: sal_Int32 GetTransliterationFlags() const; + void SetSaveToModule(bool b); + private: FixedText aSearchText; ComboBox aSearchLB; @@ -218,9 +221,9 @@ private: sal_Bool bSearch; sal_Bool bFormat; sal_uInt16 nOptions; - FASTBOOL bSet; - FASTBOOL bReadOnly; - FASTBOOL bConstruct; + bool bSet; + bool bReadOnly; + bool bConstruct; sal_uIntPtr nModifyFlag; String aStylesStr; String aLayoutStr; @@ -300,3 +303,4 @@ inline sal_Bool SvxSearchDialog::HasReplaceAttributes() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/stddlg.hxx b/svx/inc/svx/stddlg.hxx index c56cac58f4ae..a4c5b674755d 100644 --- a/svx/inc/svx/stddlg.hxx +++ b/svx/inc/svx/stddlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,4 @@ protected: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/strarray.hxx b/svx/inc/svx/strarray.hxx index 08f4975f1e35..ba2d62e53bd2 100644 --- a/svx/inc/svx/strarray.hxx +++ b/svx/inc/svx/strarray.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ // include --------------------------------------------------------------- -#ifndef _RESARY_HXX //autogen #include <tools/resary.hxx> -#endif #include "svx/svxdllapi.h" // class SvxStringArray ------------------------------------------------- @@ -51,3 +50,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/subtoolboxcontrol.hxx b/svx/inc/svx/subtoolboxcontrol.hxx index f96562661703..754476650eb7 100644 --- a/svx/inc/svx/subtoolboxcontrol.hxx +++ b/svx/inc/svx/subtoolboxcontrol.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdattr.hxx b/svx/inc/svx/svdattr.hxx index 4c4ddde2912d..43ccab00621d 100644 --- a/svx/inc/svx/svdattr.hxx +++ b/svx/inc/svx/svdattr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SVDATTR_HXX #define _SVDATTR_HXX -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #include <tools/solar.h> #include <svx/sdangitm.hxx> #include <svx/sderitm.hxx> @@ -42,25 +41,15 @@ #include <svx/sdshtitm.hxx> #include <svx/sdsxyitm.hxx> #include <svx/sdtaaitm.hxx> -#ifndef _SDTACITM_HXX #include <svx/sdtacitm.hxx> -#endif -#ifndef _SDTACITM_HXX #include <svx/sdtaditm.hxx> -#endif #include <svx/sdtagitm.hxx> #include <svx/sdtaiitm.hxx> #include <svx/sdtaitm.hxx> -#ifndef _SDTAKITM_HXX #include <svx/sdtakitm.hxx> -#endif #include <svx/sdtayitm.hxx> -#ifndef SDTCFITM_HXX #include <svx/sdtcfitm.hxx> -#endif -#ifndef _SDTDITM_HXX #include <svx/sdtditm.hxx> -#endif #include <svx/sdtfsitm.hxx> #include <svx/sdtmfitm.hxx> #include <svx/sdynitm.hxx> @@ -74,3 +63,4 @@ #include <svx/sdasaitm.hxx> #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdattrx.hxx b/svx/inc/svx/svdattrx.hxx index 7fba70ed1ed2..1fd7fed05b23 100644 --- a/svx/inc/svx/svdattrx.hxx +++ b/svx/inc/svx/svdattrx.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ #include <svx/sxcaitm.hxx> #include <svx/sxcecitm.hxx> -#ifndef _SXCGIITM_HXX #include <svx/sxcgitm.hxx> -#endif #include <svx/sxciaitm.hxx> #include <svx/sxcikitm.hxx> #include <svx/sxcllitm.hxx> @@ -44,13 +43,9 @@ #include <svx/sxelditm.hxx> #include <svx/sxenditm.hxx> -#ifndef _SXFIITM_HXX #include <svx/sxfiitm.hxx> -#endif -#ifndef _SXLAYITM_HXX #include <svx/sxlayitm.hxx> -#endif #include <svx/sxlogitm.hxx> #include <svx/sxmbritm.hxx> #include <svx/sxmfsitm.hxx> @@ -58,9 +53,7 @@ #include <svx/sxmoitm.hxx> #include <svx/sxmovitm.hxx> -#ifndef _SXMSIITM_HXX #include <svx/sxmsitm.hxx> -#endif #include <svx/sxmspitm.hxx> #include <svx/sxmsuitm.hxx> #include <svx/sxmtaitm.hxx> @@ -83,3 +76,5 @@ #include <svx/sxtraitm.hxx> #endif //_SVDATTRX_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdcrtv.hxx b/svx/inc/svx/svdcrtv.hxx index a197fded69c9..3e2993bdfe76 100644 --- a/svx/inc/svx/svdcrtv.hxx +++ b/svx/inc/svx/svdcrtv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -207,3 +208,4 @@ public: #endif //_SVDCRTV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svddef.hxx b/svx/inc/svx/svddef.hxx index d702a6eac5ab..9310817af71f 100644 --- a/svx/inc/svx/svddef.hxx +++ b/svx/inc/svx/svddef.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -311,3 +312,4 @@ #endif // _SVDDEF_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svddrag.hxx b/svx/inc/svx/svddrag.hxx index 00355132fab2..8ce675e08a95 100644 --- a/svx/inc/svx/svddrag.hxx +++ b/svx/inc/svx/svddrag.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,11 +70,11 @@ protected: Point aReservePoint4; Rectangle aReserveRect1; Rectangle aReserveRect2; - FASTBOOL bEndDragChangesAttributes; - FASTBOOL bEndDragChangesGeoAndAttributes; - FASTBOOL bMouseIsUp; - FASTBOOL aReserveBool3; - FASTBOOL aReserveBool4; + bool bEndDragChangesAttributes; + bool bEndDragChangesGeoAndAttributes; + bool bMouseIsUp; + bool aReserveBool3; + bool aReserveBool4; long aReserveLong1; long aReserveLong2; long aReserveLong3; @@ -83,21 +84,21 @@ protected: void* aReservePtr3; void* aReservePtr4; - FASTBOOL bShown; // Xor sichrbar? + bool bShown; // Xor sichrbar? sal_uInt16 nMinMov; // Soviel muss erstmal minimal bewegt werden - FASTBOOL bMinMoved; // MinMove durchbrochen? + bool bMinMoved; // MinMove durchbrochen? - FASTBOOL bHorFixed; // nur Vertikal draggen - FASTBOOL bVerFixed; // nur Horizontal draggen - FASTBOOL bWantNoSnap; // sal_True=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet + bool bHorFixed; // nur Vertikal draggen + bool bVerFixed; // nur Horizontal draggen + bool bWantNoSnap; // TRUE=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet // werden soll. Entsprechend wird auch NoSnapPos in den Buffer geschrieben. - FASTBOOL bOrtho4; - FASTBOOL bOrtho8; + bool bOrtho4; + bool bOrtho8; SdrDragMethod* pDragMethod; protected: - void Clear(FASTBOOL bLeaveOne); + void Clear(bool bLeaveOne); Point& Pnt(sal_uIntPtr nNum) { return *((Point*)aPnts.GetObject(nNum)); } //public: SdrDragStatUserData* pUser; // Userdata @@ -129,50 +130,50 @@ public: void SetHdl(SdrHdl* pH) { pHdl=pH; } SdrDragStatUserData* GetUser() const { return pUser; } void SetUser(SdrDragStatUserData* pU) { pUser=pU; } - FASTBOOL IsShown() const { return bShown; } - void SetShown(FASTBOOL bOn) { bShown=bOn; } + bool IsShown() const { return bShown; } + void SetShown(bool bOn) { bShown=bOn; } - FASTBOOL IsMinMoved() const { return bMinMoved; } + bool IsMinMoved() const { return bMinMoved; } void SetMinMoved() { bMinMoved=sal_True; } void ResetMinMoved() { bMinMoved=sal_False; } void SetMinMove(sal_uInt16 nDist) { nMinMov=nDist; if (nMinMov<1) nMinMov=1; } sal_uInt16 GetMinMove() const { return nMinMov; } - FASTBOOL IsHorFixed() const { return bHorFixed; } - void SetHorFixed(FASTBOOL bOn) { bHorFixed=bOn; } - FASTBOOL IsVerFixed() const { return bVerFixed; } - void SetVerFixed(FASTBOOL bOn) { bVerFixed=bOn; } + bool IsHorFixed() const { return bHorFixed; } + void SetHorFixed(bool bOn) { bHorFixed=bOn; } + bool IsVerFixed() const { return bVerFixed; } + void SetVerFixed(bool bOn) { bVerFixed=bOn; } // Hier kann das Obj sagen: "Ich will keinen Koordinatenfang!" // z.B. fuer den Winkel des Kreisbogen... - FASTBOOL IsNoSnap() const { return bWantNoSnap; } - void SetNoSnap(FASTBOOL bOn=sal_True) { bWantNoSnap=bOn; } + bool IsNoSnap() const { return bWantNoSnap; } + void SetNoSnap(bool bOn = true) { bWantNoSnap=bOn; } // Und hier kann das Obj sagen welches Ortho (wenn ueberhaupt eins) // sinnvoll auf ihm angewendet werden kann. // Ortho4 bedeutet Ortho in 4 Richtungen (fuer Rect und Cirt) - FASTBOOL IsOrtho4Possible() const { return bOrtho4; } - void SetOrtho4Possible(FASTBOOL bOn=sal_True) { bOrtho4=bOn; } + bool IsOrtho4Possible() const { return bOrtho4; } + void SetOrtho4Possible(bool bOn = true) { bOrtho4=bOn; } // Ortho8 bedeutet Ortho in 8 Richtungen (fuer Linien) - FASTBOOL IsOrtho8Possible() const { return bOrtho8; } - void SetOrtho8Possible(FASTBOOL bOn=sal_True) { bOrtho8=bOn; } + bool IsOrtho8Possible() const { return bOrtho8; } + void SetOrtho8Possible(bool bOn = true) { bOrtho8=bOn; } // Wird vom gedraggten Objekt gesetzt - FASTBOOL IsEndDragChangesAttributes() const { return bEndDragChangesAttributes; } - void SetEndDragChangesAttributes(FASTBOOL bOn) { bEndDragChangesAttributes=bOn; } - FASTBOOL IsEndDragChangesGeoAndAttributes() const { return bEndDragChangesGeoAndAttributes; } - void SetEndDragChangesGeoAndAttributes(FASTBOOL bOn) { bEndDragChangesGeoAndAttributes=bOn; } + bool IsEndDragChangesAttributes() const { return bEndDragChangesAttributes; } + void SetEndDragChangesAttributes(bool bOn) { bEndDragChangesAttributes=bOn; } + bool IsEndDragChangesGeoAndAttributes() const { return bEndDragChangesGeoAndAttributes; } + void SetEndDragChangesGeoAndAttributes(bool bOn) { bEndDragChangesGeoAndAttributes=bOn; } // Wird von der View gesetzt und kann vom Obj ausgewertet werden - FASTBOOL IsMouseDown() const { return !bMouseIsUp; } - void SetMouseDown(FASTBOOL bDown) { bMouseIsUp=!bDown; } + bool IsMouseDown() const { return !bMouseIsUp; } + void SetMouseDown(bool bDown) { bMouseIsUp=!bDown; } Point KorregPos(const Point& rNow, const Point& rPrev) const; void Reset(const Point& rPnt); void NextMove(const Point& rPnt); - void NextPoint(FASTBOOL bSaveReal=sal_False); + void NextPoint(bool bSaveReal=sal_False); void PrevPoint(); - FASTBOOL CheckMinMoved(const Point& rPnt); + bool CheckMinMoved(const Point& rPnt); long GetDX() const { return GetNow().X()-GetPrev().X(); } long GetDY() const { return GetNow().Y()-GetPrev().Y(); } Fraction GetXFact() const; @@ -190,3 +191,4 @@ public: #endif //_SVDDRAG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svddrgmt.hxx b/svx/inc/svx/svddrgmt.hxx index 9a32905bf37c..d1e9d682c10e 100644 --- a/svx/inc/svx/svddrgmt.hxx +++ b/svx/inc/svx/svddrgmt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,7 +52,7 @@ class SdrDragStat; ////////////////////////////////////////////////////////////////////////////// -class SdrDragEntry +class SVX_DLLPUBLIC SdrDragEntry { private: // bitfield @@ -322,3 +323,5 @@ public: #endif //_SVDDRGMT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svddrgv.hxx b/svx/inc/svx/svddrgv.hxx index 66b2c8643717..6c980399e9e1 100644 --- a/svx/inc/svx/svddrgv.hxx +++ b/svx/inc/svx/svddrgv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -319,3 +320,4 @@ public: #endif //_SVDDRGV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdedtv.hxx b/svx/inc/svx/svdedtv.hxx index a9ad00e3c6d7..e0606970cc4c 100644 --- a/svx/inc/svx/svdedtv.hxx +++ b/svx/inc/svx/svdedtv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -459,3 +460,4 @@ public: #endif //_SVDEDTV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx index aec7a656077e..742473fc1d8b 100644 --- a/svx/inc/svx/svdedxv.hxx +++ b/svx/inc/svx/svdedxv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -304,3 +305,4 @@ protected: #endif //_SVDEDXV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx index f1ba2d3cf93b..f7142e29e24f 100644 --- a/svx/inc/svx/svdetc.hxx +++ b/svx/inc/svx/svdetc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ #include <tools/string.hxx> #include <tools/contnr.hxx> -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif #include <tools/shl.hxx> #include <editeng/outliner.hxx> #include "svx/svxdllapi.h" @@ -125,7 +124,7 @@ public: class SfxItemSet; // Liefert eine Ersatzdarstellung fuer einen XFillStyle // Bei XFILL_NONE gibt's sal_False und rCol bleibt unveraendert. -SVX_DLLPUBLIC FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); +SVX_DLLPUBLIC bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); // Ein Container fuer USHORTs (im Prinzip ein dynamisches Array) class UShortCont { @@ -146,29 +145,24 @@ class ContainerSorter { protected: Container& rCont; private: -//#if 0 // _SOLAR__PRIVATE void ImpSubSort(long nL, long nR) const; -//#endif // __PRIVATE public: ContainerSorter(Container& rNewCont): rCont(rNewCont) {} void DoSort(sal_uIntPtr a=0, sal_uIntPtr b=0xFFFFFFFF) const; -#ifdef This_Is_Just_For_A_Comment - Compare() muss returnieren: - -1 falls *pElem1<*pElem2 - 0 falls *pElem1=*pElem2 - +1 falls *pElem1>*pElem2 -#endif + + // Compare() has to return: + // -1 if *pElem1<*pElem2 + // 0 if *pElem1=*pElem2 + // +1 if *pElem1>*pElem2 virtual int Compare(const void* pElem1, const void* pElem2) const=0; private: // damit keiner vergessen wird virtual void Is1stLessThan2nd(const void* pElem1, const void* pElem2) const; -// virtual FASTBOOL Is1stLessThan2nd(const void* pElem1, const void* pElem2) const=NULL; }; //////////////////////////////////////////////////////////////////////////////////////////////////// -//#if 0 // _SOLAR__PRIVATE #define SDRHDC_SAVEPEN 1 /* Save Linecolor */ #define SDRHDC_SAVEBRUSH 2 /* Save Fillcolorn */ #define SDRHDC_SAVEFONT 4 /* Save Font */ @@ -186,13 +180,12 @@ class ImpSdrHdcMerk Color* pLineColorMerk; sal_uInt16 nMode; public: - ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode=SDRHDC_SAVEALL, FASTBOOL bAutoMerk=sal_True); + ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode=SDRHDC_SAVEALL, bool bAutoMerk = true); ~ImpSdrHdcMerk(); void Save(const OutputDevice& rOut); - FASTBOOL IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; } + bool IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; } void Restore(OutputDevice& rOut, sal_uInt16 nMask=SDRHDC_SAVEALL) const; }; -//#endif // __PRIVATE //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -275,7 +268,7 @@ public: const Link& GetLink(unsigned nNum) const { return *((Link*)(aList.GetObject(nNum))); } void InsertLink(const Link& rLink, unsigned nPos=0xFFFF); void RemoveLink(const Link& rLink); - FASTBOOL HasLink(const Link& rLink) const { return FindEntry(rLink)!=0xFFFF; } + bool HasLink(const Link& rLink) const { return FindEntry(rLink)!=0xFFFF; } }; // Fuer die Factory in SvdObj.CXX @@ -354,3 +347,5 @@ SVX_DLLPUBLIC Color GetTextEditBackgroundColor(const SdrObjEditView& rView); ///////////////////////////////////////////////////////////////////// #endif //_SVDETC_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdfield.hxx b/svx/inc/svx/svdfield.hxx index cf79131a72cd..93d147485dea 100644 --- a/svx/inc/svx/svdfield.hxx +++ b/svx/inc/svx/svdfield.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,3 +35,4 @@ void SVX_DLLPUBLIC SdrRegisterFieldClasses(); #endif //_SVDFIELD_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdglev.hxx b/svx/inc/svx/svdglev.hxx index efded3a48182..83656badf9d9 100644 --- a/svx/inc/svx/svdglev.hxx +++ b/svx/inc/svx/svdglev.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -117,3 +118,4 @@ public: #endif //_SVDGLEV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdglob.hxx b/svx/inc/svx/svdglob.hxx index 1065860621db..a4783a721dfd 100644 --- a/svx/inc/svx/svdglob.hxx +++ b/svx/inc/svx/svdglob.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,7 +37,7 @@ #include <svx/svxdllapi.h> //************************************************************ -// Vorausdeklarationen +// forward declaration //************************************************************ class Link; @@ -48,7 +49,7 @@ class ImpSdrStrCache; // Defines //************************************************************ -// Den zur App passenden Resourcemanager holen +// Get the resource manager for the app ResMgr* ImpGetResMgr(); class SdrResId: ResId { @@ -56,14 +57,15 @@ public: SdrResId(sal_uInt16 nId): ResId(nId,*ImpGetResMgr()) {} }; -// ResourceCache fuer haeuffig benoetigte Strings -// gecachet werden globale String-Resourcen mit den -// IDs von SDR_StringCacheBegin (256) bis -// SDR_StringCacheEnd (weiss ich grad' nicht). -// Hierzu siehe auch SvdStr.Hrc +// ResourceCache for frequently used strings. +// Global string resources with the IDs from +// SDR_StringCacheBegin (256) to SDR_StringCacheEnd +// are cached. +// See also SvdStr.Hrc SVX_DLLPUBLIC String ImpGetResStr(sal_uInt16 nResID); //////////////////////////////////////////////////////////////////////////////////////////////////// #endif //_SVDGLOB_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdglue.hxx b/svx/inc/svx/svdglue.hxx index 334b79229aa0..df208d5185b1 100644 --- a/svx/inc/svx/svdglue.hxx +++ b/svx/inc/svx/svdglue.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,12 +70,12 @@ class SVX_DLLPUBLIC SdrGluePoint { sal_uInt16 nEscDir; sal_uInt16 nId; sal_uInt16 nAlign; - FASTBOOL bNoPercent:1; - FASTBOOL bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - FASTBOOL bUserDefined:1; // #i38892# + sal_uInt8 bNoPercent:1; + sal_uInt8 bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt + sal_uInt8 bUserDefined:1; // #i38892# public: SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=sal_False; bReallyAbsolute=sal_False; bUserDefined=sal_True; } - SdrGluePoint(const Point& rNewPos, FASTBOOL bNewPercent=sal_True, sal_uInt16 nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=sal_False; bUserDefined=sal_True; } + SdrGluePoint(const Point& rNewPos, bool bNewPercent= sal_True, sal_uInt16 nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute = sal_False; bUserDefined = sal_True; } bool operator==(const SdrGluePoint& rCmpGP) const { return aPos==rCmpGP.aPos && nEscDir==rCmpGP.nEscDir && nId==rCmpGP.nId && nAlign==rCmpGP.nAlign && bNoPercent==rCmpGP.bNoPercent && bReallyAbsolute==rCmpGP.bReallyAbsolute && bUserDefined==rCmpGP.bUserDefined; } bool operator!=(const SdrGluePoint& rCmpGP) const { return !operator==(rCmpGP); } const Point& GetPos() const { return aPos; } @@ -83,15 +84,15 @@ public: void SetEscDir(sal_uInt16 nNewEsc) { nEscDir=nNewEsc; } sal_uInt16 GetId() const { return nId; } void SetId(sal_uInt16 nNewId) { nId=nNewId; } - bool IsPercent() const { return !bNoPercent; } - void SetPercent(FASTBOOL bOn) { bNoPercent=!bOn; } + bool IsPercent() const { return bNoPercent ? false : true; } + void SetPercent(bool bOn) { bNoPercent = !bOn; } // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - FASTBOOL IsReallyAbsolute() const { return bReallyAbsolute; } - void SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj); + bool IsReallyAbsolute() const { return bReallyAbsolute ? true : false; } + void SetReallyAbsolute(bool bOn, const SdrObject& rObj); // #i38892# - FASTBOOL IsUserDefined() const { return bUserDefined; } - void SetUserDefined(FASTBOOL bNew) { bUserDefined = bNew; } + bool IsUserDefined() const { return bUserDefined ? true : false; } + void SetUserDefined(bool bNew) { bUserDefined = bNew ? true : false; } sal_uInt16 GetAlign() const { return nAlign; } void SetAlign(sal_uInt16 nAlg) { nAlign=nAlg; } @@ -100,7 +101,7 @@ public: sal_uInt16 GetVertAlign() const { return nAlign&0xFF00; } void SetVertAlign(sal_uInt16 nAlg) { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); } void Draw(OutputDevice& rOut, const SdrObject* pObj) const; - FASTBOOL IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; + bool IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; void Invalidate(Window& rWin, const SdrObject* pObj) const; Point GetAbsolutePos(const SdrObject& rObj) const; void SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj); @@ -111,7 +112,7 @@ public: void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj); - void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear, const SdrObject* pObj); + void Shear (const Point& rRef, long nWink, double tn, bool bVShear, const SdrObject* pObj); }; #define SDRGLUEPOINT_NOTFOUND 0xFFFF @@ -133,15 +134,15 @@ public: void Delete(sal_uInt16 nPos) { delete (SdrGluePoint*)aList.Remove(nPos); } SdrGluePoint& operator[](sal_uInt16 nPos) { return *GetObject(nPos); } const SdrGluePoint& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); } - sal_uInt16 FindGluePoint(sal_uInt16 nId) const; - sal_uInt16 HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, FASTBOOL bBack=sal_False, FASTBOOL bNext=sal_False, sal_uInt16 nId0=0) const; + sal_uInt16 FindGluePoint(sal_uInt16 nId) const; + sal_uInt16 HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack = false, bool bNext = false, sal_uInt16 nId0=0) const; void Invalidate(Window& rWin, const SdrObject* pObj) const; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - void SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj); + void SetReallyAbsolute(bool bOn, const SdrObject& rObj); void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj); - void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear, const SdrObject* pObj); + void Shear (const Point& rRef, long nWink, double tn, bool bVShear, const SdrObject* pObj); }; @@ -149,3 +150,4 @@ public: #endif //_SVDGLUE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx index 92a7071551a4..0026f8eeb9d0 100644 --- a/svx/inc/svx/svdhdl.hxx +++ b/svx/inc/svx/svdhdl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,14 +31,10 @@ #include <tools/gen.hxx> -#ifndef _POINTR_HXX //autogen #include <vcl/pointr.hxx> -#endif #include <tools/contnr.hxx> -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #include <svx/xpoly.hxx> #include <svx/svdoedge.hxx> @@ -153,7 +150,7 @@ class SVX_DLLPUBLIC SdrHdl friend class SdrHdlList; // #101928# - BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine, sal_Bool bIsHighContrast); + BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine ); protected: SdrObject* pObj; // Gehoert das Handle zu einem Objekt? @@ -527,8 +524,9 @@ protected: BitmapEx GetBitmapForHandle( const BitmapEx& rBitmap, int nSize ); - static BitmapEx GetHandlesBitmap( bool bIsFineHdl, bool bIsHighContrast ); + static BitmapEx GetHandlesBitmap( bool bIsFineHdl ); }; #endif //_SVDHDL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx index a41d69a38eff..a6a11d4df2cf 100644 --- a/svx/inc/svx/svdhlpln.hxx +++ b/svx/inc/svx/svdhlpln.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ #include <tools/color.hxx> #include <tools/gen.hxx> -#ifndef _POINTR_HXX //autogen #include <vcl/pointr.hxx> -#endif #include <tools/contnr.hxx> #include "svx/svxdllapi.h" @@ -68,7 +67,7 @@ public: const Point& GetPos() const { return aPos; } Pointer GetPointer() const; - FASTBOOL IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; + bool IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; // OutputDevice wird benoetigt, da Fangpunkte eine feste Pixelgroesse haben Rectangle GetBoundRect(const OutputDevice& rOut) const; @@ -105,3 +104,4 @@ public: #endif //_SVDHLPLN_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svditer.hxx b/svx/inc/svx/svditer.hxx index 2c7b9cb4c9f8..85fc4b637570 100644 --- a/svx/inc/svx/svditer.hxx +++ b/svx/inc/svx/svditer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,8 +29,9 @@ #ifndef _SVDITER_HXX #define _SVDITER_HXX +#include <vector> + #include <sal/types.h> -#include <tools/list.hxx> #include "svx/svxdllapi.h" class SdrObjList; @@ -37,23 +39,23 @@ class SdrObject; class SdrMarkList; // SdrObjListIter methods: -// IM_FLAT : Flach ueber die Liste -// IM_DEEPWITHGROUPS : Mit rekursivem Abstieg, Next() liefert auch Gruppenobjekte -// IM_DEEPNOGROUPS : Mit rekursivem Abstieg, Next() liefert keine Gruppenobjekte +// IM_FLAT : Flat over the list +// IM_DEEPWITHGROUPS : With recursive descent parser, Next() also returns group objects +// IM_DEEPNOGROUPS : With recursive descent parser, Next() returns no group objects enum SdrIterMode { IM_FLAT, IM_DEEPWITHGROUPS, IM_DEEPNOGROUPS}; class SVX_DLLPUBLIC SdrObjListIter { - List maObjList; + std::vector<SdrObject*> maObjList; sal_uInt32 mnIndex; - sal_Bool mbReverse; + bool mbReverse; - void ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, sal_Bool bUseZOrder); + void ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, bool bUseZOrder); void ImpProcessMarkList(const SdrMarkList& rMarkList, SdrIterMode eMode); - void ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, sal_Bool bUseZOrder); + void ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, bool bUseZOrder); public: - SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False); + SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode = IM_DEEPNOGROUPS, bool bReverse = false); /** This variant lets the user choose the order in which to travel over the objects. @param bUseZOrder @@ -61,21 +63,26 @@ public: Otherwise the navigation position as returned by SdrObject::GetNavigationPosition() is used. */ - SdrObjListIter(const SdrObjList& rObjList, sal_Bool bUseZOrder, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False); + SdrObjListIter(const SdrObjList& rObjList, bool bUseZOrder, SdrIterMode eMode = IM_DEEPNOGROUPS, bool bReverse = false); /* SJ: the following function can now be used with every SdrObject and is no longer limited to group objects */ - SdrObjListIter(const SdrObject& rObj, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False); + SdrObjListIter(const SdrObject& rObj, SdrIterMode eMode = IM_DEEPNOGROUPS, bool bReverse = false); /** Iterates over a list of marked objects received from the SdrMarkView. */ - SdrObjListIter(const SdrMarkList& rMarkList, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False); + SdrObjListIter(const SdrMarkList& rMarkList, SdrIterMode eMode = IM_DEEPNOGROUPS, bool bReverse = false); - void Reset() { mnIndex = (mbReverse ? maObjList.Count() : 0L); } - sal_Bool IsMore() const { return (mbReverse ? mnIndex != 0 : ( mnIndex < maObjList.Count())); } - SdrObject* Next() { return (SdrObject*)maObjList.GetObject(mbReverse ? --mnIndex : mnIndex++); } + void Reset() { mnIndex = (mbReverse ? maObjList.size() : 0L); } + bool IsMore() const { return (mbReverse ? mnIndex != 0 : ( mnIndex < maObjList.size())); } + SdrObject* Next() + { + sal_uInt32 idx = (mbReverse ? --mnIndex : mnIndex++); + return idx < maObjList.size() ? maObjList[idx] : NULL; + } - sal_uInt32 Count() { return maObjList.Count(); } + sal_uInt32 Count() { return maObjList.size(); } }; #endif //_SVDITER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svditext.hxx b/svx/inc/svx/svditext.hxx index b181b4046f9e..98c9d4dd6600 100644 --- a/svx/inc/svx/svditext.hxx +++ b/svx/inc/svx/svditext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,3 +36,4 @@ #endif // _SVDITEXT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx index b38ada9733d7..ad591d4d8c70 100644 --- a/svx/inc/svx/svdlayer.hxx +++ b/svx/inc/svx/svdlayer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,8 +70,8 @@ public: // Einem SdrLayer kann man sagen dass er ein (der) Standardlayer sein soll. // Es wird dann laenderspeziefisch der passende Name gesetzt. SetName() // setzt das Flag "StandardLayer" ggf. zurueck auf "Userdefined". - void SetStandardLayer(FASTBOOL bStd=sal_True); - FASTBOOL IsStandardLayer() const { return nType==1; } + void SetStandardLayer(bool bStd = true); + bool IsStandardLayer() const { return nType==1; } }; // Beim Aendern von Layerdaten muss man derzeit @@ -124,9 +125,9 @@ public: sal_uInt16 GetLayerPos(SdrLayer* pLayer) const; - SdrLayer* GetLayer(const String& rName, FASTBOOL bInherited) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); } - const SdrLayer* GetLayer(const String& rName, FASTBOOL bInherited) const; - SdrLayerID GetLayerID(const String& rName, FASTBOOL bInherited) const; + SdrLayer* GetLayer(const String& rName, bool bInherited) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); } + const SdrLayer* GetLayer(const String& rName, bool bInherited) const; + SdrLayerID GetLayerID(const String& rName, bool bInherited) const; SdrLayer* GetLayerPerID(sal_uInt16 nID) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); } const SdrLayer* GetLayerPerID(sal_uInt16 nID) const; @@ -152,9 +153,10 @@ bInherited: TRUE: Wird der Layer/LayerSet nicht gefunden, so wird im Parent-LayerAdmin nachgesehen, ob es dort einen entsprechende Definition gibt. FALSE: Es wird nur dieser LayerAdmin durchsucht. - Jeder LayerAdmin einer Seite hat einen Parent-LayerAdmin, nmlich den des + Jeder LayerAdmin einer Seite hat einen Parent-LayerAdmin, n�mlich den des Model. Das Model selbst hat keinen Parent. */ #endif //_SVDLAYER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdmark.hxx b/svx/inc/svx/svdmark.hxx index 2a05e81e0007..9654355a0eb9 100644 --- a/svx/inc/svx/svdmark.hxx +++ b/svx/inc/svx/svdmark.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,10 @@ #ifndef _SVDMARK_HXX #define _SVDMARK_HXX +#include <vector> + #include <tools/contnr.hxx> #include <tools/string.hxx> -#include <tools/list.hxx> #include "svx/svxdllapi.h" #include <svx/sdrobjectuser.hxx> @@ -377,7 +379,7 @@ namespace sdr SdrMarkList maMarkedObjectList; SdrMarkList maEdgesOfMarkedNodes; SdrMarkList maMarkedEdgesOfMarkedNodes; - List maAllMarkedObjects; + std::vector<SdrObject*> maAllMarkedObjects; // bitfield unsigned mbEdgesOfMarkedNodesDirty : 1; @@ -397,7 +399,7 @@ namespace sdr const SdrMarkList& GetEdgesOfMarkedNodes() const; const SdrMarkList& GetMarkedEdgesOfMarkedNodes() const; - const List& GetAllMarkedObjects() const; + const std::vector<SdrObject*>& GetAllMarkedObjects() const; SdrMarkList& GetMarkedObjectListWriteAccess() { @@ -410,3 +412,5 @@ namespace sdr #endif //_SVDMARK_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index a32147a3032f..f1f0e2b2cc71 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,16 +52,12 @@ class OutputDevice; #include <vcl/field.hxx> #include "svx/svxdllapi.h" -#include <vos/ref.hxx> +#include <rtl/ref.hxx> #if defined(UNX) || defined(WNT) #define DEGREE_CHAR ((sal_Unicode)176) /* 0xB0 = Ansi */ #endif -#if defined(OS2) -#define DEGREE_CHAR ((sal_Unicode)248) /* 0xF8 = IBM PC (Erw. ASCII) */ -#endif - #ifndef DEGREE_CHAR #error unbekannte Plattrorm #endif @@ -167,11 +164,11 @@ public: // Flag um nach dem Laden des Pools Aufzuraeumen (d.h. die RefCounts // neu zu bestimmen und unbenutztes wegzuwerfen). sal_False == aktiv -#define LOADREFCOUNTS (sal_False) +#define LOADREFCOUNTS (false) struct SdrDocumentStreamInfo { - FASTBOOL mbDeleteAfterUse; + bool mbDeleteAfterUse; String maUserData; com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxStorageRef; sal_Bool mbDummy1 : 1; @@ -196,11 +193,11 @@ protected: String aUIUnitStr; // see above Fraction aUIUnitFact; // see above int nUIUnitKomma; // see above - FASTBOOL bUIOnlyKomma; // see above + bool bUIOnlyKomma; // see above SdrLayerAdmin* pLayerAdmin; SfxItemPool* pItemPool; - FASTBOOL bMyPool; // zum Aufraeumen von pMyPool ab 303a + bool bMyPool; // zum Aufraeumen von pMyPool ab 303a comphelper::IEmbeddedHelper* m_pEmbeddedHelper; // helper for embedded objects to get rid of the SfxObjectShell SdrOutliner* pDrawOutliner; // ein Outliner zur Textausgabe @@ -220,25 +217,25 @@ protected: bool mbUndoEnabled; // If false no undo is recorded or we are during the execution of an undo action sal_uInt16 nProgressPercent; // fuer den ProgressBar-Handler sal_uInt16 nLoadVersion; // Versionsnummer der geladenen Datei - FASTBOOL bExtColorTable; // Keinen eigenen ColorTable + bool bExtColorTable; // Keinen eigenen ColorTable sal_Bool mbChanged; - FASTBOOL bInfoChanged; - FASTBOOL bPagNumsDirty; - FASTBOOL bMPgNumsDirty; - FASTBOOL bPageNotValid; // sal_True=Doc ist nur ObjektTraeger. Page ist nicht gueltig. - FASTBOOL bSavePortable; // Metafiles portabel speichern - FASTBOOL bNoBitmapCaching; // Bitmaps fuer Screenoutput cachen - FASTBOOL bReadOnly; - FASTBOOL bTransparentTextFrames; - FASTBOOL bSaveCompressed; - FASTBOOL bSwapGraphics; - FASTBOOL bPasteResize; // Objekte werden gerade resized wegen Paste mit anderem MapMode - FASTBOOL bSaveOLEPreview; // save preview metafile of OLE objects + bool bInfoChanged; + bool bPagNumsDirty; + bool bMPgNumsDirty; + bool bPageNotValid; // TRUE=Doc ist nur ObjektTraeger. Page ist nicht gueltig. + bool bSavePortable; // Metafiles portabel speichern + bool bNoBitmapCaching; // Bitmaps fuer Screenoutput cachen + bool bReadOnly; + bool bTransparentTextFrames; + bool bSaveCompressed; + bool bSwapGraphics; + bool bPasteResize; // Objekte werden gerade resized wegen Paste mit anderem MapMode + bool bSaveOLEPreview; // save preview metafile of OLE objects sal_uInt16 nStreamCompressMode; // Komprimiert schreiben? sal_uInt16 nStreamNumberFormat; sal_uInt16 nDefaultTabulator; sal_uInt32 nMaxUndoCount; - FASTBOOL bSaveNative; + bool bSaveNative; sal_Bool bStarDrawPreviewMode; @@ -268,7 +265,6 @@ public: sal_uInt16 nStarDrawPreviewMasterPageNum; // Reserven fuer kompatible Erweiterungen -//-/ SfxItemPool* pUndoItemPool; SotStorage* pModelStorage; SvxForbiddenCharactersTable* mpForbiddenCharactersTable; sal_uIntPtr nSwapGraphicsMode; @@ -279,10 +275,10 @@ public: sal_uInt16 mnHandoutPageCount; sal_uInt16 nReserveUInt6; sal_uInt16 nReserveUInt7; - FASTBOOL mbModelLocked; - FASTBOOL mbKernAsianPunctuation; - FASTBOOL mbAddExtLeading; - FASTBOOL mbInDestruction; + bool mbModelLocked; + bool mbKernAsianPunctuation; + bool mbAddExtLeading; + bool mbInDestruction; // Zeiger auf Paletten, Listen und Tabellen XColorTable* pColorTable; @@ -310,8 +306,7 @@ private: // Nicht implementiert: SVX_DLLPRIVATE SdrModel(const SdrModel& rSrcModel); SVX_DLLPRIVATE void operator=(const SdrModel& rSrcModel); - SVX_DLLPRIVATE FASTBOOL operator==(const SdrModel& rCmpModel) const; -//#if 0 // _SOLAR__PRIVATE + SVX_DLLPRIVATE bool operator==(const SdrModel& rCmpModel) const; SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo); SVX_DLLPRIVATE void ImpSetUIUnit(); SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit = sal_False ); @@ -321,16 +316,13 @@ private: SVX_DLLPRIVATE void ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts = true); -//#endif // __PRIVATE // this is a weak reference to a possible living api wrapper for this model ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxUnoModel; public: -//#if 0 // _SOLAR__PRIVATE - FASTBOOL IsPasteResize() const { return bPasteResize; } - void SetPasteResize(FASTBOOL bOn) { bPasteResize=bOn; } -//#endif // __PRIVATE + bool IsPasteResize() const { return bPasteResize; } + void SetPasteResize(bool bOn) { bPasteResize=bOn; } TYPEINFO(); // Steckt man hier seinen eigenen Pool rein, so wird die Klasse auch // Aktionen an ihm vornehmen (Put(),Remove()). Bei Zerstoerung von @@ -345,13 +337,13 @@ public: // Wahl des Pools. SdrModel(SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS); SdrModel(const String& rPath, SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS); - SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); - SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); + SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); + SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); virtual ~SdrModel(); void ClearModel(sal_Bool bCalledFromDestructor); // Hier kann man erfragen, ob das Model gerade eingrstreamt wird - FASTBOOL IsLoading() const { return sal_False /*BFS01 bLoading */; } + bool IsLoading() const { return sal_False /*BFS01 bLoading */; } // Muss z.B. ueberladen werden, um das Swappen/LoadOnDemand von Grafiken // zu ermoeglichen. Wird rbDeleteAfterUse auf sal_True gesetzt, so wird // die SvStream-Instanz vom Aufrufer nach Gebrauch destruiert. @@ -364,7 +356,7 @@ public: void BurnInStyleSheetAttributes(); // Wer sich von SdrPage ableitet muss sich auch von SdrModel ableiten // und diese beiden VM AllocPage() und AllocModel() ueberladen... - virtual SdrPage* AllocPage(FASTBOOL bMasterPage); + virtual SdrPage* AllocPage(bool bMasterPage); virtual SdrModel* AllocModel() const; // Aenderungen an den Layern setzen das Modified-Flag und broadcasten am Model! @@ -449,17 +441,17 @@ public: const Fraction& GetUIUnitFact() const { return aUIUnitFact; } const String& GetUIUnitStr() const { return aUIUnitStr; } int GetUIUnitKomma() const { return nUIUnitKomma; } - FASTBOOL IsUIOnlyKomma() const { return bUIOnlyKomma; } + bool IsUIOnlyKomma() const { return bUIOnlyKomma; } static void TakeUnitStr(FieldUnit eUnit, String& rStr); - void TakeMetricStr(long nVal, String& rStr, FASTBOOL bNoUnitChars=sal_False, sal_Int32 nNumDigits = -1) const; - void TakeWinkStr(long nWink, String& rStr, FASTBOOL bNoDegChar=sal_False) const; - void TakePercentStr(const Fraction& rVal, String& rStr, FASTBOOL bNoPercentChar=sal_False) const; + void TakeMetricStr(long nVal, String& rStr, bool bNoUnitChars = false, sal_Int32 nNumDigits = -1) const; + void TakeWinkStr(long nWink, String& rStr, bool bNoDegChar = false) const; + void TakePercentStr(const Fraction& rVal, String& rStr, bool bNoPercentChar = false) const; // RecalcPageNums wird idR. nur von der Page gerufen. - FASTBOOL IsPagNumsDirty() const { return bPagNumsDirty; }; - FASTBOOL IsMPgNumsDirty() const { return bMPgNumsDirty; }; - void RecalcPageNums(FASTBOOL bMaster); + bool IsPagNumsDirty() const { return bPagNumsDirty; }; + bool IsMPgNumsDirty() const { return bMPgNumsDirty; }; + void RecalcPageNums(bool bMaster); // Nach dem Insert gehoert die Page dem SdrModel. virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); virtual void DeletePage(sal_uInt16 nPgNum); @@ -493,28 +485,28 @@ public: // PageNotValid bedeutet, dass das Model lediglich Objekte traegt die zwar // auf einer Page verankert sind, die Page aber nicht gueltig ist. Diese // Kennzeichnung wird fuers Clipboard/Drag&Drop benoetigt. - FASTBOOL IsPageNotValid() const { return bPageNotValid; } - void SetPageNotValid(FASTBOOL bJa=sal_True) { bPageNotValid=bJa; } + bool IsPageNotValid() const { return bPageNotValid; } + void SetPageNotValid(bool bJa = true) { bPageNotValid=bJa; } // Schaltet man dieses Flag auf sal_True, so werden Grafikobjekte // portabel gespeichert. Es findet dann beim Speichern ggf. // eine implizite Wandlung von Metafiles statt. // Default=FALSE. Flag ist nicht persistent. - FASTBOOL IsSavePortable() const { return bSavePortable; } - void SetSavePortable(FASTBOOL bJa=sal_True) { bSavePortable=bJa; } + bool IsSavePortable() const { return bSavePortable; } + void SetSavePortable(bool bJa = true) { bSavePortable=bJa; } // Schaltet man dieses Flag auf sal_True, so werden // Pixelobjekte (stark) komprimiert gespeichert. // Default=FALSE. Flag ist nicht persistent. - FASTBOOL IsSaveCompressed() const { return bSaveCompressed; } - void SetSaveCompressed(FASTBOOL bJa=sal_True) { bSaveCompressed=bJa; } + bool IsSaveCompressed() const { return bSaveCompressed; } + void SetSaveCompressed(bool bJa = true) { bSaveCompressed=bJa; } // Schaltet man dieses Flag auf sal_True, so werden // Grafikobjekte mit gesetztem Native-Link // native gespeichert. // Default=FALSE. Flag ist nicht persistent. - FASTBOOL IsSaveNative() const { return bSaveNative; } - void SetSaveNative(FASTBOOL bJa=sal_True) { bSaveNative=bJa; } + bool IsSaveNative() const { return bSaveNative; } + void SetSaveNative(bool bJa = true) { bSaveNative=bJa; } // Schaltet man dieses Flag auf sal_True, so werden die Grafiken // von Grafikobjekten: @@ -525,13 +517,13 @@ public: // Damit das funktioniert, muss die virtuelle Methode // GetDocumentStream() ueberladen werden. // Default=FALSE. Flag ist nicht persistent. - FASTBOOL IsSwapGraphics() const { return bSwapGraphics; } - void SetSwapGraphics(FASTBOOL bJa=sal_True); + bool IsSwapGraphics() const { return bSwapGraphics; } + void SetSwapGraphics(bool bJa = true); void SetSwapGraphicsMode(sal_uIntPtr nMode) { nSwapGraphicsMode = nMode; } sal_uIntPtr GetSwapGraphicsMode() const { return nSwapGraphicsMode; } - FASTBOOL IsSaveOLEPreview() const { return bSaveOLEPreview; } - void SetSaveOLEPreview( FASTBOOL bSet) { bSaveOLEPreview = bSet; } + bool IsSaveOLEPreview() const { return bSaveOLEPreview; } + void SetSaveOLEPreview( bool bSet) { bSaveOLEPreview = bSet; } // Damit die Bildschirmausgabe von Bitmaps (insbesondere bei gedrehten) // etwas schneller wird, werden sie gecachet. Diesen Cache kann man mit @@ -540,14 +532,14 @@ public: // in's Undo, so wird der Cache fuer dieses Objekt sofort ausgeschaltet // (Speicher sparen). // Default=Cache eingeschaltet. Flag ist nicht persistent. - FASTBOOL IsBitmapCaching() const { return !bNoBitmapCaching; } - void SetBitmapCaching(FASTBOOL bJa=sal_True) { bNoBitmapCaching=!bJa; } + bool IsBitmapCaching() const { return !bNoBitmapCaching; } + void SetBitmapCaching(bool bJa = true) { bNoBitmapCaching=!bJa; } // Defaultmaessig (sal_False) kann man Textrahmen ohne Fuellung durch // Mausklick selektieren. Nach Aktivierung dieses Flags trifft man sie // nur noch in dem Bereich, wo sich auch tatsaechlich Text befindet. - FASTBOOL IsPickThroughTransparentTextFrames() const { return bTransparentTextFrames; } - void SetPickThroughTransparentTextFrames(FASTBOOL bOn) { bTransparentTextFrames=bOn; } + bool IsPickThroughTransparentTextFrames() const { return bTransparentTextFrames; } + void SetPickThroughTransparentTextFrames(bool bOn) { bTransparentTextFrames=bOn; } // Darf denn das Model ueberhaupt veraendert werden? // Wird nur von den Possibility-Methoden der View ausgewerdet. @@ -555,8 +547,8 @@ public: // Sollte ueberladen werden und entsprechend des ReadOnly-Status des Files // sal_True oder sal_False liefern (Methode wird oeffters gerufen, also ein Flag // verwenden!). - virtual FASTBOOL IsReadOnly() const; - virtual void SetReadOnly(FASTBOOL bYes); + virtual bool IsReadOnly() const; + virtual void SetReadOnly(bool bYes); // Vermischen zweier SdrModel. Zu beachten sei, dass rSourceModel nicht // const ist. Die Pages werden beim einfuegen nicht kopiert, sondern gemoved. @@ -576,13 +568,13 @@ public: virtual void Merge(SdrModel& rSourceModel, sal_uInt16 nFirstPageNum=0, sal_uInt16 nLastPageNum=0xFFFF, sal_uInt16 nDestPos=0xFFFF, - FASTBOOL bMergeMasterPages=sal_False, FASTBOOL bAllMasterPages=sal_False, - FASTBOOL bUndo=sal_True, FASTBOOL bTreadSourceAsConst=sal_False); + bool bMergeMasterPages = false, bool bAllMasterPages = false, + bool bUndo = true, bool bTreadSourceAsConst = false); // Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,sal_False,sal_False,bUndo,!bMoveNoCopy); void CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, sal_uInt16 nDestPos, - FASTBOOL bUndo=sal_True, FASTBOOL bMoveNoCopy=sal_False); + bool bUndo = true, bool bMoveNoCopy = false); // Mit BegUndo() / EndUndo() ist es moeglich beliebig viele UndoActions // beliebig tief zu klammern. Als Kommentar der @@ -617,13 +609,13 @@ public: sal_uIntPtr GetRedoActionCount() const { return pRedoStack!=NULL ? pRedoStack->Count() : 0; } const SfxUndoAction* GetRedoAction(sal_uIntPtr nNum) const { return (SfxUndoAction*)(pRedoStack!=NULL ? pRedoStack->GetObject(nNum) : NULL); } - FASTBOOL Undo(); - FASTBOOL Redo(); - FASTBOOL Repeat(SfxRepeatTarget&); + bool Undo(); + bool Redo(); + bool Repeat(SfxRepeatTarget&); // Hier kann die Applikation einen Handler setzen, der die auflaufenden // UndoActions einsammelt. Der Handler hat folgendes Aussehen: - // void __EXPORT NotifyUndoActionHdl(SfxUndoAction* pUndoAction); + // void NotifyUndoActionHdl(SfxUndoAction* pUndoAction); // Beim Aufruf des Handlers findet eine Eigentumsuebereignung statt; die // UndoAction gehoert somit dem Handler, nicht mehr dem SdrModel. void SetNotifyUndoActionHdl(const Link& rLink) { aUndoLink=rLink; } @@ -646,7 +638,7 @@ public: // Hier kann man einen Handler setzen der beim Streamen mehrfach gerufen // wird und ungefaehre Auskunft ueber den Fortschreitungszustand der // Funktion gibt. Der Handler muss folgendes Aussehen haben: - // void __EXPORT class::IOProgressHdl(const sal_uInt16& nPercent); + // void class::IOProgressHdl(const USHORT& nPercent); // Der erste Aufruf des Handlers erfolgt grundsaetzlich mit 0, der letzte // mit 100. Dazwischen erfolgen maximal 99 Aufrufe mit Werten 1...99. // Man kann also durchaus bei 0 den Progressbar Initiallisieren und bei @@ -682,7 +674,7 @@ public: // Methode sal_True, andernfalls FALSE. // Dieser Check steht nur zur Verfuegung, wenn die Engine mit DBG_UTIL // uebersetzt wurde. Andernfalls liefert die Methode immer TRUE. (ni) - FASTBOOL CheckConsistence() const; + bool CheckConsistence() const; void SetStarDrawPreviewMode(sal_Bool bPreview); sal_Bool IsStarDrawPreviewMode() { return bStarDrawPreviewMode; } @@ -695,11 +687,11 @@ public: // these functions are used by the api to disable repaints during a // set of api calls. - sal_Bool isLocked() const { return (sal_Bool)mbModelLocked; } - void setLock( sal_Bool bLock ); + bool isLocked() const { return mbModelLocked; } + void setLock( bool bLock ); - void SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars ); - vos::ORef<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const; + void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ); + rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const; void SetCharCompressType( sal_uInt16 nType ); sal_uInt16 GetCharCompressType() const { return mnCharCompressType; } @@ -712,7 +704,7 @@ public: void ReformatAllTextObjects(); - FASTBOOL HasTransparentObjects( sal_Bool bCheckForAlphaChannel = sal_False ) const; + bool HasTransparentObjects( bool bCheckForAlphaChannel = false ) const; SdrOutliner* createOutliner( sal_uInt16 nOutlinerMode ); void disposeOutliner( SdrOutliner* pOutliner ); @@ -770,3 +762,4 @@ Die Klasse SdrModel ist der Kopf des Datenmodells der StarView Drawing-Engine. ///////////////////////////////////////////////////////////////////////////////////////////////// */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx index 26845f0ff68d..cadae4688324 100644 --- a/svx/inc/svx/svdmrkv.hxx +++ b/svx/inc/svx/svdmrkv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -285,7 +286,7 @@ public: // die selbst jedoch nicht markiert sind. const SdrMarkList& GetEdgesOfMarkedNodes() const { return mpSdrViewSelection->GetEdgesOfMarkedNodes(); } const SdrMarkList& GetMarkedEdgesOfMarkedNodes() const { return mpSdrViewSelection->GetMarkedEdgesOfMarkedNodes(); } - const List& GetTransitiveHullOfMarkedObjects() const { return mpSdrViewSelection->GetAllMarkedObjects(); } + const std::vector<SdrObject*>& GetTransitiveHullOfMarkedObjects() const { return mpSdrViewSelection->GetAllMarkedObjects(); } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -537,3 +538,4 @@ public: #endif //_SVDMRKV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx index db0477648599..3d91549fa44d 100644 --- a/svx/inc/svx/svdoashp.hxx +++ b/svx/inc/svx/svdoashp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -124,7 +125,7 @@ public: void ImpCheckCustomGluePointsAreAdded(); // returns the new text rect that corresponds to the current logic rect, the return value can be empty if nothing changed. - Rectangle ImpCalculateTextFrame( const FASTBOOL bHgt, const FASTBOOL bWdt ); + Rectangle ImpCalculateTextFrame( const bool bHgt, const bool bWdt ); public: // #i37011# @@ -187,7 +188,7 @@ public: virtual void Move(const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear); virtual void SetSnapRect(const Rectangle& rRect); virtual void SetLogicRect(const Rectangle& rRect); @@ -195,7 +196,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); virtual void NbcSetSnapRect(const Rectangle& rRect); virtual void NbcSetLogicRect(const Rectangle& rRect); @@ -208,23 +209,24 @@ public: virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; virtual bool applySpecialDrag(SdrDragStat& rDrag); - virtual FASTBOOL BegCreate( SdrDragStat& rStat ); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); // #i37448# - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BegCreate( SdrDragStat& rStat ); + virtual bool MovCreate(SdrDragStat& rStat); // #i37448# + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True) const; - virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); - virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); - virtual FASTBOOL IsAutoGrowHeight() const; - virtual FASTBOOL IsAutoGrowWidth() const; + virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const; + virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); + virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); + virtual bool IsAutoGrowHeight() const; + virtual bool IsAutoGrowWidth() const; virtual void SetVerticalWriting( sal_Bool bVertical ); virtual sal_Bool BegTextEdit( SdrOutliner& rOutl ); virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void EndTextEdit( SdrOutliner& rOutl ); virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, - Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; - virtual void operator=(const SdrObject& rObj); + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, + Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; + virtual SdrObjCustomShape* Clone() const; + SdrObjCustomShape& operator=(const SdrObjCustomShape& rObj); virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; @@ -263,3 +265,4 @@ public: #endif //_SVDOASHP_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdoattr.hxx b/svx/inc/svx/svdoattr.hxx index 002a838284cb..c1527f0b3bcc 100644 --- a/svx/inc/svx/svdoattr.hxx +++ b/svx/inc/svx/svdoattr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,4 @@ public: #endif //_SVDOATTR_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 86d6f0717bb7..72964cf30e30 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,6 +30,7 @@ #define _SVDOBJ_HXX #include <memory> +#include <typeinfo> #include <cppuhelper/weakref.hxx> #include <vcl/mapmod.hxx> #include <tools/weakbase.hxx> @@ -183,7 +185,7 @@ public: const SetOfByte* pVisiLayer; const SdrPageView* pPageView; sal_uInt16 nTol; - FASTBOOL bDown; + bool bDown; public: SdrObjMacroHitRec() @@ -236,11 +238,11 @@ public: sal_uInt32 GetInventor() const { return nInventor; } sal_uInt16 GetId() const { return nIdentifier; } - virtual FASTBOOL HasMacro (const SdrObject* pObj) const; + virtual bool HasMacro (const SdrObject* pObj) const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; - virtual FASTBOOL DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj); + virtual bool DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj); virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; }; @@ -269,7 +271,7 @@ public: //************************************************************ // Hilfsklasse SdrObjGeoData // -// Alle geometrischen Daten eines beliebigen Objektes zur bergabe an's Undo/Redo +// Alle geometrischen Daten eines beliebigen Objektes zur �bergabe an's Undo/Redo // //************************************************************ @@ -522,8 +524,8 @@ protected: void ImpForcePlusData() { if (pPlusData==NULL) pPlusData=NewPlusData(); } - String GetWinkStr(long nWink, FASTBOOL bNoDegChar=sal_False) const; - String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, FASTBOOL bNoUnitChars=sal_False) const; + String GetWinkStr(long nWink, bool bNoDegChar = false) const; + String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, bool bNoUnitChars = false) const; // bNotMyself=sal_True bedeutet: Nur die ObjList auf Dirty setzen, nicht mich. // Wird z.B. benoetigt fuer NbcMove, denn da movt man SnapRect und aOutRect @@ -596,7 +598,7 @@ public: // Ein solcher Referenzpunkt ist z.B. der Punkt eines Symbols, der // der beim Einfuegen des Symbols auf das Raster gefangen werden soll // oder der Fixpunkt eines Bildes innerhalb eines Animationsobjektes. - virtual FASTBOOL HasRefPoint() const; + virtual bool HasRefPoint() const; virtual Point GetRefPoint() const; virtual void SetRefPoint(const Point& rPnt); @@ -685,9 +687,16 @@ public: sal_Bool SingleObjectPainter(OutputDevice& rOut) const; sal_Bool LineGeometryUsageIsNecessary() const; - // Clone() soll eine komplette Kopie des Objektes erzeugen. + /** + Returns a copy of the object. Every inherited class must reimplement this (in class Foo + it should be sufficient to do "virtual Foo* Clone() const { return CloneHelper< Foo >(); }". + Note that this function uses operator= internally. + */ virtual SdrObject* Clone() const; - virtual void operator=(const SdrObject& rObj); + /** + Implemented mainly for the purposes of Clone(). + */ + SdrObject& operator=(const SdrObject& rObj); // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert". virtual void TakeObjNameSingul(String& rName) const; @@ -757,10 +766,10 @@ public: // BckCreate() -> Letztes EndCreate() rueckgaengig machen (z.B. letzten // Polygonpunkt wieder loeschen). // RetrunCode: sal_True=Weiter gehts, sal_False=Create dadurch abgebrochen. - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); // sal_True=Xor muss repainted werden - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); // TRUE=Xor muss repainted werden + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); // damit holt man sich den Pointer, der das Createn dieses Objekts symbolisiert @@ -778,13 +787,13 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear); virtual void Move (const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void Rotate(const Point& rRef, long nWink, double sn, double cs); virtual void Mirror(const Point& rRef1, const Point& rRef2); - virtual void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void Shear (const Point& rRef, long nWink, double tn, bool bVShear); // Die relative Position eines Zeichenobjektes ist die Entfernung der // linken oberen Eche des logisch umschliessenden Rechtecks (SnapRect) @@ -821,7 +830,7 @@ public: // Drehwinkel und Shear virtual long GetRotateAngle() const; - virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const; + virtual long GetShearAngle(bool bVertical = false) const; // Zum Fangen von/auf ausgezeichneten Punkten eines Obj (Polygonpunkte, // Kreismittelpunkt, ...) @@ -864,7 +873,7 @@ public: void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearAllItems = sal_False); // NotPersistAttr fuer Layer, ObjName, geometrische Transformationen, ... - void TakeNotPersistAttr(SfxItemSet& rAttr, FASTBOOL bMerge) const; + void TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const; void ApplyNotPersistAttr(const SfxItemSet& rAttr); void NbcApplyNotPersistAttr(const SfxItemSet& rAttr); @@ -875,7 +884,7 @@ public: SfxStyleSheet* GetStyleSheet() const; // TextEdit - virtual FASTBOOL HasTextEdit() const; + virtual bool HasTextEdit() const; // Return==TRUE: TextEditMode gestartet virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); @@ -892,11 +901,11 @@ public: void BurnInStyleSheetAttributes(); // Macrofaehigkeit, z.B. ein Rechteck als PushButton. - virtual FASTBOOL HasMacro() const; + virtual bool HasMacro() const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const; virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const; - virtual FASTBOOL DoMacro (const SdrObjMacroHitRec& rRec); + virtual bool DoMacro (const SdrObjMacroHitRec& rRec); virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; sal_Bool IsMacroHit(const SdrObjMacroHitRec& rRec) const { return CheckMacroHit(rRec)!=NULL; } @@ -917,7 +926,7 @@ public: // Beim Verschieben/Resizen der Kante wird dagegen die Verbindung // geloesst. // Objekt ist ein Knoten? - virtual FASTBOOL IsNode() const; + virtual bool IsNode() const; // Automatische Klebepunkte: // je 4 Scheitelpunkt- und Eckpositionen muss ein Knotenobjekt liefern @@ -935,19 +944,19 @@ public: virtual SdrGluePointList* ForceGluePointList(); // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - void SetGlueReallyAbsolute(FASTBOOL bOn); + void SetGlueReallyAbsolute(bool bOn); void NbcRotateGluePoints(const Point& rRef, long nWink, double sn, double cs); void NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2); - void NbcShearGluePoints (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + void NbcShearGluePoints (const Point& rRef, long nWink, double tn, bool bVShear); // Objekt ist eine Kante? - virtual FASTBOOL IsEdge() const; + virtual bool IsEdge() const; // bTail1=TRUE: Linienanfang, sonst LinienEnde // pObj=NULL: Disconnect - virtual void ConnectToNode(FASTBOOL bTail1, SdrObject* pObj); - virtual void DisconnectFromNode(FASTBOOL bTail1); - virtual SdrObject* GetConnectedNode(FASTBOOL bTail1) const; + virtual void ConnectToNode(bool bTail1, SdrObject* pObj); + virtual void DisconnectFromNode(bool bTail1); + virtual SdrObject* GetConnectedNode(bool bTail1) const; /** sets the writing mode of the object's context @@ -1128,6 +1137,11 @@ public: protected: void impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxUnoShape ); + /** + Helper function for reimplementing Clone(). + */ + template< typename T > T* CloneHelper() const; + private: /** only for internal use! */ @@ -1182,5 +1196,15 @@ public: typedef tools::WeakReference< SdrObject > SdrObjectWeakRef; +template< typename T > T* SdrObject::CloneHelper() const +{ + OSL_ASSERT( typeid( T ) == typeid( *this )); + T* pObj = dynamic_cast< T* >( SdrObjFactory::MakeNewObject(GetObjInventor(),GetObjIdentifier(),NULL)); + if (pObj!=NULL) + *pObj=*static_cast< const T* >( this ); + return pObj; +} + #endif //_SVDOBJ_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdocapt.hxx b/svx/inc/svx/svdocapt.hxx index 7bac32cb9c1e..7397a29e781a 100644 --- a/svx/inc/svx/svdocapt.hxx +++ b/svx/inc/svx/svdocapt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,7 +94,7 @@ public: virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; virtual sal_uInt16 GetObjIdentifier() const; - virtual void operator=(const SdrObject& rObj); + virtual SdrCaptionObj* Clone() const; // for calc: special shadow only for text box void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = sal_True; } @@ -118,10 +119,10 @@ public: virtual bool applySpecialDrag(SdrDragStat& rDrag); virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; @@ -169,3 +170,4 @@ public: #endif //_SVDOCAPT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdocirc.hxx b/svx/inc/svx/svdocirc.hxx index 969920906dce..2c3b23a283db 100644 --- a/svx/inc/svx/svdocirc.hxx +++ b/svx/inc/svx/svdocirc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,7 +83,7 @@ private: SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // Werte in den Pool kopieren // Liefert sal_True, wenn das Painten ein XPolygon erfordert. - SVX_DLLPRIVATE FASTBOOL PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc + SVX_DLLPRIVATE bool PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc SVX_DLLPRIVATE virtual void RecalcXPoly(); protected: @@ -109,7 +110,7 @@ public: virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; - virtual void operator=(const SdrObject& rObj); + virtual SdrCircObj* Clone() const; virtual void RecalcSnapRect(); virtual void NbcSetSnapRect(const Rectangle& rRect); virtual basegfx::B2DPolyPolygon TakeXorPoly() const; @@ -126,17 +127,17 @@ public: virtual bool applySpecialDrag(SdrDragStat& rDrag); virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; virtual void NbcMove(const Size& aSiz); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear); virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; protected: @@ -151,3 +152,4 @@ public: #endif //_SVDOCIRC_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdoedge.hxx b/svx/inc/svx/svdoedge.hxx index 77f3861898a3..70268e342330 100644 --- a/svx/inc/svx/svdoedge.hxx +++ b/svx/inc/svx/svdoedge.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,7 +74,7 @@ public: SVX_DLLPUBLIC ~SdrObjConnection(); void ResetVars(); - FASTBOOL TakeGluePoint(SdrGluePoint& rGP, FASTBOOL bSetAbsolutePos) const; + bool TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsolutePos) const; inline void SetBestConnection( sal_Bool rB ) { bBestConn = rB; }; inline void SetBestVertex( sal_Bool rB ) { bBestVertex = rB; }; @@ -126,7 +127,7 @@ public: Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode); const Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode) const { return ((SdrEdgeInfoRec*)this)->ImpGetLineVersatzPoint(eLineCode); } sal_uInt16 ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; - FASTBOOL ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; + bool ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; void ImpSetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP, long nVal); long ImpGetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; }; @@ -208,10 +209,10 @@ protected: XPolygon ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1, const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2, sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const; - static FASTBOOL ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=NULL); + static bool ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=NULL); sal_uInt16 ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2) const; - FASTBOOL ImpStripPolyPoints(XPolygon& rXP) const; // entfernen ueberfluessiger Punkte - void ImpSetTailPoint(FASTBOOL bTail1, const Point& rPt); + bool ImpStripPolyPoints(XPolygon& rXP) const; // entfernen ueberfluessiger Punkte + void ImpSetTailPoint(bool bTail1, const Point& rPt); void ImpUndirtyEdgeTrack(); // eventuelle Neuberechnung des Verbindungsverlaufs void ImpDirtyEdgeTrack(); // invalidate connector path, so it will be recalculated next time void ImpSetAttrToEdgeInfo(); // Werte vom Pool nach aEdgeInfo kopieren @@ -223,30 +224,31 @@ public: SdrEdgeObj(); virtual ~SdrEdgeObj(); - SdrObjConnection& GetConnection(FASTBOOL bTail1) { return *(bTail1 ? &aCon1 : &aCon2); } + SdrObjConnection& GetConnection(bool bTail1) { return *(bTail1 ? &aCon1 : &aCon2); } virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; virtual sal_uInt16 GetObjIdentifier() const; virtual const Rectangle& GetCurrentBoundRect() const; virtual const Rectangle& GetSnapRect() const; - virtual FASTBOOL IsNode() const; + virtual bool IsNode() const; virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const; virtual const SdrGluePointList* GetGluePointList() const; virtual SdrGluePointList* ForceGluePointList(); - virtual FASTBOOL IsEdge() const; + virtual bool IsEdge() const; // bTail1=TRUE: Linienanfang, sonst LinienEnde // pObj=NULL: Disconnect void SetEdgeTrackDirty() { bEdgeTrackDirty=sal_True; } - void ConnectToNode(FASTBOOL bTail1, SdrObject* pObj); - void DisconnectFromNode(FASTBOOL bTail1); - SdrObject* GetConnectedNode(FASTBOOL bTail1) const; - const SdrObjConnection& GetConnection(FASTBOOL bTail1) const { return *(bTail1 ? &aCon1 : &aCon2); } - FASTBOOL CheckNodeConnection(FASTBOOL bTail1) const; + void ConnectToNode(bool bTail1, SdrObject* pObj); + void DisconnectFromNode(bool bTail1); + SdrObject* GetConnectedNode(bool bTail1) const; + const SdrObjConnection& GetConnection(bool bTail1) const { return *(bTail1 ? &aCon1 : &aCon2); } + bool CheckNodeConnection(bool bTail1) const; virtual void RecalcSnapRect(); virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; - virtual void operator=(const SdrObject& rObj); + virtual SdrEdgeObj* Clone() const; + SdrEdgeObj& operator=(const SdrEdgeObj& rObj); virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; @@ -273,10 +275,10 @@ public: // #102344# Added missing implementation virtual void NbcSetAnchorPos(const Point& rPnt); - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; @@ -434,3 +436,4 @@ public: #endif //_SVDOEDGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx index 948115dff47e..88cf28d7f093 100644 --- a/svx/inc/svx/svdograf.hxx +++ b/svx/inc/svx/svdograf.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -182,7 +183,8 @@ public: // #i25616# virtual basegfx::B2DPolyPolygon TakeXorPoly() const; - virtual void operator=(const SdrObject& rObj); + virtual SdrGrafObj* Clone() const; + SdrGrafObj& operator=(const SdrGrafObj& rObj); virtual sal_uInt32 GetHdlCount() const; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; @@ -190,14 +192,14 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear); virtual void NbcSetSnapRect(const Rectangle& rRect); virtual void NbcSetLogicRect(const Rectangle& rRect); virtual SdrObjGeoData* NewGeoData() const; virtual void SaveGeoData(SdrObjGeoData& rGeo) const; virtual void RestGeoData(const SdrObjGeoData& rGeo); - FASTBOOL HasGDIMetaFile() const; + bool HasGDIMetaFile() const; const GDIMetaFile* GetGDIMetaFile() const; virtual void SetPage(SdrPage* pNewPage); @@ -227,3 +229,5 @@ public: }; #endif //_SVDOGRAF_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdogrp.hxx b/svx/inc/svx/svdogrp.hxx index 9cf0ad056047..7e48ec372ae7 100644 --- a/svx/inc/svx/svdogrp.hxx +++ b/svx/inc/svx/svdogrp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,7 +57,7 @@ protected: long nShearWink; Point aRefPoint; // Referenzpunkt innerhalb der Objektgruppe - FASTBOOL bRefPoint; // Ist ein RefPoint gesetzt? + bool bRefPoint; // Ist ein RefPoint gesetzt? public: TYPEINFO(); @@ -71,7 +72,7 @@ public: virtual void SetObjList(SdrObjList* pNewObjList); virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pNewModel); - virtual FASTBOOL HasRefPoint() const; + virtual bool HasRefPoint() const; virtual Point GetRefPoint() const; virtual void SetRefPoint(const Point& rPnt); virtual SdrObjList* GetSubList() const; @@ -79,7 +80,8 @@ public: virtual const Rectangle& GetCurrentBoundRect() const; virtual const Rectangle& GetSnapRect() const; - virtual void operator=(const SdrObject& rObj); + virtual SdrObjGroup* Clone() const; + SdrObjGroup& operator=(const SdrObjGroup& rObj); virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; @@ -90,16 +92,16 @@ public: // special drag methods virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; - virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); virtual long GetRotateAngle() const; - virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const; + virtual long GetShearAngle(bool bVertical = false) const; virtual void Move(const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void Rotate(const Point& rRef, long nWink, double sn, double cs); virtual void Mirror(const Point& rRef1, const Point& rRef2); - virtual void Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear); virtual void SetAnchorPos(const Point& rPnt); virtual void SetRelativePos(const Point& rPnt); virtual void SetSnapRect(const Rectangle& rRect); @@ -109,7 +111,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); virtual void NbcSetAnchorPos(const Point& rPnt); virtual void NbcSetRelativePos(const Point& rPnt); virtual void NbcSetSnapRect(const Rectangle& rRect); @@ -123,3 +125,4 @@ public: #endif //_SVDOGRP_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdomeas.hxx b/svx/inc/svx/svdomeas.hxx index 9be5e7e2e73b..df9b7fbd5b94 100644 --- a/svx/inc/svx/svdomeas.hxx +++ b/svx/inc/svx/svdomeas.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,7 +78,7 @@ protected: Point aPt1; Point aPt2; - FASTBOOL bTextDirty; + bool bTextDirty; protected: void ImpTakeAttr(ImpMeasureRec& rRec) const; @@ -101,7 +102,7 @@ public: virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; - virtual void operator=(const SdrObject& rObj); + virtual SdrMeasureObj* Clone() const; virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; @@ -116,10 +117,10 @@ public: virtual bool applySpecialDrag(SdrDragStat& rDrag); virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; @@ -128,7 +129,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); virtual long GetRotateAngle() const; virtual void RecalcSnapRect(); @@ -144,16 +145,16 @@ public: virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); virtual const Size& GetTextSize() const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, - Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, + Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const; virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual sal_uInt16 GetOutlinerViewAnchorMode() const; virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); virtual OutlinerParaObject* GetOutlinerParaObject() const; - virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, - FASTBOOL bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; + virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, + bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; // #i97878# virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; @@ -215,3 +216,4 @@ public: #endif //_SVDOMEAS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdomedia.hxx b/svx/inc/svx/svdomedia.hxx index 46991a66c526..fa2de35e6a0d 100644 --- a/svx/inc/svx/svdomedia.hxx +++ b/svx/inc/svx/svdomedia.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,7 +54,7 @@ public: virtual ~SdrMediaObj(); - virtual FASTBOOL HasTextEdit() const; + virtual bool HasTextEdit() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; virtual sal_uInt16 GetObjIdentifier() const; @@ -61,7 +62,8 @@ public: virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; - virtual void operator=(const SdrObject& rObj); + virtual SdrMediaObj* Clone() const; + SdrMediaObj& operator=(const SdrMediaObj& rObj); virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ); @@ -91,3 +93,5 @@ private: }; #endif //_SVDOMEDIA_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx index 59327e85868d..d43fd5d52283 100644 --- a/svx/inc/svx/svdoole2.hxx +++ b/svx/inc/svx/svdoole2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,10 +86,10 @@ protected: public: TYPEINFO(); - SdrOle2Obj(FASTBOOL bFrame_=sal_False); - SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFrame_=sal_False); - SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, FASTBOOL bFrame_=sal_False); - SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_=sal_False); + SdrOle2Obj(bool bFrame_ = false); + SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, bool bFrame_ = false); + SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, bool bFrame_ = false); + SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, bool bFrame_ = false); virtual ~SdrOle2Obj(); // access to svt::EmbeddedObjectRef @@ -117,7 +118,7 @@ public: // spaeter wieder abfragen kann (SD braucht das fuer Praesentationsobjekte). void SetProgName(const String& rNam) { aProgName=rNam; } const String& GetProgName() const { return aProgName; } - FASTBOOL IsEmpty() const; + bool IsEmpty() const; void SetObjRef(const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rNewObjRef); com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObjRef() const; @@ -144,7 +145,8 @@ public: virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; - virtual void operator=(const SdrObject& rObj); + SdrOle2Obj* Clone() const; + SdrOle2Obj& operator=(const SdrOle2Obj& rObj); virtual void NbcMove(const Size& rSize); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); @@ -188,3 +190,4 @@ public: #endif //_SVDOOLE2_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdopage.hxx b/svx/inc/svx/svdopage.hxx index 7307bc7275bb..edc264e502b5 100644 --- a/svx/inc/svx/svdopage.hxx +++ b/svx/inc/svx/svdopage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,7 +65,8 @@ public: virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual void operator=(const SdrObject& rObj); + virtual SdrPageObj* Clone() const; + SdrPageObj& operator=(const SdrPageObj& rObj); virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; @@ -74,3 +76,4 @@ public: #endif //_SVDOPAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdopath.hxx b/svx/inc/svx/svdopath.hxx index 0030d48d6d6c..2b1eeb7408bf 100644 --- a/svx/inc/svx/svdopath.hxx +++ b/svx/inc/svx/svdopath.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,7 +96,8 @@ public: virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; - virtual void operator=(const SdrObject& rObj); + virtual SdrPathObj* Clone() const; + SdrPathObj& operator=(const SdrPathObj& rObj); virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; @@ -115,10 +117,10 @@ public: virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const; - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; Pointer GetCreatePointer() const; @@ -131,7 +133,7 @@ public: virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact); virtual void NbcRotate(const Point& rRefPnt, long nAngle, double fSin, double fCos); virtual void NbcMirror(const Point& rRefPnt1, const Point& rRefPnt2); - virtual void NbcShear(const Point& rRefPnt, long nAngle, double fTan, FASTBOOL bVShear); + virtual void NbcShear(const Point& rRefPnt, long nAngle, double fTan, bool bVShear); virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; @@ -193,3 +195,4 @@ public: #endif //_SVDOPATH_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx index 20fe1c3adc76..fd98d69213f8 100644 --- a/svx/inc/svx/svdorect.hxx +++ b/svx/inc/svx/svdorect.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,7 +64,7 @@ protected: protected: // Liefert sal_True, wenn das Painten ein Polygon erfordert. - FASTBOOL PaintNeedsXPoly(long nEckRad) const; + bool PaintNeedsXPoly(long nEckRad) const; protected: XPolygon ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const; @@ -98,7 +99,7 @@ public: virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; - virtual void operator=(const SdrObject& rObj); + virtual SdrRectObj* Clone() const; virtual void RecalcSnapRect(); virtual void NbcSetSnapRect(const Rectangle& rRect); virtual void NbcSetLogicRect(const Rectangle& rRect); @@ -120,9 +121,9 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); - virtual FASTBOOL DoMacro(const SdrObjMacroHitRec& rRec); + virtual bool DoMacro(const SdrObjMacroHitRec& rRec); virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; @@ -135,3 +136,4 @@ public: #endif //_SVDORECT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx index a9039c55d486..1493e8883e6f 100644 --- a/svx/inc/svx/svdotable.hxx +++ b/svx/inc/svx/svdotable.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -201,19 +202,19 @@ public: // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. - virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, ::Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; + virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText = false, ::Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; virtual void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; - virtual FASTBOOL IsAutoGrowHeight() const; + virtual bool IsAutoGrowHeight() const; long GetMinTextFrameHeight() const; long GetMaxTextFrameHeight() const; - virtual FASTBOOL IsAutoGrowWidth() const; + virtual bool IsAutoGrowWidth() const; long GetMinTextFrameWidth() const; long GetMaxTextFrameWidth() const; - virtual FASTBOOL IsFontwork() const; + virtual bool IsFontwork() const; virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pNewModel); @@ -221,11 +222,12 @@ public: virtual sal_uInt16 GetObjIdentifier() const; virtual void SetChanged(); - virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True) const; - virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); + virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const; + virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; - virtual void operator=(const SdrObject& rObj); + virtual SdrTableObj* Clone() const; + SdrTableObj& operator=(const SdrTableObj& rObj); virtual basegfx::B2DPolyPolygon TakeXorPoly() const; virtual basegfx::B2DPolyPolygon TakeContour() const; virtual void RecalcSnapRect(); @@ -250,10 +252,10 @@ public: virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const; - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; @@ -340,3 +342,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx index fe6d298af405..2dd5774d6c0e 100644 --- a/svx/inc/svx/svdotext.hxx +++ b/svx/inc/svx/svdotext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,6 +60,7 @@ namespace drawinglayer { namespace primitive2d { class SdrContourTextPrimitive2D; class SdrPathTextPrimitive2D; class SdrBlockTextPrimitive2D; + class SdrAutoFitTextPrimitive2D; class SdrStretchTextPrimitive2D; }} @@ -254,6 +256,9 @@ protected: // Flag for allowing text animation. Default is sal_true. sal_Bool mbTextAnimationAllowed : 1; + // flag for preventing recursive onEditOutlinerStatusEvent calls + sal_Bool mbInDownScale : 1; + SdrOutliner& ImpGetDrawOutliner() const; private: @@ -261,12 +266,14 @@ private: // #101029#: Extracted from ImpGetDrawOutliner() SVX_DLLPRIVATE void ImpInitDrawOutliner( SdrOutliner& rOutl ) const; // #101029#: Extracted from Paint() - SVX_DLLPRIVATE void ImpSetupDrawOutlinerForPaint( FASTBOOL bContourFrame, + SVX_DLLPRIVATE void ImpSetupDrawOutlinerForPaint( bool bContourFrame, SdrOutliner& rOutliner, Rectangle& rTextRect, Rectangle& rAnchorRect, Rectangle& rPaintRect, Fraction& aFitXKorreg ) const; + void ImpAutoFitText( SdrOutliner& rOutliner ) const; + static void ImpAutoFitText( SdrOutliner& rOutliner, const Size& rShapeSize, bool bIsVerticalWriting ); SVX_DLLPRIVATE SdrObject* ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const; SVX_DLLPRIVATE void ImpLinkAnmeldung(); SVX_DLLPRIVATE void ImpLinkAbmeldung(); @@ -276,9 +283,9 @@ private: protected: bool ImpCanConvTextToCurve() const; SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, sal_Bool bClosed, sal_Bool bBezier, sal_Bool bNoSetAttr = sal_False) const; - SdrObject* ImpConvertAddText(SdrObject* pObj, FASTBOOL bBezier) const; + SdrObject* ImpConvertAddText(SdrObject* pObj, bool bBezier) const; void ImpSetTextStyleSheetListeners(); - void ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& rTextRect, const Rectangle& rAnchorRect, Fraction& rFitXKorreg) const; + void ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg) const; void ImpJustifyRect(Rectangle& rRect) const; void ImpCheckShear(); Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; @@ -291,14 +298,14 @@ protected: virtual SdrObjGeoData* NewGeoData() const; virtual void SaveGeoData(SdrObjGeoData& rGeo) const; virtual void RestGeoData(const SdrObjGeoData& rGeo); - FASTBOOL NbcSetEckenradius(long nRad); - FASTBOOL NbcSetAutoGrowHeight(bool bAuto); - FASTBOOL NbcSetMinTextFrameHeight(long nHgt); - FASTBOOL NbcSetMaxTextFrameHeight(long nHgt); - FASTBOOL NbcSetAutoGrowWidth(bool bAuto); - FASTBOOL NbcSetMinTextFrameWidth(long nWdt); - FASTBOOL NbcSetMaxTextFrameWidth(long nWdt); - FASTBOOL NbcSetFitToSize(SdrFitToSizeType eFit); + bool NbcSetEckenradius(long nRad); + bool NbcSetAutoGrowHeight(bool bAuto); + bool NbcSetMinTextFrameHeight(long nHgt); + bool NbcSetMaxTextFrameHeight(long nHgt); + bool NbcSetAutoGrowWidth(bool bAuto); + bool NbcSetMinTextFrameWidth(long nWdt); + bool NbcSetMaxTextFrameWidth(long nWdt); + bool NbcSetFitToSize(SdrFitToSizeType eFit); // Konstruktoren fuer beschriftete Zeichenobjekte SdrTextObj(); @@ -330,20 +337,24 @@ public: // Eine Attributierung kann nur am Textrahmen vollzogen werden. void SetTextLink(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet); void ReleaseTextLink(); - FASTBOOL IsLinkedText() const { return pPlusData!=NULL && GetLinkUserData()!=NULL; } - FASTBOOL ReloadLinkedText(FASTBOOL bForceLoad=sal_False); - FASTBOOL LoadText(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet); + bool IsLinkedText() const { return pPlusData!=NULL && GetLinkUserData()!=NULL; } + bool ReloadLinkedText(bool bForceLoad = false); + bool LoadText(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet); - virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True) const; - virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); - virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); + virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const; + virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); + virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); void NbcResizeTextAttributes(const Fraction& xFact, const Fraction& yFact); - FASTBOOL IsTextFrame() const { return bTextFrame; } - FASTBOOL IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); } + bool IsTextFrame() const { return bTextFrame; } + bool IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); } + /// returns true if the PPT autofit of text into shape bounds is enabled. implies IsFitToSize()==false! + bool IsAutoFit() const; + /// returns true if the old feature for fitting shape content should into shape is enabled. implies IsAutoFit()==false! + bool IsFitToSize() const; SdrObjKind GetTextKind() const { return eTextKind; } virtual bool HasText() const; - FASTBOOL HasEditText() const; + bool HasEditText() const; sal_Bool IsTextEditActive() const { return (pEdtOutl != 0L); } /** returns the currently active text. */ @@ -364,8 +375,8 @@ public: /** returns the index of the text that contains the given point or -1 */ virtual sal_Int32 CheckTextHit(const Point& rPnt) const; - void SetDisableAutoWidthOnDragging(FASTBOOL bOn) { bDisableAutoWidthOnDragging=bOn; } - FASTBOOL IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; } + void SetDisableAutoWidthOnDragging(bool bOn) { bDisableAutoWidthOnDragging=bOn; } + bool IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; } void NbcSetText(const String& rStr); void SetText(const String& rStr); void NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat); @@ -377,16 +388,16 @@ public: // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, - Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, + Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; const GeoStat& GetGeoStat() const { return aGeo; } long GetEckenradius() const; - virtual FASTBOOL IsAutoGrowHeight() const; + virtual bool IsAutoGrowHeight() const; long GetMinTextFrameHeight() const; long GetMaxTextFrameHeight() const; - virtual FASTBOOL IsAutoGrowWidth() const; + virtual bool IsAutoGrowWidth() const; long GetMinTextFrameWidth() const; long GetMaxTextFrameWidth() const; @@ -394,13 +405,13 @@ public: const Rectangle &GetGeoRect() const { return aRect; } // Feststellen, ob TextFontwork - virtual FASTBOOL IsFontwork() const; + virtual bool IsFontwork() const; // Soll die Fontwork-Kontour versteckt werden? - FASTBOOL IsHideContour() const; + bool IsHideContour() const; // Textfluss innerhalb Kontur - FASTBOOL IsContourTextFrame() const; + bool IsContourTextFrame() const; // Horizontale Textausrichtung SdrTextHorzAdjust GetTextHorizontalAdjust(const SfxItemSet& rSet) const; @@ -427,7 +438,8 @@ public: virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; - virtual void operator=(const SdrObject& rObj); + virtual SdrTextObj* Clone() const; + SdrTextObj& operator=(const SdrTextObj& rObj); virtual basegfx::B2DPolyPolygon TakeXorPoly() const; virtual basegfx::B2DPolyPolygon TakeContour() const; virtual void RecalcSnapRect(); @@ -435,7 +447,7 @@ public: virtual void NbcSetLogicRect(const Rectangle& rRect); virtual const Rectangle& GetLogicRect() const; virtual long GetRotateAngle() const; - virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const; + virtual long GetShearAngle(bool bVertical = false) const; virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; @@ -448,10 +460,10 @@ public: virtual bool applySpecialDrag(SdrDragStat& rDrag); virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; @@ -460,9 +472,9 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); - virtual FASTBOOL HasTextEdit() const; + virtual bool HasTextEdit() const; virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void EndTextEdit(SdrOutliner& rOutl); @@ -480,8 +492,8 @@ public: virtual void NbcReformatText(); virtual void ReformatText(); - virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, - FASTBOOL bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; + virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, + bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; @@ -582,6 +594,10 @@ public: drawinglayer::primitive2d::Primitive2DSequence& rTarget, const drawinglayer::primitive2d::SdrBlockTextPrimitive2D& rSdrBlockTextPrimitive, const drawinglayer::geometry::ViewInformation2D& aViewInformation) const; + void impDecomposeAutoFitTextPrimitive( + drawinglayer::primitive2d::Primitive2DSequence& rTarget, + const drawinglayer::primitive2d::SdrAutoFitTextPrimitive2D& rSdrAutofitTextPrimitive, + const drawinglayer::geometry::ViewInformation2D& aViewInformation) const; void impDecomposeStretchTextPrimitive( drawinglayer::primitive2d::Primitive2DSequence& rTarget, const drawinglayer::primitive2d::SdrStretchTextPrimitive2D& rSdrStretchTextPrimitive, @@ -608,3 +624,4 @@ public: #endif //_SVDOTEXT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdouno.hxx b/svx/inc/svx/svdouno.hxx index db8d5058ed67..fe2e8f232caa 100644 --- a/svx/inc/svx/svdouno.hxx +++ b/svx/inc/svx/svdouno.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/awt/XControl.hpp> -#ifndef _COM_SUN_STAR_AWT_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif #include <com/sun/star/awt/XControlContainer.hpp> #include "svx/svxdllapi.h" #include <svx/svdorect.hxx> @@ -88,7 +87,8 @@ public: virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; virtual sal_uInt16 GetObjIdentifier() const; - virtual void operator = (const SdrObject& rObj); + virtual SdrUnoObj* Clone() const; + SdrUnoObj& operator= (const SdrUnoObj& rObj); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcSetLayer(SdrLayerID nLayer); @@ -161,3 +161,4 @@ private: #endif // _SVDOUNO_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdoutl.hxx b/svx/inc/svx/svdoutl.hxx index f06ded64e8b6..be7fd567d36f 100644 --- a/svx/inc/svx/svdoutl.hxx +++ b/svx/inc/svx/svdoutl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,4 @@ public: #endif //_SVDOUTL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx index dba62f84730e..5842d009b4e4 100644 --- a/svx/inc/svx/svdovirt.hxx +++ b/svx/inc/svx/svdovirt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,8 +79,8 @@ public: virtual const Rectangle& GetLastBoundRect() const; virtual void RecalcBoundRect(); virtual void SetChanged(); - virtual SdrObject* Clone() const; - virtual void operator=(const SdrObject& rObj); + virtual SdrVirtObj* Clone() const; + SdrVirtObj& operator=(const SdrVirtObj& rObj); virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; @@ -102,10 +103,10 @@ public: virtual bool supportsFullDrag() const; virtual SdrObject* getFullDragClone() const; - virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL BckCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat); + virtual bool MovCreate(SdrDragStat& rStat); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; @@ -113,13 +114,13 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); virtual void Move(const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void Rotate(const Point& rRef, long nWink, double sn, double cs); virtual void Mirror(const Point& rRef1, const Point& rRef2); - virtual void Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); + virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear); virtual void RecalcSnapRect(); virtual const Rectangle& GetSnapRect() const; @@ -131,7 +132,7 @@ public: virtual void NbcSetLogicRect(const Rectangle& rRect); virtual long GetRotateAngle() const; - virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const; + virtual long GetShearAngle(bool bVertical = false) const; virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; @@ -147,11 +148,11 @@ public: virtual void NbcReformatText(); virtual void ReformatText(); - virtual FASTBOOL HasMacro() const; + virtual bool HasMacro() const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const; virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const; - virtual FASTBOOL DoMacro (const SdrObjMacroHitRec& rRec); + virtual bool DoMacro (const SdrObjMacroHitRec& rRec); virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; // OD 30.06.2003 #108784# - virtual <GetOffset()> returns Point(0,0) @@ -163,3 +164,4 @@ public: #endif //_SVDOVIRT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx index 75eb5b331ab6..55ff262a330a 100644 --- a/svx/inc/svx/svdpage.hxx +++ b/svx/inc/svx/svdpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,8 +98,8 @@ friend class SdrEditView; Rectangle aOutRect; Rectangle aSnapRect; SdrObjListKind eListKind; - FASTBOOL bObjOrdNumsDirty; - FASTBOOL bRectsDirty; + bool bObjOrdNumsDirty; + bool bRectsDirty; protected: virtual void RecalcRects(); @@ -131,7 +132,7 @@ public: virtual void SetModel(SdrModel* pNewModel); // Neuberechnung der Objekt-Ordnungsnummern void RecalcObjOrdNums(); - FASTBOOL IsObjOrdNumsDirty() const { return bObjOrdNumsDirty; } + bool IsObjOrdNumsDirty() const { return bObjOrdNumsDirty; } virtual void NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND , const SdrInsertReason* pReason=NULL ); @@ -169,7 +170,7 @@ public: SdrObject* GetObj(sal_uIntPtr nNum) const; // Gelinkte Seite oder gelinktes Gruppenobjekt - virtual FASTBOOL IsReadOnly() const; + virtual bool IsReadOnly() const; // Zaehlt alle Objekte inkl. Objekte in Objektgruppen, ... sal_uIntPtr CountAllObjects() const; @@ -475,12 +476,12 @@ public: SdrPage(const SdrPage& rSrcPage); virtual ~SdrPage(); // pModel, pPage, pUpList, pOwnerObj und mbInserted werden Zuweisungeoperator nicht veraendert! - virtual void operator=(const SdrPage& rSrcPage); + SdrPage& operator=(const SdrPage& rSrcPage); virtual SdrPage* Clone() const; virtual SdrPage* Clone(SdrModel* pNewModel) const; bool IsMasterPage() const { return mbMaster; } void SetInserted(bool bNew = true); - FASTBOOL IsInserted() const { return mbInserted; } + bool IsInserted() const { return mbInserted; } virtual void SetChanged(); // #i68775# React on PageNum changes (from Model in most cases) @@ -519,10 +520,8 @@ public: void TRG_SetMasterPageVisibleLayers(const SetOfByte& rNew); sdr::contact::ViewContact& TRG_GetMasterPageDescriptorViewContact() const; -//#if 0 // _SOLAR__PRIVATE protected: void TRG_ImpMasterPageRemoved(const SdrPage& rRemovedPage); -//#endif // __PRIVATE public: // Aenderungen an den Layern setzen nicht das Modified-Flag ! @@ -532,11 +531,11 @@ public: // GetBitmap und GetMetafile sind noch nicht implementiert. // Bitmap in Bildschirmaufloesung und -farbtiefe aus den Objekten der // Page erzeugen. - Bitmap GetBitmap(FASTBOOL bTrimBorders=sal_True) const { return GetBitmap(aPrefVisiLayers,bTrimBorders); } - Bitmap GetBitmap(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=sal_True) const; + Bitmap GetBitmap(bool bTrimBorders = true) const { return GetBitmap(aPrefVisiLayers,bTrimBorders); } + Bitmap GetBitmap(const SetOfByte& rVisibleLayers, bool bTrimBorders = true) const; // Metafile aus den Objekten der Page erzeugen - GDIMetaFile GetMetaFile(FASTBOOL bTrimBorders=sal_True) { return GetMetaFile(aPrefVisiLayers,bTrimBorders); } - GDIMetaFile GetMetaFile(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=sal_True); + GDIMetaFile GetMetaFile(bool bTrimBorders = true) { return GetMetaFile(aPrefVisiLayers,bTrimBorders); } + GDIMetaFile GetMetaFile(const SetOfByte& rVisibleLayers, bool bTrimBorders = true); virtual String GetLayoutName() const; @@ -559,7 +558,7 @@ public: virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const; - FASTBOOL HasTransparentObjects( sal_Bool bCheckForAlphaChannel = sal_False ) const; + bool HasTransparentObjects( bool bCheckForAlphaChannel = false ) const; /** *deprecated* returns an averaged background color of this page */ // #i75566# GetBackgroundColor -> GetPageBackgroundColor @@ -616,3 +615,4 @@ public: #endif //_SVDPAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx index e085ccd212dc..e6d1fe74dad8 100644 --- a/svx/inc/svx/svdpagv.hxx +++ b/svx/inc/svx/svdpagv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,14 +74,14 @@ typedef ::std::vector< SdrPageWindow* > SdrPageWindowVector; class SVX_DLLPUBLIC SdrPageView : public SfxListener { protected: - SdrView& mrView; - SdrPage* mpPage; + SdrView& mrView; + SdrPage* mpPage; Point aPgOrg; // Nullpunkt der Page Rectangle aMarkBound; // wird Rectangle aMarkSnap; // von - sal_Bool mbHasMarked; - sal_Bool mbVisible; + sal_Bool mbHasMarked; + sal_Bool mbVisible; SetOfByte aLayerVisi; // Menge der sichtbaren Layer SetOfByte aLayerLock; // Menge der nicht editierbaren Layer @@ -97,11 +98,11 @@ protected: // #103834# Use one reserved slot (bReserveBool1) for the background color Color maBackgroundColor; - SdrPageWindowVector maPageWindows; + SdrPageWindowVector maPageWindows; // #i72752# member to remember with which SdrPageWindow the BeginDrawLayer // was done - SdrPageWindow* mpPreparedPageWindow; + SdrPageWindow* mpPreparedPageWindow; // interface to SdrPageWindow protected: @@ -295,3 +296,5 @@ public: //////////////////////////////////////////////////////////////////////////////////////////////////// #endif //_SVDPAGV_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx index 32475e51b7b8..e345093bc5f4 100644 --- a/svx/inc/svx/svdpntv.hxx +++ b/svx/inc/svx/svdpntv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -399,6 +400,8 @@ public: // #i74769# Interface change to use common BeginCompleteRedraw/EndCompleteRedraw // #i76114# bDisableIntersect disables intersecting rReg with the Window's paint region SdrPaintWindow* BeginDrawLayers(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect = false); + // used when the region passed to BeginDrawLayers needs to be changed + void UpdateDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect = false); void EndDrawLayers(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer); protected: @@ -411,6 +414,8 @@ protected: // used to paint the form layer after the PreRender device is flushed (painted) to the window. void ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const; + Region OptimizeDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect); + public: sal_Bool IsPageVisible() const { return bPageVisible; } // Seite (weisse Flaeche) malen oder nicht sal_Bool IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht @@ -578,3 +583,4 @@ public: #endif //_SVDPNTV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdpoev.hxx b/svx/inc/svx/svdpoev.hxx index c187a2ddb3eb..b65d0b2d8bf0 100644 --- a/svx/inc/svx/svdpoev.hxx +++ b/svx/inc/svx/svdpoev.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,3 +109,4 @@ public: #endif //_SVDPOEV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdpool.hxx b/svx/inc/svx/svdpool.hxx index 6c764262c5b0..550d383a8657 100644 --- a/svx/inc/svx/svdpool.hxx +++ b/svx/inc/svx/svdpool.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ public: #endif // _SVDPOOL_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdsnpv.hxx b/svx/inc/svx/svdsnpv.hxx index 4ad6d42a013c..8d9ec903b8a1 100644 --- a/svx/inc/svx/svdsnpv.hxx +++ b/svx/inc/svx/svdsnpv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -243,8 +244,8 @@ public: // - Linie behaelt beim Draggen ihren Winkel bei und wird nur (ni) // verlaengert bzw. verkuerzt. // Defaultmaessig ist Ortho ausgeschaltet. Persistent. - void SetOrtho(sal_Bool bOn) { bOrtho=bOn; } // unvollstaendig - sal_Bool IsOrtho() const { return bOrtho; } + void SetOrtho(bool bOn) { bOrtho=bOn; } // unvollstaendig + bool IsOrtho() const { return bOrtho; } // BigOrtho hat nur Relevanz wenn Ortho eingeschaltet ist. // Beispiel: Ein Rechteck wird mit eingeschaltetem Ortho (also ein Quadrat) @@ -256,8 +257,8 @@ public: // tetem BigOrtho bekaeme man dagegen ein Quadrat der Kantenlaenge 80. // Gleiches gilt auch fuer Resize. // Defaultmaessig ist BigOrtho eingeschaltet. Persistent. - void SetBigOrtho(sal_Bool bOn) { bBigOrtho=bOn; } - sal_Bool IsBigOrtho() const { return bBigOrtho; } + void SetBigOrtho(bool bOn) { bBigOrtho=bOn; } + bool IsBigOrtho() const { return bBigOrtho; } // bei MoveOnlyDragging=sal_True wird bei Resize/Rotate/Shear/Mirror/Crook // nur das Zentrum der markierten Objekte transformiert. Groesse, Form @@ -336,3 +337,4 @@ public: #endif //_SVDSNPV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdsob.hxx b/svx/inc/svx/svdsob.hxx index 64d437d4c608..c995516873b6 100644 --- a/svx/inc/svx/svdsob.hxx +++ b/svx/inc/svx/svdsob.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -131,3 +132,4 @@ inline SvStream& operator>>(SvStream& rIn, SetOfByte& rSet) #endif // _SVDSOB_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdstr.hrc b/svx/inc/svx/svdstr.hrc index 2049bc4c3fdc..e298b755d29c 100644..100755 --- a/svx/inc/svx/svdstr.hrc +++ b/svx/inc/svx/svdstr.hrc @@ -27,10 +27,8 @@ #define SDR_ResourceBegin 2560 -//////////////////////////////////////////////////////////////////////////////////////////////////// -// Achtung: Alle Strings zwischen SDR_StringCacheBegin und -// SDR_StringCacheEnd muessen buendig aneinander liegen. -//BFS06#define SDR_StringCacheBegin (SDR_ResourceBegin) +// Attention: All strings between SDR_StringCacheBegin and +// SDR_StringCacheEnd must be aligned next to each other. #define STR_ObjNameBegin (SDR_ResourceBegin) #define STR_ObjNameSingulNONE (STR_ObjNameBegin + 0) @@ -155,7 +153,6 @@ #define STR_ObjNameSingulUno (STR_ObjNameBegin +119) #define STR_ObjNamePluralUno (STR_ObjNameBegin +120) -// Neu ab 537: Namen fuer 3D-Objekte #define STR_ObjNameSingulCube3d (STR_ObjNameBegin + 121) #define STR_ObjNamePluralCube3d (STR_ObjNameBegin + 122) #define STR_ObjNameSingulExtrude3d (STR_ObjNameBegin + 123) @@ -166,7 +163,6 @@ #define STR_ObjNamePluralLathe3d (STR_ObjNameBegin + 128) #define STR_ObjNameSingulObj3d (STR_ObjNameBegin + 129) #define STR_ObjNamePluralObj3d (STR_ObjNameBegin + 130) -//BFS01#define STR_ObjNameSingulPoly3d (STR_ObjNameBegin + 131) #define STR_ObjNamePluralPoly3d (STR_ObjNameBegin + 132) #define STR_ObjNameSingulScene3d (STR_ObjNameBegin + 133) #define STR_ObjNamePluralScene3d (STR_ObjNameBegin + 134) @@ -326,11 +322,10 @@ #define STR_UndoDelLayer (STR_UndoBegin +14) #define STR_UndoMovLayer (STR_UndoBegin +15) -// --> OD 2009-07-09 #i73249# +// #i73249# #define STR_UndoObjName (STR_UndoBegin +16) #define STR_UndoObjTitle (STR_UndoBegin +17) #define STR_UndoObjDescription (STR_UndoBegin +18) -// <-- #define STR_UndoEnd (STR_UndoObjDescription) @@ -404,12 +399,6 @@ #define STR_ItemNam_SHADOWTRANSPARENCE (STR_ItemNamBegin + 4) #define STR_ItemNam_SHADOW3D (STR_ItemNamBegin + 5) #define STR_ItemNam_SHADOWPERSP (STR_ItemNamBegin + 6) -//BFS01#define STR_ItemNam_SHADOWRESERVE1 (STR_ItemNamBegin + 7) -//BFS01#define STR_ItemNam_SHADOWRESERVE2 (STR_ItemNamBegin + 8) -//BFS01#define STR_ItemNam_SHADOWRESERVE3 (STR_ItemNamBegin + 9) -//BFS01#define STR_ItemNam_SHADOWRESERVE4 (STR_ItemNamBegin + 10) -//BFS01#define STR_ItemNam_SHADOWRESERVE5 (STR_ItemNamBegin + 11) -//BFS01#define STR_ItemNamSET_SHADOW (STR_ItemNamBegin + 12) #define STR_ItemNam_CAPTIONTYPE (STR_ItemNamBegin + 13) #define STR_ItemNam_CAPTIONFIXEDANGLE (STR_ItemNamBegin + 14) #define STR_ItemNam_CAPTIONANGLE (STR_ItemNamBegin + 15) @@ -420,13 +409,6 @@ #define STR_ItemNam_CAPTIONESCABS (STR_ItemNamBegin + 20) #define STR_ItemNam_CAPTIONLINELEN (STR_ItemNamBegin + 21) #define STR_ItemNam_CAPTIONFITLINELEN (STR_ItemNamBegin + 22) -//BFS01#define STR_ItemNam_CAPTIONRESERVE1 (STR_ItemNamBegin + 23) -//BFS01#define STR_ItemNam_CAPTIONRESERVE2 (STR_ItemNamBegin + 24) -//BFS01#define STR_ItemNam_CAPTIONRESERVE3 (STR_ItemNamBegin + 25) -//BFS01#define STR_ItemNam_CAPTIONRESERVE4 (STR_ItemNamBegin + 26) -//BFS01#define STR_ItemNam_CAPTIONRESERVE5 (STR_ItemNamBegin + 27) -//BFS01#define STR_ItemNamSET_CAPTION (STR_ItemNamBegin + 28) -//BFS01#define STR_ItemNamSET_OUTLINER (STR_ItemNamBegin + 29) #define STR_ItemNam_ECKENRADIUS (STR_ItemNamBegin + 30) #define STR_ItemNam_TEXT_LEFTDIST (STR_ItemNamBegin + 31) @@ -475,27 +457,12 @@ #define STR_ItemNamEnd (STR_ItemNam_SHEARANGLE) #define STR_ItemEnd STR_ItemNamEnd -// 64 Resource-Id's reserviert fuer kompatible Erweiterungen -//BFS06#define STR_SvDraw_CacheReserve_Begin (STR_ItemEnd+1) -//BFS06#define STR_SvDraw_CacheReserve_End (STR_SvDraw_CacheReserve_Begin+63) -//BFS06#define SDR_StringCacheEnd (STR_SvDraw_CacheReserve_Begin-1) - -//BFS06#define STR_ErrorBegin (STR_SvDraw_CacheReserve_End+1) -//BFS06#define STR_ErrorBegin (STR_ItemEnd+1) -//BFS06#define STR_SvDraw_ErrorReserve_Begin (STR_ErrorBegin + 2) -// hier ist Platz fuer 30 Eintraege -//BFS06#define STR_SvDraw_ErrorReserve_End (STR_SvDraw_ErrorReserve_Begin + 29) -//BFS06#define STR_ErrorEnd STR_SvDraw_ErrorReserve_End -//BFS06#define STR_ErrorEnd (STR_ErrorBegin + 2) - -// 22-05-98: 2 Eintraege fuer die Bitmaps von der StrErrorReserve abgeknapst -//BFS06#define BMAP_Begin (STR_ErrorEnd+1) #define BMAP_Begin (STR_ItemEnd+1) #define BMAP_GrafikEi (BMAP_Begin +0) #define BMAP_GrafikDe (BMAP_Begin +1) #define BMAP_End (BMAP_GrafikDe) -// Strings fuer den Vorlagen-Dialog +// Strings for the template dialog #define SIP_Begin (BMAP_End) #define SIP_UNKNOWN_ATTR (SIP_Begin + 0) @@ -565,7 +532,6 @@ #define SIP_XA_FTRESERVED4 (SIP_Begin + 64) #define SIP_XA_FTRESERVED5 (SIP_Begin + 65) #define SIP_XA_FTRESERVED_LAST (SIP_Begin + 66) -//BFS01#define SIP_XATTRSET_TEXT (SIP_Begin + 67) #define SIP_SA_SHADOW (SIP_Begin + 68) #define SIP_SA_SHADOWCOLOR (SIP_Begin + 69) #define SIP_SA_SHADOWXDIST (SIP_Begin + 70) @@ -573,12 +539,6 @@ #define SIP_SA_SHADOWTRANSPARENCE (SIP_Begin + 72) #define SIP_SA_SHADOW3D (SIP_Begin + 73) #define SIP_SA_SHADOWPERSP (SIP_Begin + 74) -//BFS01#define SIP_SA_SHADOWRESERVE1 (SIP_Begin + 75) -//BFS01#define SIP_SA_SHADOWRESERVE2 (SIP_Begin + 76) -//BFS01#define SIP_SA_SHADOWRESERVE3 (SIP_Begin + 77) -//BFS01#define SIP_SA_SHADOWRESERVE4 (SIP_Begin + 78) -//BFS01#define SIP_SA_SHADOWRESERVE5 (SIP_Begin + 79) -//BFS01#define SIP_SDRATTRSET_SHADOW (SIP_Begin + 80) #define SIP_SA_CAPTIONTYPE (SIP_Begin + 81) #define SIP_SA_CAPTIONFIXEDANGLE (SIP_Begin + 82) #define SIP_SA_CAPTIONANGLE (SIP_Begin + 83) @@ -589,13 +549,6 @@ #define SIP_SA_CAPTIONESCABS (SIP_Begin + 88) #define SIP_SA_CAPTIONLINELEN (SIP_Begin + 89) #define SIP_SA_CAPTIONFITLINELEN (SIP_Begin + 90) -//BFS01#define SIP_SA_CAPTIONRESERVE1 (SIP_Begin + 91) -//BFS01#define SIP_SA_CAPTIONRESERVE2 (SIP_Begin + 92) -//BFS01#define SIP_SA_CAPTIONRESERVE3 (SIP_Begin + 93) -//BFS01#define SIP_SA_CAPTIONRESERVE4 (SIP_Begin + 94) -//BFS01#define SIP_SA_CAPTIONRESERVE5 (SIP_Begin + 95) -//BFS01#define SIP_SDRATTRSET_CAPTION (SIP_Begin + 96) -//BFS01#define SIP_SDRATTRSET_OUTLINER (SIP_Begin + 97) #define SIP_SA_ECKENRADIUS (SIP_Begin + 98) #define SIP_SA_TEXT_MINFRAMEHEIGHT (SIP_Begin + 99) #define SIP_SA_TEXT_AUTOGROWHEIGHT (SIP_Begin + 100) @@ -625,7 +578,6 @@ #define SIP_SA_AUTOGROWSIZE (SIP_Begin + 124) #define SIP_SA_RESERVE18 (SIP_Begin + 125) #define SIP_SA_RESERVE19 (SIP_Begin + 126) -//BFS01#define SIP_SDRATTRSET_MISC (SIP_Begin + 127) #define SIP_SA_EDGEKIND (SIP_Begin + 128) #define SIP_SA_EDGENODE1HORZDIST (SIP_Begin + 129) #define SIP_SA_EDGENODE1VERTDIST (SIP_Begin + 130) @@ -637,15 +589,6 @@ #define SIP_SA_EDGELINE1DELTA (SIP_Begin + 136) #define SIP_SA_EDGELINE2DELTA (SIP_Begin + 137) #define SIP_SA_EDGELINE3DELTA (SIP_Begin + 138) -//BFS01#define SIP_SA_EDGERESERVE02 (SIP_Begin + 139) -//BFS01#define SIP_SA_EDGERESERVE03 (SIP_Begin + 140) -//BFS01#define SIP_SA_EDGERESERVE04 (SIP_Begin + 141) -//BFS01#define SIP_SA_EDGERESERVE05 (SIP_Begin + 142) -//BFS01#define SIP_SA_EDGERESERVE06 (SIP_Begin + 143) -//BFS01#define SIP_SA_EDGERESERVE07 (SIP_Begin + 144) -//BFS01#define SIP_SA_EDGERESERVE08 (SIP_Begin + 145) -//BFS01#define SIP_SA_EDGERESERVE09 (SIP_Begin + 146) -//BFS01#define SIP_SDRATTRSET_EDGE (SIP_Begin + 147) #define SIP_SA_MEASUREKIND (SIP_Begin + 148) #define SIP_SA_MEASURETEXTHPOS (SIP_Begin + 149) #define SIP_SA_MEASURETEXTVPOS (SIP_Begin + 150) @@ -670,7 +613,6 @@ #define SIP_SA_MEASURERESERVE05 (SIP_Begin + 169) #define SIP_SA_MEASURERESERVE06 (SIP_Begin + 170) #define SIP_SA_MEASURERESERVE07 (SIP_Begin + 171) -//BFS01#define SIP_SDRATTRSET_MEASURE (SIP_Begin + 172) #define SIP_SA_CIRCKIND (SIP_Begin + 173) #define SIP_SA_CIRCSTARTANGLE (SIP_Begin + 174) #define SIP_SA_CIRCENDANGLE (SIP_Begin + 175) @@ -757,18 +699,13 @@ #define SIP_SA_GRAFRESERVE4 (SIP_Begin + 255) #define SIP_SA_GRAFRESERVE5 (SIP_Begin + 256) #define SIP_SA_GRAFRESERVE6 (SIP_Begin + 257) -//BFS01#define SIP_SDRATTRSET_GRAF (SIP_Begin + 258) #define SIP_SA_MARKERS (SIP_Begin + 258) #define SIP_SA_PAGESHADOW35X35 (SIP_Begin + 259) #define SIP_SA_FINE_MARKERS (SIP_Begin + 260) -// #100499# #define BMP_SVXOLEOBJ (SIP_Begin + 261) -// #101928# -#define SIP_SA_ACCESSIBILITY_MARKERS (SIP_Begin + 262) - #define STR_TABLE_ATTR (SIP_Begin + 263) #define STR_TABLE_AUTOFMT (SIP_Begin + 264) #define STR_TABLE_INSCOL (SIP_Begin + 265) @@ -784,11 +721,7 @@ #define STR_TABLE_STYLE_SETTINGS (SIP_Begin + 275) #define SIP_SA_CROP_MARKERS (SIP_Begin + 276) #define SIP_SA_CROP_FINE_MARKERS (SIP_Begin + 277) -#define SIP_SA_ACCESSIBILITY_CROP_MARKERS (SIP_Begin + 278) -#define SIP_End (SIP_SA_ACCESSIBILITY_CROP_MARKERS) +#define SIP_End (SIP_SA_CROP_FINE_MARKERS) #define SDR_ResourceEnd (SIP_End) - -//////////////////////////////////////////////////////////////////////////////////////////////////// - diff --git a/svx/inc/svx/svdtext.hxx b/svx/inc/svx/svdtext.hxx index f7bc7c72fcbc..ca44bed26b60 100644 --- a/svx/inc/svx/svdtext.hxx +++ b/svx/inc/svx/svdtext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,4 @@ private: #endif //_SVDTEXT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdtrans.hxx b/svx/inc/svx/svdtrans.hxx index d1cc076fe824..b0cd472a2681 100644 --- a/svx/inc/svx/svdtrans.hxx +++ b/svx/inc/svx/svdtrans.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ #include <tools/poly.hxx> #include <tools/fract.hxx> -#ifndef _MAPMOD_HXX //autogen #include <vcl/mapmod.hxx> -#endif #include <tools/string.hxx> #include "svx/svxdllapi.h" @@ -68,7 +67,7 @@ inline void MovePoly(PolyPolygon& rPoly, const Size& S) { rPoly.Move(S.Width(), void MoveXPoly(XPolygon& rPoly, const Size& S); void MoveXPoly(XPolyPolygon& rPoly, const Size& S); -SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, FASTBOOL bNoJustify=sal_False); +SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bNoJustify = false); inline void ResizePoint(Point& rPnt, const Point& rRef, Fraction xFact, Fraction yFact); void ResizePoly(Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact); void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact); @@ -83,43 +82,43 @@ void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs); // MirrorRect macht nur Sinn bei Spiegelachsen // mit einem durch 45 Degree teilbaren Winkel! -void MirrorRect(Rectangle& rRect, const Point& rRef1, const Point& rRef2, FASTBOOL bNoJustify); // ni. +void MirrorRect(Rectangle& rRect, const Point& rRef1, const Point& rRef2, bool bNoJustify); // ni. void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2); void MirrorPoly(Polygon& rPoly, const Point& rRef1, const Point& rRef2); void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2); void MirrorPoly(PolyPolygon& rPoly, const Point& rRef1, const Point& rRef2); void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2); -inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, FASTBOOL bVShear=sal_False); -SVX_DLLPUBLIC void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=sal_False); -void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=sal_False); -void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=sal_False); -void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=sal_False); +inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear = false); +SVX_DLLPUBLIC void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, bool bVShear = false); +void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear = false); +void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear = false); +void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear = false); // rPnt.X bzw rPnt.Y wird auf rCenter.X bzw. rCenter.Y gesetzt! // anschliessend muss rPnt nur noch um rCenter gedreht werden. // Der Rueckgabewinkel ist ausnahmsweise in Rad. -inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad, FASTBOOL bVertical); +inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad, bool bVertical); // Die folgenden Methoden behandeln einen Punkt eines XPolygons, wobei die // benachbarten Kontrollpunkte des eigentlichen Punktes ggf. in pC1/pC2 // uebergeben werden. Ueber rSin/rCos wird gleichzeitig sin(nWink) und cos(nWink) // zurueckgegeben. // Der Rueckgabewinkel ist hier ebenfalls in Rad. double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter, - const Point& rRad, double& rSin, double& rCos, FASTBOOL bVert); + const Point& rRad, double& rSin, double& rCos, bool bVert); double CrookSlantXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter, - const Point& rRad, double& rSin, double& rCos, FASTBOOL bVert); + const Point& rRad, double& rSin, double& rCos, bool bVert); double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter, - const Point& rRad, double& rSin, double& rCos, FASTBOOL bVert, + const Point& rRad, double& rSin, double& rCos, bool bVert, const Rectangle rRefRect); -void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert); -void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert); -void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert, const Rectangle rRefRect); +void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert); +void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert); +void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle rRefRect); -void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert); -void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert); -void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert, const Rectangle rRefRect); +void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert); +void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert); +void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle rRefRect); /**************************************************************************************************/ /* Inline */ @@ -141,7 +140,7 @@ inline void RotatePoint(Point& rPnt, const Point& rRef, double sn, double cs) rPnt.Y()=Round(rRef.Y()+dy*cs-dx*sn); } -inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, FASTBOOL bVShear) +inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear) { if (!bVShear) { // Horizontal if (rPnt.Y()!=rRef.Y()) { // sonst nicht noetig @@ -154,7 +153,7 @@ inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, FASTBOOL bVShe } } -inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad, FASTBOOL bVertical) +inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad, bool bVertical) { double nWink; if (bVertical) { @@ -237,8 +236,8 @@ public: Polygon Rect2Poly(const Rectangle& rRect, const GeoStat& rGeo); void Poly2Rect(const Polygon& rPol, Rectangle& rRect, GeoStat& rGeo); -SVX_DLLPUBLIC void OrthoDistance8(const Point& rPt0, Point& rPt, FASTBOOL bBigOrtho); -SVX_DLLPUBLIC void OrthoDistance4(const Point& rPt0, Point& rPt, FASTBOOL bBigOrtho); +SVX_DLLPUBLIC void OrthoDistance8(const Point& rPt0, Point& rPt, bool bBigOrtho); +SVX_DLLPUBLIC void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho); // Multiplikation und anschliessende Division. // Rechnung und Zwischenergebnis sind BigInt. @@ -271,20 +270,20 @@ FrPair GetMapFactor(MapUnit eS, FieldUnit eD); FrPair GetMapFactor(FieldUnit eS, MapUnit eD); FrPair GetMapFactor(FieldUnit eS, FieldUnit eD); -inline FASTBOOL IsMetric(MapUnit eU) { +inline bool IsMetric(MapUnit eU) { return (eU==MAP_100TH_MM || eU==MAP_10TH_MM || eU==MAP_MM || eU==MAP_CM); } -inline FASTBOOL IsInch(MapUnit eU) { +inline bool IsInch(MapUnit eU) { return (eU==MAP_1000TH_INCH || eU==MAP_100TH_INCH || eU==MAP_10TH_INCH || eU==MAP_INCH || eU==MAP_POINT || eU==MAP_TWIP); } -inline FASTBOOL IsMetric(FieldUnit eU) { +inline bool IsMetric(FieldUnit eU) { return (eU==FUNIT_MM || eU==FUNIT_CM || eU==FUNIT_M || eU==FUNIT_KM || eU==FUNIT_100TH_MM); } -inline FASTBOOL IsInch(FieldUnit eU) { +inline bool IsInch(FieldUnit eU) { return (eU==FUNIT_TWIP || eU==FUNIT_POINT || eU==FUNIT_PICA || eU==FUNIT_INCH || eU==FUNIT_FOOT || eU==FUNIT_MILE); } @@ -294,9 +293,9 @@ class SVX_DLLPUBLIC SdrFormatter { long nMul_; long nDiv_; short nKomma_; - FASTBOOL bSrcFU; - FASTBOOL bDstFU; - FASTBOOL bDirty; + bool bSrcFU; + bool bDstFU; + bool bDirty; MapUnit eSrcMU; MapUnit eDstMU; FieldUnit eSrcFU; @@ -324,3 +323,4 @@ public: #endif //_SVDTRANS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdtypes.hxx b/svx/inc/svx/svdtypes.hxx index 67161e8eb748..e294dbf788e8 100644 --- a/svx/inc/svx/svdtypes.hxx +++ b/svx/inc/svx/svdtypes.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -117,7 +118,7 @@ enum SdrObjListKind {SDROBJLIST_UNKNOWN =0x00, // Unbekannt // Hier haben zur Not noch 8 weitere Pagetypen Platz }; // fuer die Surrogate reserviert -inline FASTBOOL SdrIsPageKind(SdrObjListKind eK) { return eK>=SDROBJLIST_DRAWPAGE && eK<=0x1A; } +inline bool SdrIsPageKind(SdrObjListKind eK) { return eK>=SDROBJLIST_DRAWPAGE && eK<=0x1A; } //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -167,3 +168,4 @@ enum SdrRepeatFunc {SDRREPFUNC_OBJ_NONE, #endif //_SVDTYPES_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index 5329be5973eb..a88540f7cb33 100644 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SVDUNDO_HXX #define _SVDUNDO_HXX -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #include <svl/undo.hxx> #include <tools/contnr.hxx> #include <tools/gen.hxx> @@ -145,9 +144,9 @@ protected: protected: SdrUndoObj(SdrObject& rNewObj); - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, FASTBOOL bRepeat=sal_False) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, bool bRepeat = false) const; - static void GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, FASTBOOL bRepeat = sal_False ); + static void GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, bool bRepeat = false ); // #94278# new method for evtl. PageChange at UNDO/REDO void ImpShowPageOfThisObject(); @@ -173,8 +172,8 @@ protected: SfxStyleSheet* pUndoStyleSheet; SfxStyleSheet* pRedoStyleSheet; SfxStyleSheet* pRepeatStyleSheet; - FASTBOOL bStyleSheet; - FASTBOOL bHaveToTakeRedoSet; + bool bStyleSheet; + bool bHaveToTakeRedoSet; // Bei Zuweisung von TextItems auf ein Zeichenobjekt mit Text: OutlinerParaObject* pTextUndo; @@ -186,7 +185,7 @@ protected: SdrUndoGroup* pUndoGroup; public: - SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1=sal_False, FASTBOOL bSaveText=sal_False); + SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1 = false, bool bSaveText = false); virtual ~SdrUndoAttrObj(); void SetRepeatAttr(const SfxItemSet& rSet); virtual void Undo(); @@ -295,7 +294,7 @@ protected: class SVX_DLLPUBLIC SdrUndoRemoveObj : public SdrUndoObjList { public: - SdrUndoRemoveObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) + SdrUndoRemoveObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoObjList(rNewObj,bOrdNumDirect) {} virtual void Undo(); @@ -314,7 +313,7 @@ public: class SVX_DLLPUBLIC SdrUndoInsertObj : public SdrUndoObjList { public: - SdrUndoInsertObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) + SdrUndoInsertObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoObjList(rNewObj,bOrdNumDirect) {} virtual void Undo(); @@ -332,7 +331,7 @@ public: class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj { public: - SdrUndoDelObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) + SdrUndoDelObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(sal_True); } virtual void Undo(); @@ -356,7 +355,7 @@ public: class SVX_DLLPUBLIC SdrUndoNewObj : public SdrUndoInsertObj { public: - SdrUndoNewObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) + SdrUndoNewObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoInsertObj(rNewObj,bOrdNumDirect) {} virtual void Undo(); @@ -410,7 +409,7 @@ public: class SdrUndoCopyObj : public SdrUndoNewObj { public: - SdrUndoCopyObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) + SdrUndoCopyObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoNewObj(rNewObj,bOrdNumDirect) {} virtual String GetComment() const; @@ -460,7 +459,7 @@ class SVX_DLLPUBLIC SdrUndoObjSetText : public SdrUndoObj protected: OutlinerParaObject* pOldText; OutlinerParaObject* pNewText; - FASTBOOL bNewTextAvailable; + bool bNewTextAvailable; sal_Bool bEmptyPresObj; sal_Int32 mnText; @@ -468,7 +467,7 @@ public: SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText ); virtual ~SdrUndoObjSetText(); - FASTBOOL IsDifferent() const { return pOldText!=pNewText; } + bool IsDifferent() const { return pOldText!=pNewText; } void AfterSetText(); virtual void Undo(); @@ -481,7 +480,7 @@ public: virtual bool CanSdrRepeat(SdrView& rView) const; }; -// --> OD 2009-07-09 #i73249# +// Implement Title/Description Elements UI for Writer text frames, graphics and embedded objects (#i73249#) class SdrUndoObjStrAttr : public SdrUndoObj { public: @@ -508,7 +507,6 @@ public: virtual String GetComment() const; }; -// <-- //////////////////////////////////////////////////////////////////////////////////////////////////// // @@ -535,7 +533,7 @@ protected: SdrLayer* pLayer; SdrLayerAdmin* pLayerAdmin; sal_uInt16 nNum; - FASTBOOL bItsMine; + bool bItsMine; protected: SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); @@ -633,7 +631,7 @@ protected: protected: SdrUndoPage(SdrPage& rNewPg); - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 n=0, FASTBOOL bRepeat=sal_False) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 n=0, bool bRepeat = false) const; }; //************************************************************ @@ -651,7 +649,7 @@ protected: // Bei einem Undo/Redo findet moeglicherweise Uebereignung der Page // statt. Im Dtor wird die Page deleted, wenn bItsMine==TRUE - FASTBOOL bItsMine; + bool bItsMine; protected: SdrUndoPageList(SdrPage& rNewPg); @@ -853,12 +851,11 @@ public: virtual SdrUndoAction* CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer ); virtual SdrUndoAction* CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ); - // --> OD 2009-07-09 #i73249# + // Implement Title/Description Elements UI for Writer text frames, graphics and embedded objects (#i73249#) virtual SdrUndoAction* CreateUndoObjectStrAttr( SdrObject& rObject, SdrUndoObjStrAttr::ObjStrAttrType eObjStrAttrType, String sOldStr, String sNewStr ); - // <-- // layer virtual SdrUndoAction* CreateUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); @@ -880,3 +877,4 @@ public: #endif //_SVDUNDO_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx index c189c8daf9a2..f50d6e746bad 100644 --- a/svx/inc/svx/svdview.hxx +++ b/svx/inc/svx/svdview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -337,3 +338,4 @@ public: // ///////////////////////////////////////////////////////////////////////////////////////////////// */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdviter.hxx b/svx/inc/svx/svdviter.hxx index 884733bc2d84..7873e567d3ee 100644 --- a/svx/inc/svx/svdviter.hxx +++ b/svx/inc/svx/svdviter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,6 +33,39 @@ #include <sal/types.h> #include "svx/svxdllapi.h" +/* + +Using this class, you can find out: +- SdrView* First/NextView() + - All Views in which a model is displayed + - All Views in which a certain page is visible (also as MasterPage) + - All Views in which a certain object is visible (also as MasterPage) +- SdrPageView* First/NextPageView() + - All PageViews in which a model is displayed + - All PageViews in which a certain page is visible (also as MasterPage) + - All PageViews in which a certain object is visible (also as MasterPage) +- OutputDevice* First/NextOutDev() + - All OutputDevices in which a model is displayed + - All OutputDevices in which a certain page is visible (also as MasterPage) + - All OutputDevices in which a certain object is visible (also as MasterPage) +- Window* First/NextWindow() + - All Windows in which a model is displayed + - All Windows in which a certain page is visible (also as MasterPage) + - All Windows in which a certain object is visible (also as MasterPage) +You can specify if the selection is restricted to a certain page/object by +choosing the corresponding constructor. + +Among others, the following are considered: +- Visibility state of the layer +- Visible Layer of MasterPages +- Multiple layer for group objects + +Not considered are: +- Whether the pages/objects were already painted or if an Invalidate is still pending +- Whether the pages/objects in a Window are in a visible region + +*/ + //////////////////////////////////////////////////////////////////////////////////////////////////// class OutputDevice; @@ -85,42 +119,6 @@ public: Window* NextWindow(); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef _JUST_DESCRIPTION - -Mit dieser Klasse kann man rausbekommen: -- SdrView* First/NextView() - - Alle Views in denen ein Models dargestellt wird - - Alle Views in denen eine bestimme Page sichtbar ist (ww. auch als MasterPage) - - Alle Views in denen ein bestimmes Objekt sichtbar ist (ww. auch auf MasterPage) -- SdrPageView* First/NextPageView() - - Alle PageViews in denen ein Models dargestellt wird - - Alle PageViews in denen eine bestimme Page sichtbar ist (ww. auch als MasterPage) - - Alle PageViews in denen ein bestimmes Objekt sichtbar ist (ww. auch auf MasterPage) -- OutputDevice* First/NextOutDev() - - Alle OutputDevices in denen ein Models dargestellt wird - - Alle OutputDevices in denen eine bestimme Page sichtbar ist (ww. auch als MasterPage) - - Alle OutputDevices in denen ein bestimmes Objekt sichtbar ist (ww. auch auf MasterPage) -- Window* First/NextWindow() - - Alle Windows in denen ein Models dargestellt wird - - Alle Windows in denen eine bestimme Page sichtbar ist (auch als MasterPage) - - Alle Windows in denen ein bestimmes Objekt sichtbar ist (auch auf MasterPage) -Ob die Auswahl auf ein(e) bestimmte(s) Page/Objekt beschraenkt wird, bestimmt man -durch die Wahl des Konstruktors. - -Es werden u.a. auch berueksichtigt: -- Layer Sichtbarkeitsstatus -- Visible Layer von MasterPages -- Mehrfachlayer bei Gruppenobjekten - -Es wird nicht berueksichtigt: -- Ob die Pages/Objekte wirklich schon gepaintet wurden oder noch ein Invalidate ansteht, ... -- Ob die Pages/Objekte in einem Window im sichtbaren Bereich liegen - -#endif // _JUST_DESCRIPTION - -//////////////////////////////////////////////////////////////////////////////////////////////////// - #endif //_SVDVITER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx index f600ec5d7bc6..b19e2135e922 100644 --- a/svx/inc/svx/svdxcgv.hxx +++ b/svx/inc/svx/svdxcgv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <svx/svdedxv.hxx> -#ifndef _GDIMTF_HXX //autogen #include <vcl/gdimtf.hxx> -#endif #include "svx/svxdllapi.h" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -160,3 +159,5 @@ public: }; #endif //_SVDXCGV_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svimbase.hxx b/svx/inc/svx/svimbase.hxx index 4ed98e229a32..df195bd3c551 100644 --- a/svx/inc/svx/svimbase.hxx +++ b/svx/inc/svx/svimbase.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -162,43 +163,36 @@ public: sal_uIntPtr GetOrgAlignedSize() const { return GetOrgAlignedWidth() * GetOrgHeight(); } sal_uIntPtr GetDestAlignedSize() const { return GetDestAlignedWidth() * GetDestHeight(); } - // Farbtiefe des Ausgangsbildes ermitteln und setzen + // Get and set the color depth of the origin picture SimDepthType GetDepth() const { return eOrgDepth; } void SetDepth( const SimDepthType eDepth ) { eOrgDepth = eDepth; } - // Farbtiefen nach Undo und Redo ermitteln und setzen + // Get and set the color depth after Undo and Redo SimDepthType GetUndoDepth() const { return eUndoDepth; } void SetUndoDepth(const SimDepthType eDepth) { eUndoDepth = eDepth; } SimDepthType GetRedoDepth() const { return eRedoDepth; } void SetRedoDepth(const SimDepthType eDepth) { eRedoDepth = eDepth; } - // Vor- und Ruecklauf der Bildverarbeitung sal_Bool BeginProcessing( sal_Bool bUndo = sal_True ); void EndProcessing(); sal_Bool BeginProcessingExt(sal_uIntPtr nWidth, sal_uIntPtr nHeight, sal_Bool bUndo = sal_True); void EndProcessingExt() { EndProcessing(); } - // Zeiger auf Arrays zur Verfuegung stellen HPBYTE GetOrgPointer() { return pOrgArray; } HPBYTE GetDestPointer() { return pDestArray; } - // DIB-Erzeugung fuer Anzeige sal_Bool CreateOutBitmap( const sal_uIntPtr nColorCount = 256, sal_uIntPtr nLast = 0, SfxProgress* pProgress = NULL ); - // Undo-Verwaltung sal_Bool DoUndo( SfxProgress* pProgress = NULL ); sal_Bool DoRedo( SfxProgress* pProgress = NULL ); - // DIB-Rueckgabe fuer Anzeige const Bitmap& GetOutBitmap() const; - // DIB-Rueckgabe fuer Speicherung Bitmap GetSaveBitmap(); - // Palette besorgen SimPalette* GetOrgPalette() const { return nWhichOrg == 1 ? pPal1 : pPal2; } SimPalette* GetDestPalette() const { return nWhichOrg == 1 ? pPal2 : pPal1; } }; @@ -210,3 +204,5 @@ public: sal_Bool DitherBitmap( Bitmap& rBitmap, sal_Bool bDitherAlways = sal_False ); #endif // _SVIMBASE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx index 16a56f84b864..166887ac08d4 100644 --- a/svx/inc/svx/svx3ditems.hxx +++ b/svx/inc/svx/svx3ditems.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,8 +88,8 @@ public: Svx3DNormalsKindItem(sal_uInt16 nVal = 0); // use drawing::NormalsKind - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -102,8 +103,8 @@ public: Svx3DTextureProjectionXItem(sal_uInt16 nVal = 0); // use drawing::TextureProjectionMode - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -112,8 +113,8 @@ public: Svx3DTextureProjectionYItem(sal_uInt16 nVal = 0); // use drawing::TextureProjectionMode - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -147,8 +148,8 @@ public: Svx3DTextureKindItem(sal_uInt16 nVal = 3); // use drawing::TextureKind - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -157,8 +158,8 @@ public: Svx3DTextureModeItem(sal_uInt16 nVal = 2); // use drawing:TextureMode - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -173,8 +174,8 @@ public: Svx3DPerspectiveItem(sal_uInt16 nVal = (sal_uInt16)PR_PERSPECTIVE); // use drawing::ProjectionMode - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -328,8 +329,8 @@ public: Svx3DShadeModeItem(sal_uInt16 nVal = 2); // use drawing::ShadeMode - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -375,3 +376,5 @@ public: }; #endif // _SVX3DITEMS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svxcommands.h b/svx/inc/svx/svxcommands.h index 01ff0bcd95b2..01ff0bcd95b2 100644..100755 --- a/svx/inc/svx/svxcommands.h +++ b/svx/inc/svx/svxcommands.h diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index 56a4985db54d..6778da743c92 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,6 +40,7 @@ class SdrView; #include <com/sun/star/container/XIndexContainer.hpp> //add for FmShowColsDialog #include <com/sun/star/container/XNameReplace.hpp> //add for SvxMacroAssignDlg #include "svx/svxdllapi.h" +#include <vector> namespace com{namespace sun{namespace star{ namespace linguistic2{ @@ -55,7 +57,6 @@ typedef sal_uInt16* (*DialogGetRanges)(); struct ExchangeData; class INetURLObject; class GalleryTheme; -class TargetList; class SvxHyperlinkTabPageBase; class SearchAttrItemList; class FmFormShell; @@ -63,6 +64,8 @@ class Graphic; class SdrObject; class SvxSpellWrapper; +typedef ::std::vector< String* > TargetList; + namespace svx{ class SpellDialogChildWindow;} #define EMPTY_FRAME_REF com::sun::star::uno::Reference < com::sun::star::frame::XFrame >() @@ -346,7 +349,7 @@ public: virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent, const SdrView* pView, - sal_uInt16 nAnchorTypes = 0 ) = 0; //add for SvxCaptionTabDialog CHINA001 + sal_uInt16 nAnchorTypes = 0 ) = 0; //add for SvxCaptionTabDialog virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, @@ -505,3 +508,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svxdllapi.h b/svx/inc/svx/svxdllapi.h index 65670e9344f5..cd93cc428791 100644..100755 --- a/svx/inc/svx/svxdllapi.h +++ b/svx/inc/svx/svxdllapi.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,5 @@ #define SVX_DLLPRIVATE SAL_DLLPRIVATE #endif /* INCLUDED_SVXDLLAPI_H */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svxerr.hxx b/svx/inc/svx/svxerr.hxx index 0fd197f1a5f5..e59697a05e6c 100644 --- a/svx/inc/svx/svxerr.hxx +++ b/svx/inc/svx/svxerr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,9 +37,6 @@ #define ERRCODE_SVX_LINGU_THESAURUSNOTEXISTS (1UL | ERRCODE_AREA_SVX | \ ERRCODE_CLASS_NOTEXISTS) -// moved to editeng lib -//#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS (2UL | ERRCODE_AREA_SVX) - #define ERRCODE_SVX_LINGU_LINGUNOTEXISTS (3UL | ERRCODE_AREA_SVX | \ ERRCODE_CLASS_NOTEXISTS ) #define ERRCODE_SVX_LINGU_HYPHENNOTEXISTS (4UL | ERRCODE_AREA_SVX | \ @@ -50,8 +48,6 @@ #define ERRCODE_SVX_GRAPHIC_NOTREADABLE (7UL | ERRCODE_AREA_SVX | \ ERRCODE_CLASS_READ ) -// moved to editeng lib -//#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT (8UL | ERRCODE_AREA_SVX | ERRCODE_CLASS_READ ) #define ERRCODE_SVX_LINGU_NOLANGUAGE (9UL | ERRCODE_AREA_SVX | \ ERRCODE_CLASS_NOTEXISTS ) @@ -98,9 +94,9 @@ class SVX_DLLPUBLIC SvxErrorHandler : private SfxErrorHandler { - public: +public: SvxErrorHandler(); - static void Get(); + static void ensure(); }; #endif @@ -108,3 +104,4 @@ class SVX_DLLPUBLIC SvxErrorHandler : private SfxErrorHandler #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svxgrahicitem.hxx b/svx/inc/svx/svxgrahicitem.hxx index 70064c21c4fe..a76f8b1cc3e1 100644 --- a/svx/inc/svx/svxgrahicitem.hxx +++ b/svx/inc/svx/svxgrahicitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index 1cdfc9fb2b9e..0aa6db4e7fb1 100755 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -237,7 +237,6 @@ #define SID_BASICIDE_MODULEDLG ( SID_BASICIDE_START + 5 ) #define SID_BASICIDE_OBJCAT ( SID_BASICIDE_START + 6 ) #define SID_BASICIDE_REMOVEWATCH ( SID_BASICIDE_START + 7 ) -#define SID_BASICIDE_GOTOCALL ( SID_BASICIDE_START + 8 ) #define SID_BASICIDE_SHOWSBX ( SID_BASICIDE_START + 9 ) #define SID_BASICIDE_HIDECURPAGE ( SID_BASICIDE_START + 10 ) #define SID_BASICIDE_NAMECHANGEDONTAB ( SID_BASICIDE_START + 11 ) @@ -591,8 +590,8 @@ #define SID_ATTR_POSITION ( SID_SVX_START + 223 ) #define SID_ATTR_SIZE ( SID_SVX_START + 224 ) #define SID_TABLE_CELL ( SID_SVX_START + 225 ) -#define SID_ATTR_ALIGN_HOR_JUSTIFY ( SID_SVX_START + 226 ) -#define SID_ATTR_ALIGN_VER_JUSTIFY ( SID_SVX_START + 227 ) +//#define SID_ATTR_ALIGN_HOR_JUSTIFY ( SID_SVX_START + 226 ) +//#define SID_ATTR_ALIGN_VER_JUSTIFY ( SID_SVX_START + 227 ) #define SID_ATTR_ALIGN_MARGIN ( SID_SVX_START + 228 ) #define SID_ATTR_ALIGN_STACKED ( SID_SVX_START + 229 ) #define SID_ATTR_ALIGN_LINEBREAK ( SID_SVX_START + 230 ) @@ -701,7 +700,6 @@ #define SID_BMPMASK_PIPETTE ( SID_SVX_START + 351 ) #define SID_BMPMASK_BMPSELECT ( SID_SVX_START + 352 ) #define SID_BMPMASK_EXEC ( SID_SVX_START + 353 ) -//#define SID_HYPERLINK_INSERT ( SID_SVX_START + 360 ) -> sfxsids.hrc //#define SID_HYPERLINK_GETLINK ( SID_SVX_START + 361 ) -> sfxsids.hrc //#define SID_HYPERLINK_SETLINK ( SID_SVX_START + 362 ) -> sfxsids.hrc #define SID_NO_GRAPHICS ( SID_SVX_START + 364 ) @@ -745,11 +743,11 @@ //#define SID_ZOOM_PREV ( SID_SVX_START + 403 ) -> sfxsids.hrc #define SID_BACKGRND_DESTINATION ( SID_SVX_START + 404 ) #define SID_ATTR_FLASH ( SID_SVX_START + 406 ) -#define SID_ATTR_3D_LIGHT ( SID_SVX_START + 407 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ +#define SID_ATTR_3D_LIGHT ( SID_SVX_START + 407 ) /* Slots mit --> koennen demnaechst entfallen */ #define SID_ATTR_3D_START SID_ATTR_3D_LIGHT -#define SID_ATTR_3D_LIGHTINTENSITY ( SID_SVX_START + 408 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ -#define SID_ATTR_3D_LIGHTCOLOR ( SID_SVX_START + 409 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ -#define SID_ATTR_3D_AMBIENTINTENSITY ( SID_SVX_START + 410 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ +#define SID_ATTR_3D_LIGHTINTENSITY ( SID_SVX_START + 408 ) /* Slots mit --> koennen demnaechst entfallen */ +#define SID_ATTR_3D_LIGHTCOLOR ( SID_SVX_START + 409 ) /* Slots mit --> koennen demnaechst entfallen */ +#define SID_ATTR_3D_AMBIENTINTENSITY ( SID_SVX_START + 410 ) /* Slots mit --> koennen demnaechst entfallen */ #define SID_ATTR_3D_AMBIENTCOLOR ( SID_SVX_START + 411 ) #define SID_IMPORT_GRAPH_LINK ( SID_SVX_START + 412 ) @@ -1261,9 +1259,10 @@ #define SID_TRANSLITERATE_SENTENCE_CASE (SID_SVX_START+1102) #define SID_TRANSLITERATE_TITLE_CASE (SID_SVX_START+1103) #define SID_TRANSLITERATE_TOGGLE_CASE (SID_SVX_START+1104) +#define SID_TRANSLITERATE_ROTATE_CASE (SID_SVX_START+1105) // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id -#define SID_SVX_FIRSTFREE (SID_TRANSLITERATE_TOGGLE_CASE + 1) +#define SID_SVX_FIRSTFREE (SID_TRANSLITERATE_ROTATE_CASE + 1) // -------------------------------------------------------------------------- // Overflow check for slot IDs diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc index 3f3e4aaa8613..4a526b9738e4 100644..100755 --- a/svx/inc/svx/svxitems.hrc +++ b/svx/inc/svx/svxitems.hrc @@ -104,20 +104,6 @@ #define RID_SVXITEMS_CHARSET_SYSTEM (RID_SVXITEMS_START + 154) #define RID_SVXITEMS_CHARSET_SYMBOL (RID_SVXITEMS_START + 155) -// enum SvxCellHorJustify -#define RID_SVXITEMS_HORJUST_STANDARD (RID_SVXITEMS_START + 400) -#define RID_SVXITEMS_HORJUST_LEFT (RID_SVXITEMS_START + 401) -#define RID_SVXITEMS_HORJUST_CENTER (RID_SVXITEMS_START + 402) -#define RID_SVXITEMS_HORJUST_RIGHT (RID_SVXITEMS_START + 403) -#define RID_SVXITEMS_HORJUST_BLOCK (RID_SVXITEMS_START + 404) -#define RID_SVXITEMS_HORJUST_REPEAT (RID_SVXITEMS_START + 405) - -// enum SvxCellVerJustify -#define RID_SVXITEMS_VERJUST_STANDARD (RID_SVXITEMS_START + 406) -#define RID_SVXITEMS_VERJUST_TOP (RID_SVXITEMS_START + 407) -#define RID_SVXITEMS_VERJUST_CENTER (RID_SVXITEMS_START + 408) -#define RID_SVXITEMS_VERJUST_BOTTOM (RID_SVXITEMS_START + 409) - // enum SvxCellOrientation #define RID_SVXITEMS_ORI_STANDARD (RID_SVXITEMS_START + 410) #define RID_SVXITEMS_ORI_TOPBOTTOM (RID_SVXITEMS_START + 411) diff --git a/svx/inc/svx/swframeexample.hxx b/svx/inc/svx/swframeexample.hxx index 4068980b05b5..d1ffe7fd67dc 100644 --- a/svx/inc/svx/swframeexample.hxx +++ b/svx/inc/svx/swframeexample.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ public: #endif // _SVXSWFRAMEEXAMPLE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/swframeposstrings.hxx b/svx/inc/svx/swframeposstrings.hxx index 7ba005dc1e76..7271240f4a68 100644 --- a/svx/inc/svx/swframeposstrings.hxx +++ b/svx/inc/svx/swframeposstrings.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,10 +31,10 @@ #include <tools/string.hxx> #include "svx/svxdllapi.h" -/* -----------------04.03.2004 12:58----------------- +/* contains strings needed for positioning dialogs of frames and drawing in Writer - --------------------------------------------------*/ + */ class SvxSwFramePosString_Impl; class SVX_DLLPUBLIC SvxSwFramePosString { @@ -92,3 +93,4 @@ public: }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/swframevalidation.hxx b/svx/inc/svx/swframevalidation.hxx index 600479718050..e13e46ca9c53 100644 --- a/svx/inc/svx/swframevalidation.hxx +++ b/svx/inc/svx/swframevalidation.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,9 @@ #include <tools/gen.hxx> #include <limits.h> -/* -----------------03.03.2004 16:31----------------- - struct to determine min/max values for fly frame positioning in Writer - --------------------------------------------------*/ +/* + struct to determine min/max values for fly frame positioning in Writer + */ struct SvxSwFrameValidation { sal_Int16 nAnchorType; //com::sun::star::text::TextContentAnchorType @@ -61,7 +62,7 @@ struct SvxSwFrameValidation sal_Int32 nMinHeight; sal_Int32 nMaxHeight; - Size aPercentSize; // Size fuer 100%-Wert + Size aPercentSize; // Size for 100% value SvxSwFrameValidation() : bAutoHeight(false), @@ -85,3 +86,4 @@ struct SvxSwFrameValidation #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxallitm.hxx b/svx/inc/svx/sxallitm.hxx index 590e0b114d4c..1a49e75aa468 100644 --- a/svx/inc/svx/sxallitm.hxx +++ b/svx/inc/svx/sxallitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxcaitm.hxx b/svx/inc/svx/sxcaitm.hxx index 1cf8f2cd1802..5f3c730a66e2 100644 --- a/svx/inc/svx/sxcaitm.hxx +++ b/svx/inc/svx/sxcaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include <svx/svddef.hxx> -#ifndef _SDRANGITM_HXX #include <svx/sdangitm.hxx> -#endif #include <svx/sdooitm.hxx> //------------------------------------ @@ -58,3 +57,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx index 13379ab9fcbb..870b700e3727 100644 --- a/svx/inc/svx/sxcecitm.hxx +++ b/svx/inc/svx/sxcecitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxcgitm.hxx b/svx/inc/svx/sxcgitm.hxx index e4daddc12974..66499c77d7bb 100644 --- a/svx/inc/svx/sxcgitm.hxx +++ b/svx/inc/svx/sxcgitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxciaitm.hxx b/svx/inc/svx/sxciaitm.hxx index f04a672a791b..c3081ef48250 100644 --- a/svx/inc/svx/sxciaitm.hxx +++ b/svx/inc/svx/sxciaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx index 6134fe6ad5d4..1d7ab20db22d 100644 --- a/svx/inc/svx/sxcikitm.hxx +++ b/svx/inc/svx/sxcikitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,11 +46,13 @@ public: virtual sal_uInt16 GetValueCount() const; // { return 4; } SdrCircKind GetValue() const { return (SdrCircKind)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxcllitm.hxx b/svx/inc/svx/sxcllitm.hxx index 2563897b4ae1..61a1ffc29173 100644 --- a/svx/inc/svx/sxcllitm.hxx +++ b/svx/inc/svx/sxcllitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx index bf2f049a976b..ae59c320a2fb 100644 --- a/svx/inc/svx/sxctitm.hxx +++ b/svx/inc/svx/sxctitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,3 +51,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx index 936a7c75f888..c570f628d333 100644 --- a/svx/inc/svx/sxekitm.hxx +++ b/svx/inc/svx/sxekitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,10 +50,12 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual sal_uInt16 GetValueCount() const; // { return 5; } SdrEdgeKind GetValue() const { return (SdrEdgeKind)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxelditm.hxx b/svx/inc/svx/sxelditm.hxx index 5057f9d05f85..ff8e7bafac63 100644 --- a/svx/inc/svx/sxelditm.hxx +++ b/svx/inc/svx/sxelditm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,24 +42,26 @@ class SVX_DLLPUBLIC SdrEdgeLine1DeltaItem: public SdrMetricItem { public: SdrEdgeLine1DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE1DELTA,nVal) {} SdrEdgeLine1DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE1DELTA,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeLine2DeltaItem: public SdrMetricItem { public: SdrEdgeLine2DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE2DELTA,nVal) {} SdrEdgeLine2DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE2DELTA,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeLine3DeltaItem: public SdrMetricItem { public: SdrEdgeLine3DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE3DELTA,nVal) {} SdrEdgeLine3DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE3DELTA,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxenditm.hxx b/svx/inc/svx/sxenditm.hxx index fab72e1bea9d..faff5a491605 100644 --- a/svx/inc/svx/sxenditm.hxx +++ b/svx/inc/svx/sxenditm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,32 +36,32 @@ class SVX_DLLPUBLIC SdrEdgeNode1HorzDistItem: public SdrMetricItem { public: SdrEdgeNode1HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal) {} SdrEdgeNode1HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeNode1VertDistItem: public SdrMetricItem { public: SdrEdgeNode1VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal) {} SdrEdgeNode1VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeNode2HorzDistItem: public SdrMetricItem { public: SdrEdgeNode2HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal) {} SdrEdgeNode2HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeNode2VertDistItem: public SdrMetricItem { public: SdrEdgeNode2VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal) {} SdrEdgeNode2VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SdrEdgeNode1GlueDistItem: public SdrMetricItem { @@ -76,3 +77,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx index e40010bb1ad4..ff435343ea8a 100644 --- a/svx/inc/svx/sxfiitm.hxx +++ b/svx/inc/svx/sxfiitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,10 +49,9 @@ public: virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const; const Fraction& GetValue() const { return nValue; } void SetValue(const Fraction& rVal) { nValue = rVal; } -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxlayitm.hxx b/svx/inc/svx/sxlayitm.hxx index fa346dee0e9c..e857c994151a 100644 --- a/svx/inc/svx/sxlayitm.hxx +++ b/svx/inc/svx/sxlayitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxlogitm.hxx b/svx/inc/svx/sxlogitm.hxx index 9ef4903329c7..06093afbf6e6 100644 --- a/svx/inc/svx/sxlogitm.hxx +++ b/svx/inc/svx/sxlogitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmbritm.hxx b/svx/inc/svx/sxmbritm.hxx index 1f28844a0910..8abab824d31d 100644 --- a/svx/inc/svx/sxmbritm.hxx +++ b/svx/inc/svx/sxmbritm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include <svx/svddef.hxx> -#ifndef SXMBRITM_HXX #include <svx/sdynitm.hxx> -#endif // Die Masslinie unterhalb der Bezugskante // Zur Bemassung einer Objektunterkante @@ -46,3 +45,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmfsitm.hxx b/svx/inc/svx/sxmfsitm.hxx index 2e50d05aabf2..d0cd80a08112 100644 --- a/svx/inc/svx/sxmfsitm.hxx +++ b/svx/inc/svx/sxmfsitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx index 3cf0dcbe9351..b26fde1cbb31 100644 --- a/svx/inc/svx/sxmkitm.hxx +++ b/svx/inc/svx/sxmkitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,11 +46,13 @@ public: virtual sal_uInt16 GetValueCount() const; // { return 2; } SdrMeasureKind GetValue() const { return (SdrMeasureKind)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmlhitm.hxx b/svx/inc/svx/sxmlhitm.hxx index 1d4ffb5cfb05..f22f529cfeed 100644 --- a/svx/inc/svx/sxmlhitm.hxx +++ b/svx/inc/svx/sxmlhitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmoitm.hxx b/svx/inc/svx/sxmoitm.hxx index 091c66ec49ac..c9664b7f080a 100644 --- a/svx/inc/svx/sxmoitm.hxx +++ b/svx/inc/svx/sxmoitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,3 +40,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmovitm.hxx b/svx/inc/svx/sxmovitm.hxx index 360adfc52e1a..afa96c3aaa17 100644 --- a/svx/inc/svx/sxmovitm.hxx +++ b/svx/inc/svx/sxmovitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmsitm.hxx b/svx/inc/svx/sxmsitm.hxx index b58b30091569..1530cc285899 100644 --- a/svx/inc/svx/sxmsitm.hxx +++ b/svx/inc/svx/sxmsitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmspitm.hxx b/svx/inc/svx/sxmspitm.hxx index 3af212ffbad1..d0c89d9f40f3 100644 --- a/svx/inc/svx/sxmspitm.hxx +++ b/svx/inc/svx/sxmspitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmsuitm.hxx b/svx/inc/svx/sxmsuitm.hxx index bc572a8319ff..ecfbaafe3045 100644 --- a/svx/inc/svx/sxmsuitm.hxx +++ b/svx/inc/svx/sxmsuitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmtaitm.hxx b/svx/inc/svx/sxmtaitm.hxx index 0d7f3d1fb777..fceeffaa186d 100644 --- a/svx/inc/svx/sxmtaitm.hxx +++ b/svx/inc/svx/sxmtaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmtfitm.hxx b/svx/inc/svx/sxmtfitm.hxx index f43943bcc8d0..5949f6be0ed5 100644 --- a/svx/inc/svx/sxmtfitm.hxx +++ b/svx/inc/svx/sxmtfitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx index 383ee89a23ba..83b145d780b2 100644 --- a/svx/inc/svx/sxmtpitm.hxx +++ b/svx/inc/svx/sxmtpitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,8 +48,8 @@ public: virtual sal_uInt16 GetValueCount() const; // { return 4; } SdrMeasureTextHPos GetValue() const { return (SdrMeasureTextHPos)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; @@ -67,11 +68,13 @@ public: virtual sal_uInt16 GetValueCount() const; // { return 5; } SdrMeasureTextVPos GetValue() const { return (SdrMeasureTextVPos)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmtritm.hxx b/svx/inc/svx/sxmtritm.hxx index c74c26f66535..7a57a09e9d83 100644 --- a/svx/inc/svx/sxmtritm.hxx +++ b/svx/inc/svx/sxmtritm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx index aeb9dfeec955..5988d6e211fb 100644 --- a/svx/inc/svx/sxmuitm.hxx +++ b/svx/inc/svx/sxmuitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,11 +45,13 @@ public: virtual sal_uInt16 GetValueCount() const; // { return 14; } FieldUnit GetValue() const { return (FieldUnit)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxoneitm.hxx b/svx/inc/svx/sxoneitm.hxx index 00285b23265a..258533a01ef3 100644 --- a/svx/inc/svx/sxoneitm.hxx +++ b/svx/inc/svx/sxoneitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxonitm.hxx b/svx/inc/svx/sxonitm.hxx index 35fa8b54dc28..cfa6e32aae81 100644 --- a/svx/inc/svx/sxonitm.hxx +++ b/svx/inc/svx/sxonitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxopitm.hxx b/svx/inc/svx/sxopitm.hxx index dd402c3a0915..e96d5b86ba0d 100644 --- a/svx/inc/svx/sxopitm.hxx +++ b/svx/inc/svx/sxopitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxraitm.hxx b/svx/inc/svx/sxraitm.hxx index d0c48d8109ea..e2a3c7627b75 100644 --- a/svx/inc/svx/sxraitm.hxx +++ b/svx/inc/svx/sxraitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxreaitm.hxx b/svx/inc/svx/sxreaitm.hxx index ea539f63d12b..4dad393e36ae 100644 --- a/svx/inc/svx/sxreaitm.hxx +++ b/svx/inc/svx/sxreaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include <svx/svddef.hxx> -#ifndef _SXFIITM_HXX #include <svx/sxfiitm.hxx> -#endif //------------------------------ // class SdrResizeXAllItem @@ -54,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxreoitm.hxx b/svx/inc/svx/sxreoitm.hxx index 1d090c4b7277..b02bf0c3973d 100644 --- a/svx/inc/svx/sxreoitm.hxx +++ b/svx/inc/svx/sxreoitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include <svx/svddef.hxx> -#ifndef _SXFIITM_HXX #include <svx/sxfiitm.hxx> -#endif //------------------------------ // class SdrResizeXOneItem @@ -54,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxroaitm.hxx b/svx/inc/svx/sxroaitm.hxx index 739e3d653f24..17e1fe84e632 100644 --- a/svx/inc/svx/sxroaitm.hxx +++ b/svx/inc/svx/sxroaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxrooitm.hxx b/svx/inc/svx/sxrooitm.hxx index 955ce2bdf6d4..5e20e8703ce6 100644 --- a/svx/inc/svx/sxrooitm.hxx +++ b/svx/inc/svx/sxrooitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxsaitm.hxx b/svx/inc/svx/sxsaitm.hxx index 095e017d22e7..2c9c2c531016 100644 --- a/svx/inc/svx/sxsaitm.hxx +++ b/svx/inc/svx/sxsaitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxsalitm.hxx b/svx/inc/svx/sxsalitm.hxx index c189934afbb3..29866cadc90b 100644 --- a/svx/inc/svx/sxsalitm.hxx +++ b/svx/inc/svx/sxsalitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxsiitm.hxx b/svx/inc/svx/sxsiitm.hxx index ccc284f3ecbe..540edf8f6375 100644 --- a/svx/inc/svx/sxsiitm.hxx +++ b/svx/inc/svx/sxsiitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,9 +28,7 @@ #ifndef _SXSIITM_HXX #define _SXSIITM_HXX -#ifndef _SXFIITM_HXX #include <svx/sxfiitm.hxx> -#endif class SdrScaleItem: public SdrFractionItem { public: @@ -43,3 +42,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxsoitm.hxx b/svx/inc/svx/sxsoitm.hxx index 2a0139f9372a..06290f5300cc 100644 --- a/svx/inc/svx/sxsoitm.hxx +++ b/svx/inc/svx/sxsoitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/sxtraitm.hxx b/svx/inc/svx/sxtraitm.hxx index bbea7b712c06..bbab7a3bbf38 100644 --- a/svx/inc/svx/sxtraitm.hxx +++ b/svx/inc/svx/sxtraitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tabarea.hxx b/svx/inc/svx/tabarea.hxx index dc22f238b97e..cbbd2c6a60ba 100644 --- a/svx/inc/svx/tabarea.hxx +++ b/svx/inc/svx/tabarea.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,12 +31,8 @@ // include --------------------------------------------------------------- #include <svtools/valueset.hxx> -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svx/dlgctrl.hxx> #include <svx/xsetit.hxx> #include <svx/xfillit0.hxx> @@ -74,3 +71,4 @@ class SdrView; #endif // _SVX_TAB_AREA_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx index 86febb53f9f4..f62be235b5f2 100644 --- a/svx/inc/svx/tabline.hxx +++ b/svx/inc/svx/tabline.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,12 +30,8 @@ // include --------------------------------------------------------------- -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <svtools/stdctrl.hxx> #include <svx/svdpage.hxx> #include <svx/xlineit0.hxx> @@ -64,3 +61,4 @@ class SdrObject; #endif // _SVX_TAB_LINE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx index 813fa08e0374..ad465ef70cb7 100644 --- a/svx/inc/svx/tbcontrl.hxx +++ b/svx/inc/svx/tbcontrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -286,6 +287,7 @@ public: class SVX_DLLPUBLIC SvxFontColorToolBoxControl : public SfxToolBoxControl { ::svx::ToolboxButtonColorUpdater* pBtnUpdater; + Color mLastColor; public: SFX_DECL_TOOLBOX_CONTROL(); @@ -313,6 +315,7 @@ class SVX_DLLPUBLIC SvxFontColorExtToolBoxControl : public SfxToolBoxControl // SfxStatusForwarder aForward; ::svx::ToolboxButtonColorUpdater* pBtnUpdater; + Color mLastColor; public: SFX_DECL_TOOLBOX_CONTROL(); @@ -337,6 +340,8 @@ public: class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl { ::svx::ToolboxButtonColorUpdater* pBtnUpdater; + Color mLastColor; + public: SFX_DECL_TOOLBOX_CONTROL(); SvxColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); @@ -397,6 +402,8 @@ public: class SVX_DLLPUBLIC SvxFrameLineColorToolBoxControl : public SfxToolBoxControl { ::svx::ToolboxButtonColorUpdater* pBtnUpdater; + Color mLastColor; + public: SFX_DECL_TOOLBOX_CONTROL(); SvxFrameLineColorToolBoxControl( sal_uInt16 nSlotId, @@ -445,3 +452,5 @@ public: }; #endif // #ifndef _SVX_TBCONTRL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tbxalign.hxx b/svx/inc/svx/tbxalign.hxx index 85504738eafa..5a6297469489 100644 --- a/svx/inc/svx/tbxalign.hxx +++ b/svx/inc/svx/tbxalign.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ private: rtl::OUString m_aCommand; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tbxcolorupdate.hxx b/svx/inc/svx/tbxcolorupdate.hxx index fbeeb1899105..37c300e26775 100644 --- a/svx/inc/svx/tbxcolorupdate.hxx +++ b/svx/inc/svx/tbxcolorupdate.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,5 @@ namespace svx //........................................................................ #endif // SVX_TBXCOLORUPDATE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tbxctl.hxx b/svx/inc/svx/tbxctl.hxx index 301fb401a789..ee99e23a9521 100644 --- a/svx/inc/svx/tbxctl.hxx +++ b/svx/inc/svx/tbxctl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,7 +33,7 @@ /************************************************************************* |* -|* Klasse f"ur SwToolbox +|* Class for SwToolbox |* \************************************************************************/ @@ -60,3 +61,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tbxcustomshapes.hxx b/svx/inc/svx/tbxcustomshapes.hxx index 114ccf4814b1..24c995d942c9 100644 --- a/svx/inc/svx/tbxcustomshapes.hxx +++ b/svx/inc/svx/tbxcustomshapes.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tbxdraw.hxx b/svx/inc/svx/tbxdraw.hxx index 295f9e4539d4..82df76345014 100644 --- a/svx/inc/svx/tbxdraw.hxx +++ b/svx/inc/svx/tbxdraw.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,4 @@ public: #endif // _TBX_DRAW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/txencbox.hxx b/svx/inc/svx/txencbox.hxx index ede3461d2b43..7358e19c842a 100644 --- a/svx/inc/svx/txencbox.hxx +++ b/svx/inc/svx/txencbox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ // include --------------------------------------------------------------- -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <rtl/textenc.h> #include "svx/svxdllapi.h" @@ -119,3 +118,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/txenctab.hxx b/svx/inc/svx/txenctab.hxx index e04428717c53..a923c5f66ad9 100644 --- a/svx/inc/svx/txenctab.hxx +++ b/svx/inc/svx/txenctab.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ // include --------------------------------------------------------------- -#ifndef _RESARY_HXX //autogen #include <tools/resary.hxx> -#endif #include <rtl/textenc.h> #include "svx/svxdllapi.h" @@ -53,3 +52,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ucsubset.hrc b/svx/inc/svx/ucsubset.hrc index 50f7e62162e6..50f7e62162e6 100644..100755 --- a/svx/inc/svx/ucsubset.hrc +++ b/svx/inc/svx/ucsubset.hrc diff --git a/svx/inc/svx/ucsubset.hxx b/svx/inc/svx/ucsubset.hxx index 0d6e35bcaf38..1daec3b34615 100644 --- a/svx/inc/svx/ucsubset.hxx +++ b/svx/inc/svx/ucsubset.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,5 @@ private: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unoapi.hxx b/svx/inc/svx/unoapi.hxx index 6a990a8d1c70..6f3b945e7a21 100644 --- a/svx/inc/svx/unoapi.hxx +++ b/svx/inc/svx/unoapi.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,4 @@ SVX_DLLPUBLIC void SvxUnogetInternalNameForItem( const sal_Int16 nWhich, const r #endif // _SVX_UNOAPI_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unofill.hxx b/svx/inc/svx/unofill.hxx index 8c1a196b00d7..6d3b969f8761 100644 --- a/svx/inc/svx/unofill.hxx +++ b/svx/inc/svx/unofill.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,4 @@ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterfac #endif // _SVX_UNOFILL_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unomaster.hxx b/svx/inc/svx/unomaster.hxx index 06f716705233..a175e7f2cf15 100644 --- a/svx/inc/svx/unomaster.hxx +++ b/svx/inc/svx/unomaster.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unomid.hxx b/svx/inc/svx/unomid.hxx index 283a38d15bbe..828bbd50744b 100644 --- a/svx/inc/svx/unomid.hxx +++ b/svx/inc/svx/unomid.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,3 +116,5 @@ #define MID_LEFT 3 #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unomod.hxx b/svx/inc/svx/unomod.hxx index 9b55428aa76f..0b4f1c3485bf 100644 --- a/svx/inc/svx/unomod.hxx +++ b/svx/inc/svx/unomod.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unomodel.hxx b/svx/inc/svx/unomodel.hxx index 35d53a655a86..45b8dcd92ac9 100644 --- a/svx/inc/svx/unomodel.hxx +++ b/svx/inc/svx/unomodel.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,8 +29,6 @@ #ifndef SVX_UNOMODEL_HXX #define SVX_UNOMODEL_HXX -#ifndef SVX_LIGHT - #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ucb/XAnyCompareFactory.hpp> @@ -108,5 +107,4 @@ SVX_DLLPUBLIC extern sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const com #endif -#endif - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx index 5c227112342b..ac84ef560c36 100644 --- a/svx/inc/svx/unopage.hxx +++ b/svx/inc/svx/unopage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,9 +37,7 @@ #include <com/sun/star/drawing/XShapeGrouper.hpp> #include <com/sun/star/drawing/XShapeCombiner.hpp> #include <com/sun/star/drawing/XShapeBinder.hpp> -#ifndef _COM_SUN_STAR_UNO_XUNOTUNNEL_HPP_ #include <com/sun/star/lang/XUnoTunnel.hpp> -#endif #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> #include <svl/lstner.hxx> @@ -61,7 +60,6 @@ class SvxShape; class SvxShapeGroup; class SvxShapeConnector; class SvxShapeList; -class SvxDrawPageList; /*********************************************************************** * Macros fuer Umrechnung Twips<->100tel mm * @@ -158,3 +156,4 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper5< ::com::sun: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unopool.hxx b/svx/inc/svx/unopool.hxx index c34105efb448..a4a7c0e1e79a 100644 --- a/svx/inc/svx/unopool.hxx +++ b/svx/inc/svx/unopool.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx index 92b04c659f19..1d45b9b47cdd 100644 --- a/svx/inc/svx/unoprov.hxx +++ b/svx/inc/svx/unoprov.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,8 +30,8 @@ #define SVX_UNOPROV_HXX #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/uno/Sequence.hxx> #include <svl/itemprop.hxx> -#include <tools/list.hxx> #include "svx/svxdllapi.h" class SvxItemPropertySet; @@ -40,29 +41,14 @@ class SfxItemPool; * class UHashMap * ***********************************************************************/ -struct UHashMapEntry -{ - ::rtl::OUString aIdentifier; - sal_uInt32 nId; - - UHashMapEntry(const sal_Char * value, sal_Int32 length, sal_uInt32 _nId) : aIdentifier(value,length,RTL_TEXTENCODING_ASCII_US), nId(_nId) { } -}; - -DECLARE_LIST( UHashMapEntryList, UHashMapEntry* ) - -#define HASHARRAYSIZE 0x10 #define UHASHMAP_NOTFOUND sal::static_int_cast< sal_uInt32 >(~0) - class UHashMap { -private: - UHashMapEntryList m_aHashList[HASHARRAYSIZE]; - + UHashMap() {} public: - UHashMap( UHashMapEntry* pMap ); - ~UHashMap() {}; - - sal_uInt32 getId( const ::rtl::OUString& rCompareString ); + static sal_uInt32 getId( const ::rtl::OUString& rCompareString ); + static rtl::OUString getNameFromId (sal_uInt32 nId); + static ::com::sun::star::uno::Sequence< rtl::OUString > getServiceNames(); }; /*********************************************************************** @@ -103,7 +89,6 @@ class SVX_DLLPUBLIC SvxUnoPropertyMapProvider { SfxItemPropertyMapEntry* aMapArr[SVXMAP_END]; SvxItemPropertySet* aSetArr[SVXMAP_END]; -// void Sort(sal_uInt16 nId); public: SvxUnoPropertyMapProvider(); ~SvxUnoPropertyMapProvider(); @@ -118,10 +103,6 @@ public: const sal_Int16 OBJ_OLE2_APPLET = 100; const sal_Int16 OBJ_OLE2_PLUGIN = 101; -extern SvxUnoPropertyMapProvider aSvxMapProvider; -extern UHashMapEntry pSdrShapeIdentifierMap[]; -extern UHashMap aSdrShapeIdentifierMap; - #define E3D_INVENTOR_FLAG (0x80000000) #include <editeng/unoipset.hxx> @@ -147,3 +128,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx index 13154829eb4a..beb51026bf95 100644 --- a/svx/inc/svx/unoshape.hxx +++ b/svx/inc/svx/unoshape.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,12 +70,11 @@ class SfxItemSet; class SdrModel; class SvxDrawPage; class SvGlobalName; -// --> OD 2009-01-16 #i59051# +// Dimension arrows change size/position on save/reload (#i59051#) namespace basegfx { class B2DPolyPolygon; } // end of namespace basegfx -// <-- class SvxShapeMutex { @@ -139,15 +139,12 @@ protected: // Umrechnungen fuer den Writer, der in TWIPS arbeitet void ForceMetricToItemPoolMetric(Pair& rPoint) const throw(); void ForceMetricTo100th_mm(Pair& rPoint) const throw(); - // --> OD 2009-01-16 #i59051# + // Dimension arrows change size/position on save/reload (#i59051#) void ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon) const throw(); void ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) const throw(); - // <-- ::com::sun::star::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) const; - sal_Bool tryQueryAggregation( const com::sun::star::uno::Type & rType, com::sun::star::uno::Any& rAny ); - sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const ::rtl::OUString& rName ); /** called from the XActionLockable interface methods on initial locking */ @@ -209,9 +206,6 @@ public: and the property found is returned instead of set at the object directly. */ -// os: unused function -// static ::com::sun::star::uno::Any SAL_CALL GetFillAttributeByName( -// const ::rtl::OUString& rPropertyName, const ::rtl::OUString& rName, SdrModel* pModel ); UNO3_GETIMPLEMENTATION_DECL( SvxShape ) @@ -235,12 +229,6 @@ public: // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw (); - - /** @obsolete - not used anymore - */ - virtual void onUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundRect); - // XAggregation virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); @@ -839,7 +827,6 @@ protected: public: SvxCustomShape( SdrObject* pObj ) throw (); // overide these for special property handling in subcasses. Return true if property is handled - //virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertyMapEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -890,3 +877,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unoshcol.hxx b/svx/inc/svx/unoshcol.hxx index 422f6fc24029..12c9527afe67 100644 --- a/svx/inc/svx/unoshcol.hxx +++ b/svx/inc/svx/unoshcol.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx index 232708d9a14a..5e4bdf568ba2 100644 --- a/svx/inc/svx/unoshprp.hxx +++ b/svx/inc/svx/unoshprp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -532,3 +533,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/unoshtxt.hxx b/svx/inc/svx/unoshtxt.hxx index e7c678a8a358..159df0563892 100644 --- a/svx/inc/svx/unoshtxt.hxx +++ b/svx/inc/svx/unoshtxt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ private: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/verttexttbxctrl.hxx b/svx/inc/svx/verttexttbxctrl.hxx index 175704f83749..f9877540403f 100644 --- a/svx/inc/svx/verttexttbxctrl.hxx +++ b/svx/inc/svx/verttexttbxctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,9 @@ #include <sfx2/tbxctrl.hxx> #include "svx/svxdllapi.h" -/* -----------------------------27.04.01 15:38-------------------------------- - control to remove/insert cjk settings dependent vertical text toolbox item - ---------------------------------------------------------------------------*/ +/* + control to remove/insert cjk settings dependent vertical text toolbox item + */ class SvxVertCTLTextTbxCtrl : public SfxToolBoxControl { sal_Bool bCheckVertical; //determines whether vertical mode or CTL mode has to be checked @@ -45,18 +46,14 @@ public: void SetVert(sal_Bool bSet) {bCheckVertical = bSet;} }; -/* -----------------------------12.09.2002 11:50------------------------------ - ---------------------------------------------------------------------------*/ class SVX_DLLPUBLIC SvxCTLTextTbxCtrl : public SvxVertCTLTextTbxCtrl { public: SFX_DECL_TOOLBOX_CONTROL(); SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -/* -----------------------------12.09.2002 11:50------------------------------ - ---------------------------------------------------------------------------*/ class SVX_DLLPUBLIC SvxVertTextTbxCtrl : public SvxVertCTLTextTbxCtrl { public: @@ -65,3 +62,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/view3d.hxx b/svx/inc/svx/view3d.hxx index 776d6d672da7..9b2bcc6dbb6a 100644 --- a/svx/inc/svx/view3d.hxx +++ b/svx/inc/svx/view3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -275,3 +276,5 @@ public: }; #endif // _E3D_VIEW3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx index febb15fe28ca..fee6f54aef2e 100644 --- a/svx/inc/svx/viewlayoutitem.hxx +++ b/svx/inc/svx/viewlayoutitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #define _SVX_VIEWLAYOUTITEM_HXX #include <svl/intitem.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include "svx/svxdllapi.h" //------------------------------------------------------------------------- @@ -54,10 +53,12 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; // leer virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; // leer - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; // leer - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // leer + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; // leer + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // leer }; //------------------------------------------------------------------------ #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/viewpt3d.hxx b/svx/inc/svx/viewpt3d.hxx index 2a766e81e1a9..41e654dae150 100644 --- a/svx/inc/svx/viewpt3d.hxx +++ b/svx/inc/svx/viewpt3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,3 +131,5 @@ class SVX_DLLPUBLIC Viewport3D }; #endif // _VIEWPT3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/volume3d.hxx b/svx/inc/svx/volume3d.hxx index 42e90a9955a6..ce1f9c89ba81 100644 --- a/svx/inc/svx/volume3d.hxx +++ b/svx/inc/svx/volume3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,3 +32,5 @@ #include <basegfx/range/b3drange.hxx> #endif // _VOLUME3D_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/wrapfield.hxx b/svx/inc/svx/wrapfield.hxx index 1b4d745c55f8..3d19efe97de7 100644 --- a/svx/inc/svx/wrapfield.hxx +++ b/svx/inc/svx/wrapfield.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ protected: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xattr.hxx b/svx/inc/svx/xattr.hxx index 20035f7743e7..81e0251802ba 100644 --- a/svx/inc/svx/xattr.hxx +++ b/svx/inc/svx/xattr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,21 +28,6 @@ #ifndef _XATTR_HXX #define _XATTR_HXX -// include --------------------------------------------------------------- - -#ifndef _XDEF_HXX -//#include <svx/xdef.hxx> -#endif -#ifndef _XENUM_HXX -//#include <svx/xenum.hxx> -#endif -#ifndef _XPOLY_HXX -//#include <svx/xpoly.hxx> -#endif -#ifndef _SVX_RECTENUM_HXX -//#include <svx/rectenum.hxx> -#endif - class XColorTable; class XDashTable; class XLineEndTable; @@ -65,3 +51,4 @@ class XGradientTable; #endif // _XATTR_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx index 89104131a16a..dd8d32da375e 100644 --- a/svx/inc/svx/xbitmap.hxx +++ b/svx/inc/svx/xbitmap.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #define _SVX_XBITMAP_HXX #include <tools/color.hxx> -#ifndef _BITMAP_HXX //autogen #include <vcl/bitmap.hxx> -#endif #include <svtools/grfmgr.hxx> #include <svx/xenum.hxx> #include "svx/svxdllapi.h" @@ -40,10 +39,6 @@ // class XOBitmap //--------------- -#if defined HP9000 || defined SINIX -static Size aXOBitmapDefaultSize( 8, 8 ); -#endif - class SVX_DLLPUBLIC XOBitmap { protected: @@ -60,15 +55,9 @@ public: XOBitmap(); XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eStyle = XBITMAP_TILE ); XOBitmap( const Bitmap& rBitmap, XBitmapStyle eStyle = XBITMAP_TILE ); -#if defined HP9000 || defined SINIX - XOBitmap( const sal_uInt16* pArray, const Color& aPixelColor, - const Color& aBckgrColor, const Size& rSize = aXOBitmapDefaultSize, - XBitmapStyle eStyle = XBITMAP_TILE ); -#else XOBitmap( const sal_uInt16* pArray, const Color& aPixelColor, const Color& aBckgrColor, const Size& rSize = Size( 8, 8 ), XBitmapStyle eStyle = XBITMAP_TILE ); -#endif XOBitmap( const XOBitmap& rXBmp ); ~XOBitmap(); @@ -98,3 +87,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xbtmpit.hxx b/svx/inc/svx/xbtmpit.hxx index f835507c3a4c..ec0925ffe9c5 100644 --- a/svx/inc/svx/xbtmpit.hxx +++ b/svx/inc/svx/xbtmpit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,8 +59,8 @@ public: virtual SvStream& Store( SvStream& rOut, sal_uInt16 nItemVersion ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -74,3 +75,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xcolit.hxx b/svx/inc/svx/xcolit.hxx index d2bc3f410a97..49e1ff4ee976 100644 --- a/svx/inc/svx/xcolit.hxx +++ b/svx/inc/svx/xcolit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,8 +48,8 @@ public: XColorItem() {} XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); XColorItem(sal_uInt16 nWhich, const String& rName, const Color& rTheColor); XColorItem(sal_uInt16 nWhich, SvStream& rIn); @@ -65,3 +66,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xdash.hxx b/svx/inc/svx/xdash.hxx index 79621f11b628..4b2cd813691c 100644 --- a/svx/inc/svx/xdash.hxx +++ b/svx/inc/svx/xdash.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xdef.hxx b/svx/inc/svx/xdef.hxx index dd0fbd802291..645f86845cda 100644 --- a/svx/inc/svx/xdef.hxx +++ b/svx/inc/svx/xdef.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,5 @@ #define XATTR_END XATTR_TEXT_LAST #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xenum.hxx b/svx/inc/svx/xenum.hxx index e5b5d8adc5a8..97bc32d03039 100644 --- a/svx/inc/svx/xenum.hxx +++ b/svx/inc/svx/xenum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ enum XBitmapType { XBITMAP_IMPORT, XBITMAP_8X8, XBITMAP_NONE, #endif // _XENUM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xexch.hxx b/svx/inc/svx/xexch.hxx index a3b1f10c6d1c..cb31e44c7a99 100644 --- a/svx/inc/svx/xexch.hxx +++ b/svx/inc/svx/xexch.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ #include "svx/svxdllapi.h" //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// Clipboard-Format fuer XOutDev-Fuellattribute +// Clipboard format for XOutDev filling attributes //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ class XFillAttrSetItem; @@ -54,7 +55,6 @@ public: XFillExchangeData(const XFillAttrSetItem rXFillAttrSetItem); virtual ~XFillExchangeData(); - // Zuweisungsoperator XFillExchangeData& operator=( const XFillExchangeData& rXFillExchangeData ); SVX_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rXFillExchangeData ); @@ -65,3 +65,5 @@ public: }; #endif // _SVX_XEXCH_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xfillit.hxx b/svx/inc/svx/xfillit.hxx index 7556140bbbf6..38559a267639 100644 --- a/svx/inc/svx/xfillit.hxx +++ b/svx/inc/svx/xfillit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SVX_FILLITEM_HXX #define _SVX_FILLITEM_HXX -#ifndef _BITMAP_HXX //autogen #include <vcl/bitmap.hxx> -#endif #include <svx/xcolit.hxx> #include <svx/xgrad.hxx> #include <svx/xhatch.hxx> @@ -49,3 +48,5 @@ class XGradient; class XOBitmap; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xfillit0.hxx b/svx/inc/svx/xfillit0.hxx index df954983f3d2..412fd322954d 100644 --- a/svx/inc/svx/xfillit0.hxx +++ b/svx/inc/svx/xfillit0.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,8 +49,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -61,3 +62,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflasit.hxx b/svx/inc/svx/xflasit.hxx index f13308b613b6..8e4a047968dc 100644 --- a/svx/inc/svx/xflasit.hxx +++ b/svx/inc/svx/xflasit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflbckit.hxx b/svx/inc/svx/xflbckit.hxx index 265443a8c9ac..c041f5d7856e 100644 --- a/svx/inc/svx/xflbckit.hxx +++ b/svx/inc/svx/xflbckit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx index bb49400742b8..afc2b07810a3 100644 --- a/svx/inc/svx/xflbmpit.hxx +++ b/svx/inc/svx/xflbmpit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflbmsli.hxx b/svx/inc/svx/xflbmsli.hxx index 4779a76522b3..ca83cf999fb1 100644 --- a/svx/inc/svx/xflbmsli.hxx +++ b/svx/inc/svx/xflbmsli.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx index 5d8a4cf3e9a6..4238018b5505 100644 --- a/svx/inc/svx/xflbmsxy.hxx +++ b/svx/inc/svx/xflbmsxy.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,7 +56,7 @@ public: // Dieses Item nimmt sowohl metrische als auch // Prozentwerte ( sind negativ ) auf; das muessen // wir hier beruecksichtigen - SVX_DLLPRIVATE virtual FASTBOOL HasMetrics() const; + SVX_DLLPRIVATE virtual bool HasMetrics() const; }; /************************************************************************* @@ -82,7 +83,9 @@ public: // Dieses Item nimmt sowohl metrische als auch // Prozentwerte ( sind negativ ) auf; das muessen // wir hier beruecksichtigen - SVX_DLLPRIVATE virtual FASTBOOL HasMetrics() const; + SVX_DLLPRIVATE virtual bool HasMetrics() const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflbmtit.hxx b/svx/inc/svx/xflbmtit.hxx index 9625bab80d96..c15310fbde41 100644 --- a/svx/inc/svx/xflbmtit.hxx +++ b/svx/inc/svx/xflbmtit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflboxy.hxx b/svx/inc/svx/xflboxy.hxx index 19d04ea79e9f..0f35b8994e6c 100644 --- a/svx/inc/svx/xflboxy.hxx +++ b/svx/inc/svx/xflboxy.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflbstit.hxx b/svx/inc/svx/xflbstit.hxx index b5cc2ead7d27..3e5a3c4bc82e 100644 --- a/svx/inc/svx/xflbstit.hxx +++ b/svx/inc/svx/xflbstit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflbtoxy.hxx b/svx/inc/svx/xflbtoxy.hxx index 2ca52a3e5e75..14ff2d063ddd 100644 --- a/svx/inc/svx/xflbtoxy.hxx +++ b/svx/inc/svx/xflbtoxy.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflclit.hxx b/svx/inc/svx/xflclit.hxx index 367814bb4f0c..f2920884001c 100644 --- a/svx/inc/svx/xflclit.hxx +++ b/svx/inc/svx/xflclit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,8 +51,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -61,3 +62,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflftrit.hxx b/svx/inc/svx/xflftrit.hxx index 9862cf7fa92e..275810bdda02 100644 --- a/svx/inc/svx/xflftrit.hxx +++ b/svx/inc/svx/xflftrit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,8 +57,8 @@ public: virtual int operator==( const SfxPoolItem& rItem ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * pIntlWrapper = 0 ) const; @@ -70,3 +71,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflgrit.hxx b/svx/inc/svx/xflgrit.hxx index 30c918d59e21..dfbebcc6eaf3 100644 --- a/svx/inc/svx/xflgrit.hxx +++ b/svx/inc/svx/xflgrit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,8 +58,8 @@ public: virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -72,3 +73,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xflhtit.hxx b/svx/inc/svx/xflhtit.hxx index a666381dd4e3..df25fb8f9313 100644 --- a/svx/inc/svx/xflhtit.hxx +++ b/svx/inc/svx/xflhtit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,14 +57,14 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual FASTBOOL HasMetrics() const; - virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); + virtual bool HasMetrics() const; + virtual bool ScaleMetrics(long nMul, long nDiv); const XHatch& GetHatchValue(const XHatchTable* pTable = 0) const; // GetValue -> GetHatchValue void SetHatchValue(const XHatch& rNew) { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue @@ -74,3 +75,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xfltrit.hxx b/svx/inc/svx/xfltrit.hxx index 9f2bab545579..987586a552d8 100644 --- a/svx/inc/svx/xfltrit.hxx +++ b/svx/inc/svx/xfltrit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftadit.hxx b/svx/inc/svx/xftadit.hxx index e73033dee160..cd8d9c9ca687 100644 --- a/svx/inc/svx/xftadit.hxx +++ b/svx/inc/svx/xftadit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,8 +49,10 @@ public: virtual sal_uInt16 GetValueCount() const; XFormTextAdjust GetValue() const { return (XFormTextAdjust) SfxEnumItem::GetValue(); } // #FontWork# - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftdiit.hxx b/svx/inc/svx/xftdiit.hxx index d0ba783761ea..a88dce143f1b 100644 --- a/svx/inc/svx/xftdiit.hxx +++ b/svx/inc/svx/xftdiit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftmrit.hxx b/svx/inc/svx/xftmrit.hxx index 742268f5e333..17bd37f0c4a2 100644 --- a/svx/inc/svx/xftmrit.hxx +++ b/svx/inc/svx/xftmrit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftouit.hxx b/svx/inc/svx/xftouit.hxx index 11382718f5d9..0e42b86703a1 100644 --- a/svx/inc/svx/xftouit.hxx +++ b/svx/inc/svx/xftouit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftsfit.hxx b/svx/inc/svx/xftsfit.hxx index 22feb75be0f7..804117a6b905 100644 --- a/svx/inc/svx/xftsfit.hxx +++ b/svx/inc/svx/xftsfit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,9 +48,10 @@ public: virtual sal_uInt16 GetValueCount() const; XFormTextStdForm GetValue() const { return (XFormTextStdForm) SfxEnumItem::GetValue(); } // #FontWork# - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftshcit.hxx b/svx/inc/svx/xftshcit.hxx index fc473db4bb47..ddd1aefa8f99 100644 --- a/svx/inc/svx/xftshcit.hxx +++ b/svx/inc/svx/xftshcit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,3 +52,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftshit.hxx b/svx/inc/svx/xftshit.hxx index 6bd8c12c02cf..d2bf0a806729 100644 --- a/svx/inc/svx/xftshit.hxx +++ b/svx/inc/svx/xftshit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,9 +49,10 @@ public: virtual sal_uInt16 GetValueCount() const; XFormTextShadow GetValue() const { return (XFormTextShadow) SfxEnumItem::GetValue(); } // #FontWork# - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftshtit.hxx b/svx/inc/svx/xftshtit.hxx index 9a959c246e0e..7761cb5492d7 100644 --- a/svx/inc/svx/xftshtit.hxx +++ b/svx/inc/svx/xftshtit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftshxy.hxx b/svx/inc/svx/xftshxy.hxx index cc43565834b3..81619616a973 100644 --- a/svx/inc/svx/xftshxy.hxx +++ b/svx/inc/svx/xftshxy.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xftstit.hxx b/svx/inc/svx/xftstit.hxx index e55a8f8ccaa4..5f44c48349e5 100644 --- a/svx/inc/svx/xftstit.hxx +++ b/svx/inc/svx/xftstit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xgrad.hxx b/svx/inc/svx/xgrad.hxx index 313c2c2dd6c1..b931ac63a7b8 100644 --- a/svx/inc/svx/xgrad.hxx +++ b/svx/inc/svx/xgrad.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xgrscit.hxx b/svx/inc/svx/xgrscit.hxx index 69f0941b3972..26cd65dcb4ed 100644 --- a/svx/inc/svx/xgrscit.hxx +++ b/svx/inc/svx/xgrscit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xhatch.hxx b/svx/inc/svx/xhatch.hxx index 731f8084f8a0..d739982c24c8 100644 --- a/svx/inc/svx/xhatch.hxx +++ b/svx/inc/svx/xhatch.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx index aa68537d2173..2458a04ab54c 100644 --- a/svx/inc/svx/xit.hxx +++ b/svx/inc/svx/xit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlineit.hxx b/svx/inc/svx/xlineit.hxx index ac70a901d4fb..e5a465e9d587 100644 --- a/svx/inc/svx/xlineit.hxx +++ b/svx/inc/svx/xlineit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,4 @@ class SvStream; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlineit0.hxx b/svx/inc/svx/xlineit0.hxx index a30af2c1a86a..4de5f42202b7 100644 --- a/svx/inc/svx/xlineit0.hxx +++ b/svx/inc/svx/xlineit0.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,8 +45,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -57,3 +58,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlinjoit.hxx b/svx/inc/svx/xlinjoit.hxx index 97a8d4142bd6..454843485784 100644 --- a/svx/inc/svx/xlinjoit.hxx +++ b/svx/inc/svx/xlinjoit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,8 +48,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; @@ -58,3 +59,5 @@ public: }; #endif // _SVX_XLINJOIT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnasit.hxx b/svx/inc/svx/xlnasit.hxx index 2b1da62d6d88..410548ee2ddd 100644 --- a/svx/inc/svx/xlnasit.hxx +++ b/svx/inc/svx/xlnasit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnclit.hxx b/svx/inc/svx/xlnclit.hxx index ba34121c756b..18921a3bfa14 100644 --- a/svx/inc/svx/xlnclit.hxx +++ b/svx/inc/svx/xlnclit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,8 +47,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -56,3 +57,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx index 0cfefadb550c..d3a6b17ea1db 100644 --- a/svx/inc/svx/xlndsit.hxx +++ b/svx/inc/svx/xlndsit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <svx/xit.hxx> -#ifndef _SVX_XLINIIT_HXX //autogen #include <svx/xdash.hxx> -#endif #include "svx/svxdllapi.h" class SdrModel; @@ -59,15 +58,15 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual FASTBOOL HasMetrics() const; - virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); + virtual bool HasMetrics() const; + virtual bool ScaleMetrics(long nMul, long nDiv); const XDash& GetDashValue(const XDashTable* pTable = 0) const; // GetValue -> GetDashValue void SetDashValue(const XDash& rNew) { aDash = rNew; Detach(); } // SetValue -> SetDashValue @@ -78,3 +77,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnedcit.hxx b/svx/inc/svx/xlnedcit.hxx index 43dafb8e08f5..c83d6c66b307 100644 --- a/svx/inc/svx/xlnedcit.hxx +++ b/svx/inc/svx/xlnedcit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,8 +44,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -53,3 +54,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnedit.hxx b/svx/inc/svx/xlnedit.hxx index 1a999f903794..e79cec35ca74 100644 --- a/svx/inc/svx/xlnedit.hxx +++ b/svx/inc/svx/xlnedit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,8 +56,8 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -70,3 +71,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnedwit.hxx b/svx/inc/svx/xlnedwit.hxx index dcfebeaa997f..79b17175aa25 100644 --- a/svx/inc/svx/xlnedwit.hxx +++ b/svx/inc/svx/xlnedwit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,8 +47,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -57,3 +58,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnstcit.hxx b/svx/inc/svx/xlnstcit.hxx index e3f5ddaf97ed..44aaad857424 100644 --- a/svx/inc/svx/xlnstcit.hxx +++ b/svx/inc/svx/xlnstcit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,8 +44,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -54,3 +55,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnstit.hxx b/svx/inc/svx/xlnstit.hxx index 26f8d092e0ab..403629ca970c 100644 --- a/svx/inc/svx/xlnstit.hxx +++ b/svx/inc/svx/xlnstit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,8 +56,8 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -70,3 +71,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnstwit.hxx b/svx/inc/svx/xlnstwit.hxx index 7675ac4ce821..aae5cd8baa32 100644 --- a/svx/inc/svx/xlnstwit.hxx +++ b/svx/inc/svx/xlnstwit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,8 +46,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -56,3 +57,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlntrit.hxx b/svx/inc/svx/xlntrit.hxx index 91c8e8d87bb9..be0d6d02309c 100644 --- a/svx/inc/svx/xlntrit.hxx +++ b/svx/inc/svx/xlntrit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xlnwtit.hxx b/svx/inc/svx/xlnwtit.hxx index 143b786923ff..7c511e7110ed 100644 --- a/svx/inc/svx/xlnwtit.hxx +++ b/svx/inc/svx/xlnwtit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,8 +44,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -53,3 +54,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xmleohlp.hxx b/svx/inc/svx/xmleohlp.hxx index 211e17ca1801..88d965133367 100644 --- a/svx/inc/svx/xmleohlp.hxx +++ b/svx/inc/svx/xmleohlp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -147,3 +148,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xmlexchg.hxx b/svx/inc/svx/xmlexchg.hxx index f4820e0eb6fe..8c35ee3e333b 100644 --- a/svx/inc/svx/xmlexchg.hxx +++ b/svx/inc/svx/xmlexchg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,4 @@ namespace svx #endif // _SVX_XMLEXCHG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xmlgrhlp.hxx b/svx/inc/svx/xmlgrhlp.hxx index 5c7812775afa..f8260b9dfd95 100644 --- a/svx/inc/svx/xmlgrhlp.hxx +++ b/svx/inc/svx/xmlgrhlp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -161,3 +162,5 @@ SVX_DLLPUBLIC ::rtl::OUString SAL_CALL SvXMLGraphicExportHelper_getImplementatio } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xmlsecctrl.hxx b/svx/inc/svx/xmlsecctrl.hxx index 47ee75e6bac1..df6d9f7a603d 100644 --- a/svx/inc/svx/xmlsecctrl.hxx +++ b/svx/inc/svx/xmlsecctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xoutbmp.hxx b/svx/inc/svx/xoutbmp.hxx index 6dd59dbd6e57..2dd14e8b6b7d 100755 --- a/svx/inc/svx/xoutbmp.hxx +++ b/svx/inc/svx/xoutbmp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,5 @@ public: SVX_DLLPUBLIC sal_Bool DitherBitmap( Bitmap& rBitmap ); #endif // _XOUTBMP_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xpoly.hxx b/svx/inc/svx/xpoly.hxx index a645494f8ae4..78523a9bb16d 100644 --- a/svx/inc/svx/xpoly.hxx +++ b/svx/inc/svx/xpoly.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -210,3 +211,5 @@ public: #endif // _XPOLY_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xpool.hxx b/svx/inc/svx/xpool.hxx index 1834eff0d5bb..30f9c0cadb03 100644 --- a/svx/inc/svx/xpool.hxx +++ b/svx/inc/svx/xpool.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ protected: }; #endif // _XPOOL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xsetit.hxx b/svx/inc/svx/xsetit.hxx index f8405490bac9..e698072da699 100644 --- a/svx/inc/svx/xsetit.hxx +++ b/svx/inc/svx/xsetit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SVX_XSETITEM_HXX #define _SVX_XSETITEM_HXX -#ifndef _XATTR_HXX #include <svx/xit.hxx> -#endif #include <svl/metitem.hxx> #include <svl/eitem.hxx> #include <svx/rectenum.hxx> @@ -51,3 +50,5 @@ #include <svx/xflbckit.hxx> #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xsflclit.hxx b/svx/inc/svx/xsflclit.hxx index d9379ced1e68..8ac2b15249db 100644 --- a/svx/inc/svx/xsflclit.hxx +++ b/svx/inc/svx/xsflclit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx index 721b84a19955..0f5e57b96d35 100644 --- a/svx/inc/svx/xtable.hxx +++ b/svx/inc/svx/xtable.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,14 +38,10 @@ #include <svx/xflasit.hxx> #include <svx/xlnasit.hxx> -#ifndef _SV_COLOR_HXX #include <tools/color.hxx> -#endif #include <tools/string.hxx> -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif #include "svx/svxdllapi.h" #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -58,7 +55,7 @@ class XOutdevItemPool; #define BITMAP_HEIGHT 12 // Standard-Vergleichsstring -extern sal_Unicode __FAR_DATA pszStandard[]; // "standard" +extern sal_Unicode pszStandard[]; // "standard" // Funktion zum Konvertieren in echte RGB-Farben, da mit // enum COL_NAME nicht verglichen werden kann. @@ -93,8 +90,6 @@ class XColorEntry : public XPropertyEntry public: XColorEntry(const Color& rColor, const String& rName) : XPropertyEntry(rName), aColor(rColor) {} - XColorEntry(const XColorEntry& rOther) : - XPropertyEntry(rOther), aColor(rOther.aColor) {} void SetColor(const Color& rColor) { aColor = rColor; } Color& GetColor() { return aColor; } @@ -114,11 +109,6 @@ public: aB2DPolyPolygon(rB2DPolyPolygon) {} - XLineEndEntry(const XLineEndEntry& rOther) - : XPropertyEntry(rOther), - aB2DPolyPolygon(rOther.aB2DPolyPolygon) - {} - void SetLineEnd(const basegfx::B2DPolyPolygon& rB2DPolyPolygon) { aB2DPolyPolygon = rB2DPolyPolygon; @@ -141,8 +131,6 @@ class XDashEntry : public XPropertyEntry public: XDashEntry(const XDash& rDash, const String& rName) : XPropertyEntry(rName), aDash(rDash) {} - XDashEntry(const XDashEntry& rOther) : - XPropertyEntry(rOther), aDash(rOther.aDash) {} void SetDash(const XDash& rDash) { aDash = rDash; } XDash& GetDash() { return aDash; } @@ -159,8 +147,6 @@ class XHatchEntry : public XPropertyEntry public: XHatchEntry(const XHatch& rHatch, const String& rName) : XPropertyEntry(rName), aHatch(rHatch) {} - XHatchEntry(const XHatchEntry& rOther) : - XPropertyEntry(rOther), aHatch(rOther.aHatch) {} void SetHatch(const XHatch& rHatch) { aHatch = rHatch; } XHatch& GetHatch() { return aHatch; } @@ -177,8 +163,6 @@ class XGradientEntry : public XPropertyEntry public: XGradientEntry(const XGradient& rGradient, const String& rName): XPropertyEntry(rName), aGradient(rGradient) {} - XGradientEntry(const XGradientEntry& rOther) : - XPropertyEntry(rOther), aGradient(rOther.aGradient) {} void SetGradient(const XGradient& rGrad) { aGradient = rGrad; } XGradient& GetGradient() { return aGradient; } @@ -195,8 +179,6 @@ class XBitmapEntry : public XPropertyEntry public: XBitmapEntry( const XOBitmap& rXOBitmap, const String& rName ): XPropertyEntry( rName ), aXOBitmap( rXOBitmap ) {} - XBitmapEntry( const XBitmapEntry& rOther ) : - XPropertyEntry( rOther ), aXOBitmap( rOther.aXOBitmap ) {} void SetXBitmap(const XOBitmap& rXOBitmap) { aXOBitmap = rXOBitmap; } XOBitmap& GetXBitmap() { return aXOBitmap; } @@ -315,7 +297,7 @@ public: class SVX_DLLPUBLIC XColorTable : public XPropertyTable { public: - XColorTable( const String& rPath, + explicit XColorTable( const String& rPath, XOutdevItemPool* pXPool = NULL, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16 ); @@ -334,7 +316,7 @@ public: virtual sal_Bool CreateBitmapsForUI(); virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); - static XColorTable* GetStdColorTable(); + static XColorTable& GetStdColorTable(); }; // ------------------- @@ -344,7 +326,7 @@ public: class XColorList : public XPropertyList { public: - XColorList( const String& rPath, + explicit XColorList( const String& rPath, XOutdevItemPool* pXPool = NULL, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16 ); @@ -371,7 +353,7 @@ public: class XLineEndTable : public XPropertyTable { public: - XLineEndTable( const String& rPath, + explicit XLineEndTable( const String& rPath, XOutdevItemPool* pXPool = NULL, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16 ); @@ -405,7 +387,7 @@ private: void impDestroy(); public: - XLineEndList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16); + explicit XLineEndList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16); virtual ~XLineEndList(); using XPropertyList::Replace; @@ -429,7 +411,7 @@ public: class XDashTable : public XPropertyTable { public: - XDashTable( const String& rPath, + explicit XDashTable( const String& rPath, XOutdevItemPool* pXPool = NULL, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16 ); @@ -463,7 +445,7 @@ private: void impDestroy(); public: - XDashList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16); + explicit XDashList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16); virtual ~XDashList(); using XPropertyList::Replace; @@ -487,7 +469,7 @@ public: class XHatchTable : public XPropertyTable { public: - XHatchTable( const String& rPath, + explicit XHatchTable( const String& rPath, XOutdevItemPool* pXPool = NULL, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16 ); @@ -521,7 +503,7 @@ private: void impDestroy(); public: - XHatchList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16); + explicit XHatchList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16); ~XHatchList(); using XPropertyList::Replace; @@ -545,7 +527,7 @@ public: class XGradientTable : public XPropertyTable { public: - XGradientTable( const String& rPath, + explicit XGradientTable( const String& rPath, XOutdevItemPool* pXPool = NULL, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16 ); @@ -579,7 +561,7 @@ private: void impDestroy(); public: - XGradientList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16); + explicit XGradientList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16); virtual ~XGradientList(); using XPropertyList::Replace; @@ -603,7 +585,7 @@ public: class XBitmapTable : public XPropertyTable { public: - XBitmapTable( const String& rPath, + explicit XBitmapTable( const String& rPath, XOutdevItemPool* pXPool = NULL, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16 ); @@ -630,7 +612,7 @@ public: class SVX_DLLPUBLIC XBitmapList : public XPropertyList { public: - XBitmapList( const String& rPath, + explicit XBitmapList( const String& rPath, XOutdevItemPool* pXPool = NULL, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16 ); @@ -651,3 +633,5 @@ public: }; #endif // _XTABLE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xtextit.hxx b/svx/inc/svx/xtextit.hxx index 0d4630b2a0a2..5831f13f02cc 100644 --- a/svx/inc/svx/xtextit.hxx +++ b/svx/inc/svx/xtextit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/xtextit0.hxx b/svx/inc/svx/xtextit0.hxx index 73ed4878cee7..2f8ba8e9f436 100644 --- a/svx/inc/svx/xtextit0.hxx +++ b/svx/inc/svx/xtextit0.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,8 +50,8 @@ public: virtual sal_uInt16 GetValueCount() const; XFormTextStyle GetValue() const { return (XFormTextStyle) SfxEnumItem::GetValue(); } // #FontWork# - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; /************************************************************************* @@ -70,3 +71,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/zoomctrl.hxx b/svx/inc/svx/zoomctrl.hxx index 0d790b23f155..d45f071212f5 100644 --- a/svx/inc/svx/zoomctrl.hxx +++ b/svx/inc/svx/zoomctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx index 348e9ebe869a..77cf645fbacd 100644 --- a/svx/inc/svx/zoomitem.hxx +++ b/svx/inc/svx/zoomitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #define _SVX_ZOOMITEM_HXX #include <svl/intitem.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include "svx/svxdllapi.h" //------------------------------------------------------------------------- @@ -61,7 +60,7 @@ public: void SetValueSet( sal_uInt16 nValues ) { nValueSet = nValues; } sal_uInt16 GetValueSet() const { return nValueSet; } - FASTBOOL IsValueAllowed( sal_uInt16 nValue ) const + bool IsValueAllowed( sal_uInt16 nValue ) const { return nValue == ( nValue & nValueSet ); } SvxZoomType GetType() const { return eType; } @@ -72,8 +71,8 @@ public: virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; //------------------------------------------------------------------------ @@ -89,3 +88,5 @@ public: #define SVX_ZOOM_ENABLE_ALL 0x701F #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/zoomsliderctrl.hxx b/svx/inc/svx/zoomsliderctrl.hxx index 46032056fc30..39e655bf8207 100644 --- a/svx/inc/svx/zoomsliderctrl.hxx +++ b/svx/inc/svx/zoomsliderctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx index 93b1dedb1170..b8df939fff09 100644 --- a/svx/inc/svx/zoomslideritem.hxx +++ b/svx/inc/svx/zoomslideritem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #define _SVX_ZOOMSLIDERITEM_HXX #include <svl/intitem.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <com/sun/star/uno/Sequence.hxx> #include "svx/svxdllapi.h" @@ -59,10 +58,12 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; // leer virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; // leer - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; // leer - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // leer + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; //------------------------------------------------------------------------ #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svxempty.hxx b/svx/inc/svxempty.hxx index 2e8d34d39071..46849643f726 100644 --- a/svx/inc/svxempty.hxx +++ b/svx/inc/svxempty.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,7 +36,6 @@ extern XubString& rImplEmptyStr; inline const XubString& GetEmptyStr() { return rImplEmptyStr; } #define GetEmptySStr GetEmptyStr #else -// CSET stellt rImplEmptyStr nicht in items.lib (?) const XubString& GetEmptyStr(); #define GetEmptySStr GetEmptyStr #endif @@ -43,3 +43,4 @@ const XubString& GetEmptyStr(); #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/tbunocontroller.hxx b/svx/inc/tbunocontroller.hxx index 266dc917f33e..809fa7cef929 100644 --- a/svx/inc/tbunocontroller.hxx +++ b/svx/inc/tbunocontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,5 @@ class FontHeightToolBoxControl : public svt::ToolboxController, } #endif // __TBUNOCONTROLLER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx index 21c47230df48..47d1897d4837 100644 --- a/svx/inc/tbunosearchcontrollers.hxx +++ b/svx/inc/tbunosearchcontrollers.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -280,3 +281,5 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FindbarDispatcher_createIns } #endif // __TBUNOSEARCHCONTROLLERS_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/uiks.hxx b/svx/inc/uiks.hxx index a143d6537f65..e5cd01e4553a 100644 --- a/svx/inc/uiks.hxx +++ b/svx/inc/uiks.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,9 +28,7 @@ #ifndef _SVX_UIKS_HXX #define _SVX_UIKS_HXX -#ifndef _USR_UIKS_HXX #include <usr/uiks.hxx> -#endif // DBENGINE @@ -87,3 +86,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/unomlstr.hxx b/svx/inc/unomlstr.hxx index eb91531e7f11..e11bdc67795a 100644 --- a/svx/inc/unomlstr.hxx +++ b/svx/inc/unomlstr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx index 7b7f85110558..89bb149e32a6 100644 --- a/svx/inc/xpolyimp.hxx +++ b/svx/inc/xpolyimp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,16 +31,8 @@ #include <tools/gen.hxx> #include <svx/xpoly.hxx> +#include <vector> -/************************************************************************* -|* -|* class ImpXPolygon -|* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung Joe 26.09.95 -|* -*************************************************************************/ class ImpXPolygon { public: @@ -73,17 +66,7 @@ public: void Remove( sal_uInt16 nPos, sal_uInt16 nCount ); }; - -/************************************************************************* -|* -|* class ImpXPolyPolygon -|* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung Joe 26-09-1995 -|* -*************************************************************************/ -DECLARE_LIST( XPolygonList, XPolygon* ) +typedef ::std::vector< XPolygon* > XPolygonList; class ImpXPolyPolygon { @@ -91,9 +74,7 @@ public: XPolygonList aXPolyList; sal_uInt16 nRefCount; - ImpXPolyPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 ) : - aXPolyList( 1024, nInitSize, nResize ) - { nRefCount = 1; } + ImpXPolyPolygon() { nRefCount = 1; } ImpXPolyPolygon( const ImpXPolyPolygon& rImpXPolyPoly ); ~ImpXPolyPolygon(); @@ -104,3 +85,5 @@ public: #endif // _XPOLYIMP_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/prj/build.lst b/svx/prj/build.lst index 641f4e528793..34ca30e18007 100644 --- a/svx/prj/build.lst +++ b/svx/prj/build.lst @@ -1,2 +1,2 @@ -sx svx : sfx2 L10N:l10n oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt NULL +sx svx : sfx2 TRANSLATIONS:translations oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt NULL sx svx\prj nmake - all sx_prj NULL diff --git a/svx/prj/d.lst b/svx/prj/d.lst index e69de29bb2d1..d058ed4d0b91 100644 --- a/svx/prj/d.lst +++ b/svx/prj/d.lst @@ -0,0 +1,5 @@ +..\inc\svx\linkwarn.hxx %_DEST%\inc\svx\linkwarn.hxx +..\inc\svx\borderline.hxx %_DEST%\inc\svx\borderline.hxx +..\inc\svx\boxitem.hxx %_DEST%\inc\svx\boxitem.hxx +..\inc\svx\brkitem.hxx %_DEST%\inc\svx\brkitem.hxx +..\inc\svx\brshitem.hxx %_DEST%\inc\svx\brshitem.hxx diff --git a/svx/qa/unoapi/Test.java b/svx/qa/unoapi/Test.java deleted file mode 100644 index 2f7581e22efa..000000000000 --- a/svx/qa/unoapi/Test.java +++ /dev/null @@ -1,52 +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. -************************************************************************/ - -package org.openoffice.svx.qa.unoapi; - -import org.openoffice.Runner; -import org.openoffice.test.OfficeConnection; -import org.openoffice.test.Argument; -import static org.junit.Assert.*; - -public final class Test { - @org.junit.Before public void setUp() throws Exception { - connection.setUp(); - } - - @org.junit.After public void tearDown() - throws InterruptedException, com.sun.star.uno.Exception - { - connection.tearDown(); - } - - @org.junit.Test public void test() { - assertTrue( - Runner.run( - "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc", - Argument.get("tdoc"), "-cs", connection.getDescription())); - } - - private final OfficeConnection connection = new OfficeConnection(); -} diff --git a/svx/qa/unoapi/knownissues.xcl b/svx/qa/unoapi/knownissues.xcl index b26db6b7f99e..b26db6b7f99e 100644..100755 --- a/svx/qa/unoapi/knownissues.xcl +++ b/svx/qa/unoapi/knownissues.xcl diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce index 82ee2ea6b193..82ee2ea6b193 100644..100755 --- a/svx/qa/unoapi/svx.sce +++ b/svx/qa/unoapi/svx.sce diff --git a/svx/sdi/fmslots.sdi b/svx/sdi/fmslots.sdi index 1a368920ab9a..1a368920ab9a 100644..100755 --- a/svx/sdi/fmslots.sdi +++ b/svx/sdi/fmslots.sdi diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index a3b4c9a9ca21..05733064d502 100644..100755 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -1530,6 +1530,31 @@ SfxVoidItem ChangeCaseToToggleCase SID_TRANSLITERATE_TOGGLE_CASE ] //-------------------------------------------------------------------------- +SfxVoidItem ChangeCaseRotateCase SID_TRANSLITERATE_ROTATE_CASE +() +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = TRUE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_FORMAT; +] + +//-------------------------------------------------------------------------- SfxVoidItem ChangeCaseToLower SID_TRANSLITERATE_LOWER () [ diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi index 3cd78dd5f09a..3cd78dd5f09a 100644..100755 --- a/svx/sdi/svxitems.sdi +++ b/svx/sdi/svxitems.sdi diff --git a/svx/sdi/svxslots.hrc b/svx/sdi/svxslots.hrc index 83ccbd763f38..83ccbd763f38 100644..100755 --- a/svx/sdi/svxslots.hrc +++ b/svx/sdi/svxslots.hrc diff --git a/svx/sdi/svxslots.sdi b/svx/sdi/svxslots.sdi index 2ea6f7fef874..2ea6f7fef874 100644..100755 --- a/svx/sdi/svxslots.sdi +++ b/svx/sdi/svxslots.sdi diff --git a/svx/sdi/xoitems.sdi b/svx/sdi/xoitems.sdi index 0fcfd6d317e6..0fcfd6d317e6 100644..100755 --- a/svx/sdi/xoitems.sdi +++ b/svx/sdi/xoitems.sdi diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 2bca7593f423..093ec77e369d 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -207,9 +208,6 @@ void AccessibleControlShape::Init() // be aggregated, as by definition the proxy's ref count is exactly 1 when returned from the factory. // Sounds better. Though this yields the problem of slightly degraded performance, it's the only solution // I'm aware of at the moment ..... - // - // 98750 - 30.04.2002 - fs@openoffice.org - // // get the control which belongs to our model (relative to our view) const Window* pViewWindow = maShapeTreeInfo.GetWindow(); @@ -304,7 +302,7 @@ void AccessibleControlShape::Init() } catch( const Exception& ) { - OSL_ENSURE( sal_False, "AccessibleControlShape::Init: could not \"aggregate\" the controls XAccessibleContext!" ); + OSL_FAIL( "AccessibleControlShape::Init: could not \"aggregate\" the controls XAccessibleContext!" ); } } @@ -379,10 +377,10 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException) if ( !sDesc.getLength() ) { // no -> use the default aDG.Initialize (STR_ObjNameSingulUno); - aDG.AddProperty (::rtl::OUString::createFromAscii ("ControlBackground"), + aDG.AddProperty (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBackground")), DescriptionGenerator::COLOR, ::rtl::OUString()); - aDG.AddProperty (::rtl::OUString::createFromAscii ("ControlBorder"), + aDG.AddProperty (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBorder")), DescriptionGenerator::INTEGER, ::rtl::OUString()); } @@ -392,8 +390,8 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException) break; default: - aDG.Initialize (::rtl::OUString::createFromAscii ( - "Unknown accessible control shape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Unknown accessible control shape")) ); Reference< XShapeDescriptor > xDescriptor (mxShape, UNO_QUERY); if (xDescriptor.is()) { @@ -432,7 +430,7 @@ void SAL_CALL AccessibleControlShape::propertyChange( const PropertyChangeEvent& #if OSL_DEBUG_LEVEL > 0 else { - OSL_ENSURE( sal_False, "AccessibleControlShape::propertyChange: where did this come from?" ); + OSL_FAIL( "AccessibleControlShape::propertyChange: where did this come from?" ); } #endif } @@ -533,7 +531,7 @@ void SAL_CALL AccessibleControlShape::modeChanged( const ModeChangeEvent& _rSour } #if OSL_DEBUG_LEVEL > 0 else - OSL_ENSURE( sal_False, "AccessibleControlShape::modeChanged: where did this come from?" ); + OSL_FAIL( "AccessibleControlShape::modeChanged: where did this come from?" ); #endif } @@ -563,12 +561,12 @@ sal_Bool AccessibleControlShape::ensureListeningState( m_xControlModel->removePropertyChangeListener( _rPropertyName, static_cast< XPropertyChangeListener* >( this ) ); } else - OSL_ENSURE( sal_False, "AccessibleControlShape::ensureListeningState: this property does not exist at this model!" ); + OSL_FAIL( "AccessibleControlShape::ensureListeningState: this property does not exist at this model!" ); } catch( const Exception& e ) { (void)e; // make compiler happy - OSL_ENSURE( sal_False, "AccessibleControlShape::ensureListeningState: could not change the listening state!" ); + OSL_FAIL( "AccessibleControlShape::ensureListeningState: could not change the listening state!" ); } return _bNeedNewListening; @@ -684,7 +682,7 @@ void SAL_CALL AccessibleControlShape::disposing (void) // stop listening at the control container (should never be necessary here, but who knows ....) if ( m_bWaitingForControl ) { - OSL_ENSURE( sal_False, "AccessibleControlShape::disposing: this should never happen!" ); + OSL_FAIL( "AccessibleControlShape::disposing: this should never happen!" ); Reference< XContainer > xContainer = lcl_getControlContainer( maShapeTreeInfo.GetWindow(), maShapeTreeInfo.GetSdrView() ); if ( xContainer.is() ) { @@ -734,7 +732,7 @@ sal_Bool AccessibleControlShape::ensureControlModelAccess() SAL_THROW(()) catch( const Exception& e ) { (void)e; // make compiler happy - OSL_ENSURE( sal_False, "AccessibleControlShape::ensureControlModelAccess: caught an exception!" ); + OSL_FAIL( "AccessibleControlShape::ensureControlModelAccess: caught an exception!" ); } return m_xControlModel.is(); @@ -793,7 +791,7 @@ void AccessibleControlShape::stopStateMultiplexing() } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OAccessibleControlContext::getModelStringProperty: caught an exception!" ); + OSL_FAIL( "OAccessibleControlContext::getModelStringProperty: caught an exception!" ); } return sReturn; } @@ -918,3 +916,5 @@ void SAL_CALL AccessibleControlShape::elementReplaced( const ::com::sun::star::c { // not interested in } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 92633a105323..3dd0d11b3ff2 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -354,3 +355,5 @@ namespace accessibility } // end of namespace accessibility //------------------------------------------------------------------------ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx index 93ff0383eab1..2083e522111d 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,4 @@ namespace accessibility #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 76d9ae56dfba..a112610cf8e5 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,31 +32,21 @@ #include <com/sun/star/awt/KeyEvent.hpp> #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/awt/Key.hpp> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLESTATETYPE_HDL_ #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#endif -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLERELATIONTYPE_HDL_ #include <com/sun/star/accessibility/AccessibleRelationType.hpp> -#endif -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_HDL_ #include <com/sun/star/accessibility/AccessibleRole.hpp> -#endif #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/awt/FocusChangeReason.hpp> #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <svx/frmsel.hxx> #include <svx/dialmgr.hxx> #include "editeng/unolingu.hxx" -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif -#ifndef SVX_FRMSEL_HRC #include "frmsel.hrc" -#endif #ifndef MNEMONIC_CHAR #define MNEMONIC_CHAR ((sal_Unicode)'~') @@ -130,7 +121,7 @@ Reference< XAccessibleContext > AccFrameSelector::getAccessibleContext( ) sal_Int32 AccFrameSelector::getAccessibleChildCount( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); return (meBorder == FRAMEBORDER_NONE) ? mpFrameSel->GetEnabledBorderCount() : 0; } @@ -140,7 +131,7 @@ sal_Int32 AccFrameSelector::getAccessibleChildCount( ) throw (RuntimeException) Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); Reference< XAccessible > xRet; if( meBorder == FRAMEBORDER_NONE ) @@ -155,7 +146,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i ) Reference< XAccessible > AccFrameSelector::getAccessibleParent( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); Reference< XAccessible > xRet; if(meBorder == FRAMEBORDER_NONE) @@ -170,7 +161,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleParent( ) sal_Int32 AccFrameSelector::getAccessibleIndexInParent( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); sal_Int32 nIdx = 0; @@ -202,7 +193,7 @@ sal_Int16 AccFrameSelector::getAccessibleRole( ) throw (RuntimeException) OUString AccFrameSelector::getAccessibleDescription( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); return maDescriptions.GetString(meBorder); } @@ -212,7 +203,7 @@ OUString AccFrameSelector::getAccessibleDescription( ) OUString AccFrameSelector::getAccessibleName( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); return maNames.GetString(meBorder); } @@ -222,7 +213,7 @@ OUString AccFrameSelector::getAccessibleName( ) Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); utl::AccessibleRelationSetHelper* pHelper; Reference< XAccessibleRelationSet > xRet = pHelper = new utl::AccessibleRelationSetHelper; @@ -247,7 +238,7 @@ Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet( Reference< XAccessibleStateSet > AccFrameSelector::getAccessibleStateSet( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; Reference< XAccessibleStateSet > xRet = pStateSetHelper; @@ -320,7 +311,7 @@ void AccFrameSelector::removePropertyChangeListener( const Reference< XPropertyC sal_Bool AccFrameSelector::containsPoint( const AwtPoint& aPt ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); //aPt is relative to the frame selector return mpFrameSel->ContainsClickPoint( Point( aPt.X, aPt.Y ) ); @@ -332,7 +323,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleAtPoint( const AwtPoint& aPt ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); //aPt is relative to the frame selector return mpFrameSel->GetChildAccessible( Point( aPt.X, aPt.Y ) ); @@ -340,7 +331,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleAtPoint( AwtRectangle AccFrameSelector::getBounds( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); Size aSz; Point aPos; @@ -367,7 +358,7 @@ AwtRectangle AccFrameSelector::getBounds( ) throw (RuntimeException) AwtPoint AccFrameSelector::getLocation( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); Point aPos; switch(meBorder) @@ -387,7 +378,7 @@ AwtPoint AccFrameSelector::getLocation( ) throw (RuntimeException) AwtPoint AccFrameSelector::getLocationOnScreen( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); Point aPos; switch(meBorder) @@ -408,7 +399,7 @@ AwtPoint AccFrameSelector::getLocationOnScreen( ) throw (RuntimeException) AwtSize AccFrameSelector::getSize( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); Size aSz; switch(meBorder) @@ -428,7 +419,7 @@ AwtSize AccFrameSelector::getSize( ) throw (RuntimeException) sal_Bool AccFrameSelector::isShowing( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); return sal_True; } @@ -437,7 +428,7 @@ sal_Bool AccFrameSelector::isShowing( ) throw (RuntimeException) sal_Bool AccFrameSelector::isVisible( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); return sal_True; } @@ -446,7 +437,7 @@ sal_Bool AccFrameSelector::isVisible( ) throw (RuntimeException) sal_Bool AccFrameSelector::isFocusTraversable( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); return sal_True; } @@ -469,7 +460,7 @@ void AccFrameSelector::removeFocusListener( const Reference< XFocusListener >& x void AccFrameSelector::grabFocus( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); mpFrameSel->GrabFocus(); } @@ -479,7 +470,7 @@ void AccFrameSelector::grabFocus( ) throw (RuntimeException) Any AccFrameSelector::getAccessibleKeyBinding( ) throw (RuntimeException) { Any aRet; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); utl::AccessibleRelationSetHelper* pHelper; Reference< XAccessibleRelationSet > xRet = pHelper = new utl::AccessibleRelationSetHelper; @@ -517,7 +508,7 @@ sal_Int32 AccFrameSelector::getForeground( ) throw (RuntimeException) { Any aRet; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); return mpFrameSel->GetControlForeground().GetColor(); } @@ -528,7 +519,7 @@ sal_Int32 AccFrameSelector::getBackground( ) throw (RuntimeException) { Any aRet; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IsValid(); return mpFrameSel->GetControlBackground().GetColor(); } @@ -537,7 +528,7 @@ sal_Int32 AccFrameSelector::getBackground( ) void AccFrameSelector::addEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( xListener.is() ) { @@ -553,7 +544,7 @@ void AccFrameSelector::addEventListener( const Reference< XAccessibleEventListen void AccFrameSelector::removeEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( xListener.is() && mnClientId != 0 && ::comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, xListener ) == 0 ) @@ -572,7 +563,7 @@ void AccFrameSelector::removeEventListener( const Reference< XAccessibleEventLis OUString AccFrameSelector::getImplementationName( ) throw (RuntimeException) { - return OUString::createFromAscii("AccFrameSelector"); + return OUString(RTL_CONSTASCII_USTRINGPARAM("AccFrameSelector")); } // ---------------------------------------------------------------------------- @@ -614,7 +605,7 @@ void AccFrameSelector::IsValid() throw (RuntimeException) void AccFrameSelector::NotifyFocusListeners(sal_Bool bGetFocus) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; AwtFocusEvent aEvent; aEvent.FocusFlags = 0; if(bGetFocus) @@ -634,12 +625,7 @@ void AccFrameSelector::NotifyFocusListeners(sal_Bool bGetFocus) aEvent.FocusFlags |= AwtFocusChangeReason::AROUND; if(nFocusFlags&GETFOCUS_UNIQUEMNEMONIC) aEvent.FocusFlags |= AwtFocusChangeReason::UNIQUEMNEMONIC; - // if(nFocusFlags&GETFOCUS_INIT) - // aEvent.FocusFlags |= AwtFocusChangeReason:: } -// else - //how can I find the current focus window? -// aEvent.NextFocus = ; aEvent.Temporary = sal_False; Reference < XAccessibleContext > xThis( this ); @@ -738,3 +724,4 @@ void AccFrameSelector::Invalidate() } // namespace a11y } // namespace svx +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index f4e7f7747dda..da098b82dc9c 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -210,3 +211,5 @@ uno::Sequence<uno::Type> SAL_CALL { return CreateAccessibleName (); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 8f7effb4d2b8..2b99fb01218d 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -230,3 +231,4 @@ uno::Sequence<uno::Type> SAL_CALL return CreateAccessibleName (); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 0d255ed5933f..6de9d83f1a0f 100755..100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,13 +32,8 @@ #include "svx/DescriptionGenerator.hxx" #include <svx/AccessibleShapeInfo.hxx> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <rtl/uuid.h> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLE_ROLE_HPP_ #include <com/sun/star/accessibility/AccessibleRole.hpp> -#endif -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLE_STATE_TYPE_HPP_ #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/drawing/XShapes.hpp> @@ -56,14 +52,13 @@ #include <svx/ShapeTypeHandler.hxx> #include <svx/SvxShapeTypes.hxx> -#ifndef _SVX_ACCESSIBILITY_HRC #include "accessibility.hrc" -#endif #include "svx/svdstr.hrc" #include <svx/dialmgr.hxx> #include <vcl/svapp.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <svx/svdview.hxx> +#include <comphelper/servicehelper.hxx> #include "AccessibleEmptyEditSource.hxx" using namespace ::com::sun::star; @@ -383,7 +378,7 @@ uno::Reference<XAccessible> SAL_CALL } else throw lang::IndexOutOfBoundsException ( - ::rtl::OUString::createFromAscii ("shape has no child with index ") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("shape has no child with index ")) + rtl::OUString::valueOf(nIndex), static_cast<uno::XWeak*>(this)); @@ -486,7 +481,7 @@ uno::Reference<XAccessible > SAL_CALL awt::Rectangle SAL_CALL AccessibleShape::getBounds (void) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed (); @@ -518,7 +513,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds (void) aValue >>= aBoundingBox; bFoundBoundRect = true; } - catch (beans::UnknownPropertyException e) + catch (beans::UnknownPropertyException const&) { // Handled below (bFoundBoundRect stays false). } @@ -574,27 +569,6 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds (void) int x = aPixelPosition.getX() - aParentLocation.X; int y = aPixelPosition.getY() - aParentLocation.Y; - /* // The following block is a workarround for bug #99889# (property - // BoundRect returnes coordinates relative to document window - // instead of absolute coordinates for shapes in Writer). Has to - // be removed as soon as bug is fixed. - - // Use a non-null anchor position as flag that the shape is in a - // Writer document. - if (xSetInfo.is()) - if (xSetInfo->hasPropertyByName (sAnchorPositionName)) - { - uno::Any aPos = xSet->getPropertyValue (sAnchorPositionName); - awt::Point aAnchorPosition; - aPos >>= aAnchorPosition; - if (aAnchorPosition.X > 0) - { - x = aPixelPosition.getX(); - y = aPixelPosition.getY(); - } - } - // End of workarround. - */ // Clip with parent (with coordinates relative to itself). ::Rectangle aBBox ( x, y, x + aPixelSize.getWidth(), y + aPixelSize.getHeight()); @@ -681,7 +655,7 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground (void) if (aSet.is()) { uno::Any aColor; - aColor = aSet->getPropertyValue (OUString::createFromAscii ("LineColor")); + aColor = aSet->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")) ); aColor >>= nColor; } } @@ -707,7 +681,7 @@ sal_Int32 SAL_CALL AccessibleShape::getBackground (void) if (aSet.is()) { uno::Any aColor; - aColor = aSet->getPropertyValue (OUString::createFromAscii ("FillColor")); + aColor = aSet->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")) ); aColor >>= nColor; } } @@ -850,8 +824,6 @@ uno::Sequence<uno::Type> SAL_CALL ::getCppuType((const uno::Reference<document::XEventListener>*)0); const uno::Type aUnoTunnelType = ::getCppuType((const uno::Reference<lang::XUnoTunnel>*)0); - // const uno::Type aStateSetType = - // ::getCppuType((const uno::Reference<XAccessibleStateSet>*)0); // ... and merge them all into one list. sal_Int32 nTypeCount (aTypeList.getLength()), @@ -883,7 +855,7 @@ void SAL_CALL AccessibleShape::disposing (const lang::EventObject& aEvent) throw (uno::RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); try @@ -896,7 +868,7 @@ void SAL_CALL } } - catch (uno::RuntimeException e) + catch (uno::RuntimeException const&) { OSL_TRACE ("caught exception while disposing"); } @@ -935,30 +907,18 @@ void SAL_CALL } } - - - //===== lang::XUnoTunnel ================================================ +namespace +{ + class theAccessibleShapeImplementationId : public rtl::Static< UnoTunnelIdInit, theAccessibleShapeImplementationId > {}; +} + const uno::Sequence< sal_Int8 >& AccessibleShape::getUnoTunnelImplementationId() throw() { - static uno::Sequence< sal_Int8 >* pSeq = 0; - - if( !pSeq ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - - if( !pSeq ) - { - static uno::Sequence< sal_Int8 > aSeq( 16 ); - rtl_createUuid( (sal_uInt8*) aSeq.getArray(), 0, sal_True ); - pSeq = &aSeq; - } - } - - return( *pSeq ); + return theAccessibleShapeImplementationId::get().getSeq(); } //------------------------------------------------------------------------------ @@ -1039,7 +999,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, uno::Reference<beans::XPropertySet> xSet (mxShape, uno::UNO_QUERY); if (xSet.is()) { - uno::Any aZOrder (xSet->getPropertyValue (::rtl::OUString::createFromAscii ("ZOrder"))); + uno::Any aZOrder (xSet->getPropertyValue (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZOrder")) )); aZOrder >>= nIndex; // Add one to be not zero based. @@ -1109,10 +1069,10 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, break; case DRAWING_CONTROL: - aDG.AddProperty (OUString::createFromAscii ("ControlBackground"), + aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBackground")), DescriptionGenerator::COLOR, OUString()); - aDG.AddProperty (OUString::createFromAscii ("ControlBorder"), + aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBorder")), DescriptionGenerator::INTEGER, OUString()); break; @@ -1148,7 +1108,7 @@ uno::Reference< drawing::XShape > AccessibleShape::GetXShape() // protected void AccessibleShape::disposing (void) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); // Make sure to send an event that this object looses the focus in the @@ -1242,3 +1202,5 @@ void AccessibleShape::UpdateNameAndDescription (void) } // end of namespace accessibility + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleShapeInfo.cxx b/svx/source/accessibility/AccessibleShapeInfo.cxx index 7d6eb8f4c50f..e2dc5ca9647d 100644 --- a/svx/source/accessibility/AccessibleShapeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeInfo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ AccessibleShapeInfo::~AccessibleShapeInfo (void) } } // end of namespace accessibility. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx index 5241fa5abbf1..af361abc27ad 100644 --- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -221,3 +222,5 @@ const IAccessibleViewForwarder* AccessibleShapeTreeInfo::GetViewForwarder (void) } // end of namespace accessibility + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx index fa34e6d0cc17..57460bb71972 100644 --- a/svx/source/accessibility/AccessibleTextEventQueue.cxx +++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,3 +110,5 @@ namespace accessibility } // end of namespace accessibility //------------------------------------------------------------------------ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleTextEventQueue.hxx b/svx/source/accessibility/AccessibleTextEventQueue.hxx index 8f508858108a..f8564afa47c1 100644 --- a/svx/source/accessibility/AccessibleTextEventQueue.hxx +++ b/svx/source/accessibility/AccessibleTextEventQueue.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,5 @@ namespace accessibility } // end of namespace accessibility #endif /* _SVX_TEXT_CHANGED_QUEUE_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 4b3d2eab45fd..fe80bc2ad759 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,7 @@ #include <memory> #include <algorithm> #include <deque> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <cppuhelper/weakref.hxx> @@ -177,7 +178,7 @@ namespace accessibility // checks all children for visibility, throws away invisible ones void UpdateVisibleChildren( bool bBroadcastEvents=true ); - // check all children for changes in positon and size + // check all children for changes in position and size void UpdateBoundRect(); // calls SetSelection on the forwarder and updates maLastSelection @@ -293,7 +294,7 @@ namespace accessibility { DBG_DTOR( AccessibleTextHelper_Impl, NULL ); - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; try { @@ -450,13 +451,13 @@ namespace accessibility // we just received the focus, also send caret event then UpdateSelection(); - DBG_TRACE1("AccessibleTextHelper_Impl::SetChildFocus(): Paragraph %d received focus", nChild ); + OSL_TRACE("AccessibleTextHelper_Impl::SetChildFocus(): Paragraph %d received focus", nChild ); } else { maParaManager.SetFocus( -1 ); - DBG_TRACE1("AccessibleTextHelper_Impl::SetChildFocus(): Paragraph %d lost focus", nChild ); + OSL_TRACE("AccessibleTextHelper_Impl::SetChildFocus(): Paragraph %d lost focus", nChild ); if( mbGroupHasFocus ) SetShapeFocus( sal_True ); @@ -473,7 +474,7 @@ namespace accessibility mbGroupHasFocus = sal_True; maParaManager.SetFocus( nNewChild ); - DBG_TRACE1("AccessibleTextHelper_Impl::ChangeChildFocus(): Paragraph %d received focus", nNewChild ); + OSL_TRACE("AccessibleTextHelper_Impl::ChangeChildFocus(): Paragraph %d received focus", nNewChild ); } void AccessibleTextHelper_Impl::SetShapeFocus( sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException)) @@ -489,12 +490,12 @@ namespace accessibility if( bHaveFocus ) { GotPropertyEvent( uno::makeAny(AccessibleStateType::FOCUSED), AccessibleEventId::STATE_CHANGED ); - DBG_TRACE("AccessibleTextHelper_Impl::SetShapeFocus(): Parent object received focus" ); + OSL_TRACE("AccessibleTextHelper_Impl::SetShapeFocus(): Parent object received focus" ); } else { LostPropertyEvent( uno::makeAny(AccessibleStateType::FOCUSED), AccessibleEventId::STATE_CHANGED ); - DBG_TRACE("AccessibleTextHelper_Impl::SetShapeFocus(): Parent object lost focus" ); + OSL_TRACE("AccessibleTextHelper_Impl::SetShapeFocus(): Parent object lost focus" ); } } } @@ -523,7 +524,7 @@ namespace accessibility SetShapeFocus( bHaveFocus ); } - DBG_TRACE2("AccessibleTextHelper_Impl::SetFocus: focus changed, Object %d, state: %s", this, bHaveFocus ? "focused" : "not focused"); + OSL_TRACE("AccessibleTextHelper_Impl::SetFocus: focus changed, Object %d, state: %s", this, bHaveFocus ? "focused" : "not focused"); } sal_Bool AccessibleTextHelper_Impl::HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException)) @@ -573,7 +574,7 @@ namespace accessibility // #103998# Not that important, changed from assertion to trace if( mbThisHasFocus ) { - DBG_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): Parent has focus!"); + OSL_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): Parent has focus!"); } sal_uInt16 nMaxValidParaIndex( static_cast< sal_uInt16 >( GetTextForwarder().GetParagraphCount() ) - 1 ); @@ -598,7 +599,7 @@ namespace accessibility ChangeChildFocus( aSelection.nEndPara ); - DBG_TRACE3("AccessibleTextHelper_Impl::UpdateSelection(): focus changed, Object: %d, Paragraph: %d, Last paragraph: %d", + OSL_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): focus changed, Object: %d, Paragraph: %d, Last paragraph: %d", this, aSelection.nEndPara, maLastSelection.nEndPara); } } @@ -627,7 +628,7 @@ namespace accessibility aOldCursor ); } - DBG_TRACE5("AccessibleTextHelper_Impl::UpdateSelection(): caret changed, Object: %d, New pos: %d, Old pos: %d, New para: %d, Old para: %d", + OSL_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): caret changed, Object: %d, New pos: %d, Old pos: %d, New para: %d, Old para: %d", this, aSelection.nEndPos, maLastSelection.nEndPos, aSelection.nEndPara, maLastSelection.nEndPara); // #108947# Sort new range before calling FireEvent @@ -640,18 +641,15 @@ namespace accessibility makeSortedPair(::std::min( maLastSelection.nStartPara, nMaxValidParaIndex ), ::std::min( maLastSelection.nEndPara, nMaxValidParaIndex ) ) ); - // --> OD 2005-12-15 #i27299# - // event TEXT_SELECTION_CHANGED has to be submitted. + // event TEXT_SELECTION_CHANGED has to be submitted. (#i27299#) const sal_Int16 nTextSelChgEventId = AccessibleEventId::TEXT_SELECTION_CHANGED; - // <-- // #107037# notify selection change if( maLastSelection.nStartPara == EE_PARA_NOT_FOUND ) { // last selection is undefined - // --> OD 2005-12-15 #i27299# - use method <ESelection::HasRange()> + // use method <ESelection::HasRange()> (#i27299#) if ( aSelection.HasRange() ) - // <-- { // selection was undefined, now is on maParaManager.FireEvent( sortedSelection.first, @@ -662,42 +660,29 @@ namespace accessibility else { // last selection is valid - // --> OD 2005-12-15 #i27299# - use method <ESelection::HasRange()> + // use method <ESelection::HasRange()> (#i27299#) if ( maLastSelection.HasRange() && !aSelection.HasRange() ) - // <-- { // selection was on, now is empty maParaManager.FireEvent( sortedLastSelection.first, sortedLastSelection.second+1, nTextSelChgEventId ); } - // --> OD 2005-12-15 #i27299# - use method <ESelection::HasRange()> + // use method <ESelection::HasRange()> (#i27299#) else if( !maLastSelection.HasRange() && aSelection.HasRange() ) - // <-- { // selection was empty, now is on maParaManager.FireEvent( sortedSelection.first, sortedSelection.second+1, nTextSelChgEventId ); } - // --> OD 2005-12-15 #i27299# - // - no event TEXT_SELECTION_CHANGED event, if new and - // last selection are empty. + // no event TEXT_SELECTION_CHANGED event, if new and + // last selection are empty. (#i27299#) else if ( maLastSelection.HasRange() && aSelection.HasRange() ) - // <-- { - // --> OD 2005-12-16 #i27299# - // - send event TEXT_SELECTION_CHANGED for difference - // between last and new selection. -// // selection was on, now is different: take union of ranges -// maParaManager.FireEvent( ::std::min(sortedSelection.first, -// sortedLastSelection.second), -// ::std::max(sortedSelection.first, -// sortedLastSelection.second)+1, -// nTextSelChgEventId ); // use sorted last and new selection ESelection aTmpLastSel( maLastSelection ); aTmpLastSel.Adjust(); @@ -906,7 +891,7 @@ namespace accessibility } catch( const uno::Exception& ) { - DBG_ERROR("AccessibleTextHelper_Impl::UpdateVisibleChildren error while determining visible children"); + OSL_FAIL("AccessibleTextHelper_Impl::UpdateVisibleChildren error while determining visible children"); // something failed - currently no children mnFirstVisibleChild = -1; @@ -971,7 +956,7 @@ namespace accessibility if( mnFirstVisibleChild >= 0 && mnFirstVisibleChild > mnLastVisibleChild ) { - DBG_ERROR( "AccessibleTextHelper: range invalid" ); + OSL_FAIL( "AccessibleTextHelper: range invalid" ); } } #endif @@ -1203,7 +1188,7 @@ namespace accessibility } catch( const uno::Exception& ) { - DBG_ERROR("AccessibleTextHelper_Impl::ProcessQueue: could not create new paragraph"); + OSL_FAIL("AccessibleTextHelper_Impl::ProcessQueue: could not create new paragraph"); } } else if( aFunctor.GetHintId() == TEXT_HINT_PARAREMOVED ) @@ -1238,7 +1223,7 @@ namespace accessibility } #ifdef DBG_UTIL else - DBG_ERROR("AccessibleTextHelper_Impl::ProcessQueue() invalid hint id"); + OSL_FAIL("AccessibleTextHelper_Impl::ProcessQueue() invalid hint id"); #endif } else if( nNewParas != nCurrParas ) @@ -1461,10 +1446,9 @@ namespace accessibility if( pEditSourceHint ) { maEventQueue.Append( *pEditSourceHint ); - // --> OD 2005-12-19 #i27299# + // EditEngine should emit TEXT_SELECTION_CHANGED events (#i27299#) if( maEventOpenFrames == 0 ) ProcessQueue(); - // <-- } else if( pTextHint ) { @@ -1501,17 +1485,14 @@ namespace accessibility case TEXT_HINT_BLOCKNOTIFICATION_START: case TEXT_HINT_INPUT_START: ++maEventOpenFrames; - // --> OD 2005-12-19 #i27299# - no FALLTROUGH - // reason: event will not be processes, thus appending - // the event isn't necessary. + // no FALLTHROUGH reason: event will not be processed, + // thus appending the event isn't necessary. (#i27299#) break; - // <-- default: maEventQueue.Append( *pTextHint ); - // --> OD 2005-12-19 #i27299# + // EditEngine should emit TEXT_SELECTION_CHANGED events (#i27299#) if( maEventOpenFrames == 0 ) ProcessQueue(); - // <-- break; } } @@ -1742,7 +1723,7 @@ namespace accessibility AccessibleTextHelper::AccessibleTextHelper( ::std::auto_ptr< SvxEditSource > pEditSource ) : mpImpl( new AccessibleTextHelper_Impl() ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SetEditSource( pEditSource ); } @@ -1963,7 +1944,7 @@ namespace accessibility // As Dispose calls ShutdownEditSource, which in turn // deregisters as listener on the edit source, have to lock // here - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; #ifdef DBG_UTIL mpImpl->CheckInvariants(); @@ -1978,7 +1959,7 @@ namespace accessibility sal_Bool AccessibleTextHelper::IsSelected() const { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; #ifdef DBG_UTIL mpImpl->CheckInvariants(); @@ -1996,7 +1977,7 @@ namespace accessibility // XAccessibleContext sal_Int32 AccessibleTextHelper::GetChildCount() SAL_THROW((uno::RuntimeException)) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; #ifdef DBG_UTIL mpImpl->CheckInvariants(); @@ -2013,7 +1994,7 @@ namespace accessibility uno::Reference< XAccessible > AccessibleTextHelper::GetChild( sal_Int32 i ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException)) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; #ifdef DBG_UTIL mpImpl->CheckInvariants(); @@ -2057,7 +2038,7 @@ namespace accessibility // XAccessibleComponent uno::Reference< XAccessible > AccessibleTextHelper::GetAt( const awt::Point& aPoint ) SAL_THROW((uno::RuntimeException)) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; #ifdef DBG_UTIL mpImpl->CheckInvariants(); @@ -2075,3 +2056,5 @@ namespace accessibility } // end of namespace accessibility //------------------------------------------------------------------------ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index 89afa1ae073f..47812a46dd1e 100644 --- a/svx/source/accessibility/ChildrenManager.cxx +++ b/svx/source/accessibility/ChildrenManager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/ChildrenManager.hxx> -#ifndef _SVX_ACCESSIBILITY_CHILDREN_MANAGER_IMPL_HXX #include "ChildrenManagerImpl.hxx" -#endif #include <svx/AccessibleShape.hxx> using namespace ::com::sun::star; @@ -54,8 +53,8 @@ ChildrenManager::ChildrenManager ( mpImpl->Init (); else throw uno::RuntimeException( - ::rtl::OUString::createFromAscii( - "ChildrenManager::ChildrenManager can't create implementation object"), NULL); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "ChildrenManager::ChildrenManager can't create implementation object")), NULL); } @@ -178,3 +177,4 @@ void ChildrenManager::ViewForwarderChanged (ChangeType aChangeType, } // end of namespace accessibility +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 803388414451..9927424c32ce 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ #include "ChildrenManagerImpl.hxx" #include <svx/ShapeTypeHandler.hxx> #include <svx/AccessibleShapeInfo.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBLE_ACCESSIBLESTATETYPE_HPP_ #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#endif #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/container/XChild.hpp> #include <comphelper/uno3.hxx> @@ -134,8 +133,8 @@ uno::Reference<XAccessible> // Check wether the given index is valid. if (nIndex < 0 || (unsigned long)nIndex >= maVisibleChildren.size()) throw lang::IndexOutOfBoundsException ( - ::rtl::OUString::createFromAscii( - "no accessible child with index ") + nIndex, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "no accessible child with index ")) + ::rtl::OUString::valueOf(nIndex), mxParent); return GetChild (maVisibleChildren[nIndex],nIndex); @@ -1096,3 +1095,4 @@ void ChildDescriptor::disposeAccessibleObject (AccessibleContextBase& rParent) } // end of namespace accessibility +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 9e82a96434db..3716f243ad20 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,7 +33,7 @@ #include <svx/AccessibleShapeTreeInfo.hxx> #include <editeng/AccessibleContextBase.hxx> #include <cppuhelper/compbase2.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vector> #include <memory> #include <com/sun/star/drawing/XShape.hpp> @@ -575,3 +576,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/DGColorNameLookUp.cxx b/svx/source/accessibility/DGColorNameLookUp.cxx index 8c8e0e403654..844cd7f3d239 100644 --- a/svx/source/accessibility/DGColorNameLookUp.cxx +++ b/svx/source/accessibility/DGColorNameLookUp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,7 +33,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> @@ -51,7 +52,7 @@ DGColorNameLookUp& DGColorNameLookUp::Instance (void) // the shape type handler is instantiated. if (mpInstance == NULL) { - ::vos::OGuard aGuard (::Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (mpInstance == NULL) { // Create the single instance of the color name look up. @@ -98,7 +99,7 @@ DGColorNameLookUp::DGColorNameLookUp (void) // Create color table in which to look up the given color. uno::Reference<container::XNameContainer> xColorTable ( ::comphelper::getProcessServiceFactory()->createInstance( - OUString::createFromAscii("com.sun.star.drawing.ColorTable")), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ColorTable")) ), uno::UNO_QUERY); // Get list of color names in order to iterate over the color table. @@ -107,13 +108,13 @@ DGColorNameLookUp::DGColorNameLookUp (void) { // Look the solar mutex here as workarround for missing lock in // called function. - ::vos::OGuard aGuard (::Application::GetSolarMutex()); + SolarMutexGuard aGuard; aNames = xNA->getElementNames(); } } - catch (uno::RuntimeException e) + catch (uno::RuntimeException const&) { - // When an excpetion occured then whe have an empty name sequence + // When an exception occurred then whe have an empty name sequence // and the loop below is not entered. } @@ -129,9 +130,9 @@ DGColorNameLookUp::DGColorNameLookUp (void) aColor >>= nColor; maColorValueToNameMap[nColor] = aNames[i]; } - catch (uno::RuntimeException e) + catch (uno::RuntimeException const&) { - // Ignore the exception: the color who lead to the excpetion + // Ignore the exception: the color who lead to the exception // is not included into the map. } } @@ -146,3 +147,5 @@ DGColorNameLookUp::~DGColorNameLookUp (void) } } // end of namespace accessibility + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 8587639fa1fa..8b01c30215d6 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,15 +44,13 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/style/XStyle.hpp> #include <comphelper/processfactory.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/uno/Exception.hpp> // Includes for string resources. -#ifndef _SVX_ACCESSIBILITY_HRC #include "accessibility.hrc" -#endif #include "svx/svdstr.hrc" #include <svx/dialmgr.hxx> #include <tools/string.hxx> @@ -93,7 +92,7 @@ void DescriptionGenerator::Initialize (sal_Int32 nResourceId) // Get the string from the resource for the specified id. OUString sPrefix; { - ::vos::OGuard aGuard (::Application::GetSolarMutex()); + SolarMutexGuard aGuard; sPrefix = OUString (SVX_RESSTR (nResourceId)); } @@ -110,7 +109,7 @@ void DescriptionGenerator::Initialize (::rtl::OUString sPrefix) if (mxSet.is()) { { - ::vos::OGuard aGuard (::Application::GetSolarMutex()); + SolarMutexGuard aGuard; msDescription.append (sal_Unicode (' ')); msDescription.append (OUString (SVX_RESSTR(RID_SVXSTR_A11Y_WITH))); @@ -124,19 +123,19 @@ void DescriptionGenerator::Initialize (::rtl::OUString sPrefix) { if (mxSet.is()) { - uno::Any aValue = mxSet->getPropertyValue (OUString::createFromAscii ("Style")); + uno::Any aValue = mxSet->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("Style")) ); uno::Reference<container::XNamed> xStyle (aValue, uno::UNO_QUERY); if (xStyle.is()) msDescription.append (xStyle->getName()); } else msDescription.append ( - OUString::createFromAscii("<no style>")); + OUString(RTL_CONSTASCII_USTRINGPARAM("<no style>")) ); } catch (::com::sun::star::beans::UnknownPropertyException) { msDescription.append ( - OUString::createFromAscii("<unknown>")); + OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) ); } } } @@ -161,7 +160,7 @@ void DescriptionGenerator::AddProperty ( { OUString sLocalizedName; { - ::vos::OGuard aGuard (::Application::GetSolarMutex()); + SolarMutexGuard aGuard; sLocalizedName = SVX_RESSTR (nLocalizedNameId); } AddProperty (sPropertyName, aType, sLocalizedName, nWhichId); @@ -183,7 +182,7 @@ void DescriptionGenerator::AddProperty (const OUString& sPropertyName, msDescription.append (sal_Unicode (',')); else { - ::vos::OGuard aGuard (::Application::GetSolarMutex()); + SolarMutexGuard aGuard; msDescription.append (sal_Unicode (' ')); msDescription.append (OUString (SVX_RESSTR(RID_SVXSTR_A11Y_AND))); @@ -223,14 +222,14 @@ void DescriptionGenerator::AppendString (const ::rtl::OUString& sString) void DescriptionGenerator::AddLineProperties (void) { - AddProperty (OUString::createFromAscii ("LineColor"), + AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")), DescriptionGenerator::COLOR, SIP_XA_LINECOLOR); - AddProperty (OUString::createFromAscii ("LineDashName"), + AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("LineDashName")), DescriptionGenerator::STRING, SIP_XA_LINEDASH, XATTR_LINEDASH); - AddProperty (OUString::createFromAscii ("LineWidth"), + AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("LineWidth")), DescriptionGenerator::INTEGER, SIP_XA_LINEWIDTH); } @@ -243,7 +242,7 @@ void DescriptionGenerator::AddLineProperties (void) */ void DescriptionGenerator::AddFillProperties (void) { - AddProperty (OUString::createFromAscii ("FillStyle"), + AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillStyle")), DescriptionGenerator::FILL_STYLE, SIP_XA_FILLSTYLE); } @@ -253,7 +252,7 @@ void DescriptionGenerator::AddFillProperties (void) void DescriptionGenerator::Add3DProperties (void) { - AddProperty (OUString::createFromAscii ("D3DMaterialColor"), + AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("D3DMaterialColor")), DescriptionGenerator::COLOR, RID_SVXSTR_A11Y_3D_MATERIAL_COLOR); AddLineProperties (); @@ -265,7 +264,7 @@ void DescriptionGenerator::Add3DProperties (void) void DescriptionGenerator::AddTextProperties (void) { - AddProperty (OUString::createFromAscii ("CharColor"), + AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("CharColor")), DescriptionGenerator::COLOR); AddFillProperties (); } @@ -297,7 +296,7 @@ void DescriptionGenerator::AddColor (const OUString& sPropertyName, catch (::com::sun::star::beans::UnknownPropertyException) { msDescription.append ( - OUString::createFromAscii("<unknown>")); + OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) ); } } @@ -333,7 +332,7 @@ void DescriptionGenerator::AddInteger (const OUString& sPropertyName, catch (::com::sun::star::beans::UnknownPropertyException) { msDescription.append ( - OUString::createFromAscii("<unknown>")); + OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) ); } } @@ -356,7 +355,7 @@ void DescriptionGenerator::AddString (const OUString& sPropertyName, if (nWhichId >= 0) { - ::vos::OGuard aGuard (::Application::GetSolarMutex()); + SolarMutexGuard aGuard; String sLocalizedValue; SvxUnogetInternalNameForItem (sal::static_int_cast<sal_Int16>(nWhichId), sValue, sLocalizedValue); @@ -369,7 +368,7 @@ void DescriptionGenerator::AddString (const OUString& sPropertyName, catch (::com::sun::star::beans::UnknownPropertyException) { msDescription.append ( - OUString::createFromAscii("<unknown>")); + OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) ); } } @@ -393,7 +392,7 @@ void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName, // Get the fill style name from the resource. OUString sFillStyleName; { - ::vos::OGuard aGuard (::Application::GetSolarMutex()); + SolarMutexGuard aGuard; switch (aFillStyle) { case drawing::FillStyle_NONE: @@ -423,27 +422,27 @@ void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName, case drawing::FillStyle_NONE: break; case drawing::FillStyle_SOLID: - AddProperty (OUString::createFromAscii ("FillColor"), + AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")), COLOR, SIP_XA_FILLCOLOR); break; case drawing::FillStyle_GRADIENT: - AddProperty (OUString::createFromAscii ("FillGradientName"), + AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillGradientName")), STRING, SIP_XA_FILLGRADIENT, XATTR_FILLGRADIENT); break; case drawing::FillStyle_HATCH: - AddProperty (OUString::createFromAscii ("FillColor"), + AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")), COLOR, SIP_XA_FILLCOLOR); - AddProperty (OUString::createFromAscii ("FillHatchName"), + AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillHatchName")), STRING, SIP_XA_FILLHATCH, XATTR_FILLHATCH); break; case drawing::FillStyle_BITMAP: - AddProperty (OUString::createFromAscii ("FillBitmapName"), + AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillBitmapName")), STRING, SIP_XA_FILLBITMAP, XATTR_FILLBITMAP); @@ -456,7 +455,7 @@ void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName, catch (::com::sun::star::beans::UnknownPropertyException) { msDescription.append ( - OUString::createFromAscii("<unknown>")); + OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) ); } } @@ -482,3 +481,5 @@ void DescriptionGenerator::AddPropertyNames (void) } // end of namespace accessibility + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 5ffd4e9cd45a..a98a404bf1df 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> -#include <rtl/uuid.h> #include <tools/debug.hxx> #include <tools/gen.hxx> #include <svl/smplhint.hxx> @@ -52,12 +52,8 @@ #include <svx/AccessibleShapeInfo.hxx> #include "GraphCtlAccessibleContext.hxx" #include <svx/graphctl.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif -#ifndef _SVX_ACCESSIBILITY_HRC #include "accessibility.hrc" -#endif #include <svx/svdpage.hxx> #include <svx/unomod.hxx> #include <svx/dialmgr.hxx> @@ -66,7 +62,6 @@ //===== namespaces =========================================================== -using namespace ::vos; using namespace ::cppu; using namespace ::osl; using ::rtl::OUString; @@ -77,6 +72,8 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; +using rtl::OUString; + //===== internal ============================================================ /** initialize this component and set default values */ @@ -119,7 +116,7 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext( } else { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aSolarGuard; msName = SVX_RESSTR( RID_SVXSTR_GRAPHCTRL_ACC_NAME ); } @@ -129,7 +126,7 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext( } else { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aSolarGuard; msDescription = SVX_RESSTR( RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION ); } @@ -289,7 +286,7 @@ awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeExcept sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( NULL == mpPage ) throw DisposedException(); @@ -303,7 +300,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount( void SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex ) throw( RuntimeException, lang::IndexOutOfBoundsException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( NULL == mpPage ) throw DisposedException(); @@ -343,7 +340,7 @@ void SvxGraphCtrlAccessibleContext::FireEvent (const AccessibleEventObject& aEve Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChild( sal_Int32 nIndex ) throw( RuntimeException, lang::IndexOutOfBoundsException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; return getAccessible( getSdrObject( nIndex ) ); } @@ -359,7 +356,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessiblePa sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; // Use a simple but slow solution for now. Optimize later. // Iterate over all the parent's children and search for this object. @@ -398,7 +395,7 @@ sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole( void ) thro OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; return msDescription; } @@ -406,7 +403,7 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName( void ) throw( RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; return msName; } @@ -424,7 +421,7 @@ Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getA Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -434,8 +431,6 @@ Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAcce } else { - // pStateSetHelper->AddState( AccessibleStateType::ENABLED ); - // pStateSetHelper->AddState( AccessibleStateType::SENSITIVE ); pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE ); if( mpControl->HasFocus() ) pStateSetHelper->AddState( AccessibleStateType::FOCUSED ); @@ -451,7 +446,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAcce lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( mxParent.is() ) { @@ -471,7 +466,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addEventListener( const Reference< { if (xListener.is()) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if (!mnClientId) mnClientId = comphelper::AccessibleEventNotifier::registerClient( ); comphelper::AccessibleEventNotifier::addEventListener( mnClientId, xListener ); @@ -485,7 +480,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeEventListener( const Referenc { if (xListener.is()) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, xListener ); if ( !nListenerCount ) @@ -505,7 +500,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeEventListener( const Referenc void SAL_CALL SvxGraphCtrlAccessibleContext::addFocusListener( const Reference< awt::XFocusListener >& xListener ) throw( RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( xListener.is() ) { @@ -520,7 +515,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addFocusListener( const Reference< void SAL_CALL SvxGraphCtrlAccessibleContext::removeFocusListener( const Reference< awt::XFocusListener >& xListener ) throw (RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( xListener.is() ) { @@ -534,7 +529,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeFocusListener( const Referenc void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( NULL == mpControl ) throw DisposedException(); @@ -584,7 +579,7 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName( void ) t sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; // Iterate over all supported service names and return true if on of them // matches the given name. Sequence< OUString > aSupportedServices( getSupportedServiceNames() ); @@ -616,7 +611,7 @@ Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedService Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId( void ) throw( RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; return getUniqueId(); } @@ -631,7 +626,7 @@ OUString SvxGraphCtrlAccessibleContext::getServiceName( void ) throw( RuntimeExc void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( NULL == mpView ) throw DisposedException(); @@ -646,7 +641,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nI sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( NULL == mpView ) throw DisposedException(); @@ -658,7 +653,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_ void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( NULL == mpView ) throw DisposedException(); @@ -670,7 +665,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( R void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( NULL == mpView ) throw DisposedException(); @@ -682,7 +677,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCount() throw( RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( NULL == mpView ) throw DisposedException(); @@ -696,7 +691,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCoun Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; checkChildIndexOnSelection( nIndex ); @@ -714,7 +709,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAcce void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; checkChildIndexOnSelection( nIndex ); @@ -761,7 +756,7 @@ void SvxGraphCtrlAccessibleContext::checkChildIndexOnSelection( long nIndex ) th void SvxGraphCtrlAccessibleContext::setName( const OUString& rName ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; msName = rName; } @@ -770,7 +765,7 @@ void SvxGraphCtrlAccessibleContext::setName( const OUString& rName ) void SvxGraphCtrlAccessibleContext::setDescription( const OUString& rDescr ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; msDescription = rDescr; } @@ -785,7 +780,7 @@ void SvxGraphCtrlAccessibleContext::setModelAndView ( SdrModel* pModel, SdrView* pView) { - OGuard aGuard (Application::GetSolarMutex()); + ::SolarMutexGuard aGuard; mpModel = pModel; if (mpModel != NULL) @@ -812,7 +807,7 @@ void SvxGraphCtrlAccessibleContext::setModelAndView ( void SAL_CALL SvxGraphCtrlAccessibleContext::disposing() { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( mbDisposed ) return; @@ -826,7 +821,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing() { ShapesMapType::iterator I; - for (I=mxShapes.begin(); I!=mxShapes.end(); I++) + for (I=mxShapes.begin(); I!=mxShapes.end(); ++I) { XAccessible* pAcc = (*I).second; Reference< XComponent > xComp( pAcc, UNO_QUERY ); @@ -851,7 +846,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing() Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( NULL == mpControl ) throw DisposedException(); @@ -870,7 +865,7 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( R */ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox( void ) throw( RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; Rectangle aBounds ( 0, 0, 0, 0 ); @@ -899,7 +894,7 @@ Sequence< sal_Int8 > SvxGraphCtrlAccessibleContext::getUniqueId( void ) static OImplementationId* pId = 0; if( !pId ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( !pId) { static OImplementationId aId; @@ -951,7 +946,7 @@ void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHi { const SfxSimpleHint* pSfxHint = PTR_CAST(SfxSimpleHint, &rHint ); - // ist unser SdDrawDocument gerade gestorben? + // Has our SdDrawDocument just died? if(pSfxHint && pSfxHint->GetId() == SFX_HINT_DYING) { dispose(); @@ -1025,3 +1020,5 @@ Size SvxGraphCtrlAccessibleContext::PixelToLogic (const Size& rSize) const else return rSize; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 4a4cad786b58..01c8d124870c 100755..100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,7 +33,7 @@ #include <svx/SvxShapeTypes.hxx> #include <svx/AccessibleShapeInfo.hxx> #include <com/sun/star/drawing/XShapeDescriptor.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <svx/dialmgr.hxx> #include "svx/svdstr.hrc" @@ -67,7 +68,7 @@ ShapeTypeHandler& ShapeTypeHandler::Instance (void) // the shape type handler is instantiated. if (instance == NULL) { - ::vos::OGuard aGuard (::Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (instance == NULL) { // Create the single instance of the shape type handler. @@ -93,7 +94,6 @@ ShapeTypeId ShapeTypeHandler::GetTypeId (const OUString& aServiceName) const tServiceNameToSlotId::iterator I (maServiceNameToSlotId.find (aServiceName)); if (I != maServiceNameToSlotId.end()) { - // long nSlotId = maServiceNameToSlotId[aServiceName]; return maShapeTypeDescriptorList[I->second].mnShapeTypeId; } else @@ -156,7 +156,7 @@ ShapeTypeHandler::ShapeTypeHandler (void) // Resize the list, if necessary, so that the new type can be inserted. maShapeTypeDescriptorList[0].mnShapeTypeId = UNKNOWN_SHAPE_TYPE; maShapeTypeDescriptorList[0].msServiceName = - OUString::createFromAscii ("UNKNOWN_SHAPE_TYPE"); + OUString(RTL_CONSTASCII_USTRINGPARAM("UNKNOWN_SHAPE_TYPE")); maShapeTypeDescriptorList[0].maCreateFunction = CreateEmptyShapeReference; maServiceNameToSlotId[maShapeTypeDescriptorList[0].msServiceName] = 0; } @@ -180,7 +180,7 @@ ShapeTypeHandler::~ShapeTypeHandler (void) bool ShapeTypeHandler::AddShapeTypeList (int nDescriptorCount, ShapeTypeDescriptor aDescriptorList[]) { - ::vos::OGuard aGuard (::Application::GetSolarMutex()); + SolarMutexGuard aGuard; // Determine first id of new type descriptor(s). int nFirstId = maShapeTypeDescriptorList.size(); @@ -328,7 +328,7 @@ long ShapeTypeHandler::GetSlotId (const uno::Reference<drawing::XShape>& rxShape if (nResourceId != -1) { - ::vos::OGuard aGuard (::Application::GetSolarMutex()); + SolarMutexGuard aGuard; sName = OUString (SVX_RESSTR((unsigned short)nResourceId)); } @@ -336,3 +336,5 @@ long ShapeTypeHandler::GetSlotId (const uno::Reference<drawing::XShape>& rxShape } } // end of namespace accessibility + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx index afdec80872b1..6ff5e1a6eba3 100644 --- a/svx/source/accessibility/SvxShapeTypes.cxx +++ b/svx/source/accessibility/SvxShapeTypes.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,14 +67,12 @@ AccessibleShape* CreateSvxAccessibleShape ( case DRAWING_POLY_LINE_PATH: case DRAWING_RECTANGLE: case DRAWING_TEXT: - // --> OD 2004-11-29 #i37790# - default accessiblility shape for - // com::sun::star::drawing::CustomShape + // Default accessiblility shape for + // com::sun::star::drawing::CustomShape (#i37790#) case DRAWING_CUSTOM: - // <-- - // --> OD 2008-05-19 #i85429# - default accessiblility shape for - // com::sun::star::drawing::MediaShape + // Default accessiblility shape for + // com::sun::star::drawing::MediaShape (#i85429#) case DRAWING_MEDIA: - // <-- return new AccessibleShape (rShapeInfo, rShapeTreeInfo); case DRAWING_CONTROL: @@ -96,112 +95,112 @@ AccessibleShape* CreateSvxAccessibleShape ( } } - - -ShapeTypeDescriptor aSvxShapeTypeList[] = { - ShapeTypeDescriptor (DRAWING_TEXT, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.TextShape"), - CreateSvxAccessibleShape), - ShapeTypeDescriptor (DRAWING_RECTANGLE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.RectangleShape"), - CreateSvxAccessibleShape), - ShapeTypeDescriptor ( DRAWING_ELLIPSE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.EllipseShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_CONTROL, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.ControlShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_CONNECTOR, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.ConnectorShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_MEASURE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.MeasureShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_LINE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.LineShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_POLY_POLYGON, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.PolyPolygonShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_POLY_LINE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.PolyLineShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_OPEN_BEZIER, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.OpenBezierShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_CLOSED_BEZIER, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.ClosedBezierShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_OPEN_FREEHAND, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.OpenFreeHandShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_CLOSED_FREEHAND, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.ClosedFreeHandShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_POLY_POLYGON_PATH, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.PolyPolygonPathShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_POLY_LINE_PATH, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.PolyLinePathShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_GRAPHIC_OBJECT, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.GraphicObjectShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_GROUP, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.GroupShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_OLE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.OLE2Shape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_PAGE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.PageShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_CAPTION, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.CaptionShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_FRAME, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.FrameShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_PLUGIN, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.PluginShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_APPLET, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.AppletShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_3D_SCENE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.Shape3DSceneObject"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_3D_CUBE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.Shape3DCubeObject"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_3D_SPHERE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.Shape3DSphereObject"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_3D_LATHE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.Shape3DLatheObject"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_3D_EXTRUDE, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.Shape3DExtrudeObject"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_CUSTOM, - ::rtl::OUString::createFromAscii ("com.sun.star.drawing.CustomShape"), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_TABLE, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TableShape" ) ), - CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_MEDIA, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.MediaShape" ) ), - CreateSvxAccessibleShape ), - -}; - - void RegisterDrawShapeTypes (void) { - // --> OD 2004-11-26 #i37790# + /** List of shape type descriptors corresponding to the + <type>SvxShapeTypes</type> enum. + */ + ShapeTypeDescriptor aSvxShapeTypeList[] = { + ShapeTypeDescriptor (DRAWING_TEXT, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TextShape")), + CreateSvxAccessibleShape), + ShapeTypeDescriptor (DRAWING_RECTANGLE, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.RectangleShape")), + CreateSvxAccessibleShape), + ShapeTypeDescriptor ( DRAWING_ELLIPSE, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.EllipseShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_CONTROL, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_CONNECTOR, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ConnectorShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_MEASURE, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.MeasureShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_LINE, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.LineShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_POLY_POLYGON, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyPolygonShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_POLY_LINE, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyLineShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_OPEN_BEZIER, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OpenBezierShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_CLOSED_BEZIER, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ClosedBezierShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_OPEN_FREEHAND, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OpenFreeHandShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_CLOSED_FREEHAND, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ClosedFreeHandShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_POLY_POLYGON_PATH, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyPolygonPathShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_POLY_LINE_PATH, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyLinePathShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_GRAPHIC_OBJECT, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicObjectShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_GROUP, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GroupShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_OLE, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_PAGE, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PageShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_CAPTION, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CaptionShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_FRAME, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.FrameShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_PLUGIN, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PluginShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_APPLET, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.AppletShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_3D_SCENE, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DSceneObject")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_3D_CUBE, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DCubeObject")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_3D_SPHERE, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DSphereObject")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_3D_LATHE, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DLatheObject")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_3D_EXTRUDE, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DExtrudeObject")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_CUSTOM, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape")), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_TABLE, + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TableShape" ) ), + CreateSvxAccessibleShape ), + ShapeTypeDescriptor ( DRAWING_MEDIA, + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.MediaShape" ) ), + CreateSvxAccessibleShape ), + + }; + + // Crash while inserting callout with activated accesibility (#i37790#) ShapeTypeHandler::Instance().AddShapeTypeList ( DRAWING_END, aSvxShapeTypeList); - // <-- } - } // end of namespace accessibility + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index c0e49e4f78b1..8e7b051a074b 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,7 +60,7 @@ SvxShowCharSetVirtualAcc::SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ) : ,m_pTable(NULL) { osl_incrementInterlockedCount(&m_refCount); - { // #b6211265 # + { lateInit(this); } osl_decrementInterlockedCount(&m_refCount); @@ -300,7 +301,7 @@ SvxShowCharSetAcc::SvxShowCharSetAcc( SvxShowCharSetVirtualAcc* _pParent ) : OAc ,m_pParent( _pParent ) { osl_incrementInterlockedCount(&m_refCount); - { // #b6211265 # + { lateInit(this); } osl_decrementInterlockedCount(&m_refCount); @@ -889,3 +890,4 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getBackground( ) throw (RuntimeException) // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 9dfb97dff4ac..0e65b6c31de8 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,7 +42,6 @@ #include <toolkit/helper/convert.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> -#include <rtl/uuid.h> #include <tools/debug.hxx> #include <tools/gen.hxx> @@ -166,7 +166,7 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext( msName = *pName; else { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aSolarGuard; msName = SVX_RESSTR( mbAngleMode? RID_SVXSTR_RECTCTL_ACC_ANGL_NAME : RID_SVXSTR_RECTCTL_ACC_CORN_NAME ); } @@ -174,7 +174,7 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext( msDescription = *pDesc; else { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aSolarGuard; msDescription = SVX_RESSTR( mbAngleMode? RID_SVXSTR_RECTCTL_ACC_ANGL_DESCR : RID_SVXSTR_RECTCTL_ACC_CORN_DESCR ); } @@ -291,7 +291,7 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil Reference< XAccessible > xChild = mpChilds[ nIndex ]; if( !xChild.is() ) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -388,8 +388,6 @@ Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccess if( IsAlive() ) { - // pStateSetHelper->AddState( AccessibleStateType::ENABLED ); - // pStateSetHelper->AddState( AccessibleStateType::SENSITIVE ); pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE ); if( mpRepr->HasFocus() ) pStateSetHelper->AddState( AccessibleStateType::FOCUSED ); @@ -485,7 +483,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::removeFocusListener( const Reference< void SAL_CALL SvxRectCtlAccessibleContext::grabFocus() throw( RuntimeException ) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); ThrowExceptionIfNotAlive(); @@ -502,7 +500,7 @@ Any SAL_CALL SvxRectCtlAccessibleContext::getAccessibleKeyBinding() throw( Runti sal_Int32 SvxRectCtlAccessibleContext::getForeground( ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); ThrowExceptionIfNotAlive(); @@ -511,7 +509,7 @@ sal_Int32 SvxRectCtlAccessibleContext::getForeground( ) sal_Int32 SvxRectCtlAccessibleContext::getBackground( ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); ThrowExceptionIfNotAlive(); @@ -560,7 +558,7 @@ Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId( void SAL_CALL SvxRectCtlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException ) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -755,7 +753,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::disposing() Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException ) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); ThrowExceptionIfNotAlive(); @@ -765,7 +763,7 @@ Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( Run Rectangle SvxRectCtlAccessibleContext::GetBoundingBox( void ) throw( RuntimeException ) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); ThrowExceptionIfNotAlive(); @@ -845,7 +843,6 @@ Reference< XAccessibleContext> SAL_CALL SvxRectCtlChildAccessibleContext::getAcc sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException ) { // no guard -> done in getBounds() -// return GetBoundingBox().IsInside( VCLPoint( rPoint ) ); return Rectangle( Point( 0, 0 ), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); } @@ -900,13 +897,13 @@ sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::isFocusTraversable() throw( void SAL_CALL SvxRectCtlChildAccessibleContext::addFocusListener( const Reference< awt::XFocusListener >& /*xListener*/ ) throw( RuntimeException ) { - OSL_ENSURE( false, "SvxRectCtlChildAccessibleContext::addFocusListener: not implemented" ); + OSL_FAIL( "SvxRectCtlChildAccessibleContext::addFocusListener: not implemented" ); } void SAL_CALL SvxRectCtlChildAccessibleContext::removeFocusListener( const Reference< awt::XFocusListener >& /*xListener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SvxRectCtlChildAccessibleContext::removeFocusListener: not implemented" ); + OSL_FAIL( "SvxRectCtlChildAccessibleContext::removeFocusListener: not implemented" ); } void SAL_CALL SvxRectCtlChildAccessibleContext::grabFocus() throw( RuntimeException ) @@ -921,7 +918,7 @@ Any SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleKeyBinding() throw( sal_Int32 SvxRectCtlChildAccessibleContext::getForeground( ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( maMutex ); ThrowExceptionIfNotAlive(); return mrParentWindow.GetControlForeground().GetColor(); @@ -929,7 +926,7 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getForeground( ) sal_Int32 SvxRectCtlChildAccessibleContext::getBackground( ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( maMutex ); ThrowExceptionIfNotAlive(); @@ -1204,3 +1201,4 @@ void SvxRectCtlChildAccessibleContext::setStateChecked( sal_Bool bChecked ) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx index 588623dbb39a..63fc7614ec99 100644 --- a/svx/source/core/coreservices.cxx +++ b/svx/source/core/coreservices.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -143,3 +144,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 6224373f9a15..4a62898b3d8a 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,9 +36,7 @@ #include <svx/svdocirc.hxx> #include <svx/svdogrp.hxx> #include <svx/svdopath.hxx> -#ifndef _SVDOCAPT_HXX #include <svx/svdocapt.hxx> -#endif #include <svx/svdpage.hxx> #include <svx/xflclit.hxx> #include <svx/sdasaitm.hxx> @@ -59,12 +58,8 @@ #include <svx/xhatch.hxx> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> -#ifndef __COM_SUN_STAR_DRAWING_ENHANCEDCUSTOMSHAPESEGMENTCOMMAND_HPP__ #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> -#endif -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif #include <basegfx/numeric/ftools.hxx> #include <basegfx/color/bcolortools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -467,7 +462,6 @@ sal_Bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle( const rtl::OUString sMirroredY ( RTL_CONSTASCII_USTRINGPARAM( "MirroredY" ) ); const rtl::OUString sSwitched ( RTL_CONSTASCII_USTRINGPARAM( "Switched" ) ); const rtl::OUString sPolar ( RTL_CONSTASCII_USTRINGPARAM( "Polar" ) ); -// const rtl::OUString sMap ( RTL_CONSTASCII_USTRINGPARAM( "Map" ) ); const rtl::OUString sRefX ( RTL_CONSTASCII_USTRINGPARAM( "RefX" ) ); const rtl::OUString sRefY ( RTL_CONSTASCII_USTRINGPARAM( "RefY" ) ); const rtl::OUString sRefAngle ( RTL_CONSTASCII_USTRINGPARAM( "RefAngle" ) ); @@ -1004,7 +998,7 @@ sal_Bool EnhancedCustomShape2d::GetParameter( double& rRetValue, const EnhancedC { if ( rParameter.Value.getValueTypeClass() == TypeClass_DOUBLE ) { - double fValue; + double fValue(0.0); if ( rParameter.Value >>= fValue ) { rRetValue = fValue; @@ -1719,7 +1713,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm { ByteString aString( "CustomShapes::unknown PolyFlagValue :" ); aString.Append( ByteString::CreateFromInt32( nCommand ) ); - DBG_ERROR( aString.GetBuffer() ); + OSL_FAIL( aString.GetBuffer() ); } break; #endif @@ -1740,6 +1734,22 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm if(aNewB2DPolyPolygon.count()) { + if( !bLineGeometryNeededOnly ) + { + // hack aNewB2DPolyPolygon to fill logic rect - this is + // needed to produce gradient fills that look like mso + aNewB2DPolygon.clear(); + aNewB2DPolygon.append(basegfx::B2DPoint(0,0)); + aNewB2DPolygon.setClosed(true); + aNewB2DPolyPolygon.append(aNewB2DPolygon); + + aNewB2DPolygon.clear(); + aNewB2DPolygon.append(basegfx::B2DPoint(aLogicRect.GetWidth(), + aLogicRect.GetHeight())); + aNewB2DPolygon.setClosed(true); + aNewB2DPolyPolygon.append(aNewB2DPolygon); + } + // #i37011# bool bForceCreateTwoObjects(false); @@ -2129,8 +2139,6 @@ SdrObject* EnhancedCustomShape2d::CreateObject( sal_Bool bLineGeometryNeededOnly if ( eSpType == mso_sptRectangle ) { pRet = new SdrRectObj( aLogicRect ); -// SJ: not setting model, so we save a lot of broadcasting and the model is not modified any longer -// pRet->SetModel( pCustomShapeObj->GetModel() ); pRet->SetMergedItemSet( *this ); } if ( !pRet ) @@ -2150,14 +2158,6 @@ void EnhancedCustomShape2d::ApplyGluePoints( SdrObject* pObj ) aGluePoint.SetPos( GetPoint( seqGluePoints[ i ], sal_True, sal_True ) ); aGluePoint.SetPercent( sal_False ); - -// const Point& rPoint = GetPoint( seqGluePoints[ i ], sal_True, sal_True ); -// double fXRel = rPoint.X(); -// double fYRel = rPoint.Y(); -// fXRel = aLogicRect.GetWidth() == 0 ? 0.0 : fXRel / aLogicRect.GetWidth() * 10000; -// fYRel = aLogicRect.GetHeight() == 0 ? 0.0 : fYRel / aLogicRect.GetHeight() * 10000; -// aGluePoint.SetPos( Point( (sal_Int32)fXRel, (sal_Int32)fYRel ) ); -// aGluePoint.SetPercent( sal_True ); aGluePoint.SetAlign( SDRVERTALIGN_TOP | SDRHORZALIGN_LEFT ); aGluePoint.SetEscDir( SDRESC_SMART ); SdrGluePointList* pList = pObj->ForceGluePointList(); @@ -2173,3 +2173,4 @@ SdrObject* EnhancedCustomShape2d::CreateLineGeometry() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 0781ade6c97a..3b9b47fca7c6 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -345,8 +346,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con if ( pAny ) *pAny >>= eProjectionMode; ProjectionType eProjectionType( eProjectionMode == drawing::ProjectionMode_PARALLEL ? PR_PARALLEL : PR_PERSPECTIVE ); - - // pShape2d Umwandeln in Szene mit 3D Objekt + // pShape2d Convert in scenes which include 3D Objects E3dDefaultAttributes a3DDefaultAttr; a3DDefaultAttr.SetDefaultLatheCharacterMode( sal_True ); a3DDefaultAttr.SetDefaultExtrudeCharacterMode( sal_True ); @@ -507,7 +507,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con // then we can change the return value pRet = pScene; - // Kameraeinstellungen, Perspektive ... + // Camera settings, Perspective ... Camera3D& rCamera = (Camera3D&)pScene->GetCamera(); const basegfx::B3DRange& rVolume = pScene->GetBoundVolume(); pScene->NbcSetSnapRect( aSnapRect ); @@ -712,14 +712,6 @@ Rectangle EnhancedCustomShape3d::CalculateNewSnapRect( const SdrObject* pCustomS drawing::Direction3D aRotationCenterDefault( 0, 0, 0 ); // default seems to be wrong, a fractional size of shape has to be used!! drawing::Direction3D aRotationCenter( GetDirection3D( rGeometryItem, sRotationCenter, aRotationCenterDefault ) ); - // double XCenterInGUnits = rPropSet.GetPropertyValue( DFF_Prop_c3DRotationCenterX, 0 ); - // double YCenterInGUnits = rPropSet.GetPropertyValue( DFF_Prop_c3DRotationCenterY, 0 ); - - // sal_Int32 nRotationXAxisInProz = rPropSet.GetPropertyValue( DFF_Prop_c3DRotationAxisX, 100 ); - // sal_Int32 nRotationYAxisInProz = rPropSet.GetPropertyValue( DFF_Prop_c3DRotationAxisY, 0 ); - // sal_Int32 nRotationZAxisInProz = rPropSet.GetPropertyValue( DFF_Prop_c3DRotationAxisZ, 0 ); - - double fXRotate, fYRotate; GetRotateAngle( rGeometryItem, fXRotate, fYRotate ); double fZRotate = - ((SdrObjCustomShape*)pCustomShape)->GetObjectRotation() * F_PI180; @@ -750,3 +742,5 @@ Rectangle EnhancedCustomShape3d::CalculateNewSnapRect( const SdrObject* pCustomS return aTransformed.GetBoundRect(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/customshapes/EnhancedCustomShape3d.hxx b/svx/source/customshapes/EnhancedCustomShape3d.hxx index a9dbf8882340..e8268f7db6dd 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.hxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,4 @@ class EnhancedCustomShape3d #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index c20360db7c4b..53cc25b61fb9 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,9 +35,7 @@ #include "EnhancedCustomShapeHandle.hxx" #include "svx/EnhancedCustomShapeGeometry.hxx" #include <svx/unoshape.hxx> -#ifndef _SVX_UNOPAGE_HXX #include "svx/unopage.hxx" -#endif #include "svx/unoapi.hxx" #include <svx/svdobj.hxx> #include <svx/svdoashp.hxx> @@ -115,9 +114,9 @@ void SAL_CALL EnhancedCustomShapeEngine::initialize( const SEQ( NMSP_UNO::Any )& for ( i = 0; i < aParameter.getLength(); i++ ) { const NMSP_BEANS::PropertyValue& rProp = aParameter[ i ]; - if ( rProp.Name.equalsAscii( "CustomShape" ) ) + if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CustomShape" ) ) ) rProp.Value >>= mxShape; - else if ( rProp.Name.equalsAscii( "ForceGroupWithText" ) ) + else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ForceGroupWithText" ) ) ) rProp.Value >>= mbForceGroupWithText; } } @@ -469,3 +468,5 @@ SEQ( REF( com::sun::star::drawing::XCustomShapeHandle ) ) SAL_CALL EnhancedCusto aSeq[ i ] = new EnhancedCustomShapeHandle( mxShape, i ); return aSeq; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx index 1ead04b5311e..d209e4fad54e 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -122,3 +123,5 @@ SEQ( rtl::OUString ) SAL_CALL EnhancedCustomShapeEngine_getSupportedServiceNames throw( NMSP_UNO::RuntimeException ); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 0af22d94334b..82b16df44df2 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,14 +59,10 @@ #include <numeric> #include <algorithm> #include <comphelper/processfactory.hxx> -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#ifndef _COM_SUN_STAR_I18N_CHARACTERITERATORMODE_HDL_ #include <com/sun/star/i18n/CharacterIteratorMode.hdl> -#endif #include <basegfx/polygon/b2dpolygontools.hxx> using namespace com::sun::star; @@ -127,7 +124,7 @@ sal_Bool InitializeFontWorkData( const SdrObject* pCustomShape, const sal_uInt16 { FWTextArea aTextArea; sal_Int32 i, nParagraphs = ( ( nParagraphsLeft - 1 ) / nTextAreaCount ) + 1; - for ( i = 0; i < nParagraphs; i++, j++ ) + for ( i = 0; i < nParagraphs; ++i, ++j ) { FWParagraphData aParagraphData; aParagraphData.aString = rTextObj.GetText( j ); @@ -218,9 +215,9 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape, fScalingFactor = fScale; } } - aParagraphIter++; + ++aParagraphIter; } - aTextAreaIter++; + ++aTextAreaIter; } rFWData.fHorizontalTextScaling = fScalingFactor; } @@ -244,9 +241,9 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F if ( xBI.is() ) { nScriptType = xBI->getScriptType( rText, 0 ); - sal_uInt16 nChg = 0; if( i18n::ScriptType::WEAK == nScriptType ) { + sal_uInt16 nChg = 0; nChg = (xub_StrLen)xBI->endOfScript( rText, nChg, nScriptType ); if( nChg < rText.getLength() ) nScriptType = xBI->getScriptType( rText, nChg ); @@ -263,7 +260,6 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F Font aFont; aFont.SetHeight( rFWData.nSingleLineHeight ); aFont.SetAlign( ALIGN_TOP ); - // aFont.SetAlign( ) aFont.SetName( rFontItem.GetFamilyName() ); aFont.SetFamily( rFontItem.GetFamily() ); @@ -316,7 +312,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F // rotating aOutlineIter->Rotate( Point( nTextWidth / 2, rFWData.nSingleLineHeight / 2 ), 900 ); aCharacterData.aBoundRect.Union( aOutlineIter->GetBoundRect() ); - aOutlineIter++; + ++aOutlineIter; } aOutlineIter = aCharacterData.vOutlines.begin(); aOutlineIEnd = aCharacterData.vOutlines.end(); @@ -325,7 +321,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F sal_Int32 nM = - aCharacterData.aBoundRect.Left() + nHeight; aOutlineIter->Move( nM, 0 ); aCharacterData.aBoundRect.Move( nM, 0 ); - aOutlineIter++; + ++aOutlineIter; } nHeight += aCharacterData.aBoundRect.GetWidth() + ( rFWData.nSingleLineHeight / 5 ); aSingleCharacterUnion.Union( aCharacterData.aBoundRect ); @@ -342,9 +338,9 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F while ( aOutlineIter != aOutlineIEnd ) { aOutlineIter->Move( ( aSingleCharacterUnion.GetWidth() - aCharacterIter->aBoundRect.GetWidth() ) / 2, 0 ); - aOutlineIter++; + ++aOutlineIter; } - aCharacterIter++; + ++aCharacterIter; } } else @@ -362,25 +358,6 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F { aParagraphIter->vCharacters.push_back( aCharacterData ); } - -/* trying to retrieve each single character _> is not working well - sal_Int32 i; - for ( i = 0; i < rText.getLength(); i++ ) - { - FWCharacterData aCharacterData; - if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, rText, 0, i, 1, sal_True, nWidth, pDXArry ) ) - { - std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterData.vOutlines.begin(); - std::vector< PolyPolygon >::iterator aOutlineIEnd = aCharacterData.vOutlines.end(); - while ( aOutlineIter != aOutlineIEnd ) - { - aCharacterData.aBoundRect.Union( aOutlineIter->GetBoundRect() ); - aOutlineIter++; - } - } - aParagraphIter->vCharacters.push_back( aCharacterData ); - } -*/ } delete[] pDXArry; @@ -403,7 +380,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F Rectangle aBoundRect( rPolyPoly.GetBoundRect() ); aParagraphIter->aBoundRect.Union( aBoundRect ); } - aCharacterIter++; + ++aCharacterIter; } } // updating the boundrect for the text area by merging the current paragraph boundrect @@ -436,9 +413,9 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F sal_Int32 nMove = aPolyPolyBoundRect.Top() - rParagraphBoundRect.Top(); if ( nMove ) aOutlineIter->Move( 0, -nMove ); - aOutlineIter++; + ++aOutlineIter; } - aCharacterIter++; + ++aCharacterIter; } } } @@ -446,7 +423,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F nVerticalOffset -= rFWData.nSingleLineHeight; else nVerticalOffset += rFWData.nSingleLineHeight; - aParagraphIter++; + ++aParagraphIter; } } @@ -492,12 +469,12 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape ) while( aOutlineIter != aOutlineIEnd ) { aOutlineIter->Scale( fScale, 1.0 ); - aOutlineIter++; + ++aOutlineIter; } - aCharacterIter++; + ++aCharacterIter; } } - aParagraphIter++; + ++aParagraphIter; } } else @@ -527,12 +504,12 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape ) while( aOutlineIter != aOutlineIEnd ) { aOutlineIter->Move( nHorzDiff, 0 ); - aOutlineIter++; + ++aOutlineIter; } - aCharacterIter++; + ++aCharacterIter; } } - aParagraphIter++; + ++aParagraphIter; } } break; @@ -541,7 +518,7 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape ) case SDRTEXTHORZADJUST_LEFT : break; // already left aligned -> nothing to do } } - aTextAreaIter++; + ++aTextAreaIter; } } @@ -636,7 +613,7 @@ void InsertMissingOutlinePoints( const Polygon& /*rOutlinePoly*/, const std::vec void GetPoint( const Polygon& rPoly, const std::vector< double >& rDistances, const double& fX, double& fx1, double& fy1 ) { fy1 = fx1 = 0.0; - if ( rPoly.GetSize() ) + if ( rPoly.GetSize() > 1 ) { std::vector< double >::const_iterator aIter = std::lower_bound( rDistances.begin(), rDistances.end(), fX ); sal_uInt16 nIdx = sal::static_int_cast<sal_uInt16>( std::distance( rDistances.begin(), aIter ) ); @@ -725,11 +702,11 @@ void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFW rPolyPoly.Rotate( Point( aBoundRect.Center().X(), aParagraphIter->aBoundRect.Center().Y() ), sin( fAngle ), cos( fAngle ) ); rPolyPoly.Move( (sal_Int32)( ( fx1 + fvx )- aBoundRect.Center().X() ), (sal_Int32)( ( fy1 + fvy ) - aParagraphIter->aBoundRect.Center().Y() ) ); - aOutlineIter++; + ++aOutlineIter; } - aCharacterIter++; + ++aCharacterIter; } - aParagraphIter++; + ++aParagraphIter; } } } @@ -801,15 +778,15 @@ void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFW // write back polygon rPolyPoly[ i ] = aLocalPoly; } - aOutlineIter++; + ++aOutlineIter; } - aCharacterIter++; + ++aCharacterIter; } - aParagraphIter++; + ++aParagraphIter; } } } - aTextAreaIter++; + ++aTextAreaIter; } } @@ -819,8 +796,6 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const Sd if ( rFWData.vTextAreas.size() ) { pRet = new SdrObjGroup(); -// SJ: not setting model, so we save a lot of broadcasting and the model is not modified any longer -// pRet->SetModel( pCustomShape->GetModel() ); std::vector< FWTextArea >::const_iterator aTextAreaIter = rFWData.vTextAreas.begin(); std::vector< FWTextArea >::const_iterator aTextAreaIEnd = rFWData.vTextAreas.end(); while ( aTextAreaIter != aTextAreaIEnd ) @@ -838,16 +813,14 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const Sd while( aOutlineIter != aOutlineIEnd ) { SdrObject* pPathObj = new SdrPathObj( OBJ_POLY, aOutlineIter->getB2DPolyPolygon() ); - // SJ: not setting model, so we save a lot of broadcasting and the model is not modified any longer - // pPathObj->SetModel( pCustomShape->GetModel() ); ((SdrObjGroup*)pRet)->GetSubList()->NbcInsertObject( pPathObj ); - aOutlineIter++; + ++aOutlineIter; } - aCharacterIter++; + ++aCharacterIter; } - aParagraphIter++; + ++aParagraphIter; } - aTextAreaIter++; + ++aTextAreaIter; } Point aP( pCustomShape->GetSnapRect().Center() ); @@ -871,7 +844,7 @@ Reference < i18n::XBreakIterator > EnhancedCustomShapeFontWork::GetBreakIterator if ( !mxBreakIterator.is() ) { Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); - Reference < XInterface > xI = xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ); + Reference < XInterface > xI = xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ); if ( xI.is() ) { Any x = xI->queryInterface( ::getCppuType((const Reference< i18n::XBreakIterator >*)0) ); @@ -908,3 +881,5 @@ SdrObject* EnhancedCustomShapeFontWork::CreateFontWork( const SdrObject* pShape2 } return pRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx index 8d96aceedd9d..dc1ab7d7749c 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,4 @@ class EnhancedCustomShapeFontWork #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index dafd0d868963..7c71123b740b 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,7 +61,7 @@ void EnhancedCustomShape::FillEquationParameter( const EnhancedCustomShapeParame sal_Int32 nValue = 0; if ( rSource.Value.getValueTypeClass() == uno::TypeClass_DOUBLE ) { - double fValue; + double fValue(0.0); if ( rSource.Value >>= fValue ) nValue = (sal_Int32)fValue; } @@ -1210,3 +1211,4 @@ ExpressionNodeSharedPtr FunctionParser::parseFunction( const ::rtl::OUString& rF } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx index 2bf28c81ca18..14a9f948e2d3 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -8271,3 +8272,5 @@ const mso_CustomShape* GetCustomShapeContent( MSO_SPT eSpType ) } return pCustomShape; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx index 92104f0ae82e..e2f0dbfacc7e 100644 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,5 @@ void SAL_CALL EnhancedCustomShapeHandle::initialize( const com::sun::star::uno:: throw ( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException ) { } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx index c87f6d12116c..ab2b23713ca8 100644 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx index 093bae0d2a2d..319965867502 100644 --- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,8 +30,15 @@ #include "precompiled_svx.hxx" #include "svx/EnhancedCustomShapeTypeNames.hxx" #include <osl/mutex.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> +struct THash +{ + size_t operator()( const char* s ) const + { + return rtl_str_hashCode(s); + } +}; struct TCheck { bool operator()( const char* s1, const char* s2 ) const @@ -38,7 +46,7 @@ struct TCheck return strcmp( s1, s2 ) == 0; } }; -typedef std::hash_map< const char*, MSO_SPT, std::hash<const char*>, TCheck> TypeNameHashMap; +typedef boost::unordered_map< const char*, MSO_SPT, THash, TCheck> TypeNameHashMap; static TypeNameHashMap* pHashMap = NULL; static ::osl::Mutex& getHashMapMutex() { @@ -319,3 +327,5 @@ rtl::OUString EnhancedCustomShapeTypeNames::Get( const MSO_SPT eShapeType ) ? rtl::OUString::createFromAscii( pNameTypeTableArray[ eShapeType ].pS ) : rtl::OUString(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx index f0879be033ee..511a7987fcbc 100644 --- a/svx/source/customshapes/tbxcustomshapes.cxx +++ b/svx/source/customshapes/tbxcustomshapes.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,18 +29,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <tools/shl.hxx> #include <svl/eitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/toolbox.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <sfx2/imagemgr.hxx> #include <vcl/svapp.hxx> @@ -109,7 +108,7 @@ SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( sal_uInt16 nSlotId, sal_uInt16 nId /************************************************************************* |* -|* Benachrichtigung, wenn sich der Applikationsstatus geaendert hat +|* Notification when the application status has changed |* \************************************************************************/ @@ -121,7 +120,7 @@ void SvxTbxCtlCustomShapes::StateChanged( sal_uInt16 nSID, SfxItemState eState, /************************************************************************* |* -|* Wenn man ein PopupWindow erzeugen will +|* when one wants to create a popup window |* \************************************************************************/ @@ -132,9 +131,9 @@ SfxPopupWindowType SvxTbxCtlCustomShapes::GetPopupWindowType() const /************************************************************************* |* -|* Hier wird das Fenster erzeugt -|* Lage der Toolbox mit GetToolBox() abfragbar -|* rItemRect sind die Screen-Koordinaten +|* Here is the window created +|* The location of the Toolbox is queried through GetToolBox() +|* rItemRect are the screen coordinates |* \************************************************************************/ @@ -158,7 +157,7 @@ void SvxTbxCtlCustomShapes::Select( sal_Bool /*bMod1*/ ) ::sal_Bool SAL_CALL SvxTbxCtlCustomShapes::opensSubToolbar() throw (::com::sun::star::uno::RuntimeException) { - // We control a sub-toolbar therefor, we have to return true. + // We control a sub-toolbar therefore we have to return true. return sal_True; } @@ -175,13 +174,13 @@ void SAL_CALL SvxTbxCtlCustomShapes::functionSelected( const ::rtl::OUString& rC m_aCommand = rCommand; // Our sub-toolbar wants to execute a function. // We have to change the image of our toolbar button to reflect the new function. - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( !m_bDisposed ) { if ( m_aCommand.getLength() > 0 ) { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface()); - Image aImage = GetImage( xFrame, m_aCommand, hasBigImages(), isHighContrast() ); + Image aImage = GetImage( xFrame, m_aCommand, hasBigImages() ); if ( !!aImage ) GetToolBox().SetItemImage( GetId(), aImage ); } @@ -192,13 +191,14 @@ void SAL_CALL SvxTbxCtlCustomShapes::updateImage( ) throw (::com::sun::star::un { // We should update the button image of our parent (toolbar). // Use the stored command to set the correct current image. - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( m_aCommand.getLength() > 0 ) { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface()); - Image aImage = GetImage( xFrame, m_aCommand, hasBigImages(), isHighContrast() ); + Image aImage = GetImage( xFrame, m_aCommand, hasBigImages() ); if ( !!aImage ) GetToolBox().SetItemImage( GetId(), aImage ); } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx index 22dcdcc3a1be..d41cf9d8f2f4 100644 --- a/svx/source/dialog/SpellDialogChildWindow.cxx +++ b/svx/source/dialog/SpellDialogChildWindow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ namespace svx { -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ SpellDialogChildWindow::SpellDialogChildWindow ( Window* _pParent, sal_uInt16 nId, @@ -54,66 +53,52 @@ SpellDialogChildWindow::SpellDialogChildWindow ( eChildAlignment = SFX_ALIGN_NOALIGNMENT; SetHideNotDelete (sal_True); } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ SpellDialogChildWindow::~SpellDialogChildWindow (void) { } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ SfxBindings& SpellDialogChildWindow::GetBindings (void) const { OSL_ASSERT (m_pAbstractSpellDialog != NULL); return m_pAbstractSpellDialog->GetBindings(); } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ void SpellDialogChildWindow::InvalidateSpellDialog() { OSL_ASSERT (m_pAbstractSpellDialog != NULL); if(m_pAbstractSpellDialog) m_pAbstractSpellDialog->Invalidate(); } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ bool SpellDialogChildWindow::HasAutoCorrection() { return false; } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ void SpellDialogChildWindow::AddAutoCorrection( const String& /*rOld*/, const String& /*rNew*/, LanguageType /*eLanguage*/) { - DBG_ERROR("AutoCorrection should have been overloaded - if available"); + OSL_FAIL("AutoCorrection should have been overloaded - if available"); } -/*-- 16.06.2008 10:11:57--------------------------------------------------- - -----------------------------------------------------------------------*/ bool SpellDialogChildWindow::HasGrammarChecking() { return false; } -/*-- 18.06.2008 12:26:35--------------------------------------------------- - -----------------------------------------------------------------------*/ bool SpellDialogChildWindow::IsGrammarChecking() { - DBG_ERROR("Grammar checking should have been overloaded - if available"); + OSL_FAIL("Grammar checking should have been overloaded - if available"); return false; } -/*-- 18.06.2008 12:26:35--------------------------------------------------- - -----------------------------------------------------------------------*/ void SpellDialogChildWindow::SetGrammarChecking(bool ) { - DBG_ERROR("Grammar checking should have been overloaded - if available"); + OSL_FAIL("Grammar checking should have been overloaded - if available"); } } // end of namespace ::svx + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 006d288dfc47..fc4a443ff4f8 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -240,7 +241,7 @@ IMPL_LINK( MaskData, CbxHdl, CheckBox*, pCbx ) else pMask->aBtnExec.Disable(); - // Wenn eine Checkbox gecheckt wurde, wird die Pipette enabled + // When a checkbox is checked, the pipette is enabled if ( pCbx->IsChecked() ) { MaskSet* pSet = NULL; @@ -447,8 +448,7 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx, pColTab ( NULL ), aPipetteColor ( COL_WHITE ), aSelItem ( SID_BMPMASK_EXEC, *this, *pBindinx ), - maImgPipette ( BMP_RESID ( IMG_PIPETTE ) ), - maImgPipetteH ( BMP_RESID ( IMG_PIPETTE_H ) ) + maImgPipette ( BMP_RESID ( IMG_PIPETTE ) ) { FreeResource(); @@ -480,28 +480,24 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx, pQSet1->SetStyle( pQSet1->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER ); pQSet1->SetColCount( 1 ); pQSet1->SetLineCount( 1 ); -// pQSet1->SetExtraSpacing( 1 ); pQSet1->InsertItem( 1, aPipetteColor ); pQSet1->SelectItem( 1 ); pQSet2->SetStyle( pQSet2->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER ); pQSet2->SetColCount( 1 ); pQSet2->SetLineCount( 1 ); -// pQSet2->SetExtraSpacing( 1 ); pQSet2->InsertItem( 1, aPipetteColor ); pQSet2->SelectItem( 0 ); pQSet3->SetStyle( pQSet3->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER ); pQSet3->SetColCount( 1 ); pQSet3->SetLineCount( 1 ); -// pQSet3->SetExtraSpacing( 1 ); pQSet3->InsertItem( 1, aPipetteColor ); pQSet3->SelectItem( 0 ); pQSet4->SetStyle( pQSet4->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER ); pQSet4->SetColCount( 1 ); pQSet4->SetLineCount( 1 ); -// pQSet4->SetExtraSpacing( 1 ); pQSet4->InsertItem( 1, aPipetteColor ); pQSet4->SelectItem( 0 ); @@ -564,18 +560,6 @@ SvxBmpMask::~SvxBmpMask() /** is called by a MaskSet when it is selected */ void SvxBmpMask::onSelect( MaskSet* pSet ) { - // automaticaly set focus to the corresponding listbox -/* - if( pSet == pQSet1 ) - aLbColor1.GrabFocus(); - else if( pSet == pQSet2 ) - aLbColor2.GrabFocus(); - else if( pSet == pQSet2 ) - aLbColor3.GrabFocus(); - else if( pSet == pQSet2 ) - aLbColor4.GrabFocus(); -*/ - // now deselect all other value sets if( pSet != pQSet1 ) pQSet1->SelectItem( 0 ); @@ -802,7 +786,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) sal_uInt16 nCount = InitColorArrays( pSrcCols, pDstCols, pTols ); sal_Bool pTrans[4]; - // Falls keine Farben ausgewaehlt, kopieren wir nur das Mtf + // If no color is selected, we copy only the Mtf if( !nCount ) aMtf = rMtf; else @@ -825,7 +809,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) aMtf.SetPrefSize( rMtf.GetPrefSize() ); aMtf.SetPrefMapMode( rMtf.GetPrefMapMode() ); - // Farbvergleichsarrays vorbereiten + // Prepare Color comparison array for( i = 0; i < nCount; i++ ) { nTol = ( pTols[i] * 255L ) / 100L; @@ -845,8 +829,8 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) pTrans[ i ] = ( pDstCols[ i ] == TRANSP_COL ); } - // Actions untersuchen und Farben ggf. ersetzen - for( sal_uIntPtr nAct = 0UL, nActCount = rMtf.GetActionCount(); nAct < nActCount; nAct++ ) + // Investigate actions and if necessary replace colors + for( size_t nAct = 0, nActCount = rMtf.GetActionSize(); nAct < nActCount; nAct++ ) { MetaAction* pAction = rMtf.GetAction( nAct ); @@ -1100,7 +1084,7 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C GDIMetaFile aMtf; const MapMode& rPrefMap = rMtf.GetPrefMapMode(); const Size& rPrefSize = rMtf.GetPrefSize(); - const sal_uIntPtr nActionCount = rMtf.GetActionCount(); + const size_t nActionCount = rMtf.GetActionSize(); aVDev.EnableOutput( sal_False ); aMtf.Record( &aVDev ); @@ -1109,10 +1093,10 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C aVDev.SetLineColor( rColor ); aVDev.SetFillColor( rColor ); - // Actions nacheinander abspielen; zuerst - // den gesamten Bereich auf die Ersatzfarbe setzen + // retrieve one action at the time; first + // set the whole area to the replacement color. aVDev.DrawRect( Rectangle( rPrefMap.GetOrigin(), rPrefSize ) ); - for ( sal_uIntPtr i = 0; i < nActionCount; i++ ) + for ( size_t i = 0; i < nActionCount; i++ ) { MetaAction* pAct = rMtf.GetAction( i ); @@ -1139,7 +1123,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) { if( rGraphic.IsAnimated() ) { - // Transparenz ersetzen? + // Replace transparency? if ( aCbxTrans.IsChecked() ) aGraphic = ImpReplaceTransparency( rGraphic.GetAnimation(), aReplColor ); else @@ -1147,7 +1131,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) } else { - // Transparenz ersetzen? + // Replace transparency? if( aCbxTrans.IsChecked() ) { if( aGraphic.IsTransparent() ) @@ -1168,10 +1152,10 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) if( nCount ) { - // erstmal alle Transparent-Farben setzen + // first set all transparent colors for( sal_uInt16 i = 0; i < nCount; i++ ) { - // Haben wir eine Transparenzfarbe? + // Do we have a transparent color? if( pDstCols[i] == TRANSP_COL ) { BitmapEx aBmpEx( ImpMaskTransparent( aGraphic.GetBitmapEx(), @@ -1183,7 +1167,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) } } - // jetzt noch einmal mit den normalen Farben ersetzen + // now replace it again with the normal colors Bitmap aBitmap( ImpMask( aGraphic.GetBitmap() ) ); Size aSize( aBitmap.GetSizePixel() ); @@ -1204,7 +1188,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) { GDIMetaFile aMtf( aGraphic.GetGDIMetaFile() ); - // Transparenz ersetzen? + // Replace transparency? if( aCbxTrans.IsChecked() ) aMtf = ImpReplaceTransparency( aMtf, aReplColor ); else @@ -1249,9 +1233,7 @@ void SvxBmpMask::DataChanged( const DataChangedEvent& rDCEvt ) void SvxBmpMask::ApplyStyle() { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - aTbxPipette.SetItemImage( TBI_PIPETTE, bHighContrast ? maImgPipetteH : maImgPipette ); + aTbxPipette.SetItemImage( TBI_PIPETTE, maImgPipette ); } @@ -1279,3 +1261,5 @@ void SvxBmpMask::SetAccessibleNames (void) sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 4")); aCbx4.SetAccessibleName (sSourceColorN); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index cff80865e1c8..8245faa763ba 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,9 +38,7 @@ #include <sfx2/viewfrm.hxx> #include <svtools/miscopt.hxx> #include <unotools/localedatawrapper.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #define _SDR_NOITEMS #define _SDR_NOTOUCH @@ -89,33 +88,19 @@ SFX_IMPL_FLOATINGWINDOW( SvxContourDlgChildWindow, SID_CONTOUR_DLG ); /******************************************************************************/ - -/************************************************************************* -|* -|* ControllerItem -|* -\************************************************************************/ - SvxContourDlgItem::SvxContourDlgItem( sal_uInt16 _nId, SvxSuperContourDlg& rContourDlg, SfxBindings& rBindings ) : SfxControllerItem ( _nId, rBindings ), rDlg ( rContourDlg ) { } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void SvxContourDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem ) { if ( pItem && ( SID_CONTOUR_EXEC == nSID ) ) { const SfxBoolItem* pStateItem = PTR_CAST( SfxBoolItem, pItem ); - DBG_ASSERT( pStateItem || pItem == 0, "SfxBoolItem erwartet"); + DBG_ASSERT( pStateItem || pItem == 0, "SfxBoolItem expected "); rDlg.SetExecState( !pStateItem->GetValue() ); } @@ -124,13 +109,6 @@ void SvxContourDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, /******************************************************************************/ - -/************************************************************************* -|* -|* Contour-Float -|* -\************************************************************************/ - SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) @@ -146,12 +124,6 @@ SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, sal_uInt16 pDlg->Initialize( pInfo ); } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void SvxContourDlgChildWindow::UpdateContourDlg( const Graphic& rGraphic, sal_Bool bGraphicLinked, const PolyPolygon* pPolyPoly, void* pEditingObj ) { @@ -160,12 +132,6 @@ void SvxContourDlgChildWindow::UpdateContourDlg( const Graphic& rGraphic, sal_Bo SVXCONTOURDLG()->Update( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj ); } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - SvxContourDlg::SvxContourDlg( SfxBindings* _pBindings, SfxChildWindow* pCW, Window* _pParent, const ResId& rResId ) : @@ -174,22 +140,10 @@ SvxContourDlg::SvxContourDlg( SfxBindings* _pBindings, SfxChildWindow* pCW, { } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - SvxContourDlg::~SvxContourDlg() { } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, const Rectangle* pRect, const sal_uIntPtr nFlags ) @@ -217,9 +171,8 @@ PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, { const AnimationBitmap& rStepBmp = aAnim.Get( i ); - // Polygonausgabe an die richtige Stelle schieben; - // dies ist der Offset des Teilbildes innerhalb - // der Gesamtanimation + // Push Polygon output to the right place; this is the + // offset of the sub-image within the total animation aTransMap.SetOrigin( Point( rStepBmp.aPosPix.X(), rStepBmp.aPosPix.Y() ) ); aVDev.SetMapMode( aTransMap ); aVDev.DrawPolyPolygon( CreateAutoContour( rStepBmp.aBmpEx, pRect, nFlags ) ); @@ -271,13 +224,6 @@ PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, return PolyPolygon( XOutBitmap::GetCountour( aBmp, nContourFlags, 128, pRect ) ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic, const MapUnit eUnit, const Size& rDisplaySize ) { @@ -287,8 +233,6 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic const MapMode aDispMap( eUnit ); const MapMode aGrfMap( rGraphic.GetPrefMapMode() ); const Size aGrfSize( rGraphic.GetPrefSize() ); - double fScaleX; - double fScaleY; Size aOrgSize; Point aNewPoint; sal_Bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL; @@ -300,8 +244,8 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic if ( aOrgSize.Width() && aOrgSize.Height() ) { - fScaleX = (double) rDisplaySize.Width() / aOrgSize.Width(); - fScaleY = (double) rDisplaySize.Height() / aOrgSize.Height(); + double fScaleX = (double) rDisplaySize.Width() / aOrgSize.Width(); + double fScaleY = (double) rDisplaySize.Height() / aOrgSize.Height(); for ( sal_uInt16 j = 0, nPolyCount = rContour.Count(); j < nPolyCount; j++ ) { @@ -320,13 +264,8 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic } } - -/************************************************************************* -|* -|* Durchschleifen an SuperClass; keine virt. Methoden, um -|* bei IF-Aenderungen nicht inkompatibel zu werden -|* -\************************************************************************/ +// Loop through to super class, no virtual Methods to not become incompatible +// due to IF changes void SvxContourDlg::SetExecState( sal_Bool bEnable ) { @@ -379,13 +318,6 @@ void SvxContourDlg::Update( const Graphic& rGraphic, sal_Bool bGraphicLinked, pSuperClass->UpdateGraphic( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow *pCW, Window* _pParent, const ResId& rResId ) : SvxContourDlg ( _pBindings, pCW, _pParent, rResId ), @@ -398,8 +330,7 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow nGrfChanged ( 0UL ), bExecState ( sal_False ), bGraphicLinked ( sal_False ), - maImageList ( SVX_RES( CD_IMAPDLG ) ), - maImageListH ( SVX_RES( CDH_IMAPDLG ) ) + maImageList ( SVX_RES( CD_IMAPDLG ) ) { ApplyImageList(); @@ -444,23 +375,11 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow aCreateTimer.SetTimeoutHdl( LINK( this, SvxSuperContourDlg, CreateHdl ) ); } - -/************************************************************************* -|* -|* Dtor -|* -\************************************************************************/ - SvxSuperContourDlg::~SvxSuperContourDlg() { } - -/************************************************************************* -|* -|* Resize-Methode -|* -\************************************************************************/ +// Resize methods void SvxSuperContourDlg::Resize() { @@ -474,11 +393,11 @@ void SvxSuperContourDlg::Resize() Size _aSize( aStbStatus.GetSizePixel() ); Point aPoint( 0, aNewSize.Height() - _aSize.Height() ); - // StatusBar positionieren + // Position the StatusBar aStbStatus.SetPosSizePixel( aPoint, Size( aNewSize.Width(), _aSize.Height() ) ); aStbStatus.Show(); - // EditWindow positionieren + // Position the EditWindow _aSize.Width() = aNewSize.Width() - 18; _aSize.Height() = aPoint.Y() - aContourWnd.GetPosPixel().Y() - 6; aContourWnd.SetSizePixel( _aSize ); @@ -487,12 +406,7 @@ void SvxSuperContourDlg::Resize() } } - -/************************************************************************* -|* -|* Close-Methode -|* -\************************************************************************/ +// Close methods sal_Bool SvxSuperContourDlg::Close() { @@ -517,25 +431,13 @@ sal_Bool SvxSuperContourDlg::Close() return( bRet ? SfxFloatingWindow::Close() : sal_False ); } - -/************************************************************************* -|* -|* Enabled oder disabled alle Controls -|* -\************************************************************************/ +// Enabled or disabled all Controls void SvxSuperContourDlg::SetExecState( sal_Bool bEnable ) { bExecState = bEnable; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void SvxSuperContourDlg::SetGraphic( const Graphic& rGraphic ) { aUndoGraphic = aRedoGraphic = Graphic(); @@ -544,13 +446,6 @@ void SvxSuperContourDlg::SetGraphic( const Graphic& rGraphic ) aContourWnd.SetGraphic( aGraphic ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly ) { DBG_ASSERT( aContourWnd.GetGraphic().GetType() != GRAPHIC_NONE, "Graphic must've been set first!" ); @@ -580,13 +475,6 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly ) aContourWnd.GetSdrModel()->SetChanged( sal_True ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - PolyPolygon SvxSuperContourDlg::GetPolyPolygon( sal_Bool bRescaleToGraphic ) { PolyPolygon aRetPolyPoly( aContourWnd.GetPolyPolygon() ); @@ -617,13 +505,6 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( sal_Bool bRescaleToGraphic ) return aRetPolyPoly; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, sal_Bool _bGraphicLinked, const PolyPolygon* pPolyPoly, void* pEditingObj ) { @@ -639,49 +520,21 @@ void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, sal_Bool _bGrap aUpdateTimer.Start(); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - sal_Bool SvxSuperContourDlg::IsUndoPossible() const { return aUndoGraphic.GetType() != GRAPHIC_NONE; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - sal_Bool SvxSuperContourDlg::IsRedoPossible() const { return aRedoGraphic.GetType() != GRAPHIC_NONE; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void SvxSuperContourDlg::DoAutoCreate() { aCreateTimer.Start(); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void SvxSuperContourDlg::ReducePoints( const long nTol ) { PolyPolygon aPolyPoly( GetPolyPolygon( sal_False ) ); @@ -721,11 +574,7 @@ void SvxSuperContourDlg::ReducePoints( const long nTol ) } -/************************************************************************* -|* -|* Click-Hdl fuer ToolBox -|* -\************************************************************************/ +// Click handler for ToolBox IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) { @@ -811,7 +660,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) case( TBI_UNDO ): { - nGrfChanged = nGrfChanged ? nGrfChanged-- : 0UL; + nGrfChanged = nGrfChanged ? nGrfChanged - 1 : 0UL; aRedoGraphic = aGraphic; aGraphic = aUndoGraphic; aUndoGraphic = Graphic(); @@ -861,13 +710,6 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) return 0L; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd ) { String aStr; @@ -885,12 +727,6 @@ IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd ) return 0L; } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd ) { String aStr; @@ -908,12 +744,6 @@ IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd ) return 0L; } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxSuperContourDlg, UpdateHdl, Timer*, EMPTYARG ) { aUpdateTimer.Stop(); @@ -940,13 +770,6 @@ IMPL_LINK( SvxSuperContourDlg, UpdateHdl, Timer*, EMPTYARG ) return 0L; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxSuperContourDlg, CreateHdl, Timer*, EMPTYARG ) { aCreateTimer.Stop(); @@ -962,13 +785,6 @@ IMPL_LINK( SvxSuperContourDlg, CreateHdl, Timer*, EMPTYARG ) return 0L; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd ) { const SdrObject* pObj = pWnd->GetSelectedSdrObject(); @@ -1027,13 +843,6 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd ) return 0L; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxSuperContourDlg, PipetteHdl, ContourWindow*, pWnd ) { const Color& rOldLineColor = aStbStatus.GetLineColor(); @@ -1058,13 +867,6 @@ IMPL_LINK( SvxSuperContourDlg, PipetteHdl, ContourWindow*, pWnd ) return 0L; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd ) { if ( pWnd->IsClickValid() ) @@ -1112,13 +914,6 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd ) return 0L; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow*, pWnd ) { aTbx1.CheckItem( TBI_WORKPLACE, sal_False ); @@ -1130,9 +925,7 @@ IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow*, pWnd ) void SvxSuperContourDlg::ApplyImageList() { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - ImageList& rImgLst = bHighContrast ? maImageListH : maImageList; + ImageList& rImgLst = maImageList; aTbx1.SetImageList( rImgLst ); } @@ -1145,12 +938,6 @@ void SvxSuperContourDlg::DataChanged( const DataChangedEvent& rDCEvt ) ApplyImageList(); } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxSuperContourDlg, MiscHdl, void*, EMPTYARG ) { SvtMiscOptions aMiscOptions; @@ -1159,3 +946,4 @@ IMPL_LINK( SvxSuperContourDlg, MiscHdl, void*, EMPTYARG ) return 0L; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/bmpmask.hrc b/svx/source/dialog/bmpmask.hrc index 42fcc244c3f7..e726bef7c7bd 100644..100755 --- a/svx/source/dialog/bmpmask.hrc +++ b/svx/source/dialog/bmpmask.hrc @@ -61,6 +61,3 @@ #define FT_2 2 #define FT_3 3 #define IMG_PIPETTE 11 -#define IMG_PIPETTE_H 12 - - diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src index b221f633283a..d2fb4dc5d934 100644 --- a/svx/source/dialog/bmpmask.src +++ b/svx/source/dialog/bmpmask.src @@ -104,7 +104,7 @@ DockingWindow RID_SVXDLG_BMPMASK Last = 99 ; SpinSize = 1 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; }; ListBox LB_1 { @@ -147,7 +147,7 @@ DockingWindow RID_SVXDLG_BMPMASK Last = 99 ; SpinSize = 1 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; }; ListBox LB_2 { @@ -190,7 +190,7 @@ DockingWindow RID_SVXDLG_BMPMASK Last = 99 ; SpinSize = 1 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; }; ListBox LB_3 { @@ -233,7 +233,7 @@ DockingWindow RID_SVXDLG_BMPMASK Last = 99 ; SpinSize = 1 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; }; ListBox LB_4 { @@ -308,11 +308,6 @@ DockingWindow RID_SVXDLG_BMPMASK MASKCOLOR }; - Image IMG_PIPETTE_H - { - ImageBitmap = Bitmap { File = "sc10350_h.bmp" ; }; - MASKCOLOR - }; }; String RID_SVXDLG_BMPMASK_STR_TRANSP diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index b86121412ab7..5f1a2a6c1ab0 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -759,11 +760,9 @@ void SubsetMap::InitList() aAllSubsets.push_back( Subset( 0x02B0, 0x02FF, RID_SUBSETSTR_SPACING_MODIFIERS ) ); aAllSubsets.push_back( Subset( 0x0300, 0x036F, RID_SUBSETSTR_COMB_DIACRITICAL ) ); aAllSubsets.push_back( Subset( 0x0370, 0x03FF, RID_SUBSETSTR_BASIC_GREEK ) ); - // aAllSubsets.push_back( Subset( 0x03D0, 0x03F3, RID_SUBSETSTR_GREEK_SYMS_COPTIC ) ); aAllSubsets.push_back( Subset( 0x0400, 0x04FF, RID_SUBSETSTR_CYRILLIC ) ); aAllSubsets.push_back( Subset( 0x0530, 0x058F, RID_SUBSETSTR_ARMENIAN ) ); aAllSubsets.push_back( Subset( 0x0590, 0x05FF, RID_SUBSETSTR_BASIC_HEBREW ) ); - // aAllSubsets.push_back( Subset( 0x0591, 0x05C4, RID_SUBSETSTR_HEBREW_EXTENDED ) ); aAllSubsets.push_back( Subset( 0x0600, 0x065F, RID_SUBSETSTR_BASIC_ARABIC ) ); aAllSubsets.push_back( Subset( 0x0660, 0x06FF, RID_SUBSETSTR_ARABIC_EXTENDED ) ); aAllSubsets.push_back( Subset( 0x0700, 0x074F, RID_SUBSETSTR_SYRIAC ) ); @@ -891,3 +890,5 @@ void SubsetMap::ApplyCharMap( const FontCharMap* pFontCharMap ) maSubsets.erase( it ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index 0a54e3464730..7fa5725a14b3 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,10 +62,8 @@ SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId ) : // ----------------------------------------------------------------------- SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId, - const Image& rNormalStaticImage, - const Image& /*TODO#i72485# rHighContrastStaticImage*/ ) : - - SvTreeListBox( pParent, rResId ) + const Image& rNormalStaticImage ) + : SvTreeListBox( pParent, rResId ) { Init_Impl(); @@ -275,3 +274,4 @@ SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* return SvTreeListBox::InsertEntry( rText, pParent, bChildsOnDemand, nPos, pUserData, eButtonKind ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index 81091d7d7e98..433113a6abbc 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,19 +42,11 @@ #include <svx/dialmgr.hxx> #include "svx/dlgutil.hxx" -// #110094# #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> -// #110094# #include <svx/sdr/contact/displayinfo.hxx> #include <vcl/svapp.hxx> -/************************************************************************* -|* -|* Ctor SvxXConnectionPreview -|* -*************************************************************************/ - SvxXConnectionPreview::SvxXConnectionPreview( Window* pParent, const ResId& rResId, const SfxItemSet& rInAttrs ) : Control ( pParent, rResId ), @@ -66,26 +59,14 @@ SvxXConnectionPreview::SvxXConnectionPreview( Window* pParent, const ResId& rRes SetStyles(); } -/************************************************************************* -|* -|* Dtor SvxXConnectionPreview -|* -*************************************************************************/ - SvxXConnectionPreview::~SvxXConnectionPreview() { delete pObjList; } -/************************************************************************* -|* -|* Dtor SvxXConnectionPreview -|* -*************************************************************************/ - void SvxXConnectionPreview::Construct() { - DBG_ASSERT( pView, "Keine gueltige View Uebergeben!" ); + DBG_ASSERT( pView, "No valid view is passed on! "); const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); sal_uIntPtr nMarkCount = rMarkList.GetMarkCount(); @@ -116,7 +97,6 @@ void SvxXConnectionPreview::Construct() SdrObject* pTmpObj1 = pTmpEdgeObj->GetConnectedNode( sal_True ); SdrObject* pTmpObj2 = pTmpEdgeObj->GetConnectedNode( sal_False ); - // #110094# // potential memory leak here (!). Create SdrObjList only when there is // not yet one. if(!pObjList) @@ -144,7 +124,7 @@ void SvxXConnectionPreview::Construct() if( !pEdgeObj ) pEdgeObj = new SdrEdgeObj(); - // Groesse anpassen + // Adapt size if( pObjList ) { OutputDevice* pOD = pView->GetFirstOutputDevice(); // GetWin( 0 ); @@ -163,7 +143,7 @@ void SvxXConnectionPreview::Construct() double fRectWH = (double) aRect.GetWidth() / aRect.GetHeight(); double fWinWH = (double) nWidth / nHeight; - // Bitmap an Thumbgroesse anpassen (hier nicht!) + // Adapt bitmap to Thumb size (not here!) if ( fRectWH < fWinWH) { aNewSize.Width() = (long) ( (double) nHeight * fRectWH ); @@ -179,18 +159,18 @@ void SvxXConnectionPreview::Construct() Fraction aFrac2( aWinSize.Height(), aRect.GetHeight() ); Fraction aMinFrac( aFrac1 <= aFrac2 ? aFrac1 : aFrac2 ); - // MapMode umsetzen + // Implement MapMode aDisplayMap.SetScaleX( aMinFrac ); aDisplayMap.SetScaleY( aMinFrac ); - // Zentrierung + // Centering aNewPos.X() = ( nWidth - aNewSize.Width() ) >> 1; aNewPos.Y() = ( nHeight - aNewSize.Height() ) >> 1; aDisplayMap.SetOrigin( LogicToLogic( aNewPos, aMapMode, aDisplayMap ) ); SetMapMode( aDisplayMap ); - // Ursprung + // Origin aNewPos = aDisplayMap.GetOrigin(); aNewPos -= Point( aRect.TopLeft().X(), aRect.TopLeft().Y() ); aDisplayMap.SetOrigin( aNewPos ); @@ -200,53 +180,9 @@ void SvxXConnectionPreview::Construct() Point aPos; MouseEvent aMEvt( aPos, 1, 0, MOUSE_RIGHT ); MouseButtonDown( aMEvt ); - /* - Point aPt( -aRect.TopLeft().X(), -aRect.TopLeft().Y() ); - aMapMode.SetOrigin( aPt ); - - // Skalierung - Size aSize = GetOutputSize(); - Fraction aFrac1( aSize.Width(), aRect.GetWidth() ); - Fraction aFrac2( aSize.Height(), aRect.GetHeight() ); - Fraction aMaxFrac( aFrac1 > aFrac2 ? aFrac1 : aFrac2 ); - Fraction aMinFrac( aFrac1 <= aFrac2 ? aFrac1 : aFrac2 ); - sal_Bool bChange = (sal_Bool) ( (double)aMinFrac > 1.0 ); - aMapMode.SetScaleX( aMinFrac ); - aMapMode.SetScaleY( aMinFrac ); - - // zentrieren - long nXXL = aSize.Width() > aRect.GetWidth() ? aSize.Width() : aRect.GetWidth(); - long nXS = aSize.Width() <= aRect.GetWidth() ? aSize.Width() : aRect.GetWidth(); - if( bChange ) - { - long nTmp = nXXL; nXXL = nXS; nXS = nTmp; - } - long nX = (long) ( (double)aMinFrac * (double)nXXL ); - nX = (long) ( (double)labs( nXS - nX ) / (double)aMinFrac / 2.0 ); - - long nYXL = aSize.Height() > aRect.GetHeight() ? aSize.Height() : aRect.GetHeight(); - long nYS = aSize.Height() <= aRect.GetHeight() ? aSize.Height() : aRect.GetHeight(); - if( bChange ) - { - long nTmp = nXXL; nXXL = nXS; nXS = nTmp; - } - long nY = (long) ( (double)aMinFrac * (double)nYXL ); - nY = (long) ( (double)labs( nYS - nY ) / (double)aMinFrac / 2.0 ); - - aPt += Point( nX, nY ); - aMapMode.SetOrigin( aPt ); - - SetMapMode( aMapMode ); - */ } } -/************************************************************************* -|* -|* SvxXConnectionPreview: Paint() -|* -*************************************************************************/ - void SvxXConnectionPreview::Paint( const Rectangle& ) { if( pObjList ) @@ -277,25 +213,15 @@ void SvxXConnectionPreview::Paint( const Rectangle& ) } } -/************************************************************************* -|* -|* SvxXConnectionPreview: SetAttributes() -|* -*************************************************************************/ - void SvxXConnectionPreview::SetAttributes( const SfxItemSet& rInAttrs ) { - //pEdgeObj->SetItemSetAndBroadcast(rInAttrs); pEdgeObj->SetMergedItemSetAndBroadcast(rInAttrs); Invalidate(); } -/************************************************************************* -|* -|* Ermittelt die Anzahl der Linienversaetze anhand des Preview-Objektes -|* -*************************************************************************/ + +// Get number of lines which are offset based on the preview object sal_uInt16 SvxXConnectionPreview::GetLineDeltaAnz() { @@ -308,12 +234,6 @@ sal_uInt16 SvxXConnectionPreview::GetLineDeltaAnz() return nCount; } -/************************************************************************* -|* -|* SvxXConnectionPreview: MouseButtonDown() -|* -*************************************************************************/ - void SvxXConnectionPreview::MouseButtonDown( const MouseEvent& rMEvt ) { sal_Bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift(); @@ -385,3 +305,4 @@ void SvxXConnectionPreview::DataChanged( const DataChangedEvent& rDCEvt ) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/contdlg.hrc b/svx/source/dialog/contdlg.hrc index a191231daa22..612365c2e449 100644..100755 --- a/svx/source/dialog/contdlg.hrc +++ b/svx/source/dialog/contdlg.hrc @@ -27,7 +27,7 @@ #include <svx/dialogs.hrc> -// ImapDlg-Dialoge +// ImapDlg dialog #define RID_SVX_CONTOURDLG_START RID_SVX_CONTOUR_START @@ -65,7 +65,6 @@ #define STB_STATUS 1 #define CD_IMAPDLG 1300 -#define CDH_IMAPDLG 1301 /******************************************************************************/ diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src index 989bdd93d336..99424128688b 100644 --- a/svx/source/dialog/contdlg.src +++ b/svx/source/dialog/contdlg.src @@ -225,30 +225,29 @@ FloatingWindow RID_SVXDLG_CONTOUR MASKCOLOR CONTOURDLG_IDLIST }; - ImageList CDH_IMAPDLG - { - Prefix = "cdh"; - MASKCOLOR - CONTOURDLG_IDLIST - }; }; + /******************************************************************************/ String STR_CONTOURDLG_MODIFY { Text [ en-US ] = "The contour has been modified.\nDo you want to save the changes?" ; }; + String STR_CONTOURDLG_NEWPIPETTE { Text [ en-US ] = "Do you want to create a new contour?" ; }; + String STR_CONTOURDLG_WORKPLACE { Text [ en-US ] = "Setting a new workspace will\ncause the contour to be deleted.\nAre you sure you want to continue?" ; }; + String STR_CONTOURDLG_LINKED { Text [ en-US ] = "This graphic object is linked to the document. Do you want to unlink the graphics in order to edit it?" ; }; + /******************************************************************************/ diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index 4993d15839e4..bf40b9812228 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,21 +28,13 @@ #ifndef _CONTIMP_HXX_ #define _CONTIMP_HXX_ -#ifndef _CONTDLG_HXX #include <svx/contdlg.hxx> -#endif #include "contwnd.hxx" #include <vcl/toolbox.hxx> #include <vcl/status.hxx> #define CONT_RESID(nId) ResId( nId, DIALOG_MGR() ) -/************************************************************************* -|* -|* -|* -\************************************************************************/ - class SvxSuperContourDlg : public SvxContourDlg { using SvxContourDlg::GetPolyPolygon; @@ -68,7 +61,6 @@ class SvxSuperContourDlg : public SvxContourDlg sal_Bool bUpdateGraphicLinked; sal_Bool bGraphicLinked; ImageList maImageList; - ImageList maImageListH; virtual void Resize(); virtual sal_Bool Close(); @@ -125,3 +117,4 @@ public: #endif // _CONTIMP_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index a7f98ea124de..3d7f091b9c5b 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,12 +45,6 @@ #define TRANSCOL Color( COL_WHITE ) -/************************************************************************* -|* -|* -|* -\************************************************************************/ - ContourWindow::ContourWindow( Window* pParent, const ResId& rResId ) : GraphCtrl ( pParent, rResId ), aWorkRect ( 0, 0, 0, 0 ), @@ -60,33 +55,18 @@ ContourWindow::ContourWindow( Window* pParent, const ResId& rResId ) : SetWinStyle( WB_SDRMODE ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - ContourWindow::~ContourWindow() { } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly ) { SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 ); const sal_uInt16 nPolyCount = rPolyPoly.Count(); - // zuerst alle Zeichenobjekte loeschen + // First delete all drawing objects aPolyPoly = rPolyPoly; - // #117412# // To avoid to have destroyed objects which are still selected, it is necessary to deselect // them first (!) pView->UnmarkAllObj(); @@ -107,7 +87,6 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly ) aSet.Put( XFillColorItem( String(), TRANSCOL ) ); aSet.Put( XFillTransparenceItem( 50 ) ); - //pPathObj->SetItemSetAndBroadcast(aSet); pPathObj->SetMergedItemSetAndBroadcast(aSet); pPage->InsertObject( pPathObj ); @@ -123,13 +102,6 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly ) pModel->SetChanged( sal_False ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - const PolyPolygon& ContourWindow::GetPolyPolygon() { if ( pModel->IsChanged() ) @@ -153,13 +125,6 @@ const PolyPolygon& ContourWindow::GetPolyPolygon() return aPolyPoly; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void ContourWindow::InitSdrModel() { GraphCtrl::InitSdrModel(); @@ -172,26 +137,12 @@ void ContourWindow::InitSdrModel() pView->SetFrameDragSingles( sal_True ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void ContourWindow::SdrObjCreated( const SdrObject& ) { pView->MarkAll(); pView->CombineMarkedObjects( sal_False ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - sal_Bool ContourWindow::IsContourChanged() const { SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 ); @@ -203,13 +154,6 @@ sal_Bool ContourWindow::IsContourChanged() const return bRet; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt ) { if ( bWorkplaceMode ) @@ -226,13 +170,6 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt ) GraphCtrl::MouseButtonDown( rMEvt ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void ContourWindow::MouseMove( const MouseEvent& rMEvt ) { bClickValid = sal_False; @@ -254,13 +191,6 @@ void ContourWindow::MouseMove( const MouseEvent& rMEvt ) GraphCtrl::MouseMove( rMEvt ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void ContourWindow::MouseButtonUp(const MouseEvent& rMEvt) { Point aTmpPoint; @@ -306,13 +236,6 @@ void ContourWindow::MouseButtonUp(const MouseEvent& rMEvt) GraphCtrl::MouseButtonUp( rMEvt ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void ContourWindow::Paint( const Rectangle& rRect ) { // #i75482# @@ -356,3 +279,5 @@ void ContourWindow::Paint( const Rectangle& rRect ) } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx index 94addbe0b51f..cd4288cda6b0 100644 --- a/svx/source/dialog/contwnd.hxx +++ b/svx/source/dialog/contwnd.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,12 +32,6 @@ #include <tools/poly.hxx> #include <svx/graphctl.hxx> -/************************************************************************* -|* -|* -|* -\************************************************************************/ - class ContourWindow : public GraphCtrl { PolyPolygon aPolyPoly; @@ -88,3 +83,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index d8adc0560625..c7bb02dd1fa7 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,7 +76,7 @@ RedlinData::~RedlinData() } //============================================================================ -// class SvxRedlinEntry (Eintraege fuer Liste) +// class SvxRedlinEntry (Entries for list) //---------------------------------------------------------------------------- SvxRedlinEntry::SvxRedlinEntry() @@ -92,26 +93,10 @@ SvxRedlinEntry::~SvxRedlinEntry() } } -/************************************************************************* -#* Funktionen der in den SvxRedlinTable eingefuegten Items -#************************************************************************/ +// Functions in the inserts Items of SvxRedlinTable DBG_NAME(SvLBoxColorString); -/************************************************************************* -#* Member: SvLBoxColorString Datum:23.10.97 -#*------------------------------------------------------------------------ -#* -#* Klasse: SvLBoxColorString -#* -#* Funktion: Konstruktor der Klasse SvLBoxColorString -#* -#* Input: Box- Entry,Flags, Text fuer Anzeige, Schrift -#* -#* Output: --- -#* -#************************************************************************/ - SvLBoxColorString::SvLBoxColorString( SvLBoxEntry*pEntry,sal_uInt16 nFlags,const XubString& rStr, const Color& rCol) @@ -122,87 +107,31 @@ SvLBoxColorString::SvLBoxColorString( SvLBoxEntry*pEntry,sal_uInt16 nFlags,const SetText( pEntry, rStr ); } -/************************************************************************* -#* Member: SvLBoxColorString Datum:23.10.97 -#*------------------------------------------------------------------------ -#* -#* Klasse: SvLBoxColorString -#* -#* Funktion: Default Konstruktor der Klasse SvLBoxColorString -#* -#* Input: --- -#* -#* Output: --- -#* -#************************************************************************/ - SvLBoxColorString::SvLBoxColorString() : SvLBoxString() { DBG_CTOR(SvLBoxColorString,0); } -/************************************************************************* -#* Member: ~SvLBoxColorString Datum:23.10.97 -#*------------------------------------------------------------------------ -#* -#* Klasse: SvLBoxColorString -#* -#* Funktion: Destruktor der Klasse SvLBoxColorString -#* -#* Input: --- -#* -#* Output: --- -#* -#************************************************************************/ - SvLBoxColorString::~SvLBoxColorString() { DBG_DTOR(SvLBoxColorString,0); } - -/************************************************************************* -#* Member: SvLBoxColorString Datum:23.10.97 -#*------------------------------------------------------------------------ -#* -#* Klasse: SvLBoxColorString -#* -#* Funktion: Erzeugt einen neuen SvLBoxColorString -#* -#* Input: --- -#* -#* Output: SvLBoxColorString -#* -#************************************************************************/ - SvLBoxItem* SvLBoxColorString::Create() const { DBG_CHKTHIS(SvLBoxColorString,0); return new SvLBoxColorString; } - - -/************************************************************************* -#* Member: SvLBoxColorString Datum:23.10.97 -#*------------------------------------------------------------------------ -#* -#* Klasse: SvLBoxColorString -#* -#* Funktion: Zeichenroutine des SvLBoxColorString. Gezeichnet wird -#* der entsprechende Text mit der eingestellten Farbe -#* im Ausgabe- Device. -#* -#* Input: Position, Ausgabe- Device, Flag fuer Selection, -#* Zeiger auf den Eintrag -#* -#* Output: --- -#* -#************************************************************************/ - void SvLBoxColorString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry ) +/* [Description] + + Paint function of the SvLBoxColorString class. The relevant text with the + selected color is drawn in the output device. +*/ + { Color aColor=rDev.GetTextColor(); Color a2Color=aColor; @@ -596,7 +525,6 @@ void SvxRedlinTable::InitEntry( SvLBoxEntry* pEntry, const XubString& rStr, for( sal_uInt16 nToken = 0; nToken < nCount; nToken++ ) { if( pCurToken && nCurTokenLen ) - // aToken.Assign( pCurToken, nCurTokenLen ); aToken = XubString( pCurToken, nCurTokenLen ); else aToken.Erase(); @@ -627,7 +555,7 @@ SvxTPView::SvxTPView( Window * pParent) PbAcceptAll ( this, SVX_RES(PB_ACCEPTALL ) ), PbRejectAll ( this, SVX_RES(PB_REJECTALL ) ), PbUndo ( this, SVX_RES(PB_UNDO ) ), - aTitle1 ( SVX_RES( STR_TITLE1 ) ), // lokale Resource + aTitle1 ( SVX_RES( STR_TITLE1 ) ), // local resource aTitle2 ( SVX_RES( STR_TITLE2 ) ), aTitle3 ( SVX_RES( STR_TITLE3 ) ), aTitle4 ( SVX_RES( STR_TITLE4 ) ), @@ -835,12 +763,8 @@ SvxTPFilter::SvxTPFilter( Window * pParent) aLbAuthor.SetAccessibleName(aCbAuthor.GetText()); aLbAction.SetAccessibleName( String( SVX_RES( STR_ACTION) ) ); aEdComment.SetAccessibleName(aCbComment.GetText()); - Image aImgTimeHC( SVX_RES( IMG_TIME_H ) ); FreeResource(); - aIbClock.SetModeImage( aImgTimeHC, BMP_COLOR_HIGHCONTRAST ); - aIbClock2.SetModeImage( aImgTimeHC, BMP_COLOR_HIGHCONTRAST ); - aDfDate.SetShowDateCentury( sal_True ); aDfDate2.SetShowDateCentury( sal_True ); @@ -1547,3 +1471,4 @@ SvxRedlinTable* SvxAcceptChgCtr::GetViewTable() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/ctredlin.hrc b/svx/source/dialog/ctredlin.hrc index 772d985ae8c0..cfbc70294a49 100644..100755 --- a/svx/source/dialog/ctredlin.hrc +++ b/svx/source/dialog/ctredlin.hrc @@ -50,7 +50,6 @@ #define LB_ACTION 18 #define CB_COMMENT 19 #define ED_COMMENT 20 -#define IMG_TIME_H 30 #define HG_VIEW 1 #define DG_VIEW 2 @@ -66,7 +65,6 @@ #define STR_TITLE3 3 #define STR_TITLE4 4 #define STR_TITLE5 5 - //IAccessibility2 Implementation 2009----- #define STR_DATE_COMBOX 6 #define STR_DATE_SPIN 7 diff --git a/svx/source/dialog/ctredlin.src b/svx/source/dialog/ctredlin.src index 284ed97ed54e..2b4cfe9daa52 100644 --- a/svx/source/dialog/ctredlin.src +++ b/svx/source/dialog/ctredlin.src @@ -115,7 +115,6 @@ TabPage SID_REDLIN_FILTER_PAGE MASKCOLOR }; // IAccessibility2 implementation 2009. ------ - //QuickHelpText [ en-US ] = "Set Date/Time" ; QuickHelpText [ en-US ] = "Set Start Date/Time" ; // ------ IAccessibility2 implementation 2009. }; @@ -174,7 +173,6 @@ TabPage SID_REDLIN_FILTER_PAGE MASKCOLOR }; // IAccessibility2 implementation 2009. ------ - //QuickHelpText [ en-US ] = "Set Date/Time" ; QuickHelpText [ en-US ] = "Set End Date/Time" ; // ------ IAccessibility2 implementation 2009. }; @@ -255,11 +253,6 @@ TabPage SID_REDLIN_FILTER_PAGE Size = MAP_APPFONT ( 178 , 12 ) ; TabStop = TRUE ; }; - Image IMG_TIME_H - { - ImageBitmap = Bitmap { File = "time_h.bmp" ; }; - MASKCOLOR - }; /*IAccessibility2 Implementation 2009-----*/ String STR_DATE_COMBOX { diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx index 4a4088c47253..91d33d367961 100644 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,22 +32,15 @@ // === includes (declaration) ============================================ #include "svx/databaseregistrationui.hxx" -// === includes (UNO) ==================================================== -// === /includes (UNO) =================================================== - // === includes (project) ================================================ #include <svx/svxdlg.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif -//#include "connpooloptions.hxx" -// === /includes (project) =============================================== // === includes (global) ================================================= #include <sfx2/app.hxx> #include <svl/itemset.hxx> #include <vcl/msgbox.hxx> -// === /includes (global) ================================================ + namespace svx { @@ -67,3 +61,5 @@ namespace svx } } // namespace svx + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 2e5501e589af..ff98511135bf 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,6 +77,8 @@ private: DialControlBmp::DialControlBmp( Window& rParent ) : VirtualDevice( rParent, 0, 0 ), mrParent( rParent ), + mnCenterX(0), + mnCenterY(0), mbEnabled( true ) { EnableRTL( sal_False ); @@ -183,7 +186,7 @@ void DialControlBmp::DrawBackground() SetFillColor(); Erase(); - EnableRTL( sal_True ); // #107807# draw 3D effect in correct direction + EnableRTL( sal_True ); // draw 3D effect in correct direction sal_uInt8 nDiff = mbEnabled ? 0x18 : 0x10; Color aColor; @@ -265,6 +268,8 @@ DialControl_Impl::DialControl_Impl( Window& rParent ) : maBmpBuffered( rParent ), mpLinkField( 0 ), mnAngle( 0 ), + mnCenterX( 0 ), + mnCenterY( 0 ), mbNoRot( false ) { } @@ -451,7 +456,7 @@ const Link& DialControl::GetModifyHdl() const void DialControl::Init( const Size& rWinSize, const Font& rWinFont ) { mpImpl->Init( rWinSize, rWinFont ); - EnableRTL( sal_False ); // #107807# don't mirror mouse handling + EnableRTL( sal_False ); // don't mirror mouse handling SetOutputSizePixel( mpImpl->maWinSize ); SetBackground(); } @@ -570,3 +575,4 @@ void DialControlWrapper::SetControlValue( sal_Int32 nValue ) } // namespace svx +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx index c8e057ee8502..9fdd4104be00 100644 --- a/svx/source/dialog/dialmgr.cxx +++ b/svx/source/dialog/dialmgr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,10 +46,9 @@ static ResMgr* pResMgr=0; ResMgr* DialogsResMgr::GetResMgr() { if ( !pResMgr ) - { - ByteString aName( "svx" ); - pResMgr = ResMgr::CreateResMgr( aName.GetBuffer(), Application::GetSettings().GetUILocale() ); - } + pResMgr = ResMgr::CreateResMgr( "svx", Application::GetSettings().GetUILocale() ); return pResMgr; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index ee59f6ce924d..143b67091f10 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -412,7 +413,7 @@ void Svx3DLightControl::ConstructLightObjects() { for(sal_uInt32 a(0); a < MAX_NUMBER_LIGHTS; a++) { - // get rid of evtl. existing light object + // get rid of possible existing light object if(maLightObjects[a]) { mpScene->Remove3DObj(maLightObjects[a]); @@ -587,8 +588,7 @@ void Svx3DLightControl::MouseButtonDown( const MouseEvent& rMEvt ) } else { - // Einfacher Click ohne viel Bewegen, versuche eine - // Selektion + // Single click without moving much trying to do a selection TrySelection(rMEvt.GetPosPixel()); bCallParent = false; } @@ -1323,3 +1323,5 @@ IMPL_LINK( SvxLightCtl3D, InternalSelectionChange, void*, EMPTYARG) ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 7d3d6d05912c..c9e3373f08ed 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#ifndef _APP_HXX //autogen #include <vcl/svapp.hxx> -#endif #include <svx/xtable.hxx> #include <svx/xpool.hxx> @@ -66,13 +65,8 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; - -/************************************************************************* -|* -|* Control zur Darstellung und Auswahl der Eckpunkte (und Mittelpunkt) -|* eines Objekts -|* -\************************************************************************/ +// Control fo display and selection of the corner points and mid point of an +// object Bitmap& SvxRectCtl::GetRectBitmap( void ) { @@ -238,16 +232,11 @@ void SvxRectCtl::InitSettings( sal_Bool bForeground, sal_Bool bBackground ) Invalidate(); } -/************************************************************************* -|* -|* Das angeklickte Rechteck (3 x 3) wird ermittelt und der Parent (Dialog) -|* wird benachrichtigt, dass der Punkt geaendert wurde -|* -\************************************************************************/ - +// The clicked rectangle (3 x 3) is determined and the parent (dialog) +// is notified that the item was changed void SvxRectCtl::MouseButtonDown( const MouseEvent& rMEvt ) { - // #103516# CompletelyDisabled() added to have a disabled state for SvxRectCtl + // CompletelyDisabled() added to have a disabled state for SvxRectCtl if(!IsCompletelyDisabled()) { Point aPtLast = aPtNew; @@ -278,7 +267,7 @@ void SvxRectCtl::MouseButtonDown( const MouseEvent& rMEvt ) void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) { - // #103516# CompletelyDisabled() added to have a disabled state for SvxRectCtl + // CompletelyDisabled() added to have a disabled state for SvxRectCtl if(!IsCompletelyDisabled()) { RECT_POINT eNewRP = eRP; @@ -384,11 +373,7 @@ void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); } -/************************************************************************* -|* -|* Zeichnet das Control (Rechteck mit 9 Kreisen) -|* -\************************************************************************/ +// the control (rectangle with 9 circles) void SvxRectCtl::Paint( const Rectangle& ) { @@ -469,7 +454,7 @@ void SvxRectCtl::Paint( const Rectangle& ) Bitmap& rBitmap = GetRectBitmap(); - // #103516# CompletelyDisabled() added to have a disabled state for SvxRectCtl + // CompletelyDisabled() added to have a disabled state for SvxRectCtl if(IsCompletelyDisabled()) { DrawBitmap( aPtLT - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap ); @@ -491,7 +476,7 @@ void SvxRectCtl::Paint( const Rectangle& ) DrawBitmap( aPtLM - aToCenter, aDstBtnSize, bNoHorz?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap ); - // Mittelpunkt bei Rechteck und Linie + // Center for rectangle and line if( eCS == CS_RECT || eCS == CS_LINE ) DrawBitmap( aPtMM - aToCenter, aDstBtnSize, aBtnPnt1, aBtnSize, rBitmap ); @@ -503,7 +488,7 @@ void SvxRectCtl::Paint( const Rectangle& ) } // draw active button, avoid center pos for angle - // #103516# CompletelyDisabled() added to have a disabled state for SvxRectCtl + // CompletelyDisabled() added to have a disabled state for SvxRectCtl if(!IsCompletelyDisabled()) { if( IsEnabled() && (eCS != CS_ANGLE || aPtNew != aPtMM) ) @@ -516,11 +501,7 @@ void SvxRectCtl::Paint( const Rectangle& ) } } -/************************************************************************* -|* -|* Konvertiert RECT_POINT in Point -|* -\************************************************************************/ +// Convert RECT_POINT Point Point SvxRectCtl::GetPointFromRP( RECT_POINT _eRP) const { @@ -615,11 +596,7 @@ Point SvxRectCtl::GetApproxLogPtFromPixPt( const Point& rPt ) const } -/************************************************************************* -|* -|* Konvertiert Point in RECT_POINT -|* -\************************************************************************/ +// Converts Point in RECT_POINT RECT_POINT SvxRectCtl::GetRPFromPoint( Point aPt ) const { @@ -636,11 +613,7 @@ RECT_POINT SvxRectCtl::GetRPFromPoint( Point aPt ) const return RP_MM; // default } -/************************************************************************* -|* -|* Bewirkt den Ursprungszustand des Controls -|* -\************************************************************************/ +// Resets to the original state of the control void SvxRectCtl::Reset() { @@ -649,23 +622,13 @@ void SvxRectCtl::Reset() Invalidate(); } -/************************************************************************* -|* -|* Gibt den aktuell ausgewaehlten RECT_POINT zur�ck -|* -\************************************************************************/ +// Returns the currently selected RECT_POINT RECT_POINT SvxRectCtl::GetActualRP() const { return( eRP ); } -/************************************************************************* -|* -|* Gibt den aktuell ausgewaehlten RECT_POINT zur�ck -|* -\************************************************************************/ - void SvxRectCtl::SetActualRP( RECT_POINT eNewRP ) { Point aPtLast( SetActualRPWithoutInvalidate( eNewRP ) ); @@ -754,18 +717,14 @@ RECT_POINT SvxRectCtl::GetApproxRPFromPixPt( const ::com::sun::star::awt::Point& return GetRPFromPoint( GetApproxLogPtFromPixPt( Point( r.X, r.Y ) ) ); } -// #103516# CompletelyDisabled() added to have a disabled state for SvxRectCtl +// CompletelyDisabled() added to have a disabled state for SvxRectCtl void SvxRectCtl::DoCompletelyDisable(sal_Bool bNew) { mbCompleteDisable = bNew; Invalidate(); } -/************************************************************************* -|* -|* Konstruktor ohne Size-Parameter -|* -\************************************************************************/ +// Constructor without the size parameter SvxAngleCtl::SvxAngleCtl( Window* pParent, const ResId& rResId ) : @@ -777,11 +736,7 @@ SvxAngleCtl::SvxAngleCtl( Window* pParent, const ResId& rResId ) : Initialize(); } -/************************************************************************* -|* -|* Konstruktor mit Size-Parameter -|* -\************************************************************************/ +// Constructor with the size parameter SvxAngleCtl::SvxAngleCtl( Window* pParent, const ResId& rResId, Size _aSize ) : @@ -793,17 +748,10 @@ SvxAngleCtl::SvxAngleCtl( Window* pParent, const ResId& rResId, Size _aSize ) : Initialize(); } -/************************************************************************* -|* -|* Initialisierung -|* -\************************************************************************/ - void SvxAngleCtl::Initialize() { bPositive = sal_True; - // aFont.SetName( "Helvetica" ); aFont.SetSize( aFontSize ); aFont.SetWeight( WEIGHT_NORMAL ); aFont.SetTransparent( sal_False ); @@ -811,11 +759,7 @@ void SvxAngleCtl::Initialize() SetFont( aFont ); } -/************************************************************************* -|* -|* Zeichnet das (Mini-)Koordinatensystem -|* -\************************************************************************/ +// Draws the (mini) coordinate system void SvxAngleCtl::Paint( const Rectangle& ) { @@ -867,18 +811,13 @@ void SvxAngleCtl::Paint( const Rectangle& ) RTL_CONSTASCII_STRINGPARAM( "-45" ) ) ); } -/************************************************************************* -|* -|* Control zum Editieren von Bitmaps -|* -\************************************************************************/ +// Control for editing bitmaps SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, sal_uInt16 nNumber ) : Control ( pParent, rResId ), nLines ( nNumber ), bPaintable ( sal_True ) { - // SetMapMode( MAP_100TH_MM ); aRectSize = GetOutputSize(); SetPixelColor( Color( COL_BLACK ) ); @@ -890,36 +829,24 @@ SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, sal_uInt16 nNumb rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16)); } -/************************************************************************* -|* -|* Destruktor dealociert dyn. Array -|* -\************************************************************************/ +// Destructor dealocating the dynamic array SvxPixelCtl::~SvxPixelCtl( ) { delete []pPixel; } -/************************************************************************* -|* -|* Wechselt die Vordergrund- ,bzw. Hintergrundfarbe -|* -\************************************************************************/ +// Changes the foreground or Background color void SvxPixelCtl::ChangePixel( sal_uInt16 nPixel ) { if( *( pPixel + nPixel) == 0 ) - *( pPixel + nPixel) = 1; // koennte erweitert werden auf mehrere Farben + *( pPixel + nPixel) = 1; // could be extended to more colors else *( pPixel + nPixel) = 0; } -/************************************************************************* -|* -|* Das angeklickte Rechteck wird ermittelt um die Farbe zu wechseln -|* -\************************************************************************/ +// The clicked rectangle is identified, to change its color void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -940,14 +867,10 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt ) Invalidate( Rectangle( aPtTl, aPtBr ) ); if( WINDOW_TABPAGE == GetParent()->GetType() ) - ( (SvxTabPage*) GetParent() )->PointChanged( this, RP_MM ); // RectPoint ist dummy + ( (SvxTabPage*) GetParent() )->PointChanged( this, RP_MM ); // RectPoint is a dummy } -/************************************************************************* -|* -|* Zeichnet das Control (Rechteck mit 9 Kreisen) -|* -\************************************************************************/ +// Draws the Control (Rectangle with nine circles) void SvxPixelCtl::Paint( const Rectangle& ) { @@ -956,19 +879,19 @@ void SvxPixelCtl::Paint( const Rectangle& ) if( bPaintable ) { - // Linien Zeichnen + // Draw lines Control::SetLineColor( aLineColor ); for( i = 1; i < nLines; i++) { // horizontal nTmp = (sal_uInt16) ( aRectSize.Height() * i / nLines ); DrawLine( Point( 0, nTmp ), Point( aRectSize.Width(), nTmp ) ); - // vertikal + // vertically nTmp = (sal_uInt16) ( aRectSize.Width() * i / nLines ); DrawLine( Point( nTmp, 0 ), Point( nTmp, aRectSize.Height() ) ); } - // Rechtecke (Quadrate) zeichnen + //Draw Rectangles (squares) Control::SetLineColor(); sal_uInt16 nLastPixel = *pPixel ? 0 : 1; @@ -985,7 +908,7 @@ void SvxPixelCtl::Paint( const Rectangle& ) if ( *( pPixel + i * nLines + j ) != nLastPixel ) { nLastPixel = *( pPixel + i * nLines + j ); - // Farbe wechseln: 0 -> Hintergrundfarbe + // Change color: 0 -> Background color SetFillColor( nLastPixel ? aPixelColor : aBackgroundColor ); } DrawRect( Rectangle( aPtTl, aPtBr ) ); @@ -1001,12 +924,6 @@ void SvxPixelCtl::Paint( const Rectangle& ) } } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void SvxPixelCtl::SetXBitmap( const XOBitmap& rXBmp ) { if( rXBmp.GetBitmapType() == XBITMAP_8X8 ) @@ -1021,22 +938,14 @@ void SvxPixelCtl::SetXBitmap( const XOBitmap& rXBmp ) } } -/************************************************************************* -|* -|* Gibt ein bestimmtes Pixel zurueck -|* -\************************************************************************/ +// Returns a specific pixel sal_uInt16 SvxPixelCtl::GetBitmapPixel( const sal_uInt16 nPixel ) { return( *( pPixel + nPixel ) ); } -/************************************************************************* -|* -|* Bewirkt den Ursprungszustand des Controls -|* -\************************************************************************/ +// Resets to the original state of the control void SvxPixelCtl::Reset() { @@ -1045,33 +954,18 @@ void SvxPixelCtl::Reset() Invalidate(); } -/************************************************************************* -|* -|* Ctor: BitmapCtl fuer SvxPixelCtl -|* -\************************************************************************/ +// Constructor: BitmapCtl for SvxPixelCtl SvxBitmapCtl::SvxBitmapCtl( Window* /*pParent*/, const Size& rSize ) { aSize = rSize; - // aVD.SetOutputSizePixel( aSize ); } -/************************************************************************* -|* -|* Dtor -|* -\************************************************************************/ - SvxBitmapCtl::~SvxBitmapCtl() { } -/************************************************************************* -|* -|* BitmapCtl: Gibt die Bitmap zurueck -|* -\************************************************************************/ +// BitmapCtl: Returns the Bitmap XOBitmap SvxBitmapCtl::GetXBitmap() { @@ -1080,11 +974,7 @@ XOBitmap SvxBitmapCtl::GetXBitmap() return( aXOBitmap ); } -/************************************************************************* -|* -|* Fuellt die Listbox mit Farben und Strings -|* -\************************************************************************/ +// Fills the Listbox with color and strings void ColorLB::Fill( const XColorTable* pColorTab ) { @@ -1115,11 +1005,7 @@ void ColorLB::Modify( XColorEntry* pEntry, sal_uInt16 nPos, Bitmap* ) InsertEntry( pEntry->GetColor(), pEntry->GetName(), nPos ); } -/************************************************************************* -|* -|* Fuellt die Listbox mit Farben und Strings -|* -\************************************************************************/ +// Fills the Listbox with color and strings void FillAttrLB::Fill( const XColorTable* pColorTab ) { @@ -1135,11 +1021,7 @@ void FillAttrLB::Fill( const XColorTable* pColorTab ) SetUpdateMode( sal_True ); } -/************************************************************************* -|* -|* Fuellt die Listbox (vorlaeufig) mit Strings -|* -\************************************************************************/ +// Fills the listbox (provisional) with strings HatchingLB::HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ ) : ListBox( pParent, Id ), @@ -1270,11 +1152,7 @@ void HatchingLB::SelectEntryByList( const XHatchList* pList, const String& rStr, SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) ); } -/************************************************************************* -|* -|* Fuellt die Listbox (vorlaeufig) mit Strings -|* -\************************************************************************/ +// Fills the listbox (provisional) with strings void FillAttrLB::Fill( const XHatchList* pList ) { @@ -1294,11 +1172,7 @@ void FillAttrLB::Fill( const XHatchList* pList ) ListBox::SetUpdateMode( sal_True ); } -/************************************************************************* -|* -|* Fuellt die Listbox (vorlaeufig) mit Strings -|* -\************************************************************************/ +// Fills the listbox (provisional) with strings GradientLB::GradientLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ ) : ListBox( pParent, Id ), @@ -1442,11 +1316,7 @@ void GradientLB::SelectEntryByList( const XGradientList* pList, const String& rS SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) ); } -/************************************************************************* -|* -|* Fuellt die Listbox (vorlaeufig) mit Strings -|* -\************************************************************************/ +// Fills the listbox (provisional) with strings void FillAttrLB::Fill( const XGradientList* pList ) { @@ -1466,11 +1336,7 @@ void FillAttrLB::Fill( const XGradientList* pList ) ListBox::SetUpdateMode( sal_True ); } -/************************************************************************* -|* -|* Konstruktor von BitmapLB -|* -\************************************************************************/ +// BitmapLB Constructor BitmapLB::BitmapLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ ) : ListBox( pParent, Id ), @@ -1626,7 +1492,6 @@ void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr, pEntry = pList->GetBitmap( i ); String aStr = pEntry->GetName(); - // Bitmap aBmp = pEntry->GetBitmap(); if( rStr == aStr ) { @@ -1637,11 +1502,7 @@ void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr, SelectEntryPos( (sal_uInt16) ( i - 1 ) ); } -/************************************************************************* -|* -|* Konstruktor von FillAttrLB -|* -\************************************************************************/ +// FillAttrLB Constructor FillAttrLB::FillAttrLB( Window* pParent, ResId Id ) : ColorListBox( pParent, Id ) @@ -1714,25 +1575,17 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr pEntry = pList->GetBitmap( i ); String aStr = pEntry->GetName(); - // Bitmap aBmp = pEntry->GetBitmap(); if( rStr == aStr ) { bFound = sal_True; } - /* - if( rStr == aStr && rBmp == aBmp ) - bFound = sal_True; */ } if( bFound ) SelectEntryPos( (sal_uInt16) ( i - 1 ) ); } -/************************************************************************* -|* -|* Fuellt die Listbox (vorlaeufig) mit Strings -|* -\************************************************************************/ +// Fills the listbox (provisional) with strings void FillTypeLB::Fill() { @@ -1745,11 +1598,7 @@ void FillTypeLB::Fill() SetUpdateMode( sal_True ); } -/************************************************************************* -|* -|* Fuellt die Listbox (vorlaeufig) mit Strings -|* -\************************************************************************/ +// Fills the listbox (provisional) with strings void LineLB::Fill( const XDashList* pList ) { @@ -1776,7 +1625,7 @@ void LineLB::FillStyles() { ResMgr& rMgr = DIALOG_MGR(); - // Linienstile + // Line Styles Clear(); InsertEntry( String( ResId( RID_SVXSTR_INVISIBLE, rMgr ) ) ); @@ -1844,11 +1693,7 @@ void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr, SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) ); } -/************************************************************************* -|* -|* Fuellt die Listbox (vorlaeufig) mit Strings -|* -\************************************************************************/ +// Fills the listbox (provisional) with strings void LineEndLB::Fill( const XLineEndList* pList, sal_Bool bStart ) { @@ -2040,12 +1885,6 @@ void SvxPreviewBase::DataChanged(const DataChangedEvent& rDCEvt) } } -/************************************************************************* -|* -|* SvxXLinePreview::SvxXLinePreview() -|* -*************************************************************************/ - SvxXLinePreview::SvxXLinePreview( Window* pParent, const ResId& rResId ) : SvxPreviewBase( pParent, rResId ), mpLineObjA( 0L ), @@ -2167,12 +2006,6 @@ void SvxXLinePreview::Paint( const Rectangle& ) LocalPostPaint(); } -/************************************************************************* -|* -|* SvxXRectPreview::SvxXRectPreview() -|* -*************************************************************************/ - SvxXRectPreview::SvxXRectPreview( Window* pParent, const ResId& rResId ) : SvxPreviewBase( pParent, rResId ), mpRectangleObject(0) @@ -2212,12 +2045,6 @@ void SvxXRectPreview::Paint( const Rectangle& ) LocalPostPaint(); } -/************************************************************************* -|* -|* SvxXShadowPreview::SvxXShadowPreview() -|* -*************************************************************************/ - SvxXShadowPreview::SvxXShadowPreview( Window* pParent, const ResId& rResId ) : SvxPreviewBase( pParent, rResId ), mpRectangleObject(0), @@ -2285,3 +2112,5 @@ void SvxXShadowPreview::Paint( const Rectangle& ) // ----------------------------------------------------------------------- // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index 44a9762a023a..8c06f09bc367 100644 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,6 +36,9 @@ #include <sfx2/sfxsids.hrc> #include <sfx2/module.hxx> #include <svl/intitem.hxx> +#include <svl/eitem.hxx> +#include <sfx2/viewfrm.hxx> +#include <sfx2/objsh.hxx> // ----------------------------------------------------------------------- @@ -46,10 +50,42 @@ FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet ) eUnit = (FieldUnit)( (const SfxUInt16Item*)pItem )->GetValue(); else { - DBG_ERROR("Using fallback for field unit - field unit should be provided in ItemSet"); + OSL_FAIL("Using fallback for field unit - field unit should be provided in ItemSet"); return SfxModule::GetCurrentFieldUnit(); } return eUnit; } +bool GetApplyCharUnit( const SfxItemSet& rSet ) +{ + bool bUseCharUnit = false; + const SfxPoolItem* pItem = NULL; + if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_APPLYCHARUNIT, sal_False, &pItem ) ) + bUseCharUnit = ((const SfxBoolItem*)pItem )->GetValue(); + else + { + // FIXME - this might be wrong, cf. the DEV300 changes in GetModuleFieldUnit() + SfxViewFrame* pFrame = SfxViewFrame::Current(); + SfxObjectShell* pSh = NULL; + if ( pFrame ) + pSh = pFrame->GetObjectShell(); + if ( pSh ) // the object shell is not always available during reload + { + SfxModule* pModule = pSh->GetModule(); + if ( pModule ) + { + pItem = pModule->GetItem( SID_ATTR_APPLYCHARUNIT ); + if ( pItem ) + bUseCharUnit = ((SfxBoolItem*)pItem )->GetValue(); + } + else + { + DBG_ERRORFILE( "GetApplyCharUnit(): no module found" ); + } + } + } + return bUseCharUnit; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index da320eea50d7..ecdb09c4b8a7 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,8 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svx/dialmgr.hxx> +#include <sal/macros.h> + +#include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include "docrecovery.hxx" #include "docrecovery.hrc" @@ -44,14 +47,10 @@ #include <rtl/ustrbuf.hxx> #include <vcl/scrbar.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif -//#include "com/sun/star/lang/XMultiServiceFactory.hpp" #include <com/sun/star/task/XStatusIndicatorFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> -//#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/XURLTransformer.hpp> @@ -100,7 +99,7 @@ void TabDialog4Recovery::addTabPage(IExtendedTabPage* pPage) //=============================================== short TabDialog4Recovery::Execute() { - ::vos::OGuard aLock(Application::GetSolarMutex()); + ::SolarMutexGuard aLock; Show(); m_pActualPage = m_lTabPages.begin(); @@ -549,8 +548,7 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& a if (!sURL.Len()) sURL = aNew.TemplateURL; INetURLObject aURL(sURL); - aNew.StandardImage = SvFileInformationManager::GetFileImage(aURL, false, false); - aNew.HCImage = SvFileInformationManager::GetFileImage(aURL, false, true ); + aNew.StandardImage = SvFileInformationManager::GetFileImage(aURL, false); /* set the right UI state for this item to NOT_RECOVERED_YET ... because nDocState shows the state of the last emergency save operation before and is interessting for the used recovery core service only ... @@ -559,7 +557,7 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& a aNew.RecoveryState = E_NOT_RECOVERED_YET; // patch DisplayName! Because the document title contain more then the file name ... - sal_Int32 i = aNew.DisplayName.indexOf(::rtl::OUString::createFromAscii(" - ")); + sal_Int32 i = aNew.DisplayName.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" - "))); if (i > 0) aNew.DisplayName = aNew.DisplayName.copy(0, i); @@ -775,7 +773,6 @@ SaveDialog::SaveDialog(Window* pParent, m_aTitleFT.SetFont(aFont); m_aOkBtn.SetClickHdl( LINK( this, SaveDialog, OKButtonHdl ) ); -// m_aFileListLB.EnableInput( sal_False ); m_aFileListLB.SetControlBackground( rStyleSettings.GetDialogColor() ); // fill listbox with current open documents @@ -808,7 +805,7 @@ IMPL_LINK( SaveDialog, OKButtonHdl, void*, EMPTYARG ) //=============================================== short SaveDialog::execute() { - ::vos::OGuard aLock(Application::GetSolarMutex()); + ::SolarMutexGuard aLock; // wait for user input "OK" m_nResult = DLG_RET_UNKNOWN; @@ -848,7 +845,6 @@ SaveProgressDialog::SaveProgressDialog(Window* pParent, FreeResource(); PluginProgress* pProgress = new PluginProgress( &m_aProgrParent, pCore->getSMGR() ); m_xProgress = css::uno::Reference< css::task::XStatusIndicator >(static_cast< css::task::XStatusIndicator* >(pProgress), css::uno::UNO_QUERY_THROW); -// m_aProgrBaseTxt = m_aProgrFT.GetText(); } //=============================================== @@ -859,7 +855,7 @@ SaveProgressDialog::~SaveProgressDialog() //=============================================== short SaveProgressDialog::Execute() { - ::vos::OGuard aLock(Application::GetSolarMutex()); + ::SolarMutexGuard aLock; m_pCore->setProgressHandler(m_xProgress); m_pCore->setUpdateListener(this); @@ -914,16 +910,12 @@ void RecovDocListEntry::Paint(const Point& aPos , const String* pTxt = 0; RecovDocList* pList = static_cast< RecovDocList* >(&aDevice); - sal_Bool bHC = aDevice.GetSettings().GetStyleSettings().GetHighContrastMode(); - TURLInfo* pInfo = (TURLInfo*)pEntry->GetUserData(); switch(pInfo->RecoveryState) { case E_SUCCESSFULLY_RECOVERED : { pImg = &pList->m_aGreenCheckImg; - if (bHC) - pImg = &pList->m_aGreenCheckImgHC; pTxt = &pList->m_aSuccessRecovStr; } break; @@ -931,8 +923,6 @@ void RecovDocListEntry::Paint(const Point& aPos , case E_ORIGINAL_DOCUMENT_RECOVERED : // TODO must be renamed into ORIGINAL DOCUMENT recovered! Because its marked as yellow { pImg = &pList->m_aYellowCheckImg; - if (bHC) - pImg = &pList->m_aYellowCheckImgHC; pTxt = &pList->m_aOrigDocRecovStr; } break; @@ -940,8 +930,6 @@ void RecovDocListEntry::Paint(const Point& aPos , case E_RECOVERY_FAILED : { pImg = &pList->m_aRedCrossImg; - if (bHC) - pImg = &pList->m_aRedCrossImgHC; pTxt = &pList->m_aRecovFailedStr; } break; @@ -981,9 +969,6 @@ RecovDocList::RecovDocList( Window* pParent, , m_aGreenCheckImg ( ResId(IMG_GREENCHECK,*rResId.GetResMgr() ) ) , m_aYellowCheckImg ( ResId(IMG_YELLOWCHECK,*rResId.GetResMgr() ) ) , m_aRedCrossImg ( ResId(IMG_REDCROSS,*rResId.GetResMgr() ) ) - , m_aGreenCheckImgHC ( ResId(IMG_GREENCHECK_HC,*rResId.GetResMgr() ) ) - , m_aYellowCheckImgHC ( ResId(IMG_YELLOWCHECK_HC,*rResId.GetResMgr() ) ) - , m_aRedCrossImgHC ( ResId(IMG_REDCROSS_HC,*rResId.GetResMgr() ) ) , m_aSuccessRecovStr ( ResId(STR_SUCCESSRECOV,*rResId.GetResMgr() ) ) , m_aOrigDocRecovStr ( ResId(STR_ORIGDOCRECOV,*rResId.GetResMgr() ) ) , m_aRecovFailedStr ( ResId(STR_RECOVFAILED,*rResId.GetResMgr() ) ) @@ -1104,8 +1089,6 @@ RecoveryDialog::RecoveryDialog(Window* pParent, sName += impl_getStatusString( rInfo ); SvLBoxEntry* pEntry = m_aFileListLB.InsertEntry(sName, rInfo.StandardImage, rInfo.StandardImage); pEntry->SetUserData((void*)&rInfo); - m_aFileListLB.SetExpandedEntryBmp (pEntry, rInfo.HCImage, BMP_COLOR_HIGHCONTRAST); - m_aFileListLB.SetCollapsedEntryBmp(pEntry, rInfo.HCImage, BMP_COLOR_HIGHCONTRAST); } // mark first item @@ -1122,7 +1105,7 @@ RecoveryDialog::~RecoveryDialog() //=============================================== short RecoveryDialog::execute() { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + ::SolarMutexGuard aSolarLock; switch(m_eRecoveryState) { @@ -1337,7 +1320,7 @@ short RecoveryDialog::execute() } // should never be reached .-) - DBG_ERROR("Should never be reached!"); + OSL_FAIL("Should never be reached!"); return DLG_RET_OK; } @@ -1658,7 +1641,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() short ErrorRepWelcomeDialog::execute() { - ::vos::OGuard aLock(Application::GetSolarMutex()); + ::SolarMutexGuard aLock; Show(); m_nResult = DLG_RET_UNKNOWN; while(m_nResult == DLG_RET_UNKNOWN) @@ -1753,12 +1736,6 @@ void BrokenRecoveryDialog::impl_askForSavePath() ReadParams(); - /* - maDocTypeED.SetText( maParams.maSubject ); - maUsingML.SetText( maParams.maBody ); - maContactCB.Check( maParams.mbAllowContact ); - maEMailAddrED.SetText( maParams.maReturnAddress ); - */ ContactCBHdl( 0 ); } @@ -1768,7 +1745,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() short ErrorRepSendDialog::execute() { - ::vos::OGuard aLock(Application::GetSolarMutex()); + ::SolarMutexGuard aLock; Show(); m_nResult = DLG_RET_UNKNOWN; while(m_nResult == DLG_RET_UNKNOWN) @@ -1865,7 +1842,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() } // loop through all the other windows and adjust their size - for ( ; i < sizeof( pWins ) / sizeof( pWins[ 0 ] ); ++i, ++pCurrent ) + for ( ; i < SAL_N_ELEMENTS( pWins ); ++i, ++pCurrent ) { Size aSize = (*pCurrent)->GetSizePixel(); aSize.Width() -= nDelta; @@ -1936,7 +1913,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() &maProxyServerEd, &maProxyPortFT, &maProxyPortEd, &maDescriptionFT }; Window** pCurrent = pWins; - for ( sal_uInt32 i = 0; i < sizeof( pWins ) / sizeof( pWins[ 0 ] ); ++i, ++pCurrent ) + for ( sal_uInt32 i = 0; i < SAL_N_ELEMENTS( pWins ); ++i, ++pCurrent ) { Point aPos = (*pCurrent)->GetPosPixel(); aPos.Y() -= nDelta; @@ -2035,22 +2012,22 @@ void BrokenRecoveryDialog::impl_askForSavePath() static ::rtl::OUString GetCrashConfigDir() { -#if defined(WNT) || defined(OS2) - OUString ustrValue = OUString::createFromAscii("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"); +#if defined(WNT) + OUString ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}")); #elif defined( MACOSX ) - OUString ustrValue = OUString::createFromAscii("~"); + OUString ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("~")); #else - OUString ustrValue = OUString::createFromAscii("$SYSUSERCONFIG"); + OUString ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSUSERCONFIG")); #endif Bootstrap::expandMacros( ustrValue ); -#if defined(WNT) || defined(OS2) - ustrValue += OUString::createFromAscii("/user/crashdata"); +#if defined(WNT) + ustrValue += OUString(RTL_CONSTASCII_USTRINGPARAM("/user/crashdata")); #endif return ustrValue; } -#if defined(WNT) || defined(OS2) +#if defined(WNT) #define CHKFILE "crashdat.chk" #define STKFILE "crashdat.stk" #define PRVFILE "crashdat.prv" @@ -2060,26 +2037,6 @@ void BrokenRecoveryDialog::impl_askForSavePath() #define PRVFILE ".crash_report_preview" #endif -// static ::rtl::OUString GetChecksumURL() -// { -// ::rtl::OUString aURL = GetCrashConfigDir(); - -// aURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); -// aURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CHKFILE ) ); - -// return aURL; -// } - -// static ::rtl::OUString GetStackURL() -// { -// ::rtl::OUString aURL = GetCrashConfigDir(); - -// aURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); -// aURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STKFILE ) ); - -// return aURL; -// } - static ::rtl::OUString GetPreviewURL() { ::rtl::OUString aURL = GetCrashConfigDir(); @@ -2096,7 +2053,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() ::osl::File aFile( rURL ); printf( "Loading %s:", OString( rURL.getStr(), rURL.getLength(), osl_getThreadTextEncoding() ).getStr() ); - if ( ::osl::FileBase::E_None == aFile.open( OpenFlag_Read ) ) + if ( ::osl::FileBase::E_None == aFile.open( osl_File_OpenFlag_Read ) ) { ::rtl::OString aContent; ::osl::FileBase::RC result; @@ -2179,3 +2136,4 @@ void BrokenRecoveryDialog::impl_askForSavePath() } // namespace DocRecovery } // namespace svx +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc index acf1a1631c6b..3944ac3e0438 100644..100755 --- a/svx/source/dialog/docrecovery.hrc +++ b/svx/source/dialog/docrecovery.hrc @@ -105,9 +105,6 @@ #define IMG_GREENCHECK 14 #define IMG_YELLOWCHECK 15 #define IMG_REDCROSS 16 -#define IMG_GREENCHECK_HC 17 -#define IMG_YELLOWCHECK_HC 18 -#define IMG_REDCROSS_HC 19 #define STR_SUCCESSRECOV 20 #define STR_ORIGDOCRECOV 21 #define STR_RECOVFAILED 22 diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src index cf9cf6f0adcf..1279d8b7facf 100644 --- a/svx/source/dialog/docrecovery.src +++ b/svx/source/dialog/docrecovery.src @@ -213,26 +213,14 @@ TabPage RID_SVXPAGE_DOCRECOVERY_RECOVER { ImageBitmap = Bitmap { File = "nu01.png"; }; }; - Image IMG_GREENCHECK_HC - { - ImageBitmap = Bitmap { File = "nuh01.png"; }; - }; Image IMG_YELLOWCHECK { ImageBitmap = Bitmap { File = "nu04.png"; }; }; - Image IMG_YELLOWCHECK_HC - { - ImageBitmap = Bitmap { File = "nuh04.png"; }; - }; Image IMG_REDCROSS { ImageBitmap = Bitmap { File = "nu02.png"; }; }; - Image IMG_REDCROSS_HC - { - ImageBitmap = Bitmap { File = "nuh02.png"; }; - }; String STR_SUCCESSRECOV { Text[ en-US ] = "Successfully recovered"; diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index b1e7757c07f9..0e89b85d879e 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,9 +40,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #ifndef _SVSTDARR_HXX #define _SVSTDARR_USHORTS @@ -53,7 +52,40 @@ #include <svx/fntctrl.hxx> #include <svx/dialogs.hrc> -#define TEXT_WIDTH 20 +#include <svx/sdasitm.hxx> + +// Item set includes +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> + +#include <editeng/colritem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/editids.hrc> // #define SID_ATTR_* +#include <editeng/fontitem.hxx> // SvxFontItem +#include <editeng/postitem.hxx> // SvxPostureItem +#include <editeng/udlnitem.hxx> // SvxUnderlineItem +#include <editeng/crsditem.hxx> // SvxCrossedOutItem +#include <editeng/cntritem.hxx> // SvxContourItem +#include <editeng/wghtitem.hxx> // SvxWeightItem +#include <editeng/fhgtitem.hxx> // SvxFontHeightItem +#include <editeng/shdditem.hxx> // SvxShadowedItem +#include <editeng/escpitem.hxx> // SvxEscapementItem +#include <editeng/wrlmitem.hxx> // SvxWordLineModeItem +#include <editeng/cmapitem.hxx> // SvxWordLineModeItem +#include <editeng/kernitem.hxx> // SvxKerningItem +#include <editeng/brshitem.hxx> // SvxBrushItem +#include <editeng/colritem.hxx> // SvxColorItem +#include <editeng/emphitem.hxx> // SvxEmphasisMarkItem +#include <editeng/charreliefitem.hxx> // SvxCharReliefItem +#include <editeng/twolinesitem.hxx> // SvxTwoLinesItem +#include <editeng/charscaleitem.hxx> // SvxCharScaleWidthItem + +#include <svl/stritem.hxx> // SfxStringItem + +// define ---------------------------------------------------------------- + +#define TEXT_WIDTH 20 +#define ISITEMSET rSet.GetItemState(nWhich)>=SFX_ITEM_DEFAULT using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -114,7 +146,7 @@ class FontPrevWin_Impl SvxFont aFont; Printer* pPrinter; - sal_Bool bDelPrinter; + sal_Bool bDelPrinter; Reference < XBreakIterator > xBreak; SvULongs aTextWidth; @@ -133,12 +165,15 @@ class FontPrevWin_Impl long n100PercentFontWidth; // initial -1 -> not set yet long n100PercentFontWidthCJK; long n100PercentFontWidthCTL; - sal_uInt16 nFontWidthScale; + sal_uInt16 nFontWidthScale; - sal_Bool bSelection : 1, + sal_Bool bSelection : 1, bGetSelection : 1, bUseResText : 1, + bDrawBaseLine : 1, + bPreviewBackgroundToCharacter : 1, bTwoLines : 1, + bNoLines : 1, bIsCJKUI : 1, bIsCTLUI : 1, bUseFontNameAsText : 1, @@ -148,10 +183,10 @@ class FontPrevWin_Impl public: inline FontPrevWin_Impl() : pPrinter( NULL ), bDelPrinter( sal_False ), - pColor( NULL ), pBackColor( 0 ), + pColor( NULL ), pBackColor( 0 ), nAscent( 0 ), cStartBracket( 0 ), cEndBracket( 0 ), nFontWidthScale( 100 ), bSelection( sal_False ), bGetSelection( sal_False ), bUseResText( sal_False ), - bTwoLines( sal_False ), + bDrawBaseLine( sal_True ), bPreviewBackgroundToCharacter( sal_False ), bTwoLines( sal_False ), bIsCJKUI( sal_False ), bIsCTLUI( sal_False ), bUseFontNameAsText( sal_False ), bTextInited( sal_False ) { @@ -170,9 +205,9 @@ public: Size CalcTextSize( OutputDevice* pWin, OutputDevice* pPrt, SvxFont &rFont ); void DrawPrev( OutputDevice* pWin, Printer* pPrt, Point &rPt, SvxFont &rFont ); - sal_Bool SetFontWidthScale( sal_uInt16 nScaleInPercent ); + sal_Bool SetFontWidthScale( sal_uInt16 nScaleInPercent ); inline void Invalidate100PercentFontWidth(); - inline sal_Bool Is100PercentFontWidthValid() const; + inline sal_Bool Is100PercentFontWidthValid() const; void ScaleFontWidth( const OutputDevice& rOutDev ); // scales rNonCJKFont and aCJKFont depending on nFontWidthScale and // sets the 100%-Font-Widths @@ -201,13 +236,13 @@ inline sal_Bool FontPrevWin_Impl::Is100PercentFontWidthValid() const // class FontPrevWin_Impl ----------------------------------------------- -/*-----------------19.7.2001 08:44------------------ +/* * void FontPrevWin_Impl::_CheckScript() * evalutates the scripttypes of the actual string. * Afterwards the positions of script change are notified in aScriptChg, * the scripttypes in aScriptType. * The aTextWidth array will be filled with zero. - * --------------------------------------------------*/ + */ void FontPrevWin_Impl::_CheckScript() { @@ -224,7 +259,7 @@ void FontPrevWin_Impl::_CheckScript() { Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); xBreak = Reference< XBreakIterator >(xMSF->createInstance( - ::rtl::OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ),UNO_QUERY); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ),UNO_QUERY); } if( xBreak.is() ) { @@ -272,7 +307,7 @@ void FontPrevWin_Impl::_CheckScript() } } -/*-----------------19.7.2001 08:48------------------ +/* * Size FontPrevWin_Impl::CalcTextSize(..) * fills the aTextWidth array with the text width of every part * of the actual string without a script change inside. @@ -280,7 +315,7 @@ void FontPrevWin_Impl::_CheckScript() * for Asian parts the aCJKFont. * The returned size contains the whole string. * The member nAscent is calculated to the maximal ascent of all used fonts. - * --------------------------------------------------*/ + */ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter, SvxFont &rFont ) @@ -353,12 +388,12 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter return aTxtSize; } -/*-----------------19.7.2001 08:54------------------ +/* * void FontPrevWin_Impl::DrawPrev(..) * calls SvxFont::DrawPrev(..) for every part of the string without a script * change inside, for Asian parts the aCJKFont will be used, otherwise the * given rFont. - * --------------------------------------------------*/ + */ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter, Point &rPt, SvxFont &rFont ) @@ -458,9 +493,7 @@ void SvxFontPrevWindow::InitSettings( sal_Bool bForeground, sal_Bool bBackground // ----------------------------------------------------------------------- -SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent, const ResId& rId ) : - - Window ( pParent, rId ) +void SvxFontPrevWindow::Init() { pImpl = new FontPrevWin_Impl; SfxViewShell* pSh = SfxViewShell::Current(); @@ -503,7 +536,17 @@ SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent, const ResId& rId ) : } } -// ----------------------------------------------------------------------- +SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent ) : + Window( pParent ) +{ + Init(); +} + +SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent, const ResId& rId ) : + Window( pParent, rId ) +{ + Init(); +} SvxFontPrevWindow::~SvxFontPrevWindow() { @@ -533,6 +576,7 @@ void SvxFontPrevWindow::StateChanged( StateChangedType nType ) InitSettings( sal_False, sal_True ); Window::StateChanged( nType ); + Invalidate(); } // ----------------------------------------------------------------------- @@ -647,6 +691,20 @@ void SvxFontPrevWindow::UseResourceText( sal_Bool bUse ) // ----------------------------------------------------------------------- +void SvxFontPrevWindow::SetDrawBaseLine( sal_Bool bSet ) +{ + pImpl->bDrawBaseLine = bSet; +} + +// ----------------------------------------------------------------------- + +void SvxFontPrevWindow::SetPreviewBackgroundToCharacter(sal_Bool bSet) +{ + pImpl->bPreviewBackgroundToCharacter = bSet; +} + +// ----------------------------------------------------------------------- + void SvxFontPrevWindow::Paint( const Rectangle& ) { Printer* pPrinter = pImpl->pPrinter; @@ -654,172 +712,193 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) SvxFont& rCJKFont = pImpl->aCJKFont; // TODO: SvxFont& rCTLFont = pImpl->aCTLFont; - if ( pImpl->bUseResText ) - pImpl->aText = GetText(); - else if ( !pImpl->bSelection && !pImpl->bTextInited ) + if ( !IsEnabled() ) { - SfxViewShell* pSh = SfxViewShell::Current(); - - if ( pSh && !pImpl->bGetSelection && !pImpl->bUseFontNameAsText ) - { - pImpl->aText = pSh->GetSelectionText(); - pImpl->bGetSelection = sal_True; - pImpl->bSelection = pImpl->aText.Len() != 0; - - } + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); + const Size aLogSize( GetOutputSize() ); - if ( !pImpl->bSelection || pImpl->bUseFontNameAsText ) + Rectangle aRect( Point( 0, 0 ), aLogSize ); + SetLineColor(); + SetFillColor( rStyleSettings.GetWindowColor() ); + DrawRect( aRect ); + } + else + { + if ( pImpl->bUseResText ) + pImpl->aText = GetText(); + else if ( !pImpl->bSelection && !pImpl->bTextInited ) { - pImpl->aText = rFont.GetName(); - if( pImpl->bIsCJKUI ) - pImpl->aText += rCJKFont.GetName(); - //TODO bIsCTLUI - } + SfxViewShell* pSh = SfxViewShell::Current(); - if ( !pImpl->aText.Len() ) - pImpl->aText = GetText(); + if ( pSh && !pImpl->bGetSelection && !pImpl->bUseFontNameAsText ) + { + pImpl->aText = pSh->GetSelectionText(); + pImpl->bGetSelection = sal_True; + pImpl->bSelection = pImpl->aText.Len() != 0; - // remove line feeds and carriage returns from string - bool bNotEmpty = false; - for ( xub_StrLen i = 0; i < pImpl->aText.Len(); ++i ) - { - if ( 0xa == pImpl->aText.GetChar( i ) || - 0xd == pImpl->aText.GetChar( i ) ) - pImpl->aText.SetChar( i, ' ' ); - else - bNotEmpty = true; - } - if ( !bNotEmpty ) - pImpl->aText = GetText(); + } - if ( pImpl->aText.Len() > (TEXT_WIDTH-1) ) - pImpl->aText.Erase( pImpl->aText.Search( sal_Unicode( ' ' ), TEXT_WIDTH ) ); - } + if ( !pImpl->bSelection || pImpl->bUseFontNameAsText ) + { + pImpl->aText = rFont.GetName(); + if( pImpl->bIsCJKUI ) + pImpl->aText += rCJKFont.GetName(); + //TODO bIsCTLUI + } - // calculate text width scaling - pImpl->ScaleFontWidth( *this/*, rFont*/ ); + if ( !pImpl->aText.Len() ) + pImpl->aText = GetText(); - pImpl->CheckScript(); - Size aTxtSize = pImpl->CalcTextSize( this, pPrinter, rFont ); + // remove line feeds and carriage returns from string + bool bNotEmpty = false; + for ( xub_StrLen i = 0; i < pImpl->aText.Len(); ++i ) + { + if ( 0xa == pImpl->aText.GetChar( i ) || + 0xd == pImpl->aText.GetChar( i ) ) + pImpl->aText.SetChar( i, ' ' ); + else + bNotEmpty = true; + } + if ( !bNotEmpty ) + pImpl->aText = GetText(); - const Size aLogSize( GetOutputSize() ); + if ( pImpl->aText.Len() > (TEXT_WIDTH-1) ) + pImpl->aText.Erase( pImpl->aText.Search( sal_Unicode( ' ' ), TEXT_WIDTH ) ); + } - long nX = aLogSize.Width() / 2 - aTxtSize.Width() / 2; - long nY = aLogSize.Height() / 2 - aTxtSize.Height() / 2; + // calculate text width scaling + pImpl->ScaleFontWidth( *this/*, rFont*/ ); - if ( nY + pImpl->nAscent > aLogSize.Height() ) - nY = aLogSize.Height() - pImpl->nAscent; + pImpl->CheckScript(); + Size aTxtSize = pImpl->CalcTextSize( this, pPrinter, rFont ); - if ( pImpl->pBackColor ) - { - Rectangle aRect( Point( 0, 0 ), aLogSize ); - Color aLineCol = GetLineColor(); - Color aFillCol = GetFillColor(); - SetLineColor(); - SetFillColor( *pImpl->pBackColor ); - DrawRect( aRect ); - SetLineColor( aLineCol ); - SetFillColor( aFillCol ); - } - if ( pImpl->pColor ) - { - Rectangle aRect( Point( nX, nY ), aTxtSize ); - Color aLineCol = GetLineColor(); - Color aFillCol = GetFillColor(); - SetLineColor(); - SetFillColor( *pImpl->pColor ); - DrawRect( aRect ); - SetLineColor( aLineCol ); - SetFillColor( aFillCol ); - } + const Size aLogSize( GetOutputSize() ); - long nStdAscent = pImpl->nAscent; - nY += nStdAscent; + long nX = aLogSize.Width() / 2 - aTxtSize.Width() / 2; + long nY = aLogSize.Height() / 2 - aTxtSize.Height() / 2; - if(pImpl->bTwoLines) - { - SvxFont aSmallFont( rFont ); - Size aOldSize = pImpl->aCJKFont.GetSize(); - setFontSize(aSmallFont); - setFontSize(pImpl->aCJKFont); + if ( nY + pImpl->nAscent > aLogSize.Height() ) + nY = aLogSize.Height() - pImpl->nAscent; - long nStartBracketWidth = 0; - long nEndBracketWidth = 0; - long nTextWidth = 0; - if(pImpl->cStartBracket) + if ( pImpl->pBackColor ) { - String sBracket(pImpl->cStartBracket); - nStartBracketWidth = rFont.GetTxtSize( pPrinter, sBracket ).Width(); + Rectangle aRect( Point( 0, 0 ), aLogSize ); + Color aLineCol = GetLineColor(); + Color aFillCol = GetFillColor(); + SetLineColor(); + SetFillColor( *pImpl->pBackColor ); + DrawRect( aRect ); + SetLineColor( aLineCol ); + SetFillColor( aFillCol ); } - if(pImpl->cEndBracket) + if ( pImpl->pColor ) { - String sBracket(pImpl->cEndBracket); - nEndBracketWidth = rFont.GetTxtSize( pPrinter, sBracket ).Width(); + Rectangle aRect( Point( nX, nY ), aTxtSize ); + Color aLineCol = GetLineColor(); + Color aFillCol = GetFillColor(); + SetLineColor(); + SetFillColor( *pImpl->pColor ); + DrawRect( aRect ); + SetLineColor( aLineCol ); + SetFillColor( aFillCol ); } - nTextWidth = pImpl->CalcTextSize( this, pPrinter, aSmallFont ).Width(); - long nResultWidth = nStartBracketWidth; - nResultWidth += nEndBracketWidth; - nResultWidth += nTextWidth; - long _nX = (aLogSize.Width() - nResultWidth) / 2; - DrawLine( Point( 0, nY ), Point( _nX, nY ) ); - DrawLine( Point( _nX + nResultWidth, nY ), Point( aLogSize.Width(), nY ) ); + long nStdAscent = pImpl->nAscent; + nY += nStdAscent; - long nSmallAscent = pImpl->nAscent; - long nOffset = (nStdAscent - nSmallAscent ) / 2; - - if(pImpl->cStartBracket) + if(pImpl->bTwoLines) { - String sBracket(pImpl->cStartBracket); - rFont.DrawPrev( this, pPrinter, Point( _nX, nY - nOffset - 4), sBracket ); - _nX += nStartBracketWidth; - } + SvxFont aSmallFont( rFont ); + Size aOldSize = pImpl->aCJKFont.GetSize(); + setFontSize(aSmallFont); + setFontSize(pImpl->aCJKFont); + + long nStartBracketWidth = 0; + long nEndBracketWidth = 0; + long nTextWidth = 0; + if(pImpl->cStartBracket) + { + String sBracket(pImpl->cStartBracket); + nStartBracketWidth = rFont.GetTxtSize( pPrinter, sBracket ).Width(); + } + if(pImpl->cEndBracket) + { + String sBracket(pImpl->cEndBracket); + nEndBracketWidth = rFont.GetTxtSize( pPrinter, sBracket ).Width(); + } + nTextWidth = pImpl->CalcTextSize( this, pPrinter, aSmallFont ).Width(); + long nResultWidth = nStartBracketWidth; + nResultWidth += nEndBracketWidth; + nResultWidth += nTextWidth; - Point aTmpPoint1( _nX, nY - nSmallAscent - 2 ); - Point aTmpPoint2( _nX, nY ); - pImpl->DrawPrev( this, pPrinter, aTmpPoint1, aSmallFont ); - pImpl->DrawPrev( this, pPrinter, aTmpPoint2, aSmallFont ); + long _nX = (aLogSize.Width() - nResultWidth) / 2; + if ( pImpl->bDrawBaseLine ) + { + DrawLine( Point( 0, nY ), Point( _nX, nY ) ); + DrawLine( Point( _nX + nResultWidth, nY ), Point( aLogSize.Width(), nY ) ); + } - _nX += nTextWidth; - if(pImpl->cEndBracket) - { - Point aTmpPoint( _nX + 1, nY - nOffset - 4); - String sBracket(pImpl->cEndBracket); - rFont.DrawPrev( this, pPrinter, aTmpPoint, sBracket ); + long nSmallAscent = pImpl->nAscent; + long nOffset = (nStdAscent - nSmallAscent ) / 2; + + if(pImpl->cStartBracket) + { + String sBracket(pImpl->cStartBracket); + rFont.DrawPrev( this, pPrinter, Point( _nX, nY - nOffset - 4), sBracket ); + _nX += nStartBracketWidth; + } + + Point aTmpPoint1( _nX, nY - nSmallAscent - 2 ); + Point aTmpPoint2( _nX, nY ); + pImpl->DrawPrev( this, pPrinter, aTmpPoint1, aSmallFont ); + pImpl->DrawPrev( this, pPrinter, aTmpPoint2, aSmallFont ); + + _nX += nTextWidth; + if(pImpl->cEndBracket) + { + Point aTmpPoint( _nX + 1, nY - nOffset - 4); + String sBracket(pImpl->cEndBracket); + rFont.DrawPrev( this, pPrinter, aTmpPoint, sBracket ); + } + pImpl->aCJKFont.SetSize( aOldSize ); } - pImpl->aCJKFont.SetSize( aOldSize ); - } - else - { - Color aLineCol = GetLineColor(); + else + { - SetLineColor( rFont.GetColor() ); - DrawLine( Point( 0, nY ), Point( nX, nY ) ); - DrawLine( Point( nX + aTxtSize.Width(), nY ), Point( aLogSize.Width(), nY ) ); + if (!pImpl->bNoLines) + { + Color aLineCol = GetLineColor(); - SetLineColor( aLineCol ); + SetLineColor( rFont.GetColor() ); + if ( pImpl->bDrawBaseLine ) + { + DrawLine( Point( 0, nY ), Point( nX, nY ) ); + DrawLine( Point( nX + aTxtSize.Width(), nY ), Point( aLogSize.Width(), nY ) ); + } + SetLineColor( aLineCol ); + } - Point aTmpPoint( nX, nY ); - pImpl->DrawPrev( this, pPrinter, aTmpPoint, rFont ); + Point aTmpPoint( nX, nY ); + pImpl->DrawPrev( this, pPrinter, aTmpPoint, rFont ); + } } } -/* -----------------------------04.12.00 16:26-------------------------------- - ---------------------------------------------------------------------------*/ sal_Bool SvxFontPrevWindow::IsTwoLines() const { return pImpl->bTwoLines; } -/* -----------------------------04.12.00 16:26-------------------------------- - ---------------------------------------------------------------------------*/ void SvxFontPrevWindow::SetTwoLines(sal_Bool bSet) { - pImpl->bTwoLines = bSet;} + pImpl->bTwoLines = bSet; +} -/* -----------------------------04.12.00 16:26-------------------------------- +void SvxFontPrevWindow::SetNoLines(sal_Bool bSet) +{ + pImpl->bNoLines = bSet; +} - ---------------------------------------------------------------------------*/ void SvxFontPrevWindow::SetBrackets(sal_Unicode cStart, sal_Unicode cEnd) { pImpl->cStartBracket = cStart; @@ -849,3 +928,606 @@ void SvxFontPrevWindow::AutoCorrectFontColor( void ) if( COL_AUTO == pImpl->aCTLFont.GetColor().GetColor() ) pImpl->aCTLFont.SetColor( aFontColor ); } + +// ----------------------------------------------------------------------- + +static bool GetWhich (const SfxItemSet &rSet, sal_uInt16 nSlot, sal_uInt16 &rWhich) +{ + rWhich = rSet.GetPool()->GetWhich( nSlot, sal_True ); + return rSet.GetItemState(rWhich) >= SFX_ITEM_DEFAULT; +} + +static void SetPrevFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont ) +{ + sal_uInt16 nWhich; + if (GetWhich ( rSet, nSlot, nWhich ) ) + { + const SvxFontItem& rFontItem = ( SvxFontItem& ) rSet.Get( nWhich ); + rFont.SetFamily( rFontItem.GetFamily() ); + rFont.SetName( rFontItem.GetFamilyName() ); + rFont.SetPitch( rFontItem.GetPitch() ); + rFont.SetCharSet( rFontItem.GetCharSet() ); + rFont.SetStyleName( rFontItem.GetStyleName() ); + } +} + +static void SetPrevFontStyle( const SfxItemSet& rSet, sal_uInt16 nPosture, sal_uInt16 nWeight, SvxFont& rFont ) +{ + sal_uInt16 nWhich; + if( GetWhich( rSet, nPosture, nWhich ) ) + { + const SvxPostureItem& rItem = ( SvxPostureItem& ) rSet.Get( nWhich ); + rFont.SetItalic( ( FontItalic ) rItem.GetValue() != ITALIC_NONE ? ITALIC_NORMAL : ITALIC_NONE ); + } + + if( GetWhich( rSet, nWeight, nWhich ) ) + { + SvxWeightItem& rItem = ( SvxWeightItem& ) rSet.Get( nWhich ); + rFont.SetWeight( ( FontWeight ) rItem.GetValue() != WEIGHT_NORMAL ? WEIGHT_BOLD : WEIGHT_NORMAL ); + } +} + +void SvxFontPrevWindow::SetFontSize( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont ) +{ + sal_uInt16 nWhich; + long nH; + if( GetWhich( rSet, nSlot, nWhich ) ) + { + nH = LogicToLogic( ( ( SvxFontHeightItem& ) rSet.Get( nWhich ) ).GetHeight(), + ( MapUnit ) rSet.GetPool()->GetMetric( nWhich ), + MAP_TWIP ); + } + else + nH = 240; // as default 12pt + + rFont.SetSize( Size( 0, nH ) ); +} + +static void SetPrevFontEscapement(SvxFont& _rFont, sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ) +{ + _rFont.SetPropr( nProp ); + _rFont.SetProprRel( nEscProp ); + _rFont.SetEscapement( nEsc ); +} + +void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, + bool bPreviewBackgroundToCharacter ) +{ + sal_uInt16 nWhich; + SvxFont& rFont = GetFont(); + SvxFont& rCJKFont = GetCJKFont(); + SvxFont& rCTLFont = GetCTLFont(); + + // Preview string + if( GetWhich( rSet, SID_CHAR_DLG_PREVIEW_STRING, nWhich ) ) + { + const SfxStringItem& rItem = ( SfxStringItem& ) rSet.Get( nWhich ); + ::rtl::OUString aString = rItem.GetValue(); + if( aString.getLength() != 0 ) + SetPreviewText( aString ); + else + SetFontNameAsPreviewText(); + } + + // Underline + FontUnderline eUnderline; + if( GetWhich( rSet, SID_ATTR_CHAR_UNDERLINE, nWhich ) ) + { + const SvxUnderlineItem& rItem = ( SvxUnderlineItem& ) rSet.Get( nWhich ); + eUnderline = ( FontUnderline ) rItem.GetValue(); + SetTextLineColor( rItem.GetColor() ); + } + else + eUnderline = UNDERLINE_NONE; + + rFont.SetUnderline( eUnderline ); + rCJKFont.SetUnderline( eUnderline ); + rCTLFont.SetUnderline( eUnderline ); + + // Overline + FontUnderline eOverline; + if( GetWhich( rSet, SID_ATTR_CHAR_OVERLINE, nWhich ) ) + { + const SvxOverlineItem& rItem = ( SvxOverlineItem& ) rSet.Get( nWhich ); + eOverline = ( FontUnderline ) rItem.GetValue(); + SetOverlineColor( rItem.GetColor() ); + } + else + eOverline = UNDERLINE_NONE; + + rFont.SetOverline( eOverline ); + rCJKFont.SetOverline( eOverline ); + rCTLFont.SetOverline( eOverline ); + + // Strikeout + FontStrikeout eStrikeout; + if( GetWhich( rSet, SID_ATTR_CHAR_STRIKEOUT, nWhich ) ) + { + const SvxCrossedOutItem& rItem = ( SvxCrossedOutItem& ) rSet.Get( nWhich ); + eStrikeout = ( FontStrikeout ) rItem.GetValue(); + } + else + eStrikeout = STRIKEOUT_NONE; + + rFont.SetStrikeout( eStrikeout ); + rCJKFont.SetStrikeout( eStrikeout ); + rCTLFont.SetStrikeout( eStrikeout ); + + // WordLineMode + if( GetWhich( rSet, SID_ATTR_CHAR_WORDLINEMODE, nWhich ) ) + { + const SvxWordLineModeItem& rItem = ( SvxWordLineModeItem& ) rSet.Get( nWhich ); + rFont.SetWordLineMode( rItem.GetValue() ); + rCJKFont.SetWordLineMode( rItem.GetValue() ); + rCTLFont.SetWordLineMode( rItem.GetValue() ); + } + + // Emphasis + if( GetWhich( rSet, SID_ATTR_CHAR_EMPHASISMARK, nWhich ) ) + { + const SvxEmphasisMarkItem& rItem = ( SvxEmphasisMarkItem& ) rSet.Get( nWhich ); + FontEmphasisMark eMark = rItem.GetEmphasisMark(); + rFont.SetEmphasisMark( eMark ); + rCJKFont.SetEmphasisMark( eMark ); + rCTLFont.SetEmphasisMark( eMark ); + } + + // Relief + if( GetWhich( rSet, SID_ATTR_CHAR_RELIEF, nWhich ) ) + { + const SvxCharReliefItem& rItem = ( SvxCharReliefItem& ) rSet.Get( nWhich ); + FontRelief eFontRelief = ( FontRelief ) rItem.GetValue(); + rFont.SetRelief( eFontRelief ); + rCJKFont.SetRelief( eFontRelief ); + rCTLFont.SetRelief( eFontRelief ); + } + + // Effects + if( GetWhich( rSet, SID_ATTR_CHAR_CASEMAP, nWhich ) ) + { + const SvxCaseMapItem& rItem = ( SvxCaseMapItem& ) rSet.Get( nWhich ); + SvxCaseMap eCaseMap = ( SvxCaseMap ) rItem.GetValue(); + rFont.SetCaseMap( eCaseMap ); + rCJKFont.SetCaseMap( eCaseMap ); + // #i78474# small caps do not exist in CTL fonts + rCTLFont.SetCaseMap( eCaseMap == SVX_CASEMAP_KAPITAELCHEN ? SVX_CASEMAP_NOT_MAPPED : eCaseMap ); + } + + // Outline + if( GetWhich( rSet, SID_ATTR_CHAR_CONTOUR, nWhich ) ) + { + const SvxContourItem& rItem = ( SvxContourItem& ) rSet.Get( nWhich ); + sal_Bool bOutline = rItem.GetValue(); + rFont.SetOutline( bOutline ); + rCJKFont.SetOutline( bOutline ); + rCTLFont.SetOutline( bOutline ); + } + + // Shadow + if( GetWhich( rSet, SID_ATTR_CHAR_SHADOWED, nWhich ) ) + { + const SvxShadowedItem& rItem = ( SvxShadowedItem& ) rSet.Get( nWhich ); + sal_Bool bShadow = rItem.GetValue(); + rFont.SetShadow( bShadow ); + rCJKFont.SetShadow( bShadow ); + rCTLFont.SetShadow( bShadow ); + } + + // Background + sal_Bool bTransparent; + if( GetWhich( rSet, bPreviewBackgroundToCharacter ? SID_ATTR_BRUSH : SID_ATTR_BRUSH_CHAR, nWhich ) ) + { + const SvxBrushItem& rBrush = ( SvxBrushItem& ) rSet.Get( nWhich ); + const Color& rColor = rBrush.GetColor(); + bTransparent = rColor.GetTransparency() > 0; + rFont.SetFillColor( rColor ); + rCJKFont.SetFillColor( rColor ); + rCTLFont.SetFillColor( rColor ); + } + else + bTransparent = TRUE; + + rFont.SetTransparent( bTransparent ); + rCJKFont.SetTransparent( bTransparent ); + rCTLFont.SetTransparent( bTransparent ); + + Color aBackCol( COL_TRANSPARENT ); + if( !bPreviewBackgroundToCharacter ) + { + if( GetWhich( rSet, SID_ATTR_BRUSH, nWhich ) ) + { + const SvxBrushItem& rBrush = ( SvxBrushItem& ) rSet.Get( nWhich ); + if( GPOS_NONE == rBrush.GetGraphicPos() ) + aBackCol = rBrush.GetColor(); + } + } + SetBackColor( aBackCol ); + + // Font + SetPrevFont( rSet, SID_ATTR_CHAR_FONT, rFont ); + SetPrevFont( rSet, SID_ATTR_CHAR_CJK_FONT, rCJKFont ); + SetPrevFont( rSet, SID_ATTR_CHAR_CTL_FONT, rCTLFont ); + + // Style + SetPrevFontStyle( rSet, SID_ATTR_CHAR_POSTURE, SID_ATTR_CHAR_WEIGHT, rFont ); + SetPrevFontStyle( rSet, SID_ATTR_CHAR_CJK_POSTURE, SID_ATTR_CHAR_CJK_WEIGHT, rCJKFont ); + SetPrevFontStyle( rSet, SID_ATTR_CHAR_CTL_POSTURE, SID_ATTR_CHAR_CTL_WEIGHT, rCTLFont ); + + // Size + SetFontSize( rSet, SID_ATTR_CHAR_FONTHEIGHT, rFont ); + SetFontSize( rSet, SID_ATTR_CHAR_CJK_FONTHEIGHT, rCJKFont ); + SetFontSize( rSet, SID_ATTR_CHAR_CTL_FONTHEIGHT, rCTLFont ); + + // Color + if( GetWhich( rSet, SID_ATTR_CHAR_COLOR, nWhich ) ) + { + const SvxColorItem& rItem = ( SvxColorItem& ) rSet.Get( nWhich ); + Color aCol( rItem.GetValue() ); + rFont.SetColor( aCol ); + + rCJKFont.SetColor( aCol ); + rCTLFont.SetColor( aCol ); + + AutoCorrectFontColor(); // handle color COL_AUTO + } + + // Kerning + if( GetWhich( rSet, SID_ATTR_CHAR_KERNING, nWhich ) ) + { + const SvxKerningItem& rItem = ( SvxKerningItem& ) rSet.Get( nWhich ); + short nKern = ( short ) + LogicToLogic( rItem.GetValue(), ( MapUnit ) rSet.GetPool()->GetMetric( nWhich ), MAP_TWIP ); + rFont.SetFixKerning( nKern ); + rCJKFont.SetFixKerning( nKern ); + rCTLFont.SetFixKerning( nKern ); + } + + // Escapement + const sal_uInt8 nProp = 100; + short nEsc; + sal_uInt8 nEscProp; + if( GetWhich( rSet, SID_ATTR_CHAR_ESCAPEMENT, nWhich ) ) + { + const SvxEscapementItem& rItem = ( SvxEscapementItem& ) rSet.Get( nWhich ); + nEsc = rItem.GetEsc(); + nEscProp = rItem.GetProp(); + + if( nEsc == DFLT_ESC_AUTO_SUPER ) + nEsc = DFLT_ESC_SUPER; + else if( nEsc == DFLT_ESC_AUTO_SUB ) + nEsc = DFLT_ESC_SUB; + } + else + { + nEsc = 0; + nEscProp = 100; + } + SetPrevFontEscapement( rFont, nProp, nEscProp, nEsc ); + SetPrevFontEscapement( rCJKFont, nProp, nEscProp, nEsc ); + SetPrevFontEscapement( rCTLFont, nProp, nEscProp, nEsc ); + + // Font width scale + if( GetWhich( rSet, SID_ATTR_CHAR_SCALEWIDTH, nWhich ) ) + { + const SvxCharScaleWidthItem&rItem = ( SvxCharScaleWidthItem& ) rSet.Get( nWhich ); + SetFontWidthScale( rItem.GetValue() ); + } + + Invalidate(); +} + +// ----------------------------------------------------------------------- + +void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) +{ + SvxFont& rFont = GetFont(); + SvxFont& rCJKFont = GetCJKFont(); + SvxFont& rCTLFont = GetCTLFont(); + + initFont(rFont); + initFont(rCJKFont); + initFont(rCTLFont); + InitSettings( sal_True, sal_True ); + + sal_uInt16 nWhich; + nWhich = rSet.GetPool()->GetWhich( SID_CHAR_DLG_PREVIEW_STRING ); + if( ISITEMSET ) + { + const SfxStringItem& rItem = ( SfxStringItem& ) rSet.Get( nWhich ); + ::rtl::OUString aString = rItem.GetValue(); + if( aString.getLength() != 0 ) + SetPreviewText( aString ); + else + SetFontNameAsPreviewText(); + } + + // Underline + FontUnderline eUnderline; + nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_UNDERLINE ); + if( ISITEMSET ) + { + const SvxUnderlineItem& rItem = ( SvxUnderlineItem& ) rSet.Get( nWhich ); + eUnderline = ( FontUnderline ) rItem.GetValue(); + SetTextLineColor( rItem.GetColor() ); + } + else + eUnderline = UNDERLINE_NONE; + + rFont.SetUnderline( eUnderline ); + rCJKFont.SetUnderline( eUnderline ); + rCTLFont.SetUnderline( eUnderline ); + + // Overline + FontUnderline eOverline; + nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_OVERLINE ); + if( ISITEMSET ) + { + const SvxOverlineItem& rItem = ( SvxOverlineItem& ) rSet.Get( nWhich ); + eOverline = ( FontUnderline ) rItem.GetValue(); + SetOverlineColor( rItem.GetColor() ); + } + else + eOverline = UNDERLINE_NONE; + + rFont.SetOverline( eOverline ); + rCJKFont.SetOverline( eOverline ); + rCTLFont.SetOverline( eOverline ); + + // Strikeout + FontStrikeout eStrikeout; + nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_STRIKEOUT ); + if( ISITEMSET ) + { + const SvxCrossedOutItem& rItem = ( SvxCrossedOutItem& ) rSet.Get( nWhich ); + eStrikeout = ( FontStrikeout ) rItem.GetValue(); + } + else + eStrikeout = STRIKEOUT_NONE; + + rFont.SetStrikeout( eStrikeout ); + rCJKFont.SetStrikeout( eStrikeout ); + rCTLFont.SetStrikeout( eStrikeout ); + + // WordLineMode + nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_WORDLINEMODE ); + if( ISITEMSET ) + { + const SvxWordLineModeItem& rItem = ( SvxWordLineModeItem& ) rSet.Get( nWhich ); + rFont.SetWordLineMode( rItem.GetValue() ); + rCJKFont.SetWordLineMode( rItem.GetValue() ); + rCTLFont.SetWordLineMode( rItem.GetValue() ); + } + + // Emphasis + nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_EMPHASISMARK ); + if( ISITEMSET ) + { + const SvxEmphasisMarkItem& rItem = ( SvxEmphasisMarkItem& ) rSet.Get( nWhich ); + FontEmphasisMark eMark = rItem.GetEmphasisMark(); + rFont.SetEmphasisMark( eMark ); + rCJKFont.SetEmphasisMark( eMark ); + rCTLFont.SetEmphasisMark( eMark ); + } + + // Relief + nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_RELIEF ); + if( ISITEMSET ) + { + const SvxCharReliefItem& rItem = ( SvxCharReliefItem& ) rSet.Get( nWhich ); + FontRelief eFontRelief = ( FontRelief ) rItem.GetValue(); + rFont.SetRelief( eFontRelief ); + rCJKFont.SetRelief( eFontRelief ); + rCTLFont.SetRelief( eFontRelief ); + } + + // Effects + nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_CASEMAP ); + if( ISITEMSET ) + { + const SvxCaseMapItem& rItem = ( SvxCaseMapItem& ) rSet.Get( nWhich ); + SvxCaseMap eCaseMap = ( SvxCaseMap ) rItem.GetValue(); + rFont.SetCaseMap( eCaseMap ); + rCJKFont.SetCaseMap( eCaseMap ); + // #i78474# small caps do not exist in CTL fonts + rCTLFont.SetCaseMap( eCaseMap == SVX_CASEMAP_KAPITAELCHEN ? SVX_CASEMAP_NOT_MAPPED : eCaseMap ); + } + + // Outline + nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_CONTOUR ); + if( ISITEMSET ) + { + const SvxContourItem& rItem = ( SvxContourItem& ) rSet.Get( nWhich ); + sal_Bool bOutline = rItem.GetValue(); + rFont.SetOutline( bOutline ); + rCJKFont.SetOutline( bOutline ); + rCTLFont.SetOutline( bOutline ); + } + + // Shadow + nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_SHADOWED ); + if( ISITEMSET ) + { + const SvxShadowedItem& rItem = ( SvxShadowedItem& ) rSet.Get( nWhich ); + sal_Bool bShadow = rItem.GetValue(); + rFont.SetShadow( bShadow ); + rCJKFont.SetShadow( bShadow ); + rCTLFont.SetShadow( bShadow ); + } + + // Background + sal_Bool bTransparent; + nWhich = rSet.GetPool()->GetWhich( pImpl->bPreviewBackgroundToCharacter ? SID_ATTR_BRUSH : SID_ATTR_BRUSH_CHAR ); + if( ISITEMSET ) + { + const SvxBrushItem& rBrush = ( SvxBrushItem& ) rSet.Get( nWhich ); + const Color& rColor = rBrush.GetColor(); + bTransparent = rColor.GetTransparency() > 0; + rFont.SetFillColor( rColor ); + rCJKFont.SetFillColor( rColor ); + rCTLFont.SetFillColor( rColor ); + } + else + bTransparent = sal_True; + + rFont.SetTransparent( bTransparent ); + rCJKFont.SetTransparent( bTransparent ); + rCTLFont.SetTransparent( bTransparent ); + + Color aBackCol( COL_TRANSPARENT ); + if( !pImpl->bPreviewBackgroundToCharacter ) + { + nWhich = rSet.GetPool()->GetWhich( SID_ATTR_BRUSH ); + if( ISITEMSET ) + { + const SvxBrushItem& rBrush = ( SvxBrushItem& ) rSet.Get( nWhich ); + if( GPOS_NONE == rBrush.GetGraphicPos() ) + aBackCol = rBrush.GetColor(); + } + } + SetBackColor( aBackCol ); + + // Font + SetFont( rSet, SID_ATTR_CHAR_FONT, rFont ); + SetFont( rSet, SID_ATTR_CHAR_CJK_FONT, rCJKFont ); + SetFont( rSet, SID_ATTR_CHAR_CTL_FONT, rCTLFont ); + + // Style + SetFontStyle( rSet, SID_ATTR_CHAR_POSTURE, SID_ATTR_CHAR_WEIGHT, rFont ); + SetFontStyle( rSet, SID_ATTR_CHAR_CJK_POSTURE, SID_ATTR_CHAR_CJK_WEIGHT, rCJKFont ); + SetFontStyle( rSet, SID_ATTR_CHAR_CTL_POSTURE, SID_ATTR_CHAR_CTL_WEIGHT, rCTLFont ); + + // Size + SetFontSize( rSet, SID_ATTR_CHAR_FONTHEIGHT, rFont ); + SetFontSize( rSet, SID_ATTR_CHAR_CJK_FONTHEIGHT, rCJKFont ); + SetFontSize( rSet, SID_ATTR_CHAR_CTL_FONTHEIGHT, rCTLFont ); + + // Color + nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_COLOR ); + if( ISITEMSET ) + { + const SvxColorItem& rItem = ( SvxColorItem& ) rSet.Get( nWhich ); + Color aCol( rItem.GetValue() ); + rFont.SetColor( aCol ); + rCJKFont.SetColor( aCol ); + rCTLFont.SetColor( aCol ); + + AutoCorrectFontColor(); // handle color COL_AUTO + } + + // Kerning + nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_KERNING ); + if( ISITEMSET ) + { + const SvxKerningItem& rItem = ( SvxKerningItem& ) rSet.Get( nWhich ); + short nKern = ( short ) + LogicToLogic( rItem.GetValue(), ( MapUnit ) rSet.GetPool()->GetMetric( nWhich ), MAP_TWIP ); + rFont.SetFixKerning( nKern ); + rCJKFont.SetFixKerning( nKern ); + rCTLFont.SetFixKerning( nKern ); + } + + // Escapement + nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_ESCAPEMENT ); + const sal_uInt8 nProp = 100; + short nEsc; + sal_uInt8 nEscProp; + if( ISITEMSET ) + { + const SvxEscapementItem& rItem = ( SvxEscapementItem& ) rSet.Get( nWhich ); + nEsc = rItem.GetEsc(); + nEscProp = rItem.GetProp(); + + if( nEsc == DFLT_ESC_AUTO_SUPER ) + nEsc = DFLT_ESC_SUPER; + else if( nEsc == DFLT_ESC_AUTO_SUB ) + nEsc = DFLT_ESC_SUB; + } + else + { + nEsc = 0; + nEscProp = 100; + } + + SetFontEscapement( nProp, nEscProp, nEsc ); + + // Font width scale + SetFontWidthScale( rSet ); + + Invalidate(); +} + +// ----------------------------------------------------------------------- + + +// ----------------------------------------------------------------------- + +void SvxFontPrevWindow::SetFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont ) +{ + sal_uInt16 nWhich = rSet.GetPool()->GetWhich( nSlot ); + if( ISITEMSET ) + { + const SvxFontItem& rFontItem = ( SvxFontItem& ) rSet.Get( nWhich ); + rFont.SetFamily( rFontItem.GetFamily() ); + rFont.SetName( rFontItem.GetFamilyName() ); + rFont.SetPitch( rFontItem.GetPitch() ); + rFont.SetCharSet( rFontItem.GetCharSet() ); + rFont.SetStyleName( rFontItem.GetStyleName() ); + } +} + +// ----------------------------------------------------------------------- + +void SvxFontPrevWindow::SetFontStyle( const SfxItemSet& rSet, sal_uInt16 nPosture, sal_uInt16 nWeight, SvxFont& rFont ) +{ + sal_uInt16 nWhich = rSet.GetPool()->GetWhich( nPosture ); + if( ISITEMSET ) + { + const SvxPostureItem& rItem = ( SvxPostureItem& ) rSet.Get( nWhich ); + rFont.SetItalic( ( FontItalic ) rItem.GetValue() != ITALIC_NONE ? ITALIC_NORMAL : ITALIC_NONE ); + } + + nWhich = rSet.GetPool()->GetWhich( nWeight ); + if( ISITEMSET ) + { + SvxWeightItem& rItem = ( SvxWeightItem& ) rSet.Get( nWhich ); + rFont.SetWeight( ( FontWeight ) rItem.GetValue() != WEIGHT_NORMAL ? WEIGHT_BOLD : WEIGHT_NORMAL ); + } +} + +// ----------------------------------------------------------------------- + +void SvxFontPrevWindow::SetFontWidthScale( const SfxItemSet& rSet ) +{ + sal_uInt16 nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_SCALEWIDTH ); + if( ISITEMSET ) + { + const SvxCharScaleWidthItem& rItem = ( SvxCharScaleWidthItem& ) rSet.Get( nWhich ); + + SetFontWidthScale( rItem.GetValue() ); + } +} + +// ----------------------------------------------------------------------- +namespace +{ + // ----------------------------------------------------------------------- + void setFontEscapement(SvxFont& _rFont,sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ) + { + _rFont.SetPropr( nProp ); + _rFont.SetProprRel( nEscProp ); + _rFont.SetEscapement( nEsc ); + } + // ----------------------------------------------------------------------- + // ----------------------------------------------------------------------- +} +// ----------------------------------------------------------------------- + +void SvxFontPrevWindow::SetFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ) +{ + setFontEscapement(GetFont(),nProp,nEscProp,nEsc); + setFontEscapement(GetCJKFont(),nProp,nEscProp,nEsc); + setFontEscapement(GetCTLFont(),nProp,nEscProp,nEsc); + Invalidate(); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index 984d7dca4af4..4b3db2257ae4 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,7 +72,6 @@ void SvLBoxFontString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags Font aOldFont( rDev.GetFont() ); Font aNewFont( maFont ); bool bSel = (nFlags & SVLISTENTRYFLAG_SELECTED) != 0; -// if( !mbUseColor ) // selection gets font color, if available if( !mbUseColor || bSel ) // selection always gets highlight color { const StyleSettings& rSett = Application::GetSettings().GetStyleSettings(); @@ -176,14 +176,10 @@ SvxFontListBox::SvxFontListBox( Context* pParent, const char* pFile) { } -/*IMPL_IMPL (SvxFontListBox, ListBox); -IMPL_CONSTRUCTORS (SvxFontListBox, ListBox, "svxfontlistbox"); -IMPL_GET_IMPL (SvxFontListBox); -IMPL_GET_WINDOW (SvxFontListBox);*/ - }; #endif // ============================================================================ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index ae2eb6c04098..6708f3b5cca0 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,11 +53,7 @@ SFX_IMPL_DOCKINGWINDOW( SvxFontWorkChildWindow, SID_FONTWORK ); -/************************************************************************* -|* -|* ControllerItem fuer Fontwork -|* -\************************************************************************/ +// ControllerItem for Fontwork SvxFontWorkControllerItem::SvxFontWorkControllerItem ( @@ -71,11 +68,7 @@ SvxFontWorkControllerItem::SvxFontWorkControllerItem { } -/************************************************************************* -|* -|* StateChanged-Methode fuer FontWork-Items -|* -\************************************************************************/ +// StateChanged method for FontWork items void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState /*eState*/, const SfxPoolItem* pItem ) @@ -86,7 +79,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextStyleItem* pStateItem = PTR_CAST(XFormTextStyleItem, pItem); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextStyleItem erwartet"); + DBG_ASSERT(pStateItem || pItem == 0, "XFormTextStyleItem expected"); rFontWorkDlg.SetStyle_Impl(pStateItem); break; } @@ -94,7 +87,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextAdjustItem* pStateItem = PTR_CAST(XFormTextAdjustItem, pItem); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextAdjustItem erwartet"); + DBG_ASSERT(pStateItem || pItem == 0, "XFormTextAdjustItem expected"); rFontWorkDlg.SetAdjust_Impl(pStateItem); break; } @@ -110,7 +103,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextStartItem* pStateItem = PTR_CAST(XFormTextStartItem, pItem); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextStartItem erwartet"); + DBG_ASSERT(pStateItem || pItem == 0, "XFormTextStartItem expected"); rFontWorkDlg.SetStart_Impl(pStateItem); break; } @@ -118,7 +111,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextMirrorItem* pStateItem = PTR_CAST(XFormTextMirrorItem, pItem); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextMirrorItem erwartet"); + DBG_ASSERT(pStateItem || pItem == 0, "XFormTextMirrorItem expected"); rFontWorkDlg.SetMirror_Impl(pStateItem); break; } @@ -126,7 +119,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextStdFormItem* pStateItem = PTR_CAST(XFormTextStdFormItem, pItem); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextStdFormItem erwartet"); + DBG_ASSERT(pStateItem || pItem == 0, "XFormTextStdFormItem expected"); rFontWorkDlg.SetStdForm_Impl(pStateItem); break; } @@ -134,7 +127,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextHideFormItem* pStateItem = PTR_CAST(XFormTextHideFormItem, pItem); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextHideFormItem erwartet"); + DBG_ASSERT(pStateItem || pItem == 0, "XFormTextHideFormItem expected"); rFontWorkDlg.SetShowForm_Impl(pStateItem); break; } @@ -142,7 +135,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextOutlineItem* pStateItem = PTR_CAST(XFormTextOutlineItem, pItem); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextOutlineItem erwartet"); + DBG_ASSERT(pStateItem || pItem == 0, "XFormTextOutlineItem expected"); rFontWorkDlg.SetOutline_Impl(pStateItem); break; } @@ -150,7 +143,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextShadowItem* pStateItem = PTR_CAST(XFormTextShadowItem, pItem); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowItem erwartet"); + DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowItem expected"); rFontWorkDlg.SetShadow_Impl(pStateItem); break; } @@ -158,7 +151,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextShadowColorItem* pStateItem = PTR_CAST(XFormTextShadowColorItem, pItem); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowColorItem erwartet"); + DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowColorItem expected"); rFontWorkDlg.SetShadowColor_Impl(pStateItem); break; } @@ -166,7 +159,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextShadowXValItem* pStateItem = PTR_CAST(XFormTextShadowXValItem, pItem); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowXValItem erwartet"); + DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowXValItem expected"); rFontWorkDlg.SetShadowXVal_Impl(pStateItem); break; } @@ -174,18 +167,14 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextShadowYValItem* pStateItem = PTR_CAST(XFormTextShadowYValItem, pItem); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowYValItem erwartet"); + DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowYValItem expected"); rFontWorkDlg.SetShadowYVal_Impl(pStateItem); break; } } } -/************************************************************************* -|* -|* Ableitung vom SfxChildWindow als "Behaelter" fuer Fontwork-Dialog -|* -\************************************************************************/ +// Derivation from SfxChildWindow as "containers" for Fontwork dialog SvxFontWorkChildWindow::SvxFontWorkChildWindow ( @@ -207,11 +196,7 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow pDlg->Initialize( pInfo ); } -/************************************************************************* -|* -|* Floating Window zur Attributierung von Texteffekten -|* -\************************************************************************/ +// Floating Window to the attribution of text effects SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx, SfxChildWindow *pCW, @@ -248,7 +233,6 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx, nSaveShadowSize (100), maImageList (ResId(IL_FONTWORK,*rResId.GetResMgr())), - maImageListH (ResId(ILH_FONTWORK,*rResId.GetResMgr())), pColorTable (NULL) { @@ -282,16 +266,13 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx, aTbxShadow.SetSizePixel(aSize); aTbxShadow.SetSelectHdl( LINK(this, SvxFontWorkDialog, SelectShadowHdl_Impl) ); -// aFbShadowX.SetBitmap(Bitmap(FW_RESID(RID_SVXBMP_SHADOW_XDIST))); -// aFbShadowY.SetBitmap(Bitmap(FW_RESID(RID_SVXBMP_SHADOW_YDIST))); - Link aLink = LINK(this, SvxFontWorkDialog, ModifyInputHdl_Impl); aMtrFldDistance.SetModifyHdl( aLink ); aMtrFldTextStart.SetModifyHdl( aLink ); aMtrFldShadowX.SetModifyHdl( aLink ); aMtrFldShadowY.SetModifyHdl( aLink ); - // System-Metrik setzen + // Set System metric const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit(); SetFieldUnit( aMtrFldDistance, eDlgUnit, sal_True ); SetFieldUnit( aMtrFldTextStart, eDlgUnit, sal_True ); @@ -326,34 +307,17 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx, aFormSet.SetSizePixel(aSize); } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - SvxFontWorkDialog::~SvxFontWorkDialog() { for (sal_uInt16 i = 0; i < CONTROLLER_COUNT; i++) DELETEZ(pCtrlItems[i]); } -/************************************************************************* -|* -\************************************************************************/ - void SvxFontWorkDialog::Zoom() { SfxDockingWindow::Roll(); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - SfxChildAlignment SvxFontWorkDialog::CheckAlignment( SfxChildAlignment eActAlign, SfxChildAlignment eAlign ) { @@ -393,12 +357,7 @@ SfxChildAlignment SvxFontWorkDialog::CheckAlignment( SfxChildAlignment eActAlign return eAlignment; } - -/************************************************************************* -|* -|* Style-Buttons setzen -|* -\************************************************************************/ +// Set style buttons void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem) { @@ -438,11 +397,7 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem) aTbxStyle.Disable(); } -/************************************************************************* -|* -|* Adjust-Buttons setzen -|* -\************************************************************************/ +// Set adjust buttons void SvxFontWorkDialog::SetAdjust_Impl(const XFormTextAdjustItem* pItem) { @@ -480,41 +435,29 @@ void SvxFontWorkDialog::SetAdjust_Impl(const XFormTextAdjustItem* pItem) } } -/************************************************************************* -|* -|* Abstand-Wert in Editfeld eintragen -|* -\************************************************************************/ +// Enter Distance value in the edit field void SvxFontWorkDialog::SetDistance_Impl(const XFormTextDistanceItem* pItem) { - // #104596# Use HasChildPathFocus() instead of HasFocus() at SpinFields + // Use HasChildPathFocus() instead of HasFocus() at SpinFields if ( pItem && !aMtrFldDistance.HasChildPathFocus() ) { SetMetricValue( aMtrFldDistance, pItem->GetValue(), SFX_MAPUNIT_100TH_MM ); } } -/************************************************************************* -|* -|* Einzug-Wert in Editfeld eintragen -|* -\************************************************************************/ +// Enter indent value in the edit field void SvxFontWorkDialog::SetStart_Impl(const XFormTextStartItem* pItem) { - // #104596# Use HasChildPathFocus() instead of HasFocus() at SpinFields + // Use HasChildPathFocus() instead of HasFocus() at SpinFields if ( pItem && !aMtrFldTextStart.HasChildPathFocus() ) { SetMetricValue( aMtrFldTextStart, pItem->GetValue(), SFX_MAPUNIT_100TH_MM ); } } -/************************************************************************* -|* -|* Button fuer Umkehrung der Textrichtung setzen -|* -\************************************************************************/ +// Set button for reversing the direction of text void SvxFontWorkDialog::SetMirror_Impl(const XFormTextMirrorItem* pItem) { @@ -522,11 +465,7 @@ void SvxFontWorkDialog::SetMirror_Impl(const XFormTextMirrorItem* pItem) aTbxAdjust.CheckItem(TBI_ADJUST_MIRROR, pItem->GetValue()); } -/************************************************************************* -|* -|* Standardform im ValueSet anzeigen -|* -\************************************************************************/ +// Standard form in ValueSet View void SvxFontWorkDialog::SetStdForm_Impl(const XFormTextStdFormItem* pItem) { @@ -543,11 +482,7 @@ void SvxFontWorkDialog::SetStdForm_Impl(const XFormTextStdFormItem* pItem) aFormSet.Disable(); } -/************************************************************************* -|* -|* Button fuer Konturanzeige setzen -|* -\************************************************************************/ +// Set button for contour display void SvxFontWorkDialog::SetShowForm_Impl(const XFormTextHideFormItem* pItem) { @@ -555,11 +490,7 @@ void SvxFontWorkDialog::SetShowForm_Impl(const XFormTextHideFormItem* pItem) aTbxShadow.CheckItem(TBI_SHOWFORM, !pItem->GetValue()); } -/************************************************************************* -|* -|* Button fuer Zeichenumrandung setzen -|* -\************************************************************************/ +// Set button for text border void SvxFontWorkDialog::SetOutline_Impl(const XFormTextOutlineItem* pItem) { @@ -567,11 +498,7 @@ void SvxFontWorkDialog::SetOutline_Impl(const XFormTextOutlineItem* pItem) aTbxShadow.CheckItem(TBI_OUTLINE, pItem->GetValue()); } -/************************************************************************* -|* -|* Shadow-Buttons setzen -|* -\************************************************************************/ +// Set shadow buttons void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, sal_Bool bRestoreValues) @@ -604,8 +531,6 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, nId = TBI_SHADOW_NORMAL; const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit(); -// aFbShadowX.SetBitmap( Bitmap( ResId(RID_SVXBMP_SHADOW_XDIST, _pMgr ) ) ); - //aMtrFldShadowX.SetUnit(FUNIT_MM); aMtrFldShadowX.SetUnit( eDlgUnit ); aMtrFldShadowX.SetDecimalDigits(2); aMtrFldShadowX.SetMin(LONG_MIN); @@ -615,8 +540,6 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, else aMtrFldShadowX.SetSpinSize( 10 ); -// aFbShadowY.SetBitmap( Bitmap( ResId( RID_SVXBMP_SHADOW_YDIST, _pMgr ) ) ); - //aMtrFldShadowY.SetUnit(FUNIT_MM); aMtrFldShadowY.SetUnit( eDlgUnit ); aMtrFldShadowY.SetDecimalDigits(2); aMtrFldShadowY.SetMin(LONG_MIN); @@ -642,14 +565,12 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, { nId = TBI_SHADOW_SLANT; -// aFbShadowX.SetBitmap( Bitmap( ResId( RID_SVXBMP_SHADOW_ANGLE, _pMgr ) ) ); aMtrFldShadowX.SetUnit(FUNIT_CUSTOM); aMtrFldShadowX.SetDecimalDigits(1); aMtrFldShadowX.SetMin(-1800); aMtrFldShadowX.SetMax( 1800); aMtrFldShadowX.SetSpinSize(10); -// aFbShadowY.SetBitmap( Bitmap( ResId( RID_SVXBMP_SHADOW_SIZE, _pMgr ) ) ); aMtrFldShadowY.SetUnit(FUNIT_CUSTOM); aMtrFldShadowY.SetDecimalDigits(0); aMtrFldShadowY.SetMin(-999); @@ -685,11 +606,7 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, } } -/************************************************************************* -|* -|* Schattenfarbe in Listbox eintragen -|* -\************************************************************************/ +// Insert shadow color in listbox void SvxFontWorkDialog::SetShadowColor_Impl(const XFormTextShadowColorItem* pItem) { @@ -697,15 +614,11 @@ void SvxFontWorkDialog::SetShadowColor_Impl(const XFormTextShadowColorItem* pIte aShadowColorLB.SelectEntry(pItem->GetColorValue()); } -/************************************************************************* -|* -|* X-Wert fuer Schatten in Editfeld eintragen -|* -\************************************************************************/ +// Enter X-value for shadow in edit field void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem) { - // #104596# Use HasChildPathFocus() instead of HasFocus() at SpinFields + // Use HasChildPathFocus() instead of HasFocus() at SpinFields if ( pItem && !aMtrFldShadowX.HasChildPathFocus() ) { // #i19251# @@ -732,15 +645,11 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem) } } -/************************************************************************* -|* -|* Y-Wert fuer Schatten in Editfeld eintragen -|* -\************************************************************************/ +// Enter Y-value for shadow in edit field void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem) { - // #104596# Use HasChildPathFocus() instead of HasFocus() at SpinFields + // Use HasChildPathFocus() instead of HasFocus() at SpinFields if ( pItem && !aMtrFldShadowY.HasChildPathFocus() ) { // #i19251# @@ -758,10 +667,6 @@ void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem) } } -/************************************************************************* -|* -\************************************************************************/ - IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG ) { sal_uInt16 nId = aTbxStyle.GetCurItemId(); @@ -790,10 +695,6 @@ IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG ) return 0; } -/************************************************************************* -|* -\************************************************************************/ - IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG ) { sal_uInt16 nId = aTbxAdjust.GetCurItemId(); @@ -821,10 +722,6 @@ IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG ) return 0; } -/************************************************************************* -|* -\************************************************************************/ - IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG ) { sal_uInt16 nId = aTbxShadow.GetCurItemId(); @@ -865,10 +762,6 @@ IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG ) return 0; } -/************************************************************************* -|* -\************************************************************************/ - IMPL_LINK_INLINE_START( SvxFontWorkDialog, ModifyInputHdl_Impl, void *, EMPTYARG ) { aInputTimer.Start(); @@ -876,15 +769,11 @@ IMPL_LINK_INLINE_START( SvxFontWorkDialog, ModifyInputHdl_Impl, void *, EMPTYARG } IMPL_LINK_INLINE_END( SvxFontWorkDialog, ModifyInputHdl_Impl, void *, EMPTYARG ) -/************************************************************************* -|* -\************************************************************************/ - IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG ) { - // System-Metrik evtl. neu setzen - // Dieses sollte mal als Listener passieren, ist aber aus - // inkompatibilitaetsgruenden z.Z. nicht moeglich + // Possibly set the Metric system again. This should be done with a + // listen, this is however not possible at the moment due to compabillity + // issues. const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit(); if( eDlgUnit != aMtrFldDistance.GetUnit() ) { @@ -928,16 +817,12 @@ IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG ) XFormTextShadowXValItem aShadowXItem( nValueX ); XFormTextShadowYValItem aShadowYItem( nValueY ); - // Slot-ID ist egal, die Exec-Methode wertet das gesamte ItemSet aus + // Slot-ID does not matter, the Exec method evaluates the entire item set GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_DISTANCE, SFX_CALLMODE_RECORD, &aDistItem, &aStartItem, &aShadowXItem, &aShadowYItem, 0L ); return 0; } -/************************************************************************* -|* -\************************************************************************/ - IMPL_LINK( SvxFontWorkDialog, FormSelectHdl_Impl, void *, EMPTYARG ) { XFormTextStdFormItem aItem; @@ -951,25 +836,14 @@ IMPL_LINK( SvxFontWorkDialog, FormSelectHdl_Impl, void *, EMPTYARG ) return 0; } -/************************************************************************* -|* -\************************************************************************/ - IMPL_LINK( SvxFontWorkDialog, ColorSelectHdl_Impl, void *, EMPTYARG ) { -// Changed by obo. Linux-Compiler can't parse commented lines XFormTextShadowColorItem aItem( (const String &) String(), (const Color &) aShadowColorLB.GetSelectEntryColor() ); -// XFormTextShadowColorItem aItem( String(), -// aShadowColorLB.GetSelectEntryColor() ); GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHDWCOLOR, SFX_CALLMODE_RECORD, &aItem, 0L ); return 0; } -/************************************************************************* -|* -\************************************************************************/ - void SvxFontWorkDialog::SetColorTable(const XColorTable* pTable) { if ( pTable && pTable != pColorTable ) @@ -980,19 +854,11 @@ void SvxFontWorkDialog::SetColorTable(const XColorTable* pTable) } } -/************************************************************************* -|* -\************************************************************************/ - void SvxFontWorkDialog::SetActive(sal_Bool /*bActivate*/) { } -/************************************************************************* -|* -|* Standard-FontWork-Objekt erzeugen -|* -\************************************************************************/ +// Create standard fontWork Object void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV, const SfxItemSet& rAttr, @@ -1005,7 +871,6 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV, Rectangle aRect; XFormTextAdjust eAdjust = XFT_AUTOSIZE; -//-/ rOldObj.TakeAttributes(aAttr, sal_True, sal_False); aAttr.Put(rOldObj.GetMergedItemSet()); const XFormTextStdFormItem& rOldForm = (const XFormTextStdFormItem&) @@ -1091,7 +956,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV, basegfx::B2DPolygon aTopArc(XPolygon(aCenter, -nR, nR, 50, 1750, sal_False).getB2DPolygon()); basegfx::B2DPolygon aBottomArc(XPolygon(aCenter, -nR, nR, 1850, 3550, sal_False).getB2DPolygon()); - // Polygone schliessen + // Close Polygon aTopArc.setClosed(true); aBottomArc.setClosed(true); aPolyPolygon.append(aTopArc); @@ -1162,7 +1027,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV, } if ( pNewObj ) { - // #78478# due to DLs changes in Outliner the object needs + // due to DLs changes in Outliner the object needs // a model to get an outliner for later calls to // pNewObj->SetOutlinerParaObject(pPara) (see below). pNewObj->SetModel(rOldObj.GetModel()); @@ -1220,30 +1085,16 @@ void SvxFontWorkDialog::DataChanged( const DataChangedEvent& rDCEvt ) SfxDockingWindow::DataChanged( rDCEvt ); } -/* -----------------------------08.05.2002 14:28------------------------------ - ---------------------------------------------------------------------------*/ void SvxFontWorkDialog::ApplyImageList() { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - ResMgr* _pMgr = &DIALOG_MGR(); - sal_uInt16 nBitmapResId = bHighContrast ? RID_SVXBMP_FONTWORK_FORM1_H : RID_SVXBMP_FONTWORK_FORM1; + sal_uInt16 nBitmapResId = RID_SVXBMP_FONTWORK_FORM1; sal_uInt16 nTextResId = RID_SVXSTR_FONTWORK_FORM1; bool bInit = aFormSet.GetItemCount() == 0; - if( bInit ) - { -/* - Size aSize( aTbxStyle.CalcWindowSizePixel() ); - Bitmap aBmp(ResId(RID_SVXBMP_FONTWORK_FORM1,_pMgr)); - aSize.Height() = aFormSet.CalcWindowSizePixel(aBmp.GetSizePixel()).Height() + 2; - aFormSet.SetSizePixel(aSize); -*/ - } - sal_uInt16 i; for( i = 1; i < 13; i++, nTextResId++, nBitmapResId++ ) { @@ -1258,7 +1109,7 @@ void SvxFontWorkDialog::ApplyImageList() } } - ImageList& rImgLst = bHighContrast ? maImageListH : maImageList; + ImageList& rImgLst = maImageList; aTbxStyle.SetImageList( rImgLst ); aTbxAdjust.SetImageList( rImgLst ); @@ -1270,7 +1121,6 @@ void SvxFontWorkDialog::ApplyImageList() aFbShadowX.SetImage( rImgLst.GetImage( TBI_SHADOW_ANGLE ) ); aFbShadowY.SetImage( rImgLst.GetImage( TBI_SHADOW_SIZE ) ); break; -// case TBI_SHADOW_NORMAL: default: aFbShadowX.SetImage( rImgLst.GetImage( TBI_SHADOW_XDIST ) ); aFbShadowY.SetImage( rImgLst.GetImage( TBI_SHADOW_YDIST ) ); @@ -1281,3 +1131,5 @@ void SvxFontWorkDialog::ApplyImageList() aFbTextStart.SetImage( rImgLst.GetImage( TBI_TEXTSTART ) ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/fontwork.hrc b/svx/source/dialog/fontwork.hrc index cdbc48aa032e..3c696d41da9d 100644..100755 --- a/svx/source/dialog/fontwork.hrc +++ b/svx/source/dialog/fontwork.hrc @@ -40,7 +40,6 @@ #define CLB_SHADOW_COLOR 1 #define IL_FONTWORK 1200 -#define ILH_FONTWORK 1201 // the following ids are also used to identify the // bitmaps for the image list diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src index 92d1be8abc97..960a3b176512 100644 --- a/svx/source/dialog/fontwork.src +++ b/svx/source/dialog/fontwork.src @@ -350,12 +350,6 @@ DockingWindow RID_SVXDLG_FONTWORK MaskColor = IMAGE_STDBTN_COLOR ; FONTWORK_IDLIST }; - ImageList ILH_FONTWORK - { - Prefix = "fwh"; - MaskColor = IMAGE_STDBTN_COLOR ; - FONTWORK_IDLIST - }; }; // Bitmaps --------------------------------------------------------------- Bitmap RID_SVXBMP_FONTWORK_FORM1 @@ -407,55 +401,6 @@ Bitmap RID_SVXBMP_FONTWORK_FORM12 File = "fwbuttn4.bmp" ; }; -Bitmap RID_SVXBMP_FONTWORK_FORM1_H -{ - File = "fwthcirc_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM2_H -{ - File = "fwbhcirc_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM3_H -{ - File = "fwlhcirc_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM4_H -{ - File = "fwrhcirc_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM5_H -{ - File = "fwtoparc_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM6_H -{ - File = "fwbotarc_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM7_H -{ - File = "fwlftarc_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM8_H -{ - File = "fwrgtarc_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM9_H -{ - File = "fwbuttn1_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM10_H -{ - File = "fwbuttn2_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM11_H -{ - File = "fwbuttn3_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM12_H -{ - File = "fwbuttn4_h.bmp" ; -}; - // Strings --------------------------------------------------------------- String RID_SVXSTR_FONTWORK_FORM1 { diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 45ceac57c564..5d2a9005d368 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,6 +33,7 @@ #include <math.h> #include <vcl/outdev.hxx> #include <editeng/borderline.hxx> +#include <svtools/borderhelper.hxx> // ---------------------------------------------------------------------------- @@ -48,8 +50,16 @@ #if SVX_FRAME_USE_LINEINFO #include <vcl/lineinfo.hxx> +#else +#include <basegfx/polygon/b2dpolygon.hxx> +#include <basegfx/polygon/b2dpolygontools.hxx> #endif +#include <drawinglayer/primitive2d/borderlineprimitive2d.hxx> +#include <drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx> + +using namespace editeng; + namespace svx { namespace frame { @@ -128,8 +138,9 @@ struct BorderEndResult { LineEndResult maPrim; /// Result for primary line. LineEndResult maSecn; /// Result for secondary line. + LineEndResult maGap; /// Result for gap line. - inline void Negate() { maPrim.Negate(); maSecn.Negate(); } + inline void Negate() { maPrim.Negate(); maSecn.Negate(); maGap.Negate(); } }; /** Result struct used by the horizontal/vertical frame link functions. @@ -255,7 +266,6 @@ sal_uInt16 lclScaleValue( long nValue, double fScale, sal_uInt16 nMaxWidth ) | |<- middle of the frame border - lclGetDistEnd() ->||<- lclGetSecnBeg() || lclGetBeg() ->| lclGetDistBeg() ->| || |<- lclGetEnd() @@ -389,7 +399,7 @@ void lclLinkLeftEnd_Single( // don't overdraw vertical borders with equal width lclGetBehindEnd( rLFromT ) : // take leftmost start of both secondary lines (#46488#) - rResult.mnOffs1 = std::min( lclGetSecnBeg( rLFromT ), lclGetSecnBeg( rLFromB ) ); + std::min( lclGetSecnBeg( rLFromT ), lclGetSecnBeg( rLFromB ) ); // single border with equal width coming from left else if( !rLFromL.Secn() && (rLFromL.Prim() == rBorder.Prim()) ) @@ -505,6 +515,23 @@ void lclLinkLeftEnd_Secn( rResult.Swap(); } +void lclLinkLeftEnd_Gap( + LineEndResult& rResult, const Style& rBorder, + const DiagStyle& /*rLFromTR*/, const Style& rLFromT, const Style& rLFromL, const Style& rLFromB, const DiagStyle& /*rLFromBR*/ ) + +{ + if ( rLFromT.Secn() ) + rResult.mnOffs1 = lclGetDistBeg( rLFromT ); + else if ( rLFromL.Secn( ) ) + rResult.mnOffs1 = ( rLFromL.GetWidth() == rBorder.GetWidth() )? + 0 : lclGetBehindEnd( rLFromT ); + else if ( rLFromB.Secn( ) ) + rResult.mnOffs1 = lclGetDistBeg( rLFromB ); + else + rResult.mnOffs1 = std::max( lclGetBehindEnd( rLFromT ), lclGetBehindEnd( rLFromB ) ); + + rResult.mnOffs2 = rResult.mnOffs1; +} // ---------------------------------------------------------------------------- // Linking of horizontal frame border ends. @@ -526,6 +553,7 @@ void lclLinkLeftEnd( // current frame border is double lclLinkLeftEnd_Prim( rResult.maPrim, rBorder, rLFromTR, rLFromT, rLFromL, rLFromB, rLFromBR ); lclLinkLeftEnd_Secn( rResult.maSecn, rBorder, rLFromTR, rLFromT, rLFromL, rLFromB, rLFromBR ); + lclLinkLeftEnd_Gap( rResult.maGap, rBorder, rLFromTR, rLFromT, rLFromL, rLFromB, rLFromBR ); } else if( rBorder.Prim() ) { @@ -608,44 +636,6 @@ void lclLinkVerFrameBorder( // ============================================================================ -#if 0 -// Not used anymore, but not deleted for possible future usage. - -/** Returns the relative Y offset of the intercept point of 2 diagonal borders. - - @param nTLBROffs - Width offset (sub units) across the top-left to bottom-right frame border. - @param fTLBRAngle - Inner angle between horizontal and top-left to bottom-right frame border. - @param nBLTROffs - Width offset (sub units) across the bottom-left to top-right frame border. - @param fBLTRAngle - Inner angle between horizontal and bottom-left to top-right frame border. - @return - Offset (sub units) relative to the Y position of the centered intercept - point of both diagonal frame borders. - */ -long lclGetDiagDiagOffset( long nTLBROffs, double fTLBRAngle, long nBLTROffs, double fBLTRAngle ) -{ - double fASin = sin( fTLBRAngle ); - double fACos = cos( fTLBRAngle ); - double fAX = -nTLBROffs * fASin; - double fAY = nTLBROffs * fACos; - double fRAX = fACos; - double fRAY = fASin; - - double fBSin = sin( fBLTRAngle ); - double fBCos = cos( fBLTRAngle ); - double fBX = nBLTROffs * fBSin; - double fBY = nBLTROffs * fBCos; - double fRBX = fBCos; - double fRBY = -fBSin; - - double fKA = (fRBX * (fBY - fAY) - fRBY * (fBX - fAX)) / (fRBX * fRAY - fRAX * fRBY); - return lclD2L( fAY + fKA * fRAY ); -} -#endif - // ---------------------------------------------------------------------------- // Linking of diagonal frame borders. @@ -755,7 +745,7 @@ inline Polygon lclCreatePolygon( const PointVec& rPoints ) Polygon lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& rP3, const Point& rP4 ) { PointVec aPoints; - aPoints.reserve( 4 ); + aPoints.reserve( 2 ); aPoints.push_back( rP1 ); aPoints.push_back( rP2 ); aPoints.push_back( rP3 ); @@ -776,12 +766,6 @@ Polygon lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& rP3, return lclCreatePolygon( aPoints ); } -/** Returns a polygon constructed from the two passed line positions. */ -inline Polygon lclCreatePolygon( const LinePoints& rPoints1, const LinePoints& rPoints2 ) -{ - return lclCreatePolygon( rPoints1.maBeg, rPoints1.maEnd, rPoints2.maEnd, rPoints2.maBeg ); -} - /** Sets the color of the passed frame style to the output device. Sets the line color and fill color in the output device. @@ -795,81 +779,14 @@ inline Polygon lclCreatePolygon( const LinePoints& rPoints1, const LinePoints& r @param rStyle The border style that contains the line color to be set to the device. */ -void lclSetColorToOutDev( OutputDevice& rDev, const Style& rStyle, const Color* pForceColor ) +void lclSetColorToOutDev( OutputDevice& rDev, const Color& rColor, const Color* pForceColor ) { rDev.Push( PUSH_LINECOLOR | PUSH_FILLCOLOR ); - rDev.SetLineColor( pForceColor ? *pForceColor : rStyle.GetColor() ); - rDev.SetFillColor( pForceColor ? *pForceColor : rStyle.GetColor() ); + rDev.SetLineColor( pForceColor ? *pForceColor : rColor ); + rDev.SetFillColor( pForceColor ? *pForceColor : rColor ); } // ---------------------------------------------------------------------------- -// Generic drawing functions. - -/** Draws a thin (1 pixel wide) line, optionally dotted, into the passed output device. */ -void lclDrawThinLine( OutputDevice& rDev, const Point& rBeg, const Point& rEnd, bool bDotted ) -{ -#if SVX_FRAME_USE_LINEINFO - if( bDotted && (rBeg != rEnd) ) - { -// using LineInfo for dotted lines looks ugly and does not work well for diagonal lines - LineInfo aLineInfo( LINE_DASH, 1 ); - aLineInfo.SetDotCount( 1 ); - aLineInfo.SetDotLen( 1 ); - aLineInfo.SetDistance( 3 ); - rDev.DrawLine( rBeg, rEnd, aLineInfo ); - } -#else - Point aBeg( rDev.LogicToPixel( rBeg ) ); - Point aEnd( rDev.LogicToPixel( rEnd ) ); - if( bDotted && (aBeg != aEnd) ) - { - bool bHor = Abs( aEnd.X() - aBeg.X() ) > Abs( aEnd.Y() - aBeg.Y() ); - const Point& rBegPos( bHor ? ((aBeg.X() < aEnd.X()) ? aBeg : aEnd) : ((aBeg.Y() < aEnd.Y()) ? aBeg : aEnd ) ); - const Point& rEndPos( (rBegPos == aBeg) ? aEnd : aBeg ); - - long nAlongBeg = bHor ? rBegPos.X() : rBegPos.Y(); - long nAcrssBeg = bHor ? rBegPos.Y() : rBegPos.X(); - long nAlongSize = (bHor ? rEndPos.X() : rEndPos.Y()) - nAlongBeg; - long nAcrssSize = (bHor ? rEndPos.Y() : rEndPos.X()) - nAcrssBeg; - double fGradient = static_cast< double >( nAcrssSize ) / nAlongSize; - - PointVec aPoints; - aPoints.reserve( (nAlongSize + 1) / 2 ); - for( long nAlongIdx = 0; nAlongIdx <= nAlongSize; nAlongIdx += 2 ) - { - long nAl = nAlongBeg + nAlongIdx; - long nAc = nAcrssBeg + lclD2L( fGradient * nAlongIdx ); - aPoints.push_back( Point( bHor ? nAl : nAc, bHor ? nAc : nAl ) ); - } - - rDev.Push( PUSH_MAPMODE ); - rDev.SetMapMode( MAP_PIXEL ); - rDev.DrawPixel( lclCreatePolygon( aPoints ) ); - rDev.Pop(); // map mode - } -#endif - else - rDev.DrawLine( rBeg, rEnd ); -} - -/** Draws a thin (1 pixel wide) line, optionally dotted, into the passed output device. */ -inline void lclDrawThinLine( OutputDevice& rDev, const LinePoints& rPoints, bool bDotted ) -{ - lclDrawThinLine( rDev, rPoints.maBeg, rPoints.maEnd, bDotted ); -} - -/** Draws a polygon with four points into the passed output device. */ -inline void lclDrawPolygon( OutputDevice& rDev, const Point& rP1, const Point& rP2, const Point& rP3, const Point& rP4 ) -{ - rDev.DrawPolygon( lclCreatePolygon( rP1, rP2, rP3, rP4 ) ); -} - -/** Draws a polygon specified by two borders into the passed output device. */ -inline void lclDrawPolygon( OutputDevice& rDev, const LinePoints& rPoints1, const LinePoints& rPoints2 ) -{ - rDev.DrawPolygon( lclCreatePolygon( rPoints1, rPoints2 ) ); -} - // ============================================================================ // Drawing of horizontal frame borders. @@ -882,16 +799,18 @@ void lclDrawHorLine( OutputDevice& rDev, const Point& rLPos, const LineEndResult& rLRes, const Point& rRPos, const LineEndResult& rRRes, - long nTOffs, long nBOffs, bool bDotted ) + long nTOffs, long nBOffs, SvxBorderStyle nDashing ) { LinePoints aTPoints( rLPos + lclToMapUnit( rLRes.mnOffs1, nTOffs ), rRPos + lclToMapUnit( rRRes.mnOffs1, nTOffs ) ); - if( nTOffs == nBOffs ) - lclDrawThinLine( rDev, aTPoints, bDotted ); - else - { - LinePoints aBPoints( rLPos + lclToMapUnit( rLRes.mnOffs2, nBOffs ), rRPos + lclToMapUnit( rRRes.mnOffs2, nBOffs ) ); - lclDrawPolygon( rDev, aTPoints, aBPoints ); - } + LinePoints aBPoints( rLPos + lclToMapUnit( rLRes.mnOffs2, nBOffs ), rRPos + lclToMapUnit( rRRes.mnOffs2, nBOffs ) ); + + sal_uInt32 nWidth = lclToMapUnit( abs( nTOffs ) ) + lclToMapUnit( abs( nBOffs ) ); + if ( ( nTOffs >= 0 && nBOffs >= 0 ) || ( nTOffs <= 0 && nBOffs <= 0 ) ) + nWidth = abs( lclToMapUnit( nTOffs ) - lclToMapUnit( nBOffs ) ) + 1; + Point rLMid = ( aTPoints.maBeg + aBPoints.maBeg ) / 2; + Point rRMid = ( aTPoints.maEnd + aBPoints.maEnd ) / 2; + + ::svtools::DrawLine( rDev, rLMid, rRMid, nWidth, nDashing ); } /** Draws a horizontal frame border into the passed output device. @@ -915,13 +834,26 @@ void lclDrawHorFrameBorder( DBG_ASSERT( rLPos.Y() == rRPos.Y(), "svx::frame::lclDrawHorFrameBorder - line not horizontal" ); if( rLPos.X() <= rRPos.X() ) { - lclSetColorToOutDev( rDev, rBorder, pForceColor ); + if ( rBorder.UseGapColor( ) ) + { + lclSetColorToOutDev( rDev, rBorder.GetColorGap(), pForceColor ); + lclDrawHorLine( rDev, rLPos, rResult.maBeg.maGap, rRPos, rResult.maEnd.maGap, + lclGetPrimEnd( rBorder ), lclGetSecnBeg( rBorder ), rBorder.Type() ); + rDev.Pop(); // Gap color + } + + lclSetColorToOutDev( rDev, rBorder.GetColorPrim(), pForceColor ); lclDrawHorLine( rDev, rLPos, rResult.maBeg.maPrim, rRPos, rResult.maEnd.maPrim, - lclGetBeg( rBorder ), lclGetPrimEnd( rBorder ), rBorder.Dotted() ); + lclGetBeg( rBorder ), lclGetPrimEnd( rBorder ), rBorder.Type() ); + rDev.Pop(); // colors + if( rBorder.Secn() ) + { + lclSetColorToOutDev( rDev, rBorder.GetColorSecn(), pForceColor ); lclDrawHorLine( rDev, rLPos, rResult.maBeg.maSecn, rRPos, rResult.maEnd.maSecn, - lclGetSecnBeg( rBorder ), lclGetEnd( rBorder ), rBorder.Dotted() ); - rDev.Pop(); // colors + lclGetSecnBeg( rBorder ), lclGetEnd( rBorder ), rBorder.Type() ); + rDev.Pop(); // colors + } } } @@ -937,16 +869,18 @@ void lclDrawVerLine( OutputDevice& rDev, const Point& rTPos, const LineEndResult& rTRes, const Point& rBPos, const LineEndResult& rBRes, - long nLOffs, long nROffs, bool bDotted ) + long nLOffs, long nROffs, SvxBorderStyle nDashing ) { LinePoints aLPoints( rTPos + lclToMapUnit( nLOffs, rTRes.mnOffs1 ), rBPos + lclToMapUnit( nLOffs, rBRes.mnOffs1 ) ); - if( nLOffs == nROffs ) - lclDrawThinLine( rDev, aLPoints, bDotted ); - else - { - LinePoints aRPoints( rTPos + lclToMapUnit( nROffs, rTRes.mnOffs2 ), rBPos + lclToMapUnit( nROffs, rBRes.mnOffs2 ) ); - lclDrawPolygon( rDev, aLPoints, aRPoints ); - } + LinePoints aRPoints( rTPos + lclToMapUnit( nROffs, rTRes.mnOffs2 ), rBPos + lclToMapUnit( nROffs, rBRes.mnOffs2 ) ); + + sal_uInt32 nWidth = lclToMapUnit( abs( nLOffs ) ) + lclToMapUnit( abs( nROffs ) ); + if ( ( nLOffs >= 0 && nROffs >= 0 ) || ( nLOffs <= 0 && nROffs <= 0 ) ) + nWidth = abs( lclToMapUnit( nLOffs ) - lclToMapUnit( nROffs ) ) + 1; + Point rTMid = ( aLPoints.maBeg + aRPoints.maBeg ) / 2; + Point rBMid = ( aLPoints.maEnd + aRPoints.maEnd ) / 2; + + ::svtools::DrawLine( rDev, rTMid, rBMid, nWidth, nDashing ); } /** Draws a vertical frame border into the passed output device. @@ -970,13 +904,25 @@ void lclDrawVerFrameBorder( DBG_ASSERT( rTPos.X() == rBPos.X(), "svx::frame::lclDrawVerFrameBorder - line not vertical" ); if( rTPos.Y() <= rBPos.Y() ) { - lclSetColorToOutDev( rDev, rBorder, pForceColor ); + if ( rBorder.UseGapColor( ) ) + { + lclSetColorToOutDev( rDev, rBorder.GetColorGap(), pForceColor ); + lclDrawVerLine( rDev, rTPos, rResult.maBeg.maGap, rBPos, rResult.maEnd.maGap, + lclGetPrimEnd( rBorder ), lclGetSecnBeg( rBorder ), rBorder.Type() ); + rDev.Pop(); // Gap color + } + + lclSetColorToOutDev( rDev, rBorder.GetColorPrim(), pForceColor ); lclDrawVerLine( rDev, rTPos, rResult.maBeg.maPrim, rBPos, rResult.maEnd.maPrim, - lclGetBeg( rBorder ), lclGetPrimEnd( rBorder ), rBorder.Dotted() ); + lclGetBeg( rBorder ), lclGetPrimEnd( rBorder ), rBorder.Type() ); + rDev.Pop(); // colors if( rBorder.Secn() ) + { + lclSetColorToOutDev( rDev, rBorder.GetColorSecn(), pForceColor ); lclDrawVerLine( rDev, rTPos, rResult.maBeg.maSecn, rBPos, rResult.maEnd.maSecn, - lclGetSecnBeg( rBorder ), lclGetEnd( rBorder ), rBorder.Dotted() ); - rDev.Pop(); // colors + lclGetSecnBeg( rBorder ), lclGetEnd( rBorder ), rBorder.Type() ); + rDev.Pop(); // colors + } } } @@ -1108,14 +1054,19 @@ void lclPushCrossingClipRegion( OutputDevice& rDev, const Rectangle& rRect, bool */ void lclDrawDiagLine( OutputDevice& rDev, const Rectangle& rRect, bool bTLBR, - const DiagLineResult& rResult, long nDiagOffs1, long nDiagOffs2, bool bDotted ) + const DiagLineResult& rResult, long nDiagOffs1, long nDiagOffs2, SvxBorderStyle nDashing ) { lclPushDiagClipRect( rDev, rRect, rResult ); LinePoints aLPoints( lclGetDiagLineEnds( rRect, bTLBR, nDiagOffs1 ) ); - if( nDiagOffs1 == nDiagOffs2 ) - lclDrawThinLine( rDev, aLPoints, bDotted ); - else - lclDrawPolygon( rDev, aLPoints, lclGetDiagLineEnds( rRect, bTLBR, nDiagOffs2 ) ); + LinePoints aL2Points( lclGetDiagLineEnds( rRect, bTLBR, nDiagOffs2 ) ); + Point aSMid( ( aLPoints.maBeg + aL2Points.maBeg ) / 2 ); + Point aEMid( ( aLPoints.maEnd + aL2Points.maEnd ) / 2 ); + + sal_uInt32 nWidth = lclToMapUnit( abs( nDiagOffs1 ) ) + lclToMapUnit( abs( nDiagOffs2 ) ); + if ( ( nDiagOffs1 <= 0 && nDiagOffs2 <= 0 ) || ( nDiagOffs1 >=0 && nDiagOffs2 >=0 ) ) + nWidth = lclToMapUnit( abs( nDiagOffs1 - nDiagOffs2 ) ); + + svtools::DrawLine( rDev, aSMid, aEMid, nWidth, nDashing ); rDev.Pop(); // clipping region } @@ -1146,11 +1097,22 @@ void lclDrawDiagFrameBorder( if( bClip ) lclPushCrossingClipRegion( rDev, rRect, bTLBR, rCrossStyle ); - lclSetColorToOutDev( rDev, rBorder, pForceColor ); - lclDrawDiagLine( rDev, rRect, bTLBR, rResult.maPrim, lclGetBeg( rBorder ), lclGetPrimEnd( rBorder ), rBorder.Dotted() ); - if( rBorder.Secn() ) - lclDrawDiagLine( rDev, rRect, bTLBR, rResult.maSecn, lclGetSecnBeg( rBorder ), lclGetEnd( rBorder ), rBorder.Dotted() ); + lclSetColorToOutDev( rDev, rBorder.GetColorPrim(), pForceColor ); + lclDrawDiagLine( rDev, rRect, bTLBR, rResult.maPrim, lclGetBeg( rBorder ), lclGetPrimEnd( rBorder ), rBorder.Type() ); rDev.Pop(); // colors + if( rBorder.Secn() ) + { + if ( rBorder.UseGapColor( ) ) + { + lclSetColorToOutDev( rDev, rBorder.GetColorGap(), pForceColor ); + lclDrawDiagLine( rDev, rRect, bTLBR, rResult.maSecn, lclGetDistBeg( rBorder ), lclGetDistEnd( rBorder ), rBorder.Type() ); + rDev.Pop(); // colors + } + + lclSetColorToOutDev( rDev, rBorder.GetColorSecn(), pForceColor ); + lclDrawDiagLine( rDev, rRect, bTLBR, rResult.maSecn, lclGetSecnBeg( rBorder ), lclGetEnd( rBorder ), rBorder.Type() ); + rDev.Pop(); // colors + } if( bClip ) rDev.Pop(); // clipping region @@ -1203,7 +1165,7 @@ void lclDrawDiagFrameBorders( void Style::Clear() { - Set( Color(), 0, 0, 0 ); + Set( Color(), Color(), Color(), false, 0, 0, 0 ); } void Style::Set( sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS ) @@ -1220,29 +1182,34 @@ void Style::Set( sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS ) mnSecn = (nP && nD) ? nS : 0; } -void Style::Set( const Color& rColor, sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS ) +void Style::Set( const Color& rColorPrim, const Color& rColorSecn, const Color& rColorGap, bool bUseGapColor, sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS ) { - maColor = rColor; + maColorPrim = rColorPrim; + maColorSecn = rColorSecn; + maColorGap = rColorGap; + mbUseGapColor = bUseGapColor; Set( nP, nD, nS ); } -void Style::Set( const SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWidth, bool bUseDots ) +void Style::Set( const SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWidth ) { - maColor = rBorder.GetColor(); + maColorPrim = rBorder.GetColorOut(); + maColorSecn = rBorder.GetColorIn(); + maColorGap = rBorder.GetColorGap(); + mbUseGapColor = rBorder.HasGapColor(); sal_uInt16 nPrim = rBorder.GetOutWidth(); sal_uInt16 nDist = rBorder.GetDistance(); sal_uInt16 nSecn = rBorder.GetInWidth(); + mnType = rBorder.GetStyle(); if( !nSecn ) // no or single frame border { Set( SCALEVALUE( nPrim ), 0, 0 ); - mbDotted = bUseDots && (0 < nPrim) && (nPrim < 10); } else { Set( SCALEVALUE( nPrim ), SCALEVALUE( nDist ), SCALEVALUE( nSecn ) ); - mbDotted = false; // Enlarge the style if distance is too small due to rounding losses. sal_uInt16 nPixWidth = SCALEVALUE( nPrim + nDist + nSecn ); if( nPixWidth > GetWidth() ) @@ -1275,14 +1242,14 @@ void Style::Set( const SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWid } } -void Style::Set( const SvxBorderLine* pBorder, double fScale, sal_uInt16 nMaxWidth, bool bUseDots ) +void Style::Set( const SvxBorderLine* pBorder, double fScale, sal_uInt16 nMaxWidth ) { if( pBorder ) - Set( *pBorder, fScale, nMaxWidth, bUseDots ); + Set( *pBorder, fScale, nMaxWidth ); else { Clear(); - mbDotted = false; + mnType = SOLID; } } @@ -1314,7 +1281,9 @@ Style Style::Mirror() const bool operator==( const Style& rL, const Style& rR ) { return (rL.Prim() == rR.Prim()) && (rL.Dist() == rR.Dist()) && (rL.Secn() == rR.Secn()) && - (rL.GetColor() == rR.GetColor()) && (rL.GetRefMode() == rR.GetRefMode()) && (rL.Dotted() == rR.Dotted()); + (rL.GetColorPrim() == rR.GetColorPrim()) && (rL.GetColorSecn() == rR.GetColorSecn()) && + (rL.GetColorGap() == rR.GetColorGap()) && (rL.GetRefMode() == rR.GetRefMode()) && + (rL.UseGapColor() == rR.UseGapColor() ) && (rL.Type() == rR.Type()); } bool operator<( const Style& rL, const Style& rR ) @@ -1331,7 +1300,7 @@ bool operator<( const Style& rL, const Style& rR ) if( (rL.Secn() && rR.Secn()) && (rL.Dist() != rR.Dist()) ) return rL.Dist() > rR.Dist(); // both lines single and 1 unit thick, only one is dotted -> rL<rR, if rL is dotted - if( (nLW == 1) && (rL.Dotted() != rR.Dotted()) ) return rL.Dotted(); + if( (nLW == 1) && (rL.Type() != rR.Type()) ) return rL.Type(); // seem to be equal return false; @@ -1399,6 +1368,117 @@ bool CheckFrameBorderConnectable( const Style& rLBorder, const Style& rRBorder, // Drawing functions // ============================================================================ +double lcl_GetExtent( const Style& rBorder, const Style& rSide, const Style& rOpposite, + long nAngleSide = 9000, long nAngleOpposite = 9000 ) +{ + Style aOtherBorder = const_cast< Style& >( rSide ); + long nOtherAngle = nAngleSide; + if ( rSide.GetWidth() == 0 && rOpposite.GetWidth() > 0 ) + { + nOtherAngle = nAngleOpposite; + aOtherBorder = const_cast< Style& >( rOpposite ); + } + else if ( rSide.GetWidth() == 0 && rOpposite.GetWidth() == 0 ) + { + if ( ( nAngleOpposite % 18000 ) == 0 ) + nOtherAngle = nAngleSide; + else if ( ( nAngleSide % 18000 ) == 0 ) + nOtherAngle = nAngleOpposite; + } + + // Let's assume the border we are drawing is horizontal and compute all the angles / distances from this + basegfx::B2DVector aBaseVector( 1.0, 0.0 ); + basegfx::B2DPoint aBasePoint( 0.0, static_cast<double>( rBorder.GetWidth() / 2 ) ); + + basegfx::B2DHomMatrix aRotation; + aRotation.rotate( double( nOtherAngle ) * M_PI / 18000.0 ); + + basegfx::B2DVector aOtherVector = aRotation * aBaseVector; + // Compute a line shifted by half the width of the other border + basegfx::B2DVector aPerpendicular = basegfx::getNormalizedPerpendicular( aOtherVector ); + basegfx::B2DPoint aOtherPoint = basegfx::B2DPoint() + aPerpendicular * aOtherBorder.GetWidth() / 2; + + // Find the cut between the two lines + double nCut = 0.0; + basegfx::tools::findCut( + aBasePoint, aBaseVector, aOtherPoint, aOtherVector, + CUTFLAG_ALL, &nCut ); + + return nCut; +} + +basegfx::B2DPoint lcl_PointToB2DPoint( const Point aPoint ) +{ + return basegfx::B2DPoint( aPoint.getX(), aPoint.getY() ); +} + +drawinglayer::primitive2d::Primitive2DSequence CreateClippedBorderPrimitives ( + const Point& rStart, const Point& rEnd, const Style& rBorder, + const Rectangle& rClipRect ) +{ + drawinglayer::primitive2d::Primitive2DSequence aSequence( 1 ); + basegfx::B2DPolygon aPolygon; + aPolygon.append( lcl_PointToB2DPoint( rClipRect.TopLeft( ) ) ); + aPolygon.append( lcl_PointToB2DPoint( rClipRect.TopRight( ) ) ); + aPolygon.append( lcl_PointToB2DPoint( rClipRect.BottomRight( ) ) ); + aPolygon.append( lcl_PointToB2DPoint( rClipRect.BottomLeft( ) ) ); + aPolygon.setClosed( true ); + + aSequence[0] = new drawinglayer::primitive2d::ClippedBorderLinePrimitive2D( + lcl_PointToB2DPoint( rStart ), + lcl_PointToB2DPoint( rEnd ), + rBorder.Prim(), + rBorder.Dist(), + rBorder.Secn(), + aPolygon, + rBorder.GetColorSecn().getBColor(), + rBorder.GetColorPrim().getBColor(), + rBorder.GetColorGap().getBColor(), + rBorder.UseGapColor(), rBorder.Type() ); + + return aSequence; +} + +drawinglayer::primitive2d::Primitive2DSequence CreateBorderPrimitives( + const Point& rLPos, const Point& rRPos, const Style& rBorder, + const DiagStyle& /*rLFromTR*/, const Style& rLFromT, const Style& /*rLFromL*/, const Style& rLFromB, const DiagStyle& /*rLFromBR*/, + const DiagStyle& /*rRFromTL*/, const Style& rRFromT, const Style& /*rRFromR*/, const Style& rRFromB, const DiagStyle& /*rRFromBL*/, + const Color* /*pForceColor*/, const long& nRotateT, const long& nRotateB ) +{ + drawinglayer::primitive2d::Primitive2DSequence aSequence( 1 ); + + basegfx::B2DPoint aStart( rLPos.getX(), rLPos.getY() ); + basegfx::B2DPoint aEnd( rRPos.getX(), rRPos.getY() ); + + aSequence[0] = new drawinglayer::primitive2d::BorderLinePrimitive2D( + aStart, aEnd, + rBorder.Prim(), + rBorder.Dist(), + rBorder.Secn(), + lcl_GetExtent( rBorder, rLFromT, rLFromB, nRotateT, - nRotateB ), + lcl_GetExtent( rBorder, rRFromT, rRFromB, 18000 - nRotateT, nRotateB - 18000 ), + lcl_GetExtent( rBorder, rLFromB, rLFromT, nRotateB, - nRotateT ), + lcl_GetExtent( rBorder, rRFromB, rRFromT, 18000 - nRotateB, nRotateT - 18000 ), + rBorder.GetColorSecn().getBColor(), + rBorder.GetColorPrim().getBColor(), + rBorder.GetColorGap().getBColor(), + rBorder.UseGapColor(), rBorder.Type() ); + + return aSequence; +} + +drawinglayer::primitive2d::Primitive2DSequence CreateBorderPrimitives( + const Point& rLPos, const Point& rRPos, const Style& rBorder, + const Style& rLFromT, const Style& rLFromL, const Style& rLFromB, + const Style& rRFromT, const Style& rRFromR, const Style& rRFromB, + const Color* pForceColor, const long& nRotateT, const long& nRotateB ) +{ + return CreateBorderPrimitives( rLPos, rRPos, rBorder, + DiagStyle(), rLFromT, rLFromL, rLFromB, DiagStyle(), + DiagStyle(), rRFromT, rRFromR, rRFromB, DiagStyle(), + pForceColor, nRotateT, nRotateB ); +} + void DrawHorFrameBorder( OutputDevice& rDev, const Point& rLPos, const Point& rRPos, const Style& rBorder, const DiagStyle& rLFromTR, const Style& rLFromT, const Style& rLFromL, const Style& rLFromB, const DiagStyle& rLFromBR, @@ -1477,36 +1557,6 @@ void DrawVerFrameBorder( OutputDevice& rDev, lclDrawVerFrameBorder( rDev, rTPos, rBPos, rBorder, BorderResult(), pForceColor ); } -// ---------------------------------------------------------------------------- - -void DrawVerFrameBorderSlanted( OutputDevice& rDev, - const Point& rTPos, const Point& rBPos, const Style& rBorder, const Color* pForceColor ) -{ - DBG_ASSERT( rTPos.Y() < rBPos.Y(), "svx::frame::DrawVerFrameBorderSlanted - wrong order of line ends" ); - if( rBorder.Prim() && (rTPos.Y() < rBPos.Y()) ) - { - if( rTPos.X() == rBPos.X() ) - { - DrawVerFrameBorder( rDev, rTPos, rBPos, rBorder, pForceColor ); - } - else - { - const LineEndResult aRes; - - Style aScaled( rBorder ); - aScaled.ScaleSelf( 1.0 / cos( GetVerDiagAngle( rTPos, rBPos ) ) ); - - lclSetColorToOutDev( rDev, aScaled, pForceColor ); - lclDrawVerLine( rDev, rTPos, aRes, rBPos, aRes, - lclGetBeg( aScaled ), lclGetPrimEnd( aScaled ), aScaled.Dotted() ); - if( aScaled.Secn() ) - lclDrawVerLine( rDev, rTPos, aRes, rBPos, aRes, - lclGetSecnBeg( aScaled ), lclGetEnd( aScaled ), aScaled.Dotted() ); - rDev.Pop(); // colors - } - } -} - // ============================================================================ void DrawDiagFrameBorders( @@ -1529,3 +1579,4 @@ void DrawDiagFrameBorders( } // namespace frame } // namespace svx +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index a449c778f7b3..2c20e2bd1729 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1010,6 +1011,208 @@ void Array::DrawCell( OutputDevice& rDev, size_t nCol, size_t nRow, const Color* DrawRange( rDev, nCol, nRow, nCol, nRow, pForceColor ); } +void Array::DrawRange( drawinglayer::processor2d::BaseProcessor2D* pProcessor, + size_t nFirstCol, size_t nFirstRow, size_t nLastCol, size_t nLastRow, + const Color* pForceColor ) const +{ + DBG_FRAME_CHECK_COLROW( nFirstCol, nFirstRow, "DrawRange" ); + DBG_FRAME_CHECK_COLROW( nLastCol, nLastRow, "DrawRange" ); + + size_t nCol, nRow; + + // *** diagonal frame borders *** + for( nRow = nFirstRow; nRow <= nLastRow; ++nRow ) + { + for( nCol = nFirstCol; nCol <= nLastCol; ++nCol ) + { + const Cell& rCell = CELL( nCol, nRow ); + bool bOverlapX = rCell.mbOverlapX; + bool bOverlapY = rCell.mbOverlapY; + bool bFirstCol = nCol == nFirstCol; + bool bFirstRow = nRow == nFirstRow; + if( (!bOverlapX && !bOverlapY) || (bFirstCol && bFirstRow) || + (!bOverlapY && bFirstCol) || (!bOverlapX && bFirstRow) ) + { + Rectangle aRect( GetCellRect( nCol, nRow ) ); + if( (aRect.GetWidth() > 1) && (aRect.GetHeight() > 1) ) + { + size_t _nFirstCol = mxImpl->GetMergedFirstCol( nCol, nRow ); + size_t _nFirstRow = mxImpl->GetMergedFirstRow( nCol, nRow ); + + const Style aTlbrStyle = GetCellStyleTLBR( _nFirstCol, _nFirstRow, true ); + if ( aTlbrStyle.GetWidth( ) ) + pProcessor->process( CreateClippedBorderPrimitives( + aRect.TopLeft(), aRect.BottomRight(), + aTlbrStyle, aRect ) ); + + const Style aBltrStyle = GetCellStyleBLTR( _nFirstCol, _nFirstRow, true ); + if ( aBltrStyle.GetWidth( ) ) + pProcessor->process( CreateClippedBorderPrimitives( + aRect.BottomLeft(), aRect.TopRight(), + aBltrStyle, aRect ) ); + } + } + } + } + + // *** horizontal frame borders *** + + for( nRow = nFirstRow; nRow <= nLastRow + 1; ++nRow ) + { + double fAngle = mxImpl->GetHorDiagAngle( nFirstCol, nRow ); + double fTAngle = mxImpl->GetHorDiagAngle( nFirstCol, nRow - 1 ); + + // *Start*** variables store the data of the left end of the cached frame border + Point aStartPos( mxImpl->GetColPosition( nFirstCol ), mxImpl->GetRowPosition( nRow ) ); + const Style* pStart = &GetCellStyleTop( nFirstCol, nRow ); + DiagStyle aStartLFromTR( GetCellStyleBL( nFirstCol, nRow - 1 ), fTAngle ); + const Style* pStartLFromT = &GetCellStyleLeft( nFirstCol, nRow - 1 ); + const Style* pStartLFromL = &GetCellStyleTop( nFirstCol - 1, nRow ); + const Style* pStartLFromB = &GetCellStyleLeft( nFirstCol, nRow ); + DiagStyle aStartLFromBR( GetCellStyleTL( nFirstCol, nRow ), fAngle ); + + // *End*** variables store the data of the right end of the cached frame border + DiagStyle aEndRFromTL( GetCellStyleBR( nFirstCol, nRow - 1 ), fTAngle ); + const Style* pEndRFromT = &GetCellStyleRight( nFirstCol, nRow - 1 ); + const Style* pEndRFromR = &GetCellStyleTop( nFirstCol + 1, nRow ); + const Style* pEndRFromB = &GetCellStyleRight( nFirstCol, nRow ); + DiagStyle aEndRFromBL( GetCellStyleTR( nFirstCol, nRow ), fAngle ); + + for( nCol = nFirstCol + 1; nCol <= nLastCol; ++nCol ) + { + fAngle = mxImpl->GetHorDiagAngle( nCol, nRow ); + fTAngle = mxImpl->GetHorDiagAngle( nCol, nRow - 1 ); + + const Style& rCurr = *pEndRFromR; + + DiagStyle aLFromTR( GetCellStyleBL( nCol, nRow - 1 ), fTAngle ); + const Style& rLFromT = *pEndRFromT; + const Style& rLFromL = *pStart; + const Style& rLFromB = *pEndRFromB; + DiagStyle aLFromBR( GetCellStyleTL( nCol, nRow ), fAngle ); + + DiagStyle aRFromTL( GetCellStyleBR( nCol, nRow - 1 ), fTAngle ); + const Style& rRFromT = GetCellStyleRight( nCol, nRow - 1 ); + const Style& rRFromR = GetCellStyleTop( nCol + 1, nRow ); + const Style& rRFromB = GetCellStyleRight( nCol, nRow ); + DiagStyle aRFromBL( GetCellStyleTR( nCol, nRow ), fAngle ); + + // check if current frame border can be connected to cached frame border + if( !CheckFrameBorderConnectable( *pStart, rCurr, + aEndRFromTL, rLFromT, aLFromTR, aEndRFromBL, rLFromB, aLFromBR ) ) + { + // draw previous frame border + Point aEndPos( mxImpl->GetColPosition( nCol ), aStartPos.Y() ); + if( pStart->Prim() && (aStartPos.X() <= aEndPos.X()) ) + pProcessor->process( CreateBorderPrimitives( aStartPos, aEndPos, *pStart, + aStartLFromTR, *pStartLFromT, *pStartLFromL, *pStartLFromB, aStartLFromBR, + aEndRFromTL, *pEndRFromT, *pEndRFromR, *pEndRFromB, aEndRFromBL, pForceColor ) ); + + // re-init "*Start***" variables + aStartPos = aEndPos; + pStart = &rCurr; + aStartLFromTR = aLFromTR; + pStartLFromT = &rLFromT; + pStartLFromL = &rLFromL; + pStartLFromB = &rLFromB; + aStartLFromBR = aLFromBR; + } + + // store current styles in "*End***" variables + aEndRFromTL = aRFromTL; + pEndRFromT = &rRFromT; + pEndRFromR = &rRFromR; + pEndRFromB = &rRFromB; + aEndRFromBL = aRFromBL; + } + + // draw last frame border + Point aEndPos( mxImpl->GetColPosition( nCol ), aStartPos.Y() ); + if( pStart->Prim() && (aStartPos.X() <= aEndPos.X()) ) + pProcessor->process( CreateBorderPrimitives( aStartPos, aEndPos, *pStart, + aStartLFromTR, *pStartLFromT, *pStartLFromL, *pStartLFromB, aStartLFromBR, + aEndRFromTL, *pEndRFromT, *pEndRFromR, *pEndRFromB, aEndRFromBL, pForceColor ) ); + } + + // *** vertical frame borders *** + for( nCol = nFirstCol; nCol <= nLastCol + 1; ++nCol ) + { + double fAngle = mxImpl->GetVerDiagAngle( nCol, nFirstRow ); + double fLAngle = mxImpl->GetVerDiagAngle( nCol - 1, nFirstRow ); + + // *Start*** variables store the data of the top end of the cached frame border + Point aStartPos( mxImpl->GetColPosition( nCol ), mxImpl->GetRowPosition( nFirstRow ) ); + const Style* pStart = &GetCellStyleLeft( nCol, nFirstRow ); + DiagStyle aStartTFromBL( GetCellStyleTR( nCol - 1, nFirstRow ), fLAngle ); + const Style* pStartTFromL = &GetCellStyleTop( nCol - 1, nFirstRow ); + const Style* pStartTFromT = &GetCellStyleLeft( nCol, nFirstRow - 1 ); + const Style* pStartTFromR = &GetCellStyleTop( nCol, nFirstRow ); + DiagStyle aStartTFromBR( GetCellStyleTL( nCol, nFirstRow ), fAngle ); + + // *End*** variables store the data of the bottom end of the cached frame border + DiagStyle aEndBFromTL( GetCellStyleBR( nCol - 1, nFirstRow ), fLAngle ); + const Style* pEndBFromL = &GetCellStyleBottom( nCol - 1, nFirstRow ); + const Style* pEndBFromB = &GetCellStyleLeft( nCol, nFirstRow + 1 ); + const Style* pEndBFromR = &GetCellStyleBottom( nCol, nFirstRow ); + DiagStyle aEndBFromTR( GetCellStyleBL( nCol, nFirstRow ), fAngle ); + + for( nRow = nFirstRow + 1; nRow <= nLastRow; ++nRow ) + { + fAngle = mxImpl->GetVerDiagAngle( nCol, nRow ); + fLAngle = mxImpl->GetVerDiagAngle( nCol - 1, nRow ); + + const Style& rCurr = *pEndBFromB; + + DiagStyle aTFromBL( GetCellStyleTR( nCol - 1, nRow ), fLAngle ); + const Style& rTFromL = *pEndBFromL; + const Style& rTFromT = *pStart; + const Style& rTFromR = *pEndBFromR; + DiagStyle aTFromBR( GetCellStyleTL( nCol, nRow ), fAngle ); + + DiagStyle aBFromTL( GetCellStyleBR( nCol - 1, nRow ), fLAngle ); + const Style& rBFromL = GetCellStyleBottom( nCol - 1, nRow ); + const Style& rBFromB = GetCellStyleLeft( nCol, nRow + 1 ); + const Style& rBFromR = GetCellStyleBottom( nCol, nRow ); + DiagStyle aBFromTR( GetCellStyleBL( nCol, nRow ), fAngle ); + + // check if current frame border can be connected to cached frame border + if( !CheckFrameBorderConnectable( *pStart, rCurr, + aEndBFromTL, rTFromL, aTFromBL, aEndBFromTR, rTFromR, aTFromBR ) ) + { + // draw previous frame border + Point aEndPos( aStartPos.X(), mxImpl->GetRowPosition( nRow ) ); + if( pStart->Prim() && (aStartPos.Y() <= aEndPos.Y()) ) + pProcessor->process( CreateBorderPrimitives( aEndPos, aStartPos, *pStart, + aEndBFromTL, *pEndBFromL, *pEndBFromB, *pEndBFromR, aEndBFromTR, + aStartTFromBL, *pStartTFromL, *pStartTFromT, *pStartTFromR, aStartTFromBR, pForceColor ) ); + + // re-init "*Start***" variables + aStartPos = aEndPos; + pStart = &rCurr; + aStartTFromBL = aTFromBL; + pStartTFromL = &rTFromL; + pStartTFromT = &rTFromT; + pStartTFromR = &rTFromR; + aStartTFromBR = aTFromBR; + } + + // store current styles in "*End***" variables + aEndBFromTL = aBFromTL; + pEndBFromL = &rBFromL; + pEndBFromB = &rBFromB; + pEndBFromR = &rBFromR; + aEndBFromTR = aBFromTR; + } + + // draw last frame border + Point aEndPos( aStartPos.X(), mxImpl->GetRowPosition( nRow ) ); + if( pStart->Prim() && (aStartPos.Y() <= aEndPos.Y()) ) + pProcessor->process( CreateBorderPrimitives( aEndPos, aStartPos, *pStart, + aEndBFromTL, *pEndBFromL, *pEndBFromB, *pEndBFromR, aEndBFromTR, + aStartTFromBL, *pStartTFromL, *pStartTFromT, *pStartTFromR, aStartTFromBR, pForceColor ) ); + } +} + void Array::DrawRange( OutputDevice& rDev, size_t nFirstCol, size_t nFirstRow, size_t nLastCol, size_t nLastRow, const Color* pForceColor ) const @@ -1245,3 +1448,4 @@ void Array::DrawArray( OutputDevice& rDev, const Color* pForceColor ) const } // namespace frame } // namespace svx +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index dcfc14afcacd..965ff2cc24ac 100644 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -125,3 +126,4 @@ void FrameDirListBoxWrapper::SetControlValue( SvxFrameDirection eValue ) } // namespace svx +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index d25473f32570..14d2ccef225c 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,15 +36,13 @@ #include "AccessibleFrameSelector.hxx" #include <svx/dialmgr.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif -#ifndef SVX_FRMSEL_HRC #include "frmsel.hrc" -#endif #include <tools/rcid.h> +using namespace ::editeng; + namespace svx { using ::com::sun::star::uno::Reference; @@ -87,7 +86,7 @@ const long FRAMESEL_GEOM_ADD_CLICK_INNER = 2; // ---------------------------------------------------------------------------- -static const frame::Style OBJ_FRAMESTYLE_DONTCARE( 3, 0, 0 ); +static const frame::Style OBJ_FRAMESTYLE_DONTCARE( 3, 0, 0, SOLID ); static const FrameBorder OBJ_FRAMEBORDER_NONE( FRAMEBORDER_NONE ); // ---------------------------------------------------------------------------- @@ -157,7 +156,7 @@ void FrameBorder::SetCoreStyle( const SvxBorderLine* pStyle ) maCoreStyle = SvxBorderLine(); // from twips to points - maUIStyle.Set( maCoreStyle, 0.05, FRAMESEL_GEOM_WIDTH, true ); + maUIStyle.Set( maCoreStyle, 0.05, FRAMESEL_GEOM_WIDTH ); meState = maUIStyle.Prim() ? FRAMESTATE_SHOW : FRAMESTATE_HIDE; } @@ -630,18 +629,46 @@ void FrameSelectorImpl::DrawAllFrameBorders() // Translate core colors to current UI colors (regards current background and HC mode). for( FrameBorderIter aIt( maEnabBorders ); aIt.Is(); ++aIt ) { - Color aCoreColor = ((*aIt)->GetState() == FRAMESTATE_DONTCARE) ? maMarkCol : (*aIt)->GetCoreStyle().GetColor(); - (*aIt)->SetUIColor( GetDrawLineColor( aCoreColor ) ); + Color aCoreColorPrim = ((*aIt)->GetState() == FRAMESTATE_DONTCARE) ? maMarkCol : (*aIt)->GetCoreStyle().GetColorOut(); + Color aCoreColorSecn = ((*aIt)->GetState() == FRAMESTATE_DONTCARE) ? maMarkCol : (*aIt)->GetCoreStyle().GetColorIn(); + (*aIt)->SetUIColorPrim( GetDrawLineColor( aCoreColorPrim ) ); + (*aIt)->SetUIColorSecn( GetDrawLineColor( aCoreColorSecn ) ); } // Copy all frame border styles to the helper array maArray.SetColumnStyleLeft( 0, maLeft.GetUIStyle() ); if( mbVer ) maArray.SetColumnStyleLeft( 1, maVer.GetUIStyle() ); - maArray.SetColumnStyleRight( mbVer ? 1 : 0, maRight.GetUIStyle() ); + + // Invert the style for the right line + const frame::Style rRightStyle = maRight.GetUIStyle( ); + frame::Style rInvertedRight( rRightStyle.GetColorPrim(), + rRightStyle.GetColorSecn(), rRightStyle.GetColorGap(), + rRightStyle.UseGapColor(), + rRightStyle.Secn(), rRightStyle.Dist(), rRightStyle.Prim( ), + rRightStyle.Type( ) ); + maArray.SetColumnStyleRight( mbVer ? 1 : 0, rInvertedRight ); maArray.SetRowStyleTop( 0, maTop.GetUIStyle() ); - if( mbHor ) maArray.SetRowStyleTop( 1, maHor.GetUIStyle() ); - maArray.SetRowStyleBottom( mbHor ? 1 : 0, maBottom.GetUIStyle() ); + if( mbHor ) + { + // Invert the style for the hor line to match the real borders + const frame::Style rHorStyle = maHor.GetUIStyle(); + frame::Style rInvertedHor( rHorStyle.GetColorPrim(), + rHorStyle.GetColorSecn(), rHorStyle.GetColorGap(), + rHorStyle.UseGapColor(), + rHorStyle.Secn(), rHorStyle.Dist(), rHorStyle.Prim( ), + rHorStyle.Type() ); + maArray.SetRowStyleTop( 1, rInvertedHor ); + } + + // Invert the style for the bottom line + const frame::Style rBottomStyle = maBottom.GetUIStyle( ); + frame::Style rInvertedBottom( rBottomStyle.GetColorPrim(), + rBottomStyle.GetColorSecn(), rBottomStyle.GetColorGap(), + rBottomStyle.UseGapColor(), + rBottomStyle.Secn(), rBottomStyle.Dist(), rBottomStyle.Prim( ), + rBottomStyle.Type() ); + maArray.SetRowStyleBottom( mbHor ? 1 : 0, rInvertedBottom ); for( size_t nCol = 0; nCol < maArray.GetColCount(); ++nCol ) for( size_t nRow = 0; nRow < maArray.GetRowCount(); ++nRow ) @@ -862,7 +889,7 @@ void FrameSelector::HideAllBorders() mxImpl->SetBorderState( **aIt, FRAMESTATE_HIDE ); } -bool FrameSelector::GetVisibleWidth( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal_uInt16& rnSecn ) const +bool FrameSelector::GetVisibleWidth( long& rnWidth, SvxBorderStyle& rnStyle ) const { VisFrameBorderCIter aIt( mxImpl->maEnabBorders ); if( !aIt.Is() ) @@ -872,15 +899,13 @@ bool FrameSelector::GetVisibleWidth( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal bool bFound = true; for( ++aIt; bFound && aIt.Is(); ++aIt ) bFound = - (rStyle.GetOutWidth() == (*aIt)->GetCoreStyle().GetOutWidth()) && - (rStyle.GetDistance() == (*aIt)->GetCoreStyle().GetDistance()) && - (rStyle.GetInWidth() == (*aIt)->GetCoreStyle().GetInWidth()); + (rStyle.GetWidth() == (*aIt)->GetCoreStyle().GetWidth()) && + (rStyle.GetStyle() == (*aIt)->GetCoreStyle().GetStyle()); if( bFound ) { - rnPrim = rStyle.GetOutWidth(); - rnDist = rStyle.GetDistance(); - rnSecn = rStyle.GetInWidth(); + rnWidth = rStyle.GetWidth(); + rnStyle = rStyle.GetStyle(); } return bFound; } @@ -941,11 +966,10 @@ void FrameSelector::SelectAllVisibleBorders( bool bSelect ) mxImpl->SelectBorder( **aIt, bSelect ); } -void FrameSelector::SetStyleToSelection( sal_uInt16 nPrim, sal_uInt16 nDist, sal_uInt16 nSecn ) +void FrameSelector::SetStyleToSelection( long nWidth, SvxBorderStyle nStyle ) { - mxImpl->maCurrStyle.SetOutWidth( nPrim ); - mxImpl->maCurrStyle.SetDistance( nDist ); - mxImpl->maCurrStyle.SetInWidth( nSecn ); + mxImpl->maCurrStyle.SetStyle( nStyle ); + mxImpl->maCurrStyle.SetWidth( nWidth ); for( SelFrameBorderIter aIt( mxImpl->maEnabBorders ); aIt.Is(); ++aIt ) mxImpl->SetBorderState( **aIt, FRAMESTATE_SHOW ); } @@ -1203,3 +1227,4 @@ FrameBorderIterBase< Cont, Iter, Pred >& FrameBorderIterBase< Cont, Iter, Pred > } // namespace svx +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 66f4e34eb022..f4b98e26fcfb 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ #include <unotools/syslocale.hxx> #include <rtl/math.hxx> #include <unotools/localedatawrapper.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <vcl/svapp.hxx> #include <osl/mutex.hxx> @@ -48,12 +47,6 @@ // #i72889# #include "svx/sdrpaintwindow.hxx" -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void GraphCtrlUserCall::Changed( const SdrObject& rObj, SdrUserCallType eType, const Rectangle& /*rOldBoundRect*/ ) { switch( eType ) @@ -72,13 +65,6 @@ void GraphCtrlUserCall::Changed( const SdrObject& rObj, SdrUserCallType eType, c } } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - GraphCtrl::GraphCtrl( Window* pParent, const WinBits nWinBits ) : Control ( pParent, nWinBits ), aMap100 ( MAP_100TH_MM ), @@ -100,13 +86,6 @@ GraphCtrl::GraphCtrl( Window* pParent, const WinBits nWinBits ) : EnableRTL( sal_False ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) : Control ( pParent, rResId ), aMap100 ( MAP_100TH_MM ), @@ -127,13 +106,6 @@ GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) : EnableRTL( sal_False ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - GraphCtrl::~GraphCtrl() { if( mpAccContext ) @@ -146,13 +118,6 @@ GraphCtrl::~GraphCtrl() delete pUserCall; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void GraphCtrl::SetWinStyle( WinBits nWinBits ) { nWinStyle = nWinBits; @@ -173,24 +138,17 @@ void GraphCtrl::SetWinStyle( WinBits nWinBits ) InitSdrModel(); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void GraphCtrl::InitSdrModel() { - ::vos::OGuard aGuard (Application::GetSolarMutex()); + SolarMutexGuard aGuard; SdrPage* pPage; - // alten Kram zerstoeren + // destroy old junk delete pView; delete pModel; - // Model anlegen + // Creating a Model pModel = new SdrModel; pModel->GetItemPool().FreezeIdRanges(); pModel->SetScaleUnit( aMap100.GetMapUnit() ); @@ -204,12 +162,11 @@ void GraphCtrl::InitSdrModel() pModel->InsertPage( pPage ); pModel->SetChanged( sal_False ); - // View anlegen + // Creating a View pView = new GraphCtrlView( pModel, this ); pView->SetWorkArea( Rectangle( Point(), aGraphSize ) ); pView->EnableExtendedMouseEventDispatcher( sal_True ); pView->ShowSdrPage(pView->GetModel()->GetPage(0)); -// pView->ShowSdrPage(pView->GetModel()->GetPage(0)); pView->SetFrameDragSingles( sal_True ); pView->SetMarkedPointsSmooth( SDRPATHSMOOTH_SYMMETRIC ); pView->SetEditMode( sal_True ); @@ -224,16 +181,9 @@ void GraphCtrl::InitSdrModel() mpAccContext->setModelAndView (pModel, pView); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void GraphCtrl::SetGraphic( const Graphic& rGraphic, sal_Bool bNewModel ) { - // Bitmaps dithern wir ggf. fuer die Anzeige + // If possible we dither bitmaps for the display if ( !bAnim && ( rGraphic.GetType() == GRAPHIC_BITMAP ) ) { if ( rGraphic.IsTransparent() ) @@ -268,13 +218,6 @@ void GraphCtrl::SetGraphic( const Graphic& rGraphic, sal_Bool bNewModel ) Invalidate(); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void GraphCtrl::Resize() { Control::Resize(); @@ -290,7 +233,7 @@ void GraphCtrl::Resize() double fGrfWH = (double) aGraphSize.Width() / aGraphSize.Height(); double fWinWH = (double) nWidth / nHeight; - // Bitmap an Thumbgroesse anpassen + // Adapt Bitmap to Thumb size if ( fGrfWH < fWinWH) { aNewSize.Width() = (long) ( (double) nHeight * fGrfWH ); @@ -305,7 +248,7 @@ void GraphCtrl::Resize() aNewPos.X() = ( nWidth - aNewSize.Width() ) >> 1; aNewPos.Y() = ( nHeight - aNewSize.Height() ) >> 1; - // MapMode fuer Engine umsetzen + // Implementing MapMode for Engine aDisplayMap.SetScaleX( Fraction( aNewSize.Width(), aGraphSize.Width() ) ); aDisplayMap.SetScaleY( Fraction( aNewSize.Height(), aGraphSize.Height() ) ); @@ -316,13 +259,6 @@ void GraphCtrl::Resize() Invalidate(); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void GraphCtrl::Paint( const Rectangle& rRect ) { // #i72889# used splitted repaint to be able to paint an own background @@ -357,48 +293,20 @@ void GraphCtrl::Paint( const Rectangle& rRect ) } } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void GraphCtrl::SdrObjChanged( const SdrObject& ) { } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void GraphCtrl::SdrObjCreated( const SdrObject& ) { } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void GraphCtrl::MarkListHasChanged() { if ( aMarkObjLink.IsSet() ) aMarkObjLink.Call( this ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) { KeyCode aCode( rKEvt.GetKeyCode() ); @@ -487,7 +395,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) if ( aCode.IsMod1() ) { - // #97016# mark last object + // mark last object pView->UnmarkAllObj(); pView->MarkNextObj(sal_False); @@ -518,25 +426,25 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) if (aCode.GetCode() == KEY_UP) { - // Scroll nach oben + // Scroll up nX = 0; nY =-1; } else if (aCode.GetCode() == KEY_DOWN) { - // Scroll nach unten + // Scroll down nX = 0; nY = 1; } else if (aCode.GetCode() == KEY_LEFT) { - // Scroll nach links + // Scroll left nX =-1; nY = 0; } else if (aCode.GetCode() == KEY_RIGHT) { - // Scroll nach rechts + // Scroll right nX = 1; nY = 0; } @@ -545,7 +453,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) { if(aCode.IsMod2()) { - // #97016# move in 1 pixel distance + // move in 1 pixel distance Size aLogicSizeOnePixel = PixelToLogic(Size(1,1)); nX *= aLogicSizeOnePixel.Width(); nY *= aLogicSizeOnePixel.Height(); @@ -557,13 +465,13 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) nY *= 100; } - // #97016# II + // II const SdrHdlList& rHdlList = pView->GetHdlList(); SdrHdl* pHdl = rHdlList.GetFocusHdl(); if(0L == pHdl) { - // #90129# restrict movement to WorkArea + // restrict movement to WorkArea const Rectangle& rWorkArea = pView->GetWorkArea(); if(!rWorkArea.IsEmpty()) @@ -616,7 +524,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) if(pView->IsDragObj()) { - FASTBOOL bWasNoSnap = rDragStat.IsNoSnap(); + bool bWasNoSnap = rDragStat.IsNoSnap(); sal_Bool bWasSnapEnabled = pView->IsSnapEnabled(); // switch snapping off @@ -712,13 +620,6 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) ReleaseMouse(); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void GraphCtrl::MouseButtonDown( const MouseEvent& rMEvt ) { if ( bSdrMode && ( rMEvt.GetClicks() < 2 ) ) @@ -729,7 +630,7 @@ void GraphCtrl::MouseButtonDown( const MouseEvent& rMEvt ) Control::MouseButtonDown( rMEvt ); else { - // Focus anziehen fuer Key-Inputs + // Get Focus for key inputs GrabFocus(); if ( nPolyEdit ) @@ -748,7 +649,7 @@ void GraphCtrl::MouseButtonDown( const MouseEvent& rMEvt ) SdrObject* pCreateObj = pView->GetCreateObj(); - // Wir wollen das Inserten mitbekommen + // We want to realize the insert if ( pCreateObj && !pCreateObj->GetUserCall() ) pCreateObj->SetUserCall( pUserCall ); @@ -758,13 +659,6 @@ void GraphCtrl::MouseButtonDown( const MouseEvent& rMEvt ) Control::MouseButtonDown( rMEvt ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void GraphCtrl::MouseMove(const MouseEvent& rMEvt) { const Point aLogPos( PixelToLogic( rMEvt.GetPosPixel() ) ); @@ -796,13 +690,6 @@ void GraphCtrl::MouseMove(const MouseEvent& rMEvt) } } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void GraphCtrl::MouseButtonUp(const MouseEvent& rMEvt) { if ( bSdrMode ) @@ -819,13 +706,6 @@ void GraphCtrl::MouseButtonUp(const MouseEvent& rMEvt) Control::MouseButtonUp( rMEvt ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - SdrObject* GraphCtrl::GetSelectedSdrObject() const { SdrObject* pSdrObj = NULL; @@ -841,13 +721,6 @@ SdrObject* GraphCtrl::GetSelectedSdrObject() const return pSdrObj; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void GraphCtrl::SetEditMode( const sal_Bool _bEditMode ) { if ( bSdrMode ) @@ -861,13 +734,6 @@ void GraphCtrl::SetEditMode( const sal_Bool _bEditMode ) bEditMode = sal_False; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void GraphCtrl::SetPolyEditMode( const sal_uInt16 _nPolyEdit ) { if ( bSdrMode && ( _nPolyEdit != nPolyEdit ) ) @@ -879,13 +745,6 @@ void GraphCtrl::SetPolyEditMode( const sal_uInt16 _nPolyEdit ) nPolyEdit = 0; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind ) { if ( bSdrMode ) @@ -899,13 +758,6 @@ void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind ) eObjKind = OBJ_NONE; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - String GraphCtrl::GetStringFromDouble( const double& rDouble ) { sal_Unicode cSep = @@ -915,13 +767,6 @@ String GraphCtrl::GetStringFromDouble( const double& rDouble ) return aStr; } - -/************************************************************************* -www|* -|* -|* -\************************************************************************/ - IMPL_LINK( GraphCtrl, UpdateHdl, Timer*, pTimer ) { if ( aUpdateLink.IsSet() ) @@ -945,7 +790,7 @@ IMPL_LINK( GraphCtrl, UpdateHdl, Timer*, pTimer ) { ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccParent( pParent->GetAccessible() ); - // #103856# Disable accessibility if no model/view data available + // Disable accessibility if no model/view data available if( pView && pModel && xAccParent.is() ) @@ -958,3 +803,5 @@ IMPL_LINK( GraphCtrl, UpdateHdl, Timer*, pTimer ) return mpAccContext; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index 53cead9f00cf..53d67f116030 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,16 +32,13 @@ #include <vcl/msgbox.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> -#ifndef _SFXOBJSH_HXX #include <sfx2/objsh.hxx> -#endif #include <sfx2/request.hxx> #include <svx/dialmgr.hxx> #include <svx/grfflt.hxx> -//#include "grfflt.hrc" #include <svx/dialogs.hrc> -#include <svx/svxdlg.hxx> //CHINA001 +#include <svx/svxdlg.hxx> // -------------------- // - SvxGraphicFilter - @@ -187,45 +185,42 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj case( SID_GRFFILTER_MOSAIC ): { - //CHINA001 GraphicFilterMosaic aDlg( pWindow, rGraphic, 4, 4, sal_False ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, sal_False, RID_SVX_GRFFILTER_DLG_MOSAIC); - DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 - if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK ) - aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); //CHINA001 aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 ); - delete aDlg; //add by CHINA001 + DBG_ASSERT(aDlg, "Dialogdiet fail!"); + if( aDlg->Execute() == RET_OK ) + aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); + delete aDlg; } } break; case( SID_GRFFILTER_EMBOSS ): { - //CHINA001 GraphicFilterEmboss aDlg( pWindow, rGraphic, RP_MM ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterEmboss( pWindow, rGraphic, RP_MM, RID_SVX_GRFFILTER_DLG_EMBOSS ); - DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 - if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK ) - aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); //CHINA001 aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 ); - delete aDlg; //add by CHINA001 + DBG_ASSERT(aDlg, "Dialogdiet fail!"); + if( aDlg->Execute() == RET_OK ) + aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); + delete aDlg; } } break; case( SID_GRFFILTER_POSTER ): { - //CHINA001 GraphicFilterPoster aDlg( pWindow, rGraphic, 16 ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterPosterSepia( pWindow, rGraphic, 16, RID_SVX_GRFFILTER_DLG_POSTER ); - DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 - if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK ) - aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); //CHINA001 aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 ); - delete aDlg; //add by CHINA001 + DBG_ASSERT(aDlg, "Dialogdiet fail!"); + if( aDlg->Execute() == RET_OK ) + aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); + delete aDlg; } } break; @@ -257,30 +252,28 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj case( SID_GRFFILTER_SEPIA ): { - //CHINA001 GraphicFilterSepia aDlg( pWindow, rGraphic, 10 ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterPosterSepia( pWindow, rGraphic, 10, RID_SVX_GRFFILTER_DLG_SEPIA ); - DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 - if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK ) - aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); //CHINA001 aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 ); - delete aDlg; //add by CHINA001 + DBG_ASSERT(aDlg, "Dialogdiet fail!"); + if( aDlg->Execute() == RET_OK ) + aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); + delete aDlg; } } break; case( SID_GRFFILTER_SOLARIZE ): { - //CHINA001 GraphicFilterSolarize aDlg( pWindow, rGraphic, 128, sal_False ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterSolarize( pWindow, rGraphic, 128, sal_False, RID_SVX_GRFFILTER_DLG_SOLARIZE ); - DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 - if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK ) - aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); //CHINA001 aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 ); - delete aDlg; //add by CHINA001 + DBG_ASSERT(aDlg, "Dialogdiet fail!"); + if( aDlg->Execute() == RET_OK ) + aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); + delete aDlg; } } break; @@ -294,7 +287,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj default: { - DBG_ERROR( "SvxGraphicFilter: selected filter slot not yet implemented" ); + OSL_FAIL( "SvxGraphicFilter: selected filter slot not yet implemented" ); nRet = SVX_GRAPHICFILTER_UNSUPPORTED_SLOT; } break; @@ -350,444 +343,5 @@ void SvxGraphicFilter::DisableGraphicFilterSlots( SfxItemSet& rSet ) if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SOLARIZE ) ) rSet.DisableItem( SID_GRFFILTER_SOLARIZE ); }; -/* CHINA001 move to cuigrfflt.cxx -// -------------------------------------- -// - GraphicFilterDialog::PreviewWindow - -// -------------------------------------- -GraphicFilterDialog::PreviewWindow::PreviewWindow( Window* pParent, const ResId& rResId ) : - Control( pParent, rResId ) -{ -} - -// ----------------------------------------------------------------------------- - -GraphicFilterDialog::PreviewWindow::~PreviewWindow() -{ -} - -// ----------------------------------------------------------------------------- - -void GraphicFilterDialog::PreviewWindow::Paint( const Rectangle& rRect ) -{ - Control::Paint( rRect ); - - const Size aGrfSize( LogicToPixel( maGraphic.GetPrefSize(), maGraphic.GetPrefMapMode() ) ); - const Size aOutSize( GetOutputSizePixel() ); - const Point aGrfPos( ( aOutSize.Width() - aGrfSize.Width() ) >> 1, - ( aOutSize.Height() - aGrfSize.Height() ) >> 1 ); - - if( maGraphic.IsAnimated() ) - maGraphic.StartAnimation( this , aGrfPos, aGrfSize ); - else - maGraphic.Draw( this, aGrfPos, aGrfSize ); -} - -// ----------------------------------------------------------------------------- - -void GraphicFilterDialog::PreviewWindow::SetGraphic( const Graphic& rGraphic ) -{ - maGraphic = rGraphic; - - if( maGraphic.IsAnimated() || maGraphic.IsTransparent() ) - Invalidate(); - else - Paint( Rectangle( Point(), GetOutputSizePixel() ) ); -} - -// ----------------------- -// - GraphicFilterDialog - -// ----------------------- - -GraphicFilterDialog::GraphicFilterDialog( Window* pParent, const ResId& rResId, const Graphic& rGraphic ) : - ModalDialog ( pParent, rResId ), - mfScaleX ( 0.0 ), - mfScaleY ( 0.0 ), - maSizePixel ( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) ), - maModifyHdl ( LINK( this, GraphicFilterDialog, ImplModifyHdl ) ), - maPreview ( this, SVX_RES( CTL_PREVIEW ) ), - maFlParameter ( this, SVX_RES( FL_PARAMETER ) ), - maBtnOK ( this, SVX_RES( BTN_OK ) ), - maBtnCancel ( this, SVX_RES( BTN_CANCEL ) ), - maBtnHelp ( this, SVX_RES( BTN_HELP ) ) -{ - const Size aPreviewSize( maPreview.GetOutputSizePixel() ); - Size aGrfSize( maSizePixel ); - - if( rGraphic.GetType() == GRAPHIC_BITMAP && - aPreviewSize.Width() && aPreviewSize.Height() && - aGrfSize.Width() && aGrfSize.Height() ) - { - const double fGrfWH = (double) aGrfSize.Width() / aGrfSize.Height(); - const double fPreWH = (double) aPreviewSize.Width() / aPreviewSize.Height(); - - if( fGrfWH < fPreWH ) - { - aGrfSize.Width() = (long) ( aPreviewSize.Height() * fGrfWH ); - aGrfSize.Height()= aPreviewSize.Height(); - } - else - { - aGrfSize.Width() = aPreviewSize.Width(); - aGrfSize.Height()= (long) ( aPreviewSize.Width() / fGrfWH); - } - - mfScaleX = (double) aGrfSize.Width() / maSizePixel.Width(); - mfScaleY = (double) aGrfSize.Height() / maSizePixel.Height(); - - if( !rGraphic.IsAnimated() ) - { - BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - - if( aBmpEx.Scale( aGrfSize, BMP_SCALE_INTERPOLATE ) ) - maGraphic = aBmpEx; - } - } - - maTimer.SetTimeoutHdl( LINK( this, GraphicFilterDialog, ImplPreviewTimeoutHdl ) ); - maTimer.SetTimeout( 100 ); - ImplModifyHdl( NULL ); -} - -// ----------------------------------------------------------------------------- - -GraphicFilterDialog::~GraphicFilterDialog() -{ -} - -// ----------------------------------------------------------------------------- - -IMPL_LINK( GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer*, pTimer ) -{ - maTimer.Stop(); - maPreview.SetGraphic( GetFilteredGraphic( maGraphic, mfScaleX, mfScaleY ) ); - - return 0; -} - -// ----------------------------------------------------------------------------- - -IMPL_LINK( GraphicFilterDialog, ImplModifyHdl, void*, p ) -{ - if( maGraphic.GetType() == GRAPHIC_BITMAP ) - { - maTimer.Stop(); - maTimer.Start(); - } - - return 0; -} - -// ---------------- -// - FilterMosaic - -// ---------------- - -GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic, - sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges ) : - GraphicFilterDialog( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ), - maFtWidth ( this, SVX_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ), - maMtrWidth ( this, SVX_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ), - maFtHeight ( this, SVX_RES( DLG_FILTERMOSAIC_FT_HEIGHT ) ), - maMtrHeight ( this, SVX_RES( DLG_FILTERMOSAIC_MTR_HEIGHT ) ), - maCbxEdges ( this, SVX_RES( DLG_FILTERMOSAIC_CBX_EDGES ) ) -{ - FreeResource(); - - maMtrWidth.SetValue( nTileWidth ); - maMtrWidth.SetLast( GetGraphicSizePixel().Width() ); - maMtrWidth.SetModifyHdl( GetModifyHdl() ); - - maMtrHeight.SetValue( nTileHeight ); - maMtrHeight.SetLast( GetGraphicSizePixel().Height() ); - maMtrHeight.SetModifyHdl( GetModifyHdl() ); - - maCbxEdges.Check( bEnhanceEdges ); - maCbxEdges.SetToggleHdl( GetModifyHdl() ); - - maMtrWidth.GrabFocus(); -} - -// ----------------------------------------------------------------------------- - -GraphicFilterMosaic::~GraphicFilterMosaic() -{ -} - -// ----------------------------------------------------------------------------- - -Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, - double fScaleX, double fScaleY ) -{ - Graphic aRet; - const Size aSize( Max( FRound( GetTileWidth() * fScaleX ), 1L ), - Max( FRound( GetTileHeight() * fScaleY ), 1L ) ); - BmpFilterParam aParam( aSize ); - - if( rGraphic.IsAnimated() ) - { - Animation aAnim( rGraphic.GetAnimation() ); - - if( aAnim.Filter( BMP_FILTER_MOSAIC, &aParam ) ) - { - if( IsEnhanceEdges() ) - aAnim.Filter( BMP_FILTER_SHARPEN ); - - aRet = aAnim; - } - } - else - { - BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - - if( aBmpEx.Filter( BMP_FILTER_MOSAIC, &aParam ) ) - { - if( IsEnhanceEdges() ) - aBmpEx.Filter( BMP_FILTER_SHARPEN ); - - aRet = aBmpEx; - } - } - - return aRet; -} - -// ------------------ -// - GraphicFilterSolarize - -// ------------------ - -GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic, - sal_uInt8 cGreyThreshold, sal_Bool bInvert ) : - GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ), - maFtThreshold ( this, SVX_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ), - maMtrThreshold ( this, SVX_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ), - maCbxInvert ( this, SVX_RES( DLG_FILTERSOLARIZE_CBX_INVERT ) ) -{ - FreeResource(); - - maMtrThreshold.SetValue( FRound( cGreyThreshold / 2.55 ) ); - maMtrThreshold.SetModifyHdl( GetModifyHdl() ); - - maCbxInvert.Check( bInvert ); - maCbxInvert.SetToggleHdl( GetModifyHdl() ); - - maMtrThreshold.GrabFocus(); -} - -// ----------------------------------------------------------------------------- - -GraphicFilterSolarize::~GraphicFilterSolarize() -{ -} - -// ----------------------------------------------------------------------------- - -Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, - double fScaleX, double fScaleY ) -{ - Graphic aRet; - BmpFilterParam aParam( GetGreyThreshold() ); - - if( rGraphic.IsAnimated() ) - { - Animation aAnim( rGraphic.GetAnimation() ); - - if( aAnim.Filter( BMP_FILTER_SOLARIZE, &aParam ) ) - { - if( IsInvert() ) - aAnim.Invert(); - - aRet = aAnim; - } - } - else - { - BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - - if( aBmpEx.Filter( BMP_FILTER_SOLARIZE, &aParam ) ) - { - if( IsInvert() ) - aBmpEx.Invert(); - - aRet = aBmpEx; - } - } - - return aRet; -} - -// ---------------------- -// - GraphicFilterSepia - -// ---------------------- - -GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic, - sal_uInt16 nSepiaPercent ) : - GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ), - maFtSepia ( this, SVX_RES( DLG_FILTERSEPIA_FT_SEPIA ) ), - maMtrSepia ( this, SVX_RES( DLG_FILTERSEPIA_MTR_SEPIA ) ) -{ - FreeResource(); - - maMtrSepia.SetValue( nSepiaPercent ); - maMtrSepia.SetModifyHdl( GetModifyHdl() ); - - maMtrSepia.GrabFocus(); -} - -// ----------------------------------------------------------------------------- - -GraphicFilterSepia::~GraphicFilterSepia() -{ -} - -// ----------------------------------------------------------------------------- - -Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, - double fScaleX, double fScaleY ) -{ - Graphic aRet; - BmpFilterParam aParam( GetSepiaPercent() ); - - if( rGraphic.IsAnimated() ) - { - Animation aAnim( rGraphic.GetAnimation() ); - - if( aAnim.Filter( BMP_FILTER_SEPIA, &aParam ) ) - aRet = aAnim; - } - else - { - BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - - if( aBmpEx.Filter( BMP_FILTER_SEPIA, &aParam ) ) - aRet = aBmpEx; - } - - return aRet; -} - -// ----------------------- -// - GraphicFilterPoster - -// ----------------------- - -GraphicFilterPoster::GraphicFilterPoster( Window* pParent, const Graphic& rGraphic, - sal_uInt16 nPosterCount ) : - GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ), - maFtPoster ( this, SVX_RES( DLG_FILTERPOSTER_FT_POSTER ) ), - maNumPoster ( this, SVX_RES( DLG_FILTERPOSTER_NUM_POSTER ) ) -{ - FreeResource(); - - maNumPoster.SetFirst( 2 ); - maNumPoster.SetLast( rGraphic.GetBitmapEx().GetBitCount() ); - maNumPoster.SetValue( nPosterCount ); - maNumPoster.SetModifyHdl( GetModifyHdl() ); - maNumPoster.GrabFocus(); -} - -// ----------------------------------------------------------------------------- - -GraphicFilterPoster::~GraphicFilterPoster() -{ -} - -// ----------------------------------------------------------------------------- - -Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, - double fScaleX, double fScaleY ) -{ - Graphic aRet; - const sal_uInt16 nPosterCount = GetPosterColorCount(); - - if( rGraphic.IsAnimated() ) - { - Animation aAnim( rGraphic.GetAnimation() ); - - if( aAnim.ReduceColors( nPosterCount, BMP_REDUCE_POPULAR ) ) - aRet = aAnim; - } - else - { - BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - - if( aBmpEx.ReduceColors( nPosterCount, BMP_REDUCE_POPULAR ) ) - aRet = aBmpEx; - } - - return aRet; -} - -// ----------------------- -// - GraphicFilterEmboss - -// ----------------------- - -void GraphicFilterEmboss::EmbossControl::MouseButtonDown( const MouseEvent& rEvt ) -{ - const RECT_POINT eOldRP = GetActualRP(); - - SvxRectCtl::MouseButtonDown( rEvt ); - - if( GetActualRP() != eOldRP ) - maModifyHdl.Call( this ); -} - -// ----------------------------------------------------------------------------- - -GraphicFilterEmboss::GraphicFilterEmboss( Window* pParent, const Graphic& rGraphic, - RECT_POINT eLightSource ) : - GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_EMBOSS ), rGraphic ), - maFtLight ( this, SVX_RES( DLG_FILTEREMBOSS_FT_LIGHT ) ), - maCtlLight ( this, SVX_RES( DLG_FILTEREMBOSS_CTL_LIGHT ), eLightSource ) -{ - FreeResource(); - - maCtlLight.SetModifyHdl( GetModifyHdl() ); - maCtlLight.GrabFocus(); -} - -// ----------------------------------------------------------------------------- - -GraphicFilterEmboss::~GraphicFilterEmboss() -{ -} - -// ----------------------------------------------------------------------------- - -Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, - double fScaleX, double fScaleY ) -{ - Graphic aRet; - sal_uInt16 nAzim, nElev; - - switch( maCtlLight.GetActualRP() ) - { - case( RP_LT ): nAzim = 4500, nElev = 4500; break; - case( RP_MT ): nAzim = 9000, nElev = 4500; break; - case( RP_RT ): nAzim = 13500, nElev = 4500; break; - case( RP_LM ): nAzim = 0, nElev = 4500; break; - case( RP_MM ): nAzim = 0, nElev = 9000; break; - case( RP_RM ): nAzim = 18000, nElev = 4500; break; - case( RP_LB ): nAzim = 31500, nElev = 4500; break; - case( RP_MB ): nAzim = 27000, nElev = 4500; break; - case( RP_RB ): nAzim = 22500, nElev = 4500; break; - } - - BmpFilterParam aParam( nAzim, nElev ); - - if( rGraphic.IsAnimated() ) - { - Animation aAnim( rGraphic.GetAnimation() ); - - if( aAnim.Filter( BMP_FILTER_EMBOSS_GREY, &aParam ) ) - aRet = aAnim; - } - else - { - BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - - if( aBmpEx.Filter( BMP_FILTER_EMBOSS_GREY, &aParam ) ) - aRet = aBmpEx; - } - - return aRet; -} -*/ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index b4debaa4eaa4..90438e867974 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,7 +48,7 @@ #include <svx/hdft.hxx> #include <svx/pageitem.hxx> -//CHINA001 #include "bbdlg.hxx" + #include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> #include "svx/htmlmode.hxx" @@ -59,17 +60,16 @@ #include <editeng/sizeitem.hxx> #include <editeng/boxitem.hxx> -#include <svx/svxdlg.hxx> //CHINA001 -#include <svx/dialogs.hrc> //CHINA001 +#include <svx/svxdlg.hxx> +#include <svx/dialogs.hrc> // static ---------------------------------------------------------------- -// --> OD 2004-06-18 #i19922# -//static const long MINBODY = 284; // 0,5cm in twips aufgerundet +// Word 97 incompatibility (#i19922#) static const long MINBODY = 56; // 1mm in twips rounded // default distance to Header or footer static const long DEF_DIST_WRITER = 500; // 5mm (Writer) -static const long DEF_DIST_CALC = 250; // 2,5mm (Calc) +static const long DEF_DIST_CALC = 250; // 2.5mm (Calc) static sal_uInt16 pRanges[] = { @@ -89,11 +89,7 @@ static sal_uInt16 pRanges[] = 0 }; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -// gibt den Bereich der Which-Werte zurueck +// returns the Which values to the range sal_uInt16* SvxHeaderPage::GetRanges() @@ -171,12 +167,12 @@ SvxHFPage::SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rAtt InitHandler(); aBspWin.EnableRTL( sal_False ); - // diese Page braucht ExchangeSupport + // This Page needs ExchangeSupport SetExchangeSupport(); FreeResource(); - // Metrik einstellen + // Set metrics FieldUnit eFUnit = GetModuleFieldUnit( rAttr ); SetFieldUnit( aDistEdit, eFUnit ); SetFieldUnit( aHeightEdit, eFUnit ); @@ -251,20 +247,18 @@ sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet ) delete pBoolItem; } - // Groesse + // Size SvxSizeItem aSizeItem( (const SvxSizeItem&)rOldSet.Get( nWSize ) ); Size aSize( aSizeItem.GetSize() ); long nDist = GetCoreValue( aDistEdit, eUnit ); long nH = GetCoreValue( aHeightEdit, eUnit ); - // fixe Hoehe? -// if ( !aHeightDynBtn.IsChecked() ) - nH += nDist; // dann Abstand dazu addieren + nH += nDist; // add distance aSize.Height() = nH; aSizeItem.SetSize( aSize ); aSet.Put( aSizeItem ); - // Raender + // Margins SvxLRSpaceItem aLR( nWLRSpace ); aLR.SetLeft( (sal_uInt16)GetCoreValue( aLMEdit, eUnit ) ); aLR.SetRight( (sal_uInt16)GetCoreValue( aRMEdit, eUnit ) ); @@ -277,7 +271,7 @@ sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet ) aUL.SetUpper( (sal_uInt16)nDist ); aSet.Put( aUL ); - // Hintergrund und Umrandung? + // Background and border? if ( pBBSet ) aSet.Put( *pBBSet ); else @@ -301,7 +295,7 @@ sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet ) } } - // Das SetItem wegschreiben + // Flush the SetItem SvxSetItem aSetItem( GetWhich( nId ), aSet ); rSet.Put( aSetItem ); @@ -315,11 +309,10 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) ResetBackground_Impl( rSet ); SfxItemPool* pPool = GetItemSet().GetPool(); - DBG_ASSERT( pPool, "Wo ist der Pool" ); + DBG_ASSERT( pPool, "Where is the pool" ); SfxMapUnit eUnit = pPool->GetMetric( GetWhich( SID_ATTR_PAGE_SIZE ) ); - // Kopf-/Fusszeilen-Attribute auswerten - // + // Evaluate header-/footer- attributes const SvxSetItem* pSetItem = 0; if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), sal_False, @@ -352,12 +345,12 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) if ( nId == SID_ATTR_PAGE_HEADERSET ) - { // Kopfzeile + { // Header SetMetricValue( aDistEdit, rUL.GetLower(), eUnit ); SetMetricValue( aHeightEdit, rSize.GetSize().Height() - rUL.GetLower(), eUnit ); } else - { // Fusszeile + { // Footer SetMetricValue( aDistEdit, rUL.GetUpper(), eUnit ); SetMetricValue( aHeightEdit, rSize.GetSize().Height() - rUL.GetUpper(), eUnit ); } @@ -402,13 +395,13 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) aCntSharedBox.SaveValue(); RangeHdl( 0 ); - sal_uInt16 nHtmlMode = 0; const SfxPoolItem* pItem = 0; SfxObjectShell* pShell; if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem) || ( 0 != (pShell = SfxObjectShell::Current()) && 0 != (pItem = pShell->GetItem(SID_HTML_MODE)))) { + sal_uInt16 nHtmlMode = 0; nHtmlMode = ((SfxUInt16Item*)pItem)->GetValue(); if(nHtmlMode && HTMLMODE_ON) { @@ -419,10 +412,6 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) } -/*-------------------------------------------------------------------- - Beschreibung: Handler initialisieren - --------------------------------------------------------------------*/ - void SvxHFPage::InitHandler() { aTurnOnBox.SetClickHdl(LINK(this, SvxHFPage, TurnOnHdl)); @@ -439,10 +428,6 @@ void SvxHFPage::InitHandler() aBackgroundBtn.SetClickHdl(LINK(this,SvxHFPage, BackgroundHdl)); } -/*-------------------------------------------------------------------- - Beschreibung: Ein/aus - --------------------------------------------------------------------*/ - IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox ) { if ( aTurnOnBox.IsChecked() ) @@ -497,10 +482,6 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: Abstand im Bsp Modifizieren - --------------------------------------------------------------------*/ - IMPL_LINK_INLINE_START( SvxHFPage, DistModify, MetricField *, EMPTYARG ) { UpdateExample(); @@ -516,10 +497,6 @@ IMPL_LINK_INLINE_START( SvxHFPage, HeightModify, MetricField *, EMPTYARG ) } IMPL_LINK_INLINE_END( SvxHFPage, HeightModify, MetricField *, EMPTYARG ) -/*-------------------------------------------------------------------- - Beschreibung: Raender einstellen - --------------------------------------------------------------------*/ - IMPL_LINK_INLINE_START( SvxHFPage, BorderModify, MetricField *, EMPTYARG ) { UpdateExample(); @@ -527,21 +504,17 @@ IMPL_LINK_INLINE_START( SvxHFPage, BorderModify, MetricField *, EMPTYARG ) } IMPL_LINK_INLINE_END( SvxHFPage, BorderModify, MetricField *, EMPTYARG ) -/*-------------------------------------------------------------------- - Beschreibung: Hintergrund - --------------------------------------------------------------------*/ - IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG ) { if ( !pBBSet ) { - // nur die n"otigen Items f"uer Umrandung und Hintergrund benutzen + // Use only the necessary items for border and background sal_uInt16 nBrush = GetWhich( SID_ATTR_BRUSH ); sal_uInt16 nOuter = GetWhich( SID_ATTR_BORDER_OUTER ); sal_uInt16 nInner = GetWhich( SID_ATTR_BORDER_INNER, sal_False ); sal_uInt16 nShadow = GetWhich( SID_ATTR_BORDER_SHADOW ); - // einen leeren Set erzeugenc + // Create an empty set pBBSet = new SfxItemSet( *GetItemSet().GetPool(), nBrush, nBrush, nOuter, nOuter, nInner, nInner, nShadow, nShadow, 0 ); @@ -549,22 +522,20 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG ) if ( SFX_ITEM_SET == GetItemSet().GetItemState( GetWhich( nId ), sal_False, &pItem ) ) - // wenn es schon einen gesetzen Set gibt, dann diesen benutzen + // if there is one that is already set, then use this pBBSet->Put( ( (SvxSetItem*)pItem)->GetItemSet() ); if ( SFX_ITEM_SET == GetItemSet().GetItemState( nInner, sal_False, &pItem ) ) - // das gesetze InfoItem wird immer ben"otigt + // The set InfoItem is always required pBBSet->Put( *pItem ); } - //CHINA001 SvxBorderBackgroundDlg* pDlg = -//CHINA001 new SvxBorderBackgroundDlg( this, *pBBSet, bEnableBackgroundSelector ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { SfxAbstractTabDialog* pDlg = pFact->CreateSvxBorderBackgroundDlg( this, *pBBSet, bEnableBackgroundSelector ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); if ( pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet() ) { SfxItemIter aIter( *pDlg->GetOutputItemSet() ); @@ -611,10 +582,6 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: Bsp - --------------------------------------------------------------------*/ - void SvxHFPage::UpdateExample() { if ( nId == SID_ATTR_PAGE_HEADERSET ) @@ -636,10 +603,6 @@ void SvxHFPage::UpdateExample() aBspWin.Invalidate(); } -/*-------------------------------------------------------------------- - Beschreibung: Hintergrund im Beispiel setzen - --------------------------------------------------------------------*/ - void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) { sal_uInt16 nWhich = GetWhich( SID_ATTR_PAGE_HEADERSET ); @@ -726,17 +689,13 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) { const SfxPoolItem* pItem = GetItem( rSet, SID_ATTR_LRSPACE ); if ( pItem ) { - // linken und rechten Rand einstellen + // Set left and right margins const SvxLRSpaceItem& rLRSpace = (const SvxLRSpaceItem&)*pItem; aBspWin.SetLeft( rLRSpace.GetLeft() ); @@ -752,7 +711,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) if ( pItem ) { - // oberen und unteren Rand einstellen + // Set top and bottom margins const SvxULSpaceItem& rULSpace = (const SvxULSpaceItem&)*pItem; aBspWin.SetTop( rULSpace.GetUpper() ); @@ -780,13 +739,13 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) if ( pItem ) { - // Orientation und Size aus dem PageItem + // Orientation and Size from the PageItem const SvxSizeItem& rSize = (const SvxSizeItem&)*pItem; - // die Groesse ist ggf. schon geswappt (Querformat) + // if the size is already swapped (Landscape) aBspWin.SetSize( rSize.GetSize() ); } - // Kopfzeilen-Attribute auswerten + // Evaluate Header attribute const SvxSetItem* pSetItem = 0; if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_HEADERSET ), @@ -881,10 +840,6 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) RangeHdl( 0 ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - int SvxHFPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) @@ -892,10 +847,6 @@ int SvxHFPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -/*-------------------------------------------------------------------- - Beschreibung: Berech - --------------------------------------------------------------------*/ - IMPL_LINK( SvxHFPage, RangeHdl, Edit *, EMPTYARG ) { long nHHeight = aBspWin.GetHdHeight(); @@ -923,7 +874,7 @@ IMPL_LINK( SvxHFPage, RangeHdl, Edit *, EMPTYARG ) nFDist = nDist; } - // Aktuelle Werte der Seitenraender + // Current values of the side edges long nBT = aBspWin.GetTop(); long nBB = aBspWin.GetBottom(); long nBL = aBspWin.GetLeft(); @@ -932,7 +883,7 @@ IMPL_LINK( SvxHFPage, RangeHdl, Edit *, EMPTYARG ) long nH = aBspWin.GetSize().Height(); long nW = aBspWin.GetSize().Width(); - // Grenzen + // Borders if ( nId == SID_ATTR_PAGE_HEADERSET ) { // Header @@ -958,7 +909,7 @@ IMPL_LINK( SvxHFPage, RangeHdl, Edit *, EMPTYARG ) aDistEdit.SetMax( aDistEdit.Normalize( nDist ), FUNIT_TWIP ); } - // Einzuege beschraenken + // Limit Indentation nMax = nW - nBL - nBR - static_cast<long>(aRMEdit.Denormalize( aRMEdit.GetValue( FUNIT_TWIP ) )) - MINBODY; aLMEdit.SetMax( aLMEdit.Normalize( nMax ), FUNIT_TWIP ); @@ -968,9 +919,7 @@ IMPL_LINK( SvxHFPage, RangeHdl, Edit *, EMPTYARG ) aRMEdit.SetMax( aLMEdit.Normalize( nMax ), FUNIT_TWIP ); return 0; } -/* -----------------------------26.08.2002 12:49------------------------------ - ---------------------------------------------------------------------------*/ void lcl_Move(Window& rWin, sal_Int32 nDiff) { Point aPos(rWin.GetPosPixel()); @@ -995,3 +944,4 @@ void SvxHFPage::EnableDynamicSpacing() lcl_Move(*aMoveWindows[nIdx++], nOffset); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/hdft.hrc b/svx/source/dialog/hdft.hrc index e9c72c38b45f..e9c72c38b45f 100644..100755 --- a/svx/source/dialog/hdft.hrc +++ b/svx/source/dialog/hdft.hrc diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx index 3b15bc245779..4bc6afe67405 100644 --- a/svx/source/dialog/hyperdlg.cxx +++ b/svx/source/dialog/hyperdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,7 +33,7 @@ #include <vcl/settings.hxx> #include <unotools/viewoptions.hxx> #include "svx/hyperdlg.hxx" -#include <svx/svxdlg.hxx> //CHINA001 +#include <svx/svxdlg.hxx> #include <sfx2/app.hxx> #include <sfx2/sfxsids.hrc> @@ -65,11 +66,10 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, sal_uInt16 nId, mpDlg( NULL ) { - //CHINA001 pWindow = new SvxHpLinkDlg( _pParent, pBindings ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); mpDlg = pFact->CreateSvxHpLinkDlg( _pParent, pBindings, SID_HYPERLINK_DIALOG ); - DBG_ASSERT(mpDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(mpDlg, "Dialogdiet fail!"); pWindow = mpDlg->GetWindow(); ((MyStruct*)pImp)->bVisible = sal_False; @@ -105,3 +105,4 @@ sal_Bool SvxHlinkDlgWrapper::QueryClose() return mpDlg ? mpDlg->QueryClose() : sal_True; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx deleted file mode 100644 index dc7b438db0af..000000000000 --- a/svx/source/dialog/hyprlink.cxx +++ /dev/null @@ -1,999 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svx.hxx" -#include <tools/urlobj.hxx> -#include <vcl/msgbox.hxx> -#include <unotools/configitem.hxx> -#include <unotools/cmdoptions.hxx> -#include <svtools/inetimg.hxx> -#include <svl/urlbmk.hxx> -#include <svl/eitem.hxx> -#include <svl/stritem.hxx> -#include <sfx2/viewfrm.hxx> -#include <sfx2/docfile.hxx> -#include <sfx2/imgmgr.hxx> -#include <sfx2/dispatch.hxx> -#include <svl/urihelper.hxx> -#include <sfx2/objsh.hxx> -#include <comphelper/processfactory.hxx> - -#include "svx/hlnkitem.hxx" -#include <svx/dialogs.hrc> -#include "hyprlink.hrc" -#include <svx/dialmgr.hxx> -#include "svx/hyprlink.hxx" -#include "hyprdlg.hxx" - -using namespace ::rtl; -using namespace ::com::sun::star; - -// ----------------------------------------------------------------------- - -class SearchDefaultConfigItem_Impl : public ::utl::ConfigItem -{ - OUString sDefaultEngine; -public: - SearchDefaultConfigItem_Impl(); - ~SearchDefaultConfigItem_Impl(); - - const OUString& GetDefaultSearchEngine(){ return sDefaultEngine;} - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - virtual void Commit(); -}; - -/*-- 11.11.2003 14:20:59--------------------------------------------------- - - -----------------------------------------------------------------------*/ -SearchDefaultConfigItem_Impl::SearchDefaultConfigItem_Impl() : - ConfigItem(OUString::createFromAscii("Inet/DefaultSearchEngine")) -{ - uno::Sequence<OUString> aNames(1); - aNames.getArray()[0] = OUString::createFromAscii("Name"); - uno::Sequence< uno::Any > aValues = GetProperties(aNames); - aValues.getConstArray()[0] >>= sDefaultEngine; -} -/*-- 11.11.2003 14:21:00--------------------------------------------------- - - -----------------------------------------------------------------------*/ -SearchDefaultConfigItem_Impl::~SearchDefaultConfigItem_Impl() -{ -} - -void SearchDefaultConfigItem_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) -{ -} - -void SearchDefaultConfigItem_Impl::Commit() -{ -} - -/************************************************************************* -|* -|* Dialog zum Einf"ugen/"Andern eines Hyperlink -|* -\************************************************************************/ - -SvxHyperlinkDlg::SvxHyperlinkDlg( SfxBindings *_pBindings, Window* pParent) : - - ToolBox ( pParent, SVX_RES( RID_SVXDLG_HYPERLINK ) ), - SfxControllerItem ( SID_HYPERLINK_SETLINK, *_pBindings ), - - aForwarder ( SID_HYPERLINK_GETLINK, *this ), - aHyperlinkDlgForward( SID_HYPERLINK_DIALOG , *this), - - aNameCB ( this, SVX_RES( CB_NAME ) ), - aUrlFT ( this, SVX_RES( FT_URL ) ), - aUrlCB ( this, SVX_RES( CB_URL ) ), - aSearchConfig (sal_True), - sAddress ( SVX_RES( STR_ADDRESS ) ), - sExplorer ( SVX_RES( STR_EXPLORER ) ), - sSearchTitle ( SVX_RES( STR_BOOKMARK_SEARCH ) ), - aLinkPopup ( SVX_RES( RID_SVXMN_HYPERLINK ) ), - pTargetMenu ( NULL ), - - bNoDoc ( sal_True ), - bSend ( sal_False ), - bHasOldName ( sal_False ), - bHtmlMode ( sal_False ) - -{ - FreeResource(); - - mpManager = SfxImageManager::GetImageManager( 0 ); - mpManager->RegisterToolBox( this ); - - SetImages(); - - // save initial size - nMaxWidth = GetSizePixel().Width(); - nMaxHeight = GetSizePixel().Height(); - - - InsertSeparator( 0 ); - InsertWindow( CB_URL, &aUrlCB, 0, 0 ); - // we need an item text for accessibility - String sItemText = aUrlCB.GetText(); - if ( sItemText.Len() == 0 ) - sItemText = aUrlCB.GetQuickHelpText(); - if ( sItemText.Len() > 0 ) - { - SetItemText( CB_URL, sItemText ); - sItemText.Erase(); - } - InsertWindow( FT_URL, &aUrlFT, 0, 0 ); - InsertSeparator( 0 ); - InsertWindow( CB_NAME, &aNameCB, 0, 0 ); - sItemText = aNameCB.GetText(); - if ( sItemText.Len() == 0 ) - sItemText = aNameCB.GetQuickHelpText(); - if ( sItemText.Len() > 0 ) - SetItemText( CB_NAME, sItemText ); - - SetSizePixel(CalcWindowSizePixel()); // Groesse initialisieren - - nMaxHeight = GetSizePixel().Height(); // Hoehe nochmal merken, da sie veraendert wurde - // SetSizePixel ruft Resize-Handler! - - Show(); - Resize(); - - long nUrlWidth = aUrlCB.GetResizeWidth(); - long nNameWidth = aNameCB.GetResizeWidth(); - long nSum = nUrlWidth + nNameWidth; - - aUrlCB.SetRatio((nUrlWidth * 100L) / nSum); - aNameCB.SetRatio((nNameWidth * 100L) / nSum); - - SetClickHdl( LINK( this, SvxHyperlinkDlg, TBClickHdl ) ); - SetSelectHdl( LINK( this, SvxHyperlinkDlg, TBSelectHdl ) ); - SetDropdownClickHdl( LINK( this, SvxHyperlinkDlg, DropdownClick ) ); - - SetItemBits( BTN_TARGET, GetItemBits( BTN_TARGET ) | TIB_DROPDOWNONLY ); - SetItemBits( BTN_INET_SEARCH, GetItemBits( BTN_INET_SEARCH ) | TIB_DROPDOWN ); - SetItemBits( BTN_INET_SEARCH, GetItemBits( BTN_TARGET ) | TIB_DROPDOWNONLY ); - - aLinkPopup.SetSelectHdl(LINK(this, SvxHyperlinkDlg, LinkPopupSelectHdl)); - - Link aLk = LINK(this, SvxHyperlinkDlg, ComboSelectHdl); - aNameCB.SetSelectHdl(aLk); - aUrlCB.SetSelectHdl(aLk); - - aLk = LINK(this, SvxHyperlinkDlg, ComboModifyHdl); - aNameCB.SetModifyHdl(aLk); - aUrlCB.SetModifyHdl(aLk); - - // Accessibility: Set the quick help text as accessible name for the - // drop down lists. - aNameCB.SetAccessibleName (aNameCB.GetQuickHelpText()); - aUrlCB.SetAccessibleName (aUrlCB.GetQuickHelpText()); - - // Hide button according to config item. - SvtCommandOptions aCmdOpts; - if ( aCmdOpts.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "InternetSearch" ) ) ) ) - HideItem( BTN_INET_SEARCH ); -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -SvxHyperlinkDlg::~SvxHyperlinkDlg() -{ - SfxImageManager::GetImageManager( 0 )->ReleaseToolBox(this); - - if (pTargetMenu != NULL) - delete pTargetMenu; -} - -/*-------------------------------------------------------------------- - Beschreibung: Leiste so resizen, dass die Comboboxen automatisch mit - verkleinert werden - --------------------------------------------------------------------*/ - -void SvxHyperlinkDlg::Resize() -{ - long nWidth = GetSizePixel().Width(); - - ToolBox::Resize(); - - if (nWidth) // nWidth ist manchmal 0 - { - long nDeltaW = nMaxWidth - nWidth + aUrlCB.LogicToPixel(Size(3, 1)).Width() + 1; - - long nNewUrlWidth = aUrlCB.CalcResizeWidth(nDeltaW); - long nNewNameWidth = aNameCB.CalcResizeWidth(nDeltaW); - - if (nNewUrlWidth && nNewNameWidth) // Flackern reduzieren - { - SetUpdateMode(sal_False); - - // Comboboxen resizen - aUrlCB.DoResize(nNewUrlWidth); - aNameCB.DoResize(nNewNameWidth); - RecalcItems(); // Alle Elemente neu anordnen - - SetUpdateMode(sal_True); - } - } -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -void SvxHyperlinkDlg::Resizing(Size& rSize) -{ - if (rSize.Height() > nMaxHeight) - rSize.Height() = nMaxHeight; - - if (rSize.Width() > nMaxWidth) - rSize.Width() = nMaxWidth; - - ToolBox::Resizing(rSize); -} - -/*-------------------------------------------------------------------- - Beschreibung: Im Dokument selektierten Hyperlink in Leiste anzeigen - --------------------------------------------------------------------*/ - -void SvxHyperlinkDlg::StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) -{ - if ( nSID == SID_HYPERLINK_DIALOG ) - { - if( eState != SFX_ITEM_DISABLED) - { - EnableItem( BTN_OPENDIALOG, sal_True ); - - sal_Bool bItem = sal_False; - if ( pState && eState == SFX_ITEM_AVAILABLE ) - bItem = ((SfxBoolItem*)pState)->GetValue(); - SetItemState ( BTN_OPENDIALOG, bItem ? STATE_CHECK : STATE_NOCHECK ); - } - else - { - SetItemState ( BTN_OPENDIALOG, STATE_NOCHECK ); - EnableItem( BTN_OPENDIALOG, sal_False ); - } - } - - if (nSID == SID_HYPERLINK_SETLINK) - { - if (eState == SFX_ITEM_DISABLED) - bNoDoc = sal_True; - else - bNoDoc = sal_False; - EnableItem(BTN_TARGET, !bNoDoc); - EnableLink(); - } - - if (nSID == SID_HYPERLINK_GETLINK) - { - if (eState == SFX_ITEM_AVAILABLE) - { - const SvxHyperlinkItem& rHLnkItem = *((const SvxHyperlinkItem*)pState); - - sal_uInt16 nNamePos = aNameCB.GetEntryPos(aNameCB.GetText()); - sal_uInt16 nUrlPos = aUrlCB.GetEntryPos(aUrlCB.GetText()); - sal_uInt16 nNotFound = COMBOBOX_ENTRY_NOTFOUND; - - if (!bHasOldName && - (nNamePos == nNotFound || nUrlPos == nNotFound)) - { - sOldName = aNameCB.GetText(); - bHasOldName = sal_True; - } - if (rHLnkItem.GetName().Len()) - { - aNameCB.SetText(rHLnkItem.GetName()); - ComboModifyHdl(&aNameCB); - } - if (rHLnkItem.GetURL().Len() || rHLnkItem.GetName().Len()) - { - String sUrl = INetURLObject(rHLnkItem.GetURL()).GetURLNoPass(); - aUrlCB.SetText(sUrl); - } - else if (aUrlCB.GetEntryCount()) - { // Letzten Eintrag wieder selektieren - aNameCB.SetText(aNameCB.GetEntry(0)); - aUrlCB.SetText(aUrlCB.GetEntry(0)); - } - - TargetMenu(rHLnkItem.GetTargetFrame(), sal_False); - bHtmlMode = (rHLnkItem.GetInsertMode() & HLINK_HTMLMODE) != 0; - } - else - return; - - ComboModifyHdl(&aUrlCB); - } -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -IMPL_LINK( SvxHyperlinkDlg, TBClickHdl, ToolBox *, pBox ) -{ - switch (pBox->GetCurItemId()) - { - case BTN_LINK: - { - if (!bSend) // Link ins Dokument einfuegen - SendToApp(HLINK_DEFAULT); - } - break; - - case BTN_OPENDIALOG: - { - GetBindings().GetDispatcher()->Execute( SID_HYPERLINK_DIALOG ); - } - break; - } - - return sal_True; -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -IMPL_LINK( SvxHyperlinkDlg, TBSelectHdl, ToolBox *, pBox ) -{ - switch (pBox->GetCurItemId()) - { - // Link als Bookmark im Explorer eintragen - // Soll erst im Loslassen der Maus gerufen werden, daher im Select-Hdl - case BTN_INSERT_BOOKMARK: - { - String sName = aNameCB.GetText(); - if ( !sName.Len() ) - sName = aUrlCB.GetText(); - - String aBase = GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL(); - SfxStringItem aName( SID_BOOKMARK_TITLE, sName ); - SfxStringItem aURL( SID_BOOKMARK_URL, - URIHelper::SmartRel2Abs( INetURLObject(aBase), aUrlCB.GetText(), URIHelper::GetMaybeFileHdl(), true, false, - INetURLObject::WAS_ENCODED, - INetURLObject::DECODE_UNAMBIGUOUS ) ); - GetBindings().GetDispatcher()->Execute( - SID_CREATELINK, SFX_CALLMODE_ASYNCHRON, &aName, &aURL, 0L ); - } - break; - } - - return sal_True; -} - -IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox ) -{ - switch (pBox->GetCurItemId()) - { - case BTN_LINK: - { - // Link-Popup anstossen - EndSelection(); // Vor dem Execute, damit Popup den Focus bekommt - aLinkPopup.EnableItem(MN_BUTTON, !bHtmlMode); - aLinkPopup.Execute( this, GetItemRect( BTN_LINK ), FLOATWIN_POPUPMODE_DOWN ); - } - break; - - case BTN_INET_SEARCH: - { - // Search-Engines per Popup auswaehlen - PopupMenu *pMenu = new PopupMenu; - pMenu->SetSelectHdl(LINK(this, SvxHyperlinkDlg, SearchPopupSelectHdl)); - SearchDefaultConfigItem_Impl aDefaultEngine; - String sDefault(aDefaultEngine.GetDefaultSearchEngine()); - sDefault.ToLowerAscii(); - const bool bHasDefault = sDefault.Len() > 0; - - sal_uInt16 nCount = aSearchConfig.Count(); - String sFound; - for (sal_uInt16 i = 0; i < nCount; i++) - { - const SvxSearchEngineData& rData = aSearchConfig.GetData(i); - //check if it's the configured default search engine - String sTest(rData.sEngineName); - sTest.ToLowerAscii(); - bool bIsDefaultEngine = bHasDefault && STRING_NOTFOUND != sTest.Search( sDefault ); - //then put it at the top - if(i && bIsDefaultEngine) - { - pMenu->InsertItem( i + 1, rData.sEngineName, 0, 0); - pMenu->InsertSeparator(1); - } - else - { - if (i) - pMenu->InsertSeparator(); - pMenu->InsertItem( i + 1, rData.sEngineName); - } - } - pBox->SetItemDown(BTN_INET_SEARCH, sal_True, sal_True); - pMenu->Execute( this, GetItemRect( BTN_INET_SEARCH ), FLOATWIN_POPUPMODE_DOWN ); - pBox->SetItemDown(BTN_INET_SEARCH, sal_False, sal_True); - EndSelection(); - delete pMenu; - } - break; - - case BTN_TARGET: - { - // Target Frame einstellen - TargetMenu(GetSelTarget(), sal_True); - EndSelection(); - } - break; - } - - return sal_True; -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, sal_Bool bExecute) -{ - if (pTargetMenu && !bExecute) - { - for (sal_uInt16 i = 1; i <= pTargetMenu->GetItemCount(); i++) - { - if (pTargetMenu->GetItemText(i) == rSelEntry) - { - pTargetMenu->CheckItem(i); - return; - } - } - } - - SfxViewFrame* pVwFrm = SfxViewFrame::Current(); - - if (pVwFrm) // Alle moeglichen Target Frames zusammensammeln und anzeigen - { - TargetList aList; - pVwFrm->GetTopFrame().GetTargetList(aList); - - sal_uInt16 nCount = (sal_uInt16)aList.Count(); - if( nCount ) - { - sal_Bool bChecked = sal_False; - - if (pTargetMenu != NULL) - delete pTargetMenu; - - pTargetMenu = new PopupMenu; - pTargetMenu->SetMenuFlags( pTargetMenu->GetMenuFlags() | - MENU_FLAG_NOAUTOMNEMONICS ); - sal_uInt16 i; - for ( i = 0; i < nCount; i++ ) - { - String sEntry(*aList.GetObject(i)); - pTargetMenu->InsertItem(i + 1, sEntry, MIB_RADIOCHECK|MIB_AUTOCHECK); - - if (sEntry == rSelEntry) - { - pTargetMenu->CheckItem(i + 1); - bChecked = sal_True; - } - } - for ( i = nCount; i; i-- ) - delete aList.GetObject( i - 1 ); - - if (!bChecked) - pTargetMenu->CheckItem(1); - - if (bExecute) - { - sal_uInt16 nEntry = pTargetMenu->Execute( - this, GetItemRect( BTN_TARGET ), FLOATWIN_POPUPMODE_DOWN ); - if ( nEntry ) - pTargetMenu->CheckItem( nEntry ); - } - } - } -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -IMPL_LINK( SvxHyperlinkDlg, LinkPopupSelectHdl, Menu *, pMenu ) -{ - switch (pMenu->GetCurItemId()) - { - case MN_FIELD: // URL als Hyperlink ins Dok einfuegen - SendToApp(HLINK_FIELD); - break; - case MN_BUTTON: // URL als Button ins Dok einfuegen - SendToApp(HLINK_BUTTON); - break; - } - - return sal_True; -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -IMPL_LINK( SvxHyperlinkDlg, SearchPopupSelectHdl, Menu *, pMenu ) -{ - const SvxSearchEngineData& rData = aSearchConfig.GetData(pMenu->GetCurItemId() - 1); - String sText(aNameCB.GetText()); - sText.EraseLeadingChars().EraseTrailingChars(); - - rtl::OUString sPrefix; - rtl::OUString sSuffix; - rtl::OUString sSeparator; - sal_Int32 nCaseMatch; - sal_Unicode cToken = 0; - - if (sText.Search(' ') != STRING_NOTFOUND) - { - sPrefix = rData.sExactPrefix; - sSuffix = rData.sExactSuffix; - sSeparator = rData.sExactSeparator; - nCaseMatch = rData.nExactCaseMatch; - cToken = ' '; - } - else if (sText.Search('+') != STRING_NOTFOUND) - { - sPrefix = rData.sAndPrefix; - sSuffix = rData.sAndSuffix; - sSeparator = rData.sAndSeparator; - nCaseMatch = rData.nAndCaseMatch; - cToken = '+'; - } - else if (sText.Search(',') != STRING_NOTFOUND) - { - sPrefix = rData.sOrPrefix; - sSuffix = rData.sOrSuffix; - sSeparator = rData.sOrSeparator; - nCaseMatch = rData.nOrCaseMatch; - cToken = ','; - } - else - { - sPrefix = rData.sExactPrefix; - sSuffix = rData.sExactSuffix; - nCaseMatch = rData.nExactCaseMatch; - cToken = 0; - } - - String sURL = sPrefix; - xub_StrLen nTok; - - if(1 == nCaseMatch) - sText.ToUpperAscii(); - else if(2 == nCaseMatch) - sText.ToLowerAscii(); - - if ((nTok = sText.GetTokenCount(cToken)) > 1) - { - for (sal_uInt16 i = 0; i < nTok; i++) - { - sURL += sText.GetToken(i, cToken); - if(i < nTok -1) - sURL += (String)sSeparator; - } - sURL += (String)sSuffix; - } - else - { - sURL += sText; - sURL += (String)sSuffix; - } - sURL.EraseAllChars(); // remove all spaces - SfxViewFrame* pViewFrame = SfxViewFrame::Current(); - if ( pViewFrame ) - pViewFrame = pViewFrame->GetTopViewFrame(); - OpenDoc( sURL, pViewFrame ); - - return sal_True; -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -IMPL_LINK( SvxHyperlinkDlg, BookmarkFoundHdl, String *, pUrl ) -{ - if (pUrl && pUrl->Len()) - { - aUrlCB.SetText(*pUrl); - ComboModifyHdl(&aUrlCB); - } - - return sal_True; -} -/*-------------------------------------------------------------------- - Beschreibung: Link-Button enablen/disablen - --------------------------------------------------------------------*/ - -void SvxHyperlinkDlg::EnableLink() -{ - sal_Bool bEnable = aUrlCB.GetText().Len() != 0; - - EnableItem(BTN_LINK, (!bNoDoc) & bEnable); -} - -/*-------------------------------------------------------------------- - Beschreibung: URL im Dokument einfuegen - --------------------------------------------------------------------*/ - -void SvxHyperlinkDlg::SendToApp(sal_uInt16 nType) -{ - sal_Bool bIsFile = sal_False; - bSend = sal_True; - String sURL( aUrlCB.GetText() ); - - if ( !sURL.Len() ) - return; - - String aBase = GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL(); - INetURLObject aObj( URIHelper::SmartRel2Abs( INetURLObject(aBase), sURL, URIHelper::GetMaybeFileHdl(), true, false, - INetURLObject::WAS_ENCODED, - INetURLObject::DECODE_UNAMBIGUOUS ) ); - sURL = aObj.GetMainURL( INetURLObject::NO_DECODE ); - if ( aObj.GetProtocol() == INET_PROT_FILE ) - bIsFile = sal_True; - - if ( bIsFile ) - { - EnterWait(); - SfxMedium aMedium( sURL, STREAM_STD_READ, sal_True ); - if ( aMedium.Exists( sal_False ) == sal_False ) - { - LeaveWait(); - QueryBox aBox( this, SVX_RES( RID_SVXQB_DONTEXIST ) ); - if ( aBox.Execute() == RET_NO ) - return; - } - else - LeaveWait(); - } - - SvxHyperlinkItem aItem( SID_HYPERLINK_SETLINK ); - - if (aNameCB.GetText().Len()) - aItem.SetName( aNameCB.GetText() ); - else - aItem.SetName( sURL ); - - sOldName = aNameCB.GetText(); - - aItem.SetURL(sURL); - aItem.SetInsertMode( (SvxLinkInsertMode)nType ); - aItem.SetTargetFrame( GetSelTarget() ); - - GetBindings().GetDispatcher()->Execute( - SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); - - AddToHistory( aNameCB.GetText(), sURL ); - - if ( sURL != aUrlCB.GetText() ) - aUrlCB.SetText( sURL ); -} - -/*-------------------------------------------------------------------- - Beschreibung: Selektierten Target Frame Eintrag im Popup ermitteln - --------------------------------------------------------------------*/ - -String SvxHyperlinkDlg::GetSelTarget() -{ - String sTarget; - - if (pTargetMenu != NULL) - { - for (sal_uInt16 i = 1; i <= pTargetMenu->GetItemCount(); i++) - { - if (pTargetMenu->IsItemChecked(i)) - { - sTarget = pTargetMenu->GetItemText(i); - break; - } - } - } - - return sTarget; -} - -/*-------------------------------------------------------------------- - Beschreibung: URL in History der Leiste aufnehmen - --------------------------------------------------------------------*/ - -void SvxHyperlinkDlg::AddToHistory(const String& rName, const String& rURL) -{ - String sName(rName); - - if (bHasOldName && sOldName.Len()) - { - sName = sOldName; - bHasOldName = sal_False; - } - - if (!sName.Len()) - sName = rURL; - - if (rURL.Len()) - { - sal_uInt16 nNamePos = aNameCB.GetEntryPos(sName); - sal_uInt16 nUrlPos = aUrlCB.GetEntryPos(rURL); - sal_uInt16 nPos = COMBOBOX_ENTRY_NOTFOUND; - - if (nNamePos != COMBOBOX_ENTRY_NOTFOUND) - nPos = nNamePos; - else - nPos = nUrlPos; - - // Alten Eintrag durch neuen Eintrag ersetzen - if (nPos != COMBOBOX_ENTRY_NOTFOUND) - { - aNameCB.RemoveEntry(nPos); - aUrlCB.RemoveEntry(nPos); - aNameCB.SetText(rName); - aUrlCB.SetText(rURL); - } - - aNameCB.InsertEntry(sName, 0); - aUrlCB.InsertEntry(rURL, 0); - } -} - -/*-------------------------------------------------------------------- - Beschreibung: Bookmark und Search-Button enablen/disablen - --------------------------------------------------------------------*/ - -IMPL_LINK( SvxHyperlinkDlg, ComboSelectHdl, ComboBox *, pCombo ) -{ - sal_uInt16 nPos = pCombo->GetEntryPos(pCombo->GetText()); - - if (nPos != COMBOBOX_ENTRY_NOTFOUND) - { - aNameCB.SetText(aNameCB.GetEntry(nPos)); - aUrlCB.SetText(aUrlCB.GetEntry(nPos)); - - EnableLink(); - EnableItem(BTN_INSERT_BOOKMARK, sal_True); - EnableItem(BTN_INET_SEARCH, sal_True); - } - return sal_True; -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -IMPL_LINK( SvxHyperlinkDlg, ComboModifyHdl, ComboBox *, pCombo ) -{ - sal_Bool bEnable = sal_True; - - if (!pCombo->GetText().Len()) - bEnable = sal_False; - - if (pCombo == &aNameCB) - { - if (IsItemEnabled(BTN_INET_SEARCH) != bEnable) - EnableItem(BTN_INET_SEARCH, bEnable); - } - - EnableLink(); - - if (aUrlCB.GetText().Len()) - bEnable = sal_True; - else - bEnable = sal_False; - - if (IsItemEnabled(BTN_INSERT_BOOKMARK) != bEnable) - EnableItem(BTN_INSERT_BOOKMARK, bEnable); - - return sal_True; -} - -// -------------------------------------------------------------------- - -void SvxHyperlinkDlg::DataChanged( const DataChangedEvent& rDCEvt ) -{ - ToolBox::DataChanged( rDCEvt ); - - if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE)) - SetImages(); -} - -// -------------------------------------------------------------------- - -void SvxHyperlinkDlg::SetImages() -{ - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - SetItemImage( BTN_LINK, mpManager->GetImage( BTN_LINK, bHighContrast ) ); - SetItemImage( BTN_INSERT_BOOKMARK, mpManager->GetImage( BTN_INSERT_BOOKMARK, bHighContrast ) ); - SetItemImage( BTN_INET_SEARCH, mpManager->GetImage( BTN_INET_SEARCH, bHighContrast ) ); - SetItemImage( BTN_TARGET, mpManager->GetImage( BTN_TARGET, bHighContrast ) ); - SetItemImage( BTN_OPENDIALOG, mpManager->GetImage( BTN_OPENDIALOG, bHighContrast ) ); -} - -/*-------------------------------------------------------------------- - Beschreibung: Comboboxen - --------------------------------------------------------------------*/ - -HyperCombo::HyperCombo( SvxHyperlinkDlg* pDialog, const ResId& rResId ) : - ComboBox( (Window *)pDialog, rResId ) -{ - pDlg = pDialog; - - nMaxWidth = GetSizePixel().Width(); - if (this == &pDlg->aUrlCB) - nMinWidth = GetTextWidth(String::CreateFromAscii("http://www.stardiv.dewww")); - else - nMinWidth = GetTextWidth(String::CreateFromAscii("StarDivision GmbHwww")); -} - -/*-------------------------------------------------------------------- - Beschreibung: Comboboxen KeyInput - --------------------------------------------------------------------*/ - -long HyperCombo::Notify( NotifyEvent& rNEvt ) -{ - long nHandled = 0; - static sal_Bool bLocked = sal_False; - - if (bLocked) // Keine weiteren RETURNs annehmen (nicht Reentrant!) - return nHandled; - - bLocked = sal_True; - - if ( rNEvt.GetType() == EVENT_KEYINPUT ) - { - const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - const KeyCode aKeyCode = pKEvt->GetKeyCode(); - - if (aKeyCode.GetCode() == KEY_RETURN) - { - pDlg->SendToApp(HLINK_DEFAULT); - nHandled = 1; - } - } - if (this == &pDlg->aNameCB) - pDlg->sOldName = GetText(); - - if (!nHandled) - nHandled = ComboBox::Notify( rNEvt ); - - bLocked = sal_False; - - return nHandled; -} - -/*-------------------------------------------------------------------- - Beschreibung: Drag&Drop vor dem Combo-Edit abfangen und weiterleiten - --------------------------------------------------------------------*/ - -long HyperCombo::PreNotify( NotifyEvent& rNEvt ) -{ - long nHandled = 0; - - nHandled = ComboBox::PreNotify( rNEvt ); - - return nHandled; -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -long HyperCombo::CalcResizeWidth( long nW ) -{ - long nNewWidth = Max(nMaxWidth - nW * GetRatio() / 100L, nMinWidth); - - if (nNewWidth > nMaxWidth) - nNewWidth = nMaxWidth; - - if (nNewWidth != GetSizePixel().Width()) - return nNewWidth; - else - return 0; // Kein Resize notwendig -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -void HyperCombo::DoResize( long nNewWidth ) -{ - SetSizePixel(Size(nNewWidth, GetSizePixel().Height())); -} - -/*-------------------------------------------------------------------- - Beschreibung: FixedText - --------------------------------------------------------------------*/ - -HyperFixedText::HyperFixedText( SvxHyperlinkDlg* pDialog, const ResId& rResId ) : - FixedInfo( (Window *)pDialog, rResId ) -{ - pDlg = pDialog; -} - -/*-------------------------------------------------------------------- - Beschreibung: Webseite der Search-Engine mit Suchergebnissen anzeigen - --------------------------------------------------------------------*/ -void SvxHyperlinkDlg::OpenDoc( const String& rURL, SfxViewFrame* pViewFrame ) -{ - SfxStringItem aName( SID_FILE_NAME, rURL ); - SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii("private:user") ); - SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_True ); - SfxBoolItem aSilent( SID_SILENT, sal_True ); - SfxBoolItem aReadOnly( SID_DOC_READONLY, sal_True ); - SfxBoolItem aExternal( SID_BROWSE, sal_True ); - SfxDispatcher* pDisp = SfxViewFrame::Current() ? SfxViewFrame::Current()->GetDispatcher() : NULL; - - if ( pViewFrame ) - { - SfxFrameItem aView( SID_DOCFRAME, pViewFrame ? &pViewFrame->GetFrame() : NULL ); - if ( pDisp ) - pDisp->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, - &aName, &aView, &aNewView, &aSilent, &aReadOnly, &aReferer, &aExternal, 0L ); - } - else if ( pDisp ) - pDisp->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, - &aName, &aNewView, &aSilent, &aReadOnly, &aReferer, 0L ); -} -// class SvxHyperlinkDialogWrapper ------------------------------------------ - -SFX_IMPL_CHILDWINDOW(SvxHyperlinkDlgWrapper, SID_HYPERLINK_INSERT) - -/*-------------------------------------------------------------------- - Beschreibung: Wrapper fuer Hyperlinkleiste - --------------------------------------------------------------------*/ - -SvxHyperlinkDlgWrapper::SvxHyperlinkDlgWrapper( Window* _pParent, sal_uInt16 nId, - SfxBindings* _pBindings, SfxChildWinInfo* /*pInfo*/ ) : - - SfxChildWindow( _pParent, nId ) - -{ - pWindow = new SvxHyperlinkDlg( _pBindings, _pParent ); - eChildAlignment = SFX_ALIGN_TOP; -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -SfxChildWinInfo SvxHyperlinkDlgWrapper::GetInfo() const -{ - SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); - return aInfo; -} - diff --git a/svx/source/dialog/hyprlink.src b/svx/source/dialog/hyprlink.src deleted file mode 100644 index c59a2f8eb52a..000000000000 --- a/svx/source/dialog/hyprlink.src +++ /dev/null @@ -1,167 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - // include ------------------------------------------------------------------ -#include <svx/dialogs.hrc> -#include "hyprlink.hrc" -#include "helpid.hrc" -#include <svx/svxids.hrc> - - // pragma ------------------------------------------------------------------- - - // RID_SVXDLG_HYPERLINK ------------------------------------------------------ -ToolBox RID_SVXDLG_HYPERLINK -{ - OutputSize = TRUE ; - Hide = TRUE; - - // Dockable = TRUE ; - // Closeable = TRUE ; - // Moveable = TRUE ; - // Sizeable = TRUE ; - // EnableResizing = TRUE ; - - SVLook = TRUE ; - Border = TRUE ; - Size = MAP_APPFONT ( 410 , 17 ) ; - Scroll = TRUE ; - HelpID = HID_OFA_HYPERLINK_DLG ; - - Text [ en-US ] = "Insert Hyperlink" ; - - ComboBox CB_NAME - { - HelpID = HID_OFA_HYPERLINK_NAME ; - Pos = MAP_APPFONT ( 2 , 3 ) ; - Size = MAP_APPFONT ( 100 , 60 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - AutoSize = TRUE ; - AutoHScroll = TRUE ; - DDExtraWidth = TRUE ; - QuickHelpText [ en-US ] = "URL Name" ; - }; - FixedText FT_URL - { - HelpID = HID_OFA_HYPERLINK_URL_TXT ; - Pos = MAP_APPFONT ( 105 , 5 ) ; - Size = MAP_APPFONT ( 16 , 10 ) ; - Text [ en-US ] = "URL:" ; - }; - ComboBox CB_URL - { - HelpID = HID_OFA_HYPERLINK_URL ; - Pos = MAP_APPFONT ( 121 , 3 ) ; - Size = MAP_APPFONT ( 204 , 60 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - AutoSize = TRUE ; - AutoHScroll = TRUE ; - DDExtraWidth = TRUE ; - QuickHelpText [ en-US ] = "Internet URLs" ; - }; - ItemList = - { - ToolBoxItem - { - HelpID = HID_OFA_HYPERLINK_TARGET ; - Identifier = BTN_TARGET ; - DropDown = TRUE ; - Text [ en-US ] = "Target Frame" ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - HelpID = CMD_SID_HYPERLINK_SETLINK ; - Identifier = BTN_LINK ; - Disable = TRUE ; - DropDown = TRUE ; - Text [ en-US ] = "Hyperlink" ; - }; - ToolBoxItem - { - HelpID = CMD_SID_CREATELINK ; - Identifier = BTN_INSERT_BOOKMARK ; - Disable = TRUE ; - Hide = TRUE; - Text [ en-US ] = "Link" ; - }; - ToolBoxItem - { - HelpID = HID_OFA_HYPERLINK_SEARCH ; - Identifier = BTN_INET_SEARCH ; - Disable = TRUE ; - DropDown = TRUE ; - Text [ en-US ] = "Find" ; - }; - }; - String STR_ADDRESS - { - Text [ en-US ] = "Address Book" ; - }; - String STR_EXPLORER - { - Text [ en-US ] = "Bookmark folder" ; - }; - String STR_BOOKMARK_SEARCH - { - Text [ en-US ] = "Search in bookmarks"; - }; -}; - // PopupMenu ------------------------------------------------------------- -Menu RID_SVXMN_HYPERLINK -{ - ItemList = - { - MenuItem - { - Identifier = MN_FIELD ; - Text [ en-US ] = "As Text" ; - }; - MenuItem - { - Identifier = MN_BUTTON ; - Text [ en-US ] = "As Button" ; - }; - }; -}; -QueryBox RID_SVXQB_DONTEXIST -{ - BUTTONS = WB_YES_NO ; - DEFBUTTON = WB_DEF_YES ; - Message [ en-US ] = "This URL does not exist.\nInsert anyway?" ; -}; - - - - - - - - diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 9cd43f0f5195..633c8a236c74 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,13 +40,9 @@ #include <stdlib.h> #include <tools/shl.hxx> -#ifndef _EINF_HXX #include <tools/errinf.hxx> -#endif #include <tools/urlobj.hxx> -#ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> -#endif #include <vcl/msgbox.hxx> #include <vcl/group.hxx> #include <vcl/lstbox.hxx> @@ -63,9 +60,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> #include <unotools/localedatawrapper.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #define _IMAPDLG_PRIVATE #include "svx/imapdlg.hxx" @@ -114,11 +109,7 @@ inline String GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode cS return aVal; } -/************************************************************************* -|* -|* ControllerItem -|* -\************************************************************************/ +// ControllerItem SvxIMapDlgItem::SvxIMapDlgItem( sal_uInt16 _nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ) : SfxControllerItem ( _nId, rBindings ), @@ -126,12 +117,6 @@ SvxIMapDlgItem::SvxIMapDlgItem( sal_uInt16 _nId, SvxIMapDlg& rIMapDlg, SfxBindin { } -/************************************************************************* -|* -|* StateChanged-Methode -|* -\************************************************************************/ - void SvxIMapDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem ) { @@ -139,19 +124,13 @@ void SvxIMapDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, { const SfxBoolItem* pStateItem = PTR_CAST( SfxBoolItem, pItem ); - DBG_ASSERT( pStateItem || pItem == 0, "SfxBoolItem erwartet"); + DBG_ASSERT( pStateItem || pItem == 0, "SfxBoolItem expected"); - // Float ggf. disablen + // Disable Float if possible rIMap.SetExecState( !pStateItem->GetValue() ); } } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -168,13 +147,6 @@ SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( Window* _pParent, sal_uInt16 nId, pDlg->Initialize( pInfo ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void SvxIMapDlgChildWindow::UpdateIMapDlg( const Graphic& rGraphic, const ImageMap* pImageMap, const TargetList* pTargetList, void* pEditingObj ) { @@ -183,13 +155,6 @@ void SvxIMapDlgChildWindow::UpdateIMapDlg( const Graphic& rGraphic, const ImageM SVXIMAPDLG()->Update( rGraphic, pImageMap, pTargetList, pEditingObj ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW, Window* _pParent, const ResId& rResId ) : SfxModelessDialog ( _pBindings, pCW, _pParent, rResId ), @@ -203,7 +168,6 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW, maCbbTarget ( this, SVX_RES( RID_SVXCTL_CBB_TARGET ) ), aStbStatus ( this, WB_BORDER | WB_3DLOOK | WB_LEFT ), maImageList ( SVX_RES( IL_IMAPDLG ) ), - maImageListH ( SVX_RES( ILH_IMAPDLG ) ), pCheckObj ( NULL ), aIMapItem ( SID_IMAP_EXEC, *this, *_pBindings ) { @@ -259,27 +223,13 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW, aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_False ); } - -/************************************************************************* -|* -|* Dtor -|* -\************************************************************************/ - SvxIMapDlg::~SvxIMapDlg() { - // URL-Liste loeschen + // Delete URL-List delete pIMapWnd; delete pOwnData; } - -/************************************************************************* -|* -|* Resize-Methode -|* -\************************************************************************/ - void SvxIMapDlg::Resize() { SfxModelessDialog::Resize(); @@ -292,11 +242,11 @@ void SvxIMapDlg::Resize() Size _aSize( aStbStatus.GetSizePixel() ); Point aPoint( 0, aNewSize.Height() - _aSize.Height() ); - // StatusBar positionieren + // Position the StatusBar aStbStatus.SetPosSizePixel( aPoint, Size( aNewSize.Width(), _aSize.Height() ) ); aStbStatus.Show(); - // EditWindow positionieren + // Position the EditWindow _aSize.Width() = aNewSize.Width() - 18; _aSize.Height() = aPoint.Y() - pIMapWnd->GetPosPixel().Y() - 6; pIMapWnd->SetSizePixel( _aSize ); @@ -305,13 +255,6 @@ void SvxIMapDlg::Resize() } } - -/************************************************************************* -|* -|* Close-Methode -|* -\************************************************************************/ - sal_Bool SvxIMapDlg::Close() { sal_Bool bRet = sal_True; @@ -346,61 +289,28 @@ sal_Bool SvxIMapDlg::Close() return( bRet ? SfxModelessDialog::Close() : sal_False ); } - -/************************************************************************* -|* -|* Enabled oder disabled alle Controls -|* -\************************************************************************/ +// Enabled or disable all Controls void SvxIMapDlg::SetExecState( sal_Bool bEnable ) { pOwnData->bExecState = bEnable; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void SvxIMapDlg::SetGraphic( const Graphic& rGraphic ) { pIMapWnd->SetGraphic( rGraphic ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void SvxIMapDlg::SetImageMap( const ImageMap& rImageMap ) { pIMapWnd->SetImageMap( rImageMap ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - const ImageMap& SvxIMapDlg::GetImageMap() const { return pIMapWnd->GetImageMap(); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void SvxIMapDlg::SetTargetList( const TargetList& rTargetList ) { TargetList aNewList( rTargetList ); @@ -409,29 +319,15 @@ void SvxIMapDlg::SetTargetList( const TargetList& rTargetList ) maCbbTarget.Clear(); - for( String* pStr = aNewList.First(); pStr; pStr = aNewList.Next() ) - maCbbTarget.InsertEntry( *pStr ); + for ( size_t i = 0, n = aNewList.size(); i < n; ++i ) + maCbbTarget.InsertEntry( *aNewList[ i ] ); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - const TargetList& SvxIMapDlg::GetTargetList() const { return pIMapWnd->GetTargetList(); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void SvxIMapDlg::Update( const Graphic& rGraphic, const ImageMap* pImageMap, const TargetList* pTargetList, void* pEditingObj ) { @@ -444,23 +340,21 @@ void SvxIMapDlg::Update( const Graphic& rGraphic, const ImageMap* pImageMap, pOwnData->pUpdateEditingObject = pEditingObj; - // UpdateTargetList loeschen, da diese Methode - // vor dem Zuschlagen des Update-Timers noch - // mehrmals gerufen werden kann( #46540 ) - for( String* pStr = pOwnData->aUpdateTargetList.First(); pStr; pStr = pOwnData->aUpdateTargetList.Next() ) - delete pStr; - pOwnData->aUpdateTargetList.Clear(); - - // TargetListe muss kopiert werden, da sie im - // Besitz des Aufrufers ist und von ihm nach diesem - // Aufruf sofort geloescht werden kann; - // die kopierte Liste wird im Handler wieder geloescht + // Delete UpdateTargetList, because this method can still be called several + // times before the update timer is turned on + for ( size_t i = 0, n = pOwnData->aUpdateTargetList.size(); i < n; ++i ) + delete pOwnData->aUpdateTargetList[ i ]; + pOwnData->aUpdateTargetList.clear(); + + // TargetList must be copied, since it is owned by the caller and can be + // deleted immediately after this call the copied list will be deleted + // again in the handler if( pTargetList ) { TargetList aTargetList( *pTargetList ); - for( String* pStr = aTargetList.First(); pStr; pStr = aTargetList.Next() ) - pOwnData->aUpdateTargetList.Insert( new String( *pStr ) ); + for ( size_t i = 0, n = aTargetList.size(); i < n; ++i ) + pOwnData->aUpdateTargetList.push_back( new String( *aTargetList[ i ] ) ); } pOwnData->aTimer.Start(); @@ -472,11 +366,7 @@ void SvxIMapDlg::KeyInput( const KeyEvent& rKEvt ) SfxModelessDialog::KeyInput( rKEvt ); } -/************************************************************************* -|* -|* Click-Hdl fuer ToolBox -|* -\************************************************************************/ +// Click-handler for ToolBox IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) { @@ -619,13 +509,6 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) return 0; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void SvxIMapDlg::DoOpen() { ::sfx2::FileDialogHelper aDlg( @@ -667,13 +550,6 @@ void SvxIMapDlg::DoOpen() } } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - sal_Bool SvxIMapDlg::DoSave() { ::sfx2::FileDialogHelper aDlg( @@ -723,7 +599,7 @@ sal_Bool SvxIMapDlg::DoSave() if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { - DBG_ERROR( "invalid URL" ); + OSL_FAIL( "invalid URL" ); } else { @@ -748,13 +624,6 @@ sal_Bool SvxIMapDlg::DoSave() return bRet; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd ) { String aStr; @@ -823,12 +692,6 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd ) return 0; } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxIMapDlg, MousePosHdl, IMapWindow*, pWnd ) { String aStr; @@ -846,12 +709,6 @@ IMPL_LINK( SvxIMapDlg, MousePosHdl, IMapWindow*, pWnd ) return 0L; } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxIMapDlg, GraphSizeHdl, IMapWindow*, pWnd ) { String aStr; @@ -869,12 +726,6 @@ IMPL_LINK( SvxIMapDlg, GraphSizeHdl, IMapWindow*, pWnd ) return 0L; } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxIMapDlg, URLModifyHdl, void*, EMPTYARG ) { NotifyInfo aNewInfo; @@ -888,13 +739,6 @@ IMPL_LINK( SvxIMapDlg, URLModifyHdl, void*, EMPTYARG ) return 0; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxIMapDlg, URLLoseFocusHdl, void*, EMPTYARG ) { NotifyInfo aNewInfo; @@ -923,13 +767,6 @@ IMPL_LINK( SvxIMapDlg, URLLoseFocusHdl, void*, EMPTYARG ) return 0; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxIMapDlg, UpdateHdl, Timer*, EMPTYARG ) { pOwnData->aTimer.Stop(); @@ -948,29 +785,21 @@ IMPL_LINK( SvxIMapDlg, UpdateHdl, Timer*, EMPTYARG ) SetTargetList( pOwnData->aUpdateTargetList ); SetEditingObject( pOwnData->pUpdateEditingObject ); - // Nach Wechsel => default Selektion + // After changes => default selection aTbxIMapDlg1.CheckItem( TBI_SELECT, sal_True ); pIMapWnd->SetEditMode( sal_True ); } - // die in der Update-Methode kopierte Liste wieder loeschen - for( String* pStr = pOwnData->aUpdateTargetList.First(); pStr; pStr = pOwnData->aUpdateTargetList.Next() ) - delete pStr; - - pOwnData->aUpdateTargetList.Clear(); + // Delete the copied list again in the Update method + for ( size_t i = 0, n = pOwnData->aUpdateTargetList.size(); i < n; ++i ) + delete pOwnData->aUpdateTargetList[ i ]; + pOwnData->aUpdateTargetList.clear(); GetBindings().Invalidate( SID_IMAP_EXEC ); return 0L; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd ) { const SdrObject* pObj = pWnd->GetSelectedSdrObject(); @@ -1023,12 +852,6 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd ) return 0L; } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( SvxIMapDlg, MiscHdl, void*, EMPTYARG ) { SvtMiscOptions aMiscOptions; @@ -1039,9 +862,7 @@ IMPL_LINK( SvxIMapDlg, MiscHdl, void*, EMPTYARG ) void SvxIMapDlg::ApplyImageList() { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - ImageList& rImgLst = bHighContrast ? maImageListH : maImageList; + ImageList& rImgLst = maImageList; aTbxIMapDlg1.SetImageList( rImgLst ); } @@ -1053,3 +874,5 @@ void SvxIMapDlg::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) ApplyImageList(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc index 4a6d322699b5..07cdf696eea1 100644..100755 --- a/svx/source/dialog/imapdlg.hrc +++ b/svx/source/dialog/imapdlg.hrc @@ -27,7 +27,7 @@ #include <svx/dialogs.hrc> -// ImapDlg-Dialoge +// ImapDlg-Dialog #define RID_SVX_IMAPDLG_START RID_SVX_IMAP_START @@ -71,7 +71,6 @@ #define STB_STATUS 1 #define IL_IMAPDLG 1024 -#define ILH_IMAPDLG 1025 /******************************************************************************/ diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src index d691f5443b5a..8ceebdefbb7d 100644 --- a/svx/source/dialog/imapdlg.src +++ b/svx/source/dialog/imapdlg.src @@ -269,13 +269,8 @@ ModelessDialog RID_SVXDLG_IMAP MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ; IMAPDLG_IDLIST }; - ImageList ILH_IMAPDLG - { - Prefix = "idh"; - MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ; - IMAPDLG_IDLIST - }; }; + Control RID_SVXCTL_IMAP { Border = TRUE ; diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx index fd496a609f90..9838caa8ad7f 100644 --- a/svx/source/dialog/imapimp.hxx +++ b/svx/source/dialog/imapimp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,8 +50,10 @@ public: void* pUpdateEditingObject; sal_Bool bExecState; - IMapOwnData( SvxIMapDlg* pIMapDlg ) : pIMap ( pIMapDlg ) {} + IMapOwnData( SvxIMapDlg* pIMapDlg ) : pIMap ( pIMapDlg ), pUpdateEditingObject( NULL ) {} }; #endif // _IMAPIMP_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index ff152a152d51..5393ef8fd085 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,12 +67,6 @@ using ::com::sun::star::uno::Reference; #define TRANSCOL Color( COL_WHITE ) -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMapWindow::IMapWindow( Window* pParent, const ResId& rResId, const Reference< XFrame >& rxDocumentFrame ) : GraphCtrl( pParent, rResId ), DropTargetHelper( this ), @@ -86,39 +81,21 @@ IMapWindow::IMapWindow( Window* pParent, const ResId& rResId, const Reference< X pIMapPool->FreezeIdRanges(); } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMapWindow::~IMapWindow() { - // Liste loeschen - for( String* pStr = aTargetList.First(); pStr; pStr = aTargetList.Next() ) - delete pStr; + // Delete Liste + for ( size_t i = 0, n = aTargetList.size(); i < n; ++i ) + delete aTargetList[ i ]; SfxItemPool::Free(pIMapPool); delete[] pItemInfo; } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void IMapWindow::SetImageMap( const ImageMap& rImageMap ) { ReplaceImageMap( rImageMap, sal_False ); } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, sal_Bool /*bScaleToGraphic*/ ) { SdrPage* pPage = 0; @@ -156,12 +133,6 @@ void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, sal_Bool /*bScaleTo } } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - sal_Bool IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ) { const SdrObject* pSdrObj = GetSelectedSdrObject(); @@ -182,12 +153,6 @@ sal_Bool IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ) return bRet; } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - const ImageMap& IMapWindow::GetImageMap() { if ( pModel->IsChanged() ) @@ -210,35 +175,20 @@ const ImageMap& IMapWindow::GetImageMap() return aIMap; } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void IMapWindow::SetTargetList( TargetList& rTargetList ) { - String* pStr; + // Delete old List + for( size_t i = 0, n = aTargetList.size(); i < n; ++i ) + delete aTargetList[ i ]; + aTargetList.clear(); - // alte Liste loeschen - for( pStr = aTargetList.First(); pStr; pStr = aTargetList.Next() ) - delete pStr; - - aTargetList.Clear(); - - // mit uebergebener Liste fuellen - for( pStr = rTargetList.First(); pStr; pStr = rTargetList.Next() ) - aTargetList.Insert( new String( *pStr ) ); + // Fill with the provided list + for( size_t i = 0, n = rTargetList.size(); i < n; ++i ) + aTargetList.push_back( new String( *rTargetList[ i ] ) ); pModel->SetChanged( sal_False ); } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) { Point aPoint; @@ -253,7 +203,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) IMapRectangleObject* pIMapRectObj = (IMapRectangleObject*) pIMapObj; Rectangle aDrawRect( pIMapRectObj->GetRectangle( sal_False ) ); - // auf Zeichenflaeche clippen + // clipped on CanvasPane aDrawRect.Intersection( aClipRect ); pSdrObj = (SdrObject*) new SdrRectObj( aDrawRect ); @@ -269,7 +219,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) const Point aOffset( nRadius, nRadius ); Rectangle aCircle( aCenter - aOffset, aCenter + aOffset ); - // auf Zeichenflaeche begrenzen + // limited to CanvasPane aCircle.Intersection( aClipRect ); pSdrObj = (SdrObject*) new SdrCircObj( OBJ_CIRC, aCircle, 0, 36000 ); @@ -281,13 +231,12 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) { IMapPolygonObject* pIMapPolyObj = (IMapPolygonObject*) pIMapObj; - // Falls wir eigentlich eine Ellipse sind, - // erzeugen wir auch wieder eine Ellipse + // If it actually is an ellipse, then another ellipse is created again if ( pIMapPolyObj->HasExtraEllipse() ) { Rectangle aDrawRect( pIMapPolyObj->GetExtraEllipse() ); - // auf Zeichenflaeche clippen + // clipped on CanvasPane aDrawRect.Intersection( aClipRect ); pSdrObj = (SdrObject*) new SdrCircObj( OBJ_CIRC, aDrawRect, 0, 36000 ); @@ -297,7 +246,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) const Polygon& rPoly = pIMapPolyObj->GetPolygon( sal_False ); Polygon aDrawPoly( rPoly ); - // auf Zeichenflaeche clippen + // clipped on CanvasPane aDrawPoly.Clip( aClipRect ); basegfx::B2DPolygon aPolygon; @@ -331,7 +280,6 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) aSet.Put( XLineColorItem( String(), Color( COL_BLACK ) ) ); } - //pSdrObj->SetItemSetAndBroadcast(aSet); pSdrObj->SetMergedItemSetAndBroadcast(aSet); pSdrObj->InsertUserData( new IMapUserData( pCloneIMapObj ) ); @@ -341,12 +289,6 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) return pSdrObj; } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void IMapWindow::InitSdrModel() { GraphCtrl::InitSdrModel(); @@ -359,12 +301,6 @@ void IMapWindow::InitSdrModel() pView->SetFrameDragSingles( sal_True ); } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void IMapWindow::SdrObjCreated( const SdrObject& rObj ) { switch( rObj.GetObjIdentifier() ) @@ -414,12 +350,6 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj ) } } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void IMapWindow::SdrObjChanged( const SdrObject& rObj ) { IMapUserData* pUserData = (IMapUserData*) rObj.GetUserData( 0 ); @@ -460,7 +390,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj ) IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False ); pObj->SetExtraEllipse( aPoly.GetBoundRect() ); - // wurde von uns nur temporaer angelegt + // was only created by us temporarily delete pPathObj; pUserData->ReplaceObject( IMapObjectPtr(pObj) ); } @@ -489,36 +419,18 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj ) } } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void IMapWindow::MouseButtonUp(const MouseEvent& rMEvt) { GraphCtrl::MouseButtonUp( rMEvt ); UpdateInfo( sal_True ); } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void IMapWindow::MarkListHasChanged() { GraphCtrl::MarkListHasChanged(); UpdateInfo( sal_False ); } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const { SdrObject* pObj = NULL; @@ -548,12 +460,6 @@ SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const return pObj; } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMapObject* IMapWindow::GetIMapObj( const SdrObject* pSdrObj ) const { IMapObject* pIMapObj = NULL; @@ -569,12 +475,6 @@ IMapObject* IMapWindow::GetIMapObj( const SdrObject* pSdrObj ) const return pIMapObj; } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - SdrObject* IMapWindow::GetSdrObj( const IMapObject* pIMapObj ) const { SdrObject* pSdrObj = NULL; @@ -598,12 +498,6 @@ SdrObject* IMapWindow::GetSdrObj( const IMapObject* pIMapObj ) const return pSdrObj; } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void IMapWindow::Command(const CommandEvent& rCEvt) { Region aRegion; @@ -655,23 +549,11 @@ void IMapWindow::Command(const CommandEvent& rCEvt) Window::Command(rCEvt); } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - sal_Int8 IMapWindow::AcceptDrop( const AcceptDropEvent& rEvt ) { return( ( GetHitSdrObj( rEvt.maPosPixel ) != NULL ) ? rEvt.mnAction : DND_ACTION_NONE ); } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - sal_Int8 IMapWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) { sal_Int8 nRet = DND_ACTION_NONE; @@ -699,12 +581,6 @@ sal_Int8 IMapWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void IMapWindow::RequestHelp( const HelpEvent& rHEvt ) { SdrObject* pSdrObj = NULL; @@ -736,12 +612,6 @@ void IMapWindow::RequestHelp( const HelpEvent& rHEvt ) } } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void IMapWindow::SetCurrentObjState( sal_Bool bActive ) { SdrObject* pObj = GetSelectedSdrObject(); @@ -769,12 +639,6 @@ void IMapWindow::SetCurrentObjState( sal_Bool bActive ) } } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void IMapWindow::UpdateInfo( sal_Bool bNewObj ) { if ( aInfoLink.IsSet() ) @@ -804,12 +668,6 @@ void IMapWindow::UpdateInfo( sal_Bool bNewObj ) } } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void IMapWindow::DoMacroAssign() { SdrObject* pSdrObj = GetSelectedSdrObject(); @@ -843,12 +701,6 @@ void IMapWindow::DoMacroAssign() } } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - void IMapWindow::DoPropertyDialog() { SdrObject* pSdrObj = GetSelectedSdrObject(); @@ -882,17 +734,11 @@ void IMapWindow::DoPropertyDialog() pModel->SetChanged( sal_True ); UpdateInfo( sal_True ); } - delete aDlg; //add by CHINA001 + delete aDlg; } } } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu ) { if (pMenu) @@ -1004,40 +850,6 @@ void IMapWindow::CreateDefaultObject() void IMapWindow::KeyInput( const KeyEvent& rKEvt ) { - KeyCode aCode = rKEvt.GetKeyCode(); - -/* - switch(aCode.GetCode()) - { - case KEY_ESCAPE: - { - if ( pView->IsAction() ) - { - pView->BrkAction(); - return; - } - else if ( pView->AreObjectsMarked() ) - { - const SdrHdlList& rHdlList = pView->GetHdlList(); - SdrHdl* pHdl = rHdlList.GetFocusHdl(); - - if(pHdl) - { - ((SdrHdlList&)rHdlList).ResetFocusHdl(); - } - else - { - pView->UnmarkAllObj(); - ((Dialog*)GetParent())->GrabFocusToFirstControl(); - } - - return; - } - } - break; - - } -*/ GraphCtrl::KeyInput( rKEvt ); } @@ -1067,3 +879,5 @@ void IMapWindow::StartPolyEdit() ((SdrHdlList&)rHdlList).TravelFocusHdl(true); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index bbc6a2c1ed6d..d5eba52dfaa4 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,12 +41,6 @@ #include <com/sun/star/frame/XFrame.hpp> -/************************************************************************* -|* -|* -|* -\************************************************************************/ - struct NotifyInfo { String aMarkURL; @@ -65,13 +60,6 @@ struct NotifyPosSize sal_Bool bMousePos; }; - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - #define SVD_IMAP_USERDATA 0x0001 const sal_uInt32 IMapInventor = sal_uInt32('I') * 0x00000001+ @@ -110,47 +98,6 @@ public: void ReplaceObject( const IMapObjectPtr& pNewIMapObject ) { mpObj = pNewIMapObject; } }; - -/************************************************************************* -|* -|* -|* -\************************************************************************/ -/* move to cui //CHINA001 -class URLDlg : public ModalDialog -{ - FixedLine aFlURL; - FixedText aFtURL1; - Edit aEdtURL; - FixedText aFtURLDescription; - Edit aEdtURLDescription; - FixedText aFtTarget; - ComboBox aCbbTargets; - FixedText aFtName; - Edit aEdtName; - OKButton aBtnOk; - CancelButton aBtnCancel; - -public: - - URLDlg( Window* pWindow, - const String& rURL, const String& rDescription, - const String& rTarget, const String& rName, - TargetList& rTargetList ); - - String GetURL() const { return aEdtURL.GetText(); } - String GetDescription() const { return aEdtURLDescription.GetText(); } - String GetTarget() const { return aCbbTargets.GetText(); } - String GetName() const { return aEdtName.GetText(); } -}; -*/ - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - class IMapWindow : public GraphCtrl, public DropTargetHelper { NotifyInfo aInfo; @@ -224,3 +171,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index cdc4cfc0b9b8..418e9b42ca3f 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -155,7 +156,6 @@ void SvxLanguageBox::Init() m_pLangTable = new SvtLanguageTable; m_aNotCheckedImage = Image( SVX_RES( RID_SVXIMG_NOTCHECKED ) ); m_aCheckedImage = Image( SVX_RES( RID_SVXIMG_CHECKED ) ); - m_aCheckedImageHC = Image( SVX_RES( RID_SVXIMG_CHECKED_H ) ); m_aAllString = String( SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL ) ); m_nLangList = LANG_LIST_EMPTY; m_bHasLangNone = sal_False; @@ -201,8 +201,6 @@ sal_uInt16 SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, sal_uInt16 sal_uInt16 nRet = 0; if( !bChecked ) nRet = InsertEntry( rEntry, m_aNotCheckedImage, nPos ); - else if( GetSettings().GetStyleSettings().GetHighContrastMode() ) - nRet = InsertEntry( rEntry, m_aCheckedImageHC, nPos ); else nRet = InsertEntry( rEntry, m_aCheckedImage, nPos ); return nRet; @@ -516,11 +514,8 @@ bool SvxLanguageBox::IsLanguageSelected( const LanguageType/*type*/) const return true; } -/*IMPL_IMPL (SvxLanguageBox, ListBox); -IMPL_CONSTRUCTORS ( SvxLanguageBox, ListBox, "svxlanguagebox" ); -IMPL_GET_IMPL( SvxLanguageBox ); -IMPL_GET_WINDOW (SvxLanguageBox);*/ }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/langbox.src b/svx/source/dialog/langbox.src index 79bf1cf010c3..b7cc9c40fce5 100644 --- a/svx/source/dialog/langbox.src +++ b/svx/source/dialog/langbox.src @@ -34,16 +34,12 @@ Image RID_SVXIMG_NOTCHECKED ImageBitmap = Bitmap { File = "notcheck.bmp" ; } ; MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; }; + Image RID_SVXIMG_CHECKED { ImageBitmap = Bitmap { File = "lngcheck.bmp" ; } ; MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; }; -Image RID_SVXIMG_CHECKED_H -{ - ImageBitmap = Bitmap { File = "lngcheck_h.bmp" ; } ; - MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; -}; // ********************************************************************** EOF diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx new file mode 100644 index 000000000000..d69ddda72b7c --- /dev/null +++ b/svx/source/dialog/linkwarn.cxx @@ -0,0 +1,150 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * Copyright 2010 Novell, 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_svx.hxx" + +#include "linkwarn.hrc" +#include "svx/linkwarn.hxx" +#include "svx/dialogs.hrc" +#include "svx/dialmgr.hxx" +#include <vcl/msgbox.hxx> +#include <sfx2/basedlgs.hxx> +#include <svtools/miscopt.hxx> + +SvxLinkWarningDialog::SvxLinkWarningDialog( Window* pParent, const String& _rFileName ) : + SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_LINK_WARNING ) ), + m_aQueryImage ( this, SVX_RES( FI_QUERY ) ), + m_aInfoText ( this, SVX_RES( FT_INFOTEXT ) ), + m_aLinkGraphicBtn ( this, SVX_RES( PB_OK ) ), + m_aEmbedGraphicBtn ( this, SVX_RES( PB_NO ) ), + m_aOptionLine ( this, SVX_RES( FL_OPTION ) ), + m_aWarningOnBox ( this, SVX_RES( CB_WARNING_OFF ) ) +{ + FreeResource(); + + // set questionmark image + m_aQueryImage.SetImage( QueryBox::GetStandardImage() ); + + // replace filename + String sInfoText = m_aInfoText.GetText(); + sInfoText.SearchAndReplaceAll( + UniString::CreateFromAscii( + RTL_CONSTASCII_STRINGPARAM( "%FILENAME" ) ), _rFileName ); + m_aInfoText.SetText( sInfoText ); + + // load state of "warning on" checkbox from misc options + SvtMiscOptions aMiscOpt; + m_aWarningOnBox.Check( aMiscOpt.ShowLinkWarningDialog() == sal_True ); + if( aMiscOpt.IsShowLinkWarningDialogReadOnly() ) + m_aWarningOnBox.Disable(); + + // set focus to Cancel button + m_aEmbedGraphicBtn.GrabFocus(); + + // calculate and set the size of the dialog and its controls + InitSize(); +} + +// ----------------------------------------------------------------------- + +SvxLinkWarningDialog::~SvxLinkWarningDialog() +{ + // save value of "warning off" checkbox, if necessary + SvtMiscOptions aMiscOpt; + sal_Bool bChecked = m_aWarningOnBox.IsChecked(); + if ( aMiscOpt.ShowLinkWarningDialog() != bChecked ) + aMiscOpt.SetShowLinkWarningDialog( bChecked ); +} + +// ----------------------------------------------------------------------- + +void SvxLinkWarningDialog::InitSize() +{ + // text of checkbox to wide -> add new line + long nTxtW = m_aWarningOnBox.GetCtrlTextWidth( m_aWarningOnBox.GetText() ) + IMPL_EXTRA_BUTTON_WIDTH; + long nCtrlW = m_aWarningOnBox.GetSizePixel().Width(); + if ( nTxtW >= nCtrlW ) + { + long nTextHeight = m_aWarningOnBox.GetTextHeight(); + Size aNewSize = m_aWarningOnBox.GetSizePixel(); + aNewSize.Height() += nTextHeight; + m_aWarningOnBox.SetSizePixel( aNewSize ); + aNewSize = GetSizePixel(); + aNewSize.Height() += nTextHeight; + SetSizePixel( aNewSize ); + } + + // align the size of the information text control (FixedText) to its content + Size aMinSize = m_aInfoText.CalcMinimumSize( m_aInfoText.GetSizePixel().Width() ); + long nTxtH = aMinSize.Height(); + long nCtrlH = m_aInfoText.GetSizePixel().Height(); + long nDelta = ( nCtrlH - nTxtH ); + Size aNewSize = m_aInfoText.GetSizePixel(); + aNewSize.Height() -= nDelta; + m_aInfoText.SetSizePixel( aNewSize ); + + // new position for the succeeding windows + Window* pWins[] = + { + &m_aLinkGraphicBtn, &m_aEmbedGraphicBtn, &m_aOptionLine, &m_aWarningOnBox + }; + Window** pCurrent = pWins; + for ( sal_uInt32 i = 0; i < sizeof(pWins) / sizeof(*pWins); ++i, ++pCurrent ) + { + Point aNewPos = (*pCurrent)->GetPosPixel(); + aNewPos.Y() -= nDelta; + (*pCurrent)->SetPosPixel( aNewPos ); + } + + // new size of the dialog + aNewSize = GetSizePixel(); + aNewSize.Height() -= nDelta; + SetSizePixel( aNewSize ); + + // recalculate the size and position of the buttons + nTxtW = m_aLinkGraphicBtn.GetCtrlTextWidth( m_aLinkGraphicBtn.GetText() ); + long nTemp = m_aEmbedGraphicBtn.GetCtrlTextWidth( m_aEmbedGraphicBtn.GetText() ); + if ( nTemp > nTxtW ) + nTxtW = nTemp; + nTxtW += IMPL_EXTRA_BUTTON_WIDTH; + Size a3Size = LogicToPixel( Size( 3, 3 ), MAP_APPFONT ); + Point aPos = m_aLinkGraphicBtn.GetPosPixel(); + aPos.X() = ( aNewSize.Width() - (2*nTxtW) - a3Size.Width() ) / 2; + long nDefX = m_aWarningOnBox.GetPosPixel().X(); + if ( nDefX < aPos.X() ) + aPos.X() = nDefX; + aNewSize = m_aLinkGraphicBtn.GetSizePixel(); + aNewSize.Width() = nTxtW; + m_aLinkGraphicBtn.SetPosSizePixel( aPos, aNewSize ); + aPos.X() += nTxtW + a3Size.Width(); + m_aEmbedGraphicBtn.SetPosSizePixel( aPos, aNewSize ); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/linkwarn.hrc b/svx/source/dialog/linkwarn.hrc new file mode 100644 index 000000000000..d01dc88d8e30 --- /dev/null +++ b/svx/source/dialog/linkwarn.hrc @@ -0,0 +1,60 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * Copyright 2010 Novell, 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. + * + ************************************************************************/ + +#ifndef _SVX_LINKWARN_HRC +#define _SVX_LINKWARN_HRC + +#include <svtools/controldims.hrc> + +// dialog ids +#define FI_QUERY 10 +#define FT_INFOTEXT 11 +#define PB_OK 12 +#define PB_NO 13 +#define FL_OPTION 15 +#define CB_WARNING_OFF 16 + +// --------- general metrics --------- + +#define SYMBOL_EDGE 20 +#define DIALOG_WIDTH 220 +#define INFO_TEXT_LINES 11 + +#define AW_COL_1 (RSC_SP_DLG_INNERBORDER_LEFT) +#define AW_COL_2 (AW_COL_1+SYMBOL_EDGE+RSC_SP_CTRL_DESC_X) +#define AW_COL_3 (AW_COL_2+RSC_CD_PUSHBUTTON_WIDTH+RSC_SP_CTRL_DESC_X) +#define AW_COL_4 (DIALOG_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH) + +#define AW_ROW_1 (RSC_SP_DLG_INNERBORDER_TOP) +#define AW_ROW_2 (AW_ROW_1+INFO_TEXT_LINES*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y) +#define AW_ROW_3 (AW_ROW_2+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y) +#define AW_ROW_4 (AW_ROW_3+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y) + +#define DIALOG_HEIGHT (AW_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_DLG_INNERBORDER_BOTTOM) + +#endif diff --git a/svx/source/dialog/linkwarn.src b/svx/source/dialog/linkwarn.src new file mode 100644 index 000000000000..100b53cb6e33 --- /dev/null +++ b/svx/source/dialog/linkwarn.src @@ -0,0 +1,85 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * Copyright 2010 Novell, 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. + * + ************************************************************************/ + +#include "linkwarn.hrc" +#include "svx/dialogs.hrc" +#include "helpid.hrc" + +ModalDialog RID_SVXDLG_LINK_WARNING +{ + Size = MAP_APPFONT( DIALOG_WIDTH, DIALOG_HEIGHT ); + OutputSize = TRUE; + Closeable = FALSE; + Moveable = TRUE; + SVLook = TRUE; + + Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION"; + + FixedImage FI_QUERY + { + Pos = MAP_APPFONT( AW_COL_1, AW_ROW_1 ); + Size = MAP_APPFONT( SYMBOL_EDGE, SYMBOL_EDGE ); + }; + FixedText FT_INFOTEXT + { + Pos = MAP_APPFONT( AW_COL_2, AW_ROW_1 ); + Size = MAP_APPFONT( DIALOG_WIDTH-AW_COL_2-RSC_SP_DLG_INNERBORDER_RIGHT, INFO_TEXT_LINES*RSC_CD_FIXEDTEXT_HEIGHT ); + NoLabel = TRUE; + Wordbreak = TRUE; + Text [ en-US ] = "The file %FILENAME will not be stored along with your document, but only referenced as a link. This is dangerous if you move and/or rename the files. Do you want to embed the graphic instead?"; + Text [ de-DE ] = "Die Datei %FILENAME wird nicht zusammen mit dem Dokument gespeichert, sondern nur als Verweis referenziert. Dies kann zu Problemen führen, wenn die Dateien verschoben und/oder umbenannt werden. Möchten Sie stattdessen die Grafik als eingebettetes Objekt einfügen?"; + }; + OKButton PB_OK + { + Pos = MAP_APPFONT( AW_COL_2, AW_ROW_2 ); + Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); + DefButton = TRUE ; + Text [ en-US ] = "~Keep Link"; + Text [ de-DE ] = "~Als Verweis einfügen"; + }; + CancelButton PB_NO + { + Pos = MAP_APPFONT( AW_COL_3, AW_ROW_2 ); + Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); + Text [ en-US ] = "~Embed Graphic"; + Text [ de-DE ] = "~Eingebettet einfügen"; + }; + FixedLine FL_OPTION + { + Pos = MAP_APPFONT( 0, AW_ROW_3 ); + Size = MAP_APPFONT( DIALOG_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); + }; + CheckBox CB_WARNING_OFF + { + Pos = MAP_APPFONT( AW_COL_2, AW_ROW_4 ); + Size = MAP_APPFONT( DIALOG_WIDTH-AW_COL_2-RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT ); + WordBreak = TRUE ; + Text [ en-US ] = "~Ask when linking a graphic"; + Text [ de-DE ] = "~Nachfragen falls Grafik als Verweis eingefügt wird"; + }; +}; diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk new file mode 100755 index 000000000000..2f1d36c85c42 --- /dev/null +++ b/svx/source/dialog/makefile.mk @@ -0,0 +1,154 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* +PRJ=..$/.. +PRJNAME=svx +TARGET=dialogs +LIBTARGET=NO +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/makefile.pmk + +# +.IF "$(GUI)"=="WNT" +CFLAGS+= -DUNICODE -D_UNICODE +.ENDIF + +# --- Files -------------------------------------------------------- + +SRS1NAME=dialogs +SRC1FILES = \ + bmpmask.src \ + contdlg.src \ + ctredlin.src \ + dlgctrl.src \ + docrecovery.src \ + fontwork.src \ + frmsel.src \ + hdft.src \ + imapdlg.src \ + langbox.src \ + language.src \ + linkwarn.src \ + passwd.src \ + prtqry.src \ + rubydialog.src\ + ruler.src \ + srchdlg.src \ + svxbmpnumvalueset.src \ + swframeposstrings.src \ + txenctab.src \ + ucsubset.src \ + optgrid.src + +SRS2NAME=drawdlgs +SRC2FILES = \ + sdstring.src + +LIB1TARGET=$(SLB)$/$(TARGET)-core.lib + +LIB1OBJFILES= \ + $(SLO)$/checklbx.obj \ + $(SLO)$/dialmgr.obj\ + $(SLO)$/dlgutil.obj \ + $(SLO)$/framelink.obj\ + $(SLO)$/langbox.obj \ + $(SLO)$/simptabl.obj \ + $(SLO)$/svxdlg.obj \ + $(SLO)$/stddlg.obj \ + +LIB2TARGET=$(SLB)$/$(TARGET).lib + +LIB2OBJFILES= \ + $(SLO)$/charmap.obj \ + $(SLO)$/connctrl.obj \ + $(SLO)$/contwnd.obj \ + $(SLO)$/ctredlin.obj \ + $(SLO)$/databaseregistrationui.obj \ + $(SLO)$/dialcontrol.obj \ + $(SLO)$/dlgctl3d.obj \ + $(SLO)$/dlgctrl.obj \ + $(SLO)$/docrecovery.obj \ + $(SLO)$/fntctrl.obj \ + $(SLO)$/fontlb.obj \ + $(SLO)$/fontwork.obj \ + $(SLO)$/framelinkarray.obj \ + $(SLO)$/frmdirlbox.obj \ + $(SLO)$/frmsel.obj \ + $(SLO)$/graphctl.obj \ + $(SLO)$/grfflt.obj \ + $(SLO)$/hdft.obj \ + $(SLO)$/hyperdlg.obj \ + $(SLO)$/imapdlg.obj \ + $(SLO)$/imapwnd.obj \ + $(SLO)$/linkwarn.obj \ + $(SLO)$/measctrl.obj \ + $(SLO)$/orienthelper.obj \ + $(SLO)$/pagectrl.obj \ + $(SLO)$/paraprev.obj \ + $(SLO)$/passwd.obj \ + $(SLO)$/pfiledlg.obj \ + $(SLO)$/prtqry.obj \ + $(SLO)$/relfld.obj \ + $(SLO)$/rlrcitem.obj \ + $(SLO)$/rubydialog.obj \ + $(SLO)$/rulritem.obj \ + $(SLO)$/SpellDialogChildWindow.obj \ + $(SLO)$/srchctrl.obj \ + $(SLO)$/srchdlg.obj \ + $(SLO)$/strarray.obj \ + $(SLO)$/svxbmpnumvalueset.obj\ + $(SLO)$/svxgrahicitem.obj \ + $(SLO)$/svxruler.obj \ + $(SLO)$/swframeexample.obj \ + $(SLO)$/swframeposstrings.obj \ + $(SLO)$/txencbox.obj \ + $(SLO)$/txenctab.obj \ + $(SLO)$/wrapfield.obj \ + $(SLO)$/_bmpmask.obj \ + $(SLO)$/_contdlg.obj \ + $(SLO)$/optgrid.obj + + +.IF "$(GUI)"=="UNX" +LIB2OBJFILES += $(SLO)$/sendreportunx.obj +.ELSE +.IF "$(GUI)"=="WNT" +LIB2OBJFILES += $(SLO)$/sendreportw32.obj +.ELSE +LIB2OBJFILES += $(SLO)$/sendreportgen.obj +.ENDIF +.ENDIF + +SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk + diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx index df93370dda8e..2098b86d6846 100644 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,12 +38,6 @@ #include <svx/dialmgr.hxx> #include "svx/dlgutil.hxx" -/************************************************************************* -|* -|* Ctor SvxXMeasurePreview -|* -*************************************************************************/ - SvxXMeasurePreview::SvxXMeasurePreview ( Window* pParent, @@ -58,14 +53,13 @@ SvxXMeasurePreview::SvxXMeasurePreview Size aSize = GetOutputSize(); - // Massstab: 1:2 + // Scale: 1:2 MapMode aMapMode = GetMapMode(); aMapMode.SetScaleX( Fraction( 1, 2 ) ); aMapMode.SetScaleY( Fraction( 1, 2 ) ); SetMapMode( aMapMode ); aSize = GetOutputSize(); - Rectangle aRect = Rectangle( Point(), aSize ); Point aPt1 = Point( aSize.Width() / 5, (long) ( aSize.Height() / 2 ) ); Point aPt2 = Point( aSize.Width() * 4 / 5, (long) ( aSize.Height() / 2 ) ); @@ -73,7 +67,6 @@ SvxXMeasurePreview::SvxXMeasurePreview pModel = new SdrModel(); pMeasureObj->SetModel( pModel ); - //pMeasureObj->SetItemSetAndBroadcast(rInAttrs); pMeasureObj->SetMergedItemSetAndBroadcast(rInAttrs); SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR ); @@ -81,15 +74,8 @@ SvxXMeasurePreview::SvxXMeasurePreview Invalidate(); } -/************************************************************************* -|* -|* Dtor SvxXMeasurePreview -|* -*************************************************************************/ - SvxXMeasurePreview::~SvxXMeasurePreview() { - // #111111# // No one is deleting the MeasureObj? This is not only an error but also // a memory leak (!). Main problem is that this object is still listening to // a StyleSheet of the model which was set. Thus, if You want to keep the obnject, @@ -100,37 +86,18 @@ SvxXMeasurePreview::~SvxXMeasurePreview() delete pModel; } -/************************************************************************* -|* -|* SvxXMeasurePreview: Paint() -|* -*************************************************************************/ - void SvxXMeasurePreview::Paint( const Rectangle& ) { - pMeasureObj->SingleObjectPainter(*this); // #110094#-17 + pMeasureObj->SingleObjectPainter(*this); } -/************************************************************************* -|* -|* SvxXMeasurePreview: SetAttributes() -|* -*************************************************************************/ - void SvxXMeasurePreview::SetAttributes( const SfxItemSet& rInAttrs ) { - //pMeasureObj->SetItemSetAndBroadcast(rInAttrs); pMeasureObj->SetMergedItemSetAndBroadcast(rInAttrs); Invalidate(); } -/************************************************************************* -|* -|* SvxXMeasurePreview: SetAttributes() -|* -*************************************************************************/ - void SvxXMeasurePreview::MouseButtonDown( const MouseEvent& rMEvt ) { sal_Bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift(); @@ -197,3 +164,4 @@ void SvxXMeasurePreview::DataChanged( const DataChangedEvent& rDCEvt ) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index a3b367ad878c..c1173560578e 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,9 +44,7 @@ #include "optgrid.hrc" #include "svx/dlgutil.hxx" -/* -----------------18.08.98 17:41------------------- - * local functions - * --------------------------------------------------*/ +// local functions void lcl_GetMinMax(MetricField& rField, long& nFirst, long& nLast, long& nMin, long& nMax) { nFirst = static_cast<long>(rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) )); @@ -62,10 +61,6 @@ void lcl_SetMinMax(MetricField& rField, long nFirst, long nLast, long nMin, l rField.SetMax( rField.Normalize( nMax ), FUNIT_TWIP ); } -/*-------------------------------------------------------------------- - Beschreibung: Rastereinstellungen Ctor - --------------------------------------------------------------------*/ - SvxOptionsGrid::SvxOptionsGrid() : nFldDrawX ( 100 ), nFldDivisionX ( 0 ), @@ -80,18 +75,10 @@ SvxOptionsGrid::SvxOptionsGrid() : { } -/*-------------------------------------------------------------------- - Beschreibung: Rastereinstellungen Dtor - --------------------------------------------------------------------*/ - SvxOptionsGrid::~SvxOptionsGrid() { } -/*-------------------------------------------------------------------- - Beschreibung: Item fuer Rastereinstellungen - --------------------------------------------------------------------*/ - SvxGridItem::SvxGridItem( const SvxGridItem& rItem ) : SvxOptionsGrid() , SfxPoolItem(rItem) @@ -109,22 +96,14 @@ SvxGridItem::SvxGridItem( const SvxGridItem& rItem ) }; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SfxPoolItem* SvxGridItem::Clone( SfxItemPool* ) const { return new SvxGridItem( *this ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - int SvxGridItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" ); + DBG_ASSERT( SfxPoolItem::operator==(rAttr), "different types "); const SvxGridItem& rItem = (const SvxGridItem&) rAttr; @@ -140,10 +119,6 @@ int SvxGridItem::operator==( const SfxPoolItem& rAttr ) const nFldSnapY == rItem.nFldSnapY ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SfxItemPresentation SvxGridItem::GetPresentation ( SfxItemPresentation ePres, @@ -166,11 +141,7 @@ SfxItemPresentation SvxGridItem::GetPresentation } } - -/*----------------- OS 23.02.95 ----------------------- - TabPage Rastereinstellungen --------------------------------------------------------*/ - +// TabPage Screen Settings SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_GRID ), rCoreSet ), @@ -216,13 +187,13 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : bAttrModified( sal_False ) { - // diese Page braucht ExchangeSupport + // This page requires exchange Support SetExchangeSupport(); FreeResource(); aDivisionPointY.SetText(aDivisionPointX.GetText()); - // Metrik einstellen + // Set Metrics FieldUnit eFUnit = GetModuleFieldUnit( rCoreSet ); long nFirst, nLast, nMin, nMax; @@ -336,10 +307,8 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) ChangeGridsnapHdl_Impl( &aCbxUseGridsnap ); } - // Metrik ggfs. aendern (da TabPage im Dialog liegt, - // wo die Metrik eingestellt werden kann - //sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC ); - //if( rSet.GetItemState( GetWhich( SID_ATTR_METRIC ) ) >= SFX_ITEM_AVAILABLE ) + // Metric Change if necessary (as TabPage is in the dialog, where the + // metric can be set if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , sal_False, (const SfxPoolItem**)&pAttr )) { @@ -349,7 +318,7 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) if( eFUnit != aMtrFldDrawX.GetUnit() ) { - // Metriken einstellen + // Set Metrics long nFirst, nLast, nMin, nMax; long nVal = static_cast<long>(aMtrFldDrawX.Denormalize( aMtrFldDrawX.GetValue( FUNIT_TWIP ) )); @@ -424,3 +393,4 @@ IMPL_LINK( SvxGridTabPage, ChangeGridsnapHdl_Impl, void *, EMPTYARG ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/optgrid.hrc b/svx/source/dialog/optgrid.hrc index ced9bee740ca..ced9bee740ca 100644..100755 --- a/svx/source/dialog/optgrid.hrc +++ b/svx/source/dialog/optgrid.hrc diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index 95b6e5b4ca08..4878f350d37d 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ #include <vector> #include <utility> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include "svx/dialcontrol.hxx" namespace svx { @@ -204,3 +203,4 @@ void OrientStackedWrapper::SetControlValue( bool bValue ) } // namespace svx +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index e0c302da38df..13ab889da4d1 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,7 +46,7 @@ struct PageWindow_Impl { SvxBoxItem* pBorder; Bitmap aBitmap; - FASTBOOL bBitmap; + bool bBitmap; sal_Bool bResetBackground; sal_Bool bFrameDirection; sal_Int32 nFrameDirection; @@ -101,7 +102,7 @@ SvxPageWindow::SvxPageWindow( Window* pParent, const ResId& rId ) : { pImpl = new PageWindow_Impl; - // defaultmaessing in Twips rechnen + // Count in Twips by default SetMapMode( MapMode( MAP_TWIP ) ); aWinSize = GetOutputSizePixel(); aWinSize.Height() -= 4; @@ -122,7 +123,7 @@ SvxPageWindow::~SvxPageWindow() // ----------------------------------------------------------------------- -void __EXPORT SvxPageWindow::Paint( const Rectangle& ) +void SvxPageWindow::Paint( const Rectangle& ) { Fraction aXScale( aWinSize.Width(), std::max( (long) (aSize.Width() * 2 + aSize.Width() / 8), 1L ) ); Fraction aYScale( aWinSize.Height(), std::max( aSize.Height(), 1L ) ); @@ -144,10 +145,10 @@ void __EXPORT SvxPageWindow::Paint( const Rectangle& ) if ( eUsage == SVX_PAGE_ALL ) { - // alle Seiten gleich -> eine Seite malen + // all pages are equal -> draw one page if ( aSize.Width() > aSize.Height() ) { - // Querformat in gleicher Gr"osse zeichnen + // Draw Landscape page of the same size Fraction aX = aMapMode.GetScaleX(); Fraction aY = aMapMode.GetScaleY(); Fraction a2( 1.5 ); @@ -162,12 +163,12 @@ void __EXPORT SvxPageWindow::Paint( const Rectangle& ) DrawPage( Point( nXPos, nYPos ), sal_True, sal_True ); } else - // Hochformat + // Portrait DrawPage( Point( ( aSz.Width() - aSize.Width() ) / 2, nYPos ), sal_True, sal_True ); } else { - // Linke und rechte Seite unterschiedlich -> ggf. zwei Seiten malen + // Left and right page are different -> draw two pages if possible DrawPage( Point( 0, nYPos ), sal_False, (sal_Bool)( eUsage & SVX_PAGE_LEFT ) ); DrawPage( Point( aSize.Width() + aSize.Width() / 8, nYPos ), sal_True, (sal_Bool)( eUsage & SVX_PAGE_RIGHT ) ); @@ -195,9 +196,9 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s pImpl->bResetBackground = sal_False; } SetLineColor( rFieldTextColor ); - // Schatten + // Shadow Size aTempSize = aSize; - // Seite + // Page if ( !bEnabled ) { SetFillColor( rDisableColor ); @@ -216,7 +217,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s if ( eUsage == SVX_PAGE_MIRROR && !bSecond ) { - // f"ur gespiegelt drehen + // turn for mirrored nL = nRight; nR = nLeft; } @@ -233,7 +234,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s if ( bHeader ) { - // ggf. Header anzeigen + // show headers if possible aHdRect.Left() += nHdLeft; aHdRect.Right() -= nHdRight; aHdRect.Bottom() = aRect.Top() + nHdHeight; @@ -244,7 +245,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s if ( bFooter ) { - // ggf. Footer anzeigen + // show footer if possible aFtRect.Left() += nFtLeft; aFtRect.Right() -= nFtRight; aFtRect.Top() = aRect.Bottom() - nFtHeight; @@ -253,7 +254,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s DrawRect( aFtRect ); } - // Body malen + // Paint Body SetFillColor( aColor ); if ( pImpl->bBitmap ) { @@ -273,7 +274,6 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s if(pImpl->bFrameDirection && !bTable) { - //pImpl->nFrameDirection Point aPos; Font aFont(GetFont()); const Size aSaveSize = aFont.GetSize(); @@ -339,7 +339,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s } if ( bTable ) { - // Tabelle malen, ggf. zentrieren + // Paint Table, if necessary center it SetLineColor( Color(COL_LIGHTGRAY) ); long nW = aRect.GetWidth(), nH = aRect.GetHeight(); @@ -400,16 +400,12 @@ void SvxPageWindow::SetFtBorder( const SvxBoxItem& rNew ) delete pFtBorder; pFtBorder = new SvxBoxItem( rNew ); } -/* -----------------------------13.06.2002 16:16------------------------------ - ---------------------------------------------------------------------------*/ void SvxPageWindow::EnableFrameDirection(sal_Bool bEnable) { pImpl->EnableFrameDirection(bEnable); } -/* -----------------------------13.06.2002 16:16------------------------------ - ---------------------------------------------------------------------------*/ void SvxPageWindow::SetFrameDirection(sal_Int32 nFrameDirection) { pImpl->SetFrameDirection(nFrameDirection); @@ -419,3 +415,5 @@ void SvxPageWindow::ResetBackground() { pImpl->bResetBackground = sal_True; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index 2e9283b1c15d..ab1c5411069b 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,7 +54,7 @@ SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent, const ResId& rId ) : nLineVal ( 0 ) { - // defaultmaessing in Twips rechnen + // Count in Twips by default SetMapMode( MapMode( MAP_TWIP ) ); aWinSize = GetOutputSizePixel(); aWinSize = PixelToLogic( aWinSize ); @@ -219,7 +220,7 @@ void SvxParaPrevWindow::DrawParagraph( sal_Bool bAll ) } aPnt.Y() += nH; - // wieder zuruecksetzen, fuer jede Linie neu berechnen + // Reset, recalculate for each line aPnt.X() = DEF_MARGIN / 2; aSiz = aLineSiz; } @@ -236,3 +237,4 @@ void SvxParaPrevWindow::OutputSizeChanged() Invalidate(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 2a107d9e23af..6c8638bd4f62 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #define _SVX_PASSWD_CXX @@ -134,3 +133,4 @@ SvxPasswordDialog::~SvxPasswordDialog() // ----------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/passwd.hrc b/svx/source/dialog/passwd.hrc index 337990a952e6..337990a952e6 100644..100755 --- a/svx/source/dialog/passwd.hrc +++ b/svx/source/dialog/passwd.hrc diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index 2938988fac7e..d133d523197f 100644 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,14 +45,10 @@ using namespace ::rtl; using namespace ::com::sun::star; -sal_Char __READONLY_DATA sAudio[] = "audio"; -sal_Char __READONLY_DATA sVideo[] = "video"; +sal_Char const sAudio[] = "audio"; +sal_Char const sVideo[] = "video"; -/************************************************************************* -|* -|* Filedialog to insert Plugin-Fileformats -|* -\************************************************************************/ +// Filedialog to insert Plugin-Fileformats ErrCode SvxPluginFileDlg::Execute() { @@ -87,7 +84,7 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind ) : if( xMgr.is() ) { uno::Reference< plugin::XPluginManager > rPluginManager( xMgr->createInstance( - OUString::createFromAscii( "com.sun.star.plugin.PluginManager" ) ), uno::UNO_QUERY ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")) ), uno::UNO_QUERY ); if ( rPluginManager.is() ) { const uno::Sequence<plugin::PluginDescription > aSeq( rPluginManager->getPluginDescriptions() ); @@ -195,12 +192,6 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind ) : maFileDlg.SetCurrentFilter( aAllFilter ); } -/************************************************************************* -|* -|* Dtor -|* -\************************************************************************/ - SvxPluginFileDlg::~SvxPluginFileDlg() { } @@ -208,7 +199,7 @@ SvxPluginFileDlg::~SvxPluginFileDlg() /************************************************************************* |* |* Plugins available for the the MIME-Typ in nKind -|* (whith nKind = SID_INSERT_SOUND for MIME-Type audio +|* (with nKind = SID_INSERT_SOUND for MIME-Type audio |* SID_INSERT_VIDEO for MIME-Type video |* \************************************************************************/ @@ -232,7 +223,7 @@ bool SvxPluginFileDlg::IsAvailable (sal_uInt16 nKind) if( xMgr.is() ) { - uno::Reference< plugin::XPluginManager > rPluginManager = uno::Reference< plugin::XPluginManager > ( xMgr->createInstance( OUString::createFromAscii( "com.sun.star.plugin.PluginManager" ) ), uno::UNO_QUERY ); + uno::Reference< plugin::XPluginManager > rPluginManager = uno::Reference< plugin::XPluginManager > ( xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")) ), uno::UNO_QUERY ); if( rPluginManager.is() ) { const uno::Sequence<plugin::PluginDescription > aSeq( rPluginManager->getPluginDescriptions() ); @@ -278,3 +269,5 @@ void SvxPluginFileDlg::SetContext( sfx2::FileDialogHelper::Context _eNewContext { maFileDlg.SetContext( _eNewContext ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx index 0a19d52958e3..9d4173bd4707 100644 --- a/svx/source/dialog/prtqry.cxx +++ b/svx/source/dialog/prtqry.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,16 +29,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <svx/prtqry.hxx> #include <svx/dialmgr.hxx> #include <tools/shl.hxx> -/* -----------------------------01.02.00 13:57-------------------------------- - - ---------------------------------------------------------------------------*/ SvxPrtQryBox::SvxPrtQryBox(Window* pParent) : MessBox(pParent, 0, String(SVX_RES(RID_SVXSTR_QRY_PRINT_TITLE)), @@ -52,11 +48,10 @@ SvxPrtQryBox::SvxPrtQryBox(Window* pParent) : AddButton(BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON); SetButtonHelpText( RET_OK, String() ); } -/* -----------------------------01.02.00 13:57-------------------------------- - ---------------------------------------------------------------------------*/ SvxPrtQryBox::~SvxPrtQryBox() { } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 2b94fde81edb..79b022df9b45 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -144,3 +145,4 @@ void SvxRelativeField::SetRelative( sal_Bool bNewRelative ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index 7e2cd0868cce..0254b074b64a 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,7 +67,7 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, switch(nSID) { - // Linker / rechter Seitenrand + // Left / right margin case SID_RULER_LR_MIN_MAX: { const SfxRectangleItem *pItem = PTR_CAST(SfxRectangleItem, pState); @@ -76,14 +77,14 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, case SID_ATTR_LONG_LRSPACE: { const SvxLongLRSpaceItem *pItem = PTR_CAST(SvxLongLRSpaceItem, pState); - DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxLRSpaceItem erwartet"); + DBG_ASSERT(pState? 0 != pItem: true, "SvxLRSpaceItem expected"); rRuler.UpdateFrame(pItem); break; } case SID_ATTR_LONG_ULSPACE: { const SvxLongULSpaceItem *pItem = PTR_CAST(SvxLongULSpaceItem, pState); - DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxULSpaceItem erwartet"); + DBG_ASSERT(pState? 0 != pItem: true, "SvxULSpaceItem expected"); rRuler.UpdateFrame(pItem); break; } @@ -91,7 +92,7 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, case SID_ATTR_TABSTOP: { const SvxTabStopItem *pItem = PTR_CAST(SvxTabStopItem, pState); - DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxTabStopItem erwartet"); + DBG_ASSERT(pState? 0 != pItem: true, "SvxTabStopItem expected"); rRuler.Update(pItem); break; } @@ -99,7 +100,7 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, case SID_ATTR_PARA_LRSPACE: { const SvxLRSpaceItem *pItem = PTR_CAST(SvxLRSpaceItem, pState); - DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxLRSpaceItem erwartet"); + DBG_ASSERT(pState? 0 != pItem: true, "SvxLRSpaceItem expected"); rRuler.UpdatePara(pItem); break; } @@ -109,14 +110,14 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, case SID_RULER_ROWS_VERTICAL: { const SvxColumnItem *pItem = PTR_CAST(SvxColumnItem, pState); - DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxColumnItem erwartet"); + DBG_ASSERT(pState? 0 != pItem: true, "SvxColumnItem expected"); #ifdef DBG_UTIL if(pItem) { if(pItem->IsConsistent()) rRuler.Update(pItem, nSID); else - DBG_ERROR("Spaltenitem corrupted"); + OSL_FAIL("Column item corrupted"); } else rRuler.Update(pItem, nSID); @@ -126,37 +127,37 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, break; } case SID_RULER_PAGE_POS: - { // Position Seite, Seitenbreite + { // Position page, page width const SvxPagePosSizeItem *pItem = PTR_CAST(SvxPagePosSizeItem, pState); - DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxPagePosSizeItem erwartet"); + DBG_ASSERT(pState? 0 != pItem: true, "SvxPagePosSizeItem expected"); rRuler.Update(pItem); break; } case SID_RULER_OBJECT: - { // Object-Selektion + { // Object selection const SvxObjectItem *pItem = PTR_CAST(SvxObjectItem, pState); - DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxObjectItem erwartet"); + DBG_ASSERT(pState? 0 != pItem: true, "SvxObjectItem expected"); rRuler.Update(pItem); break; } case SID_RULER_PROTECT: { const SvxProtectItem *pItem = PTR_CAST(SvxProtectItem, pState); - DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxProtectItem erwartet"); + DBG_ASSERT(pState? 0 != pItem: true, "SvxProtectItem expected"); rRuler.Update(pItem); break; } case SID_RULER_BORDER_DISTANCE: { const SvxLRSpaceItem *pItem = PTR_CAST(SvxLRSpaceItem, pState); - DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxLRSpaceItem erwartet"); + DBG_ASSERT(pState? 0 != pItem: true, "SvxLRSpaceItem expected"); rRuler.UpdateParaBorder(pItem); } break; case SID_RULER_TEXT_RIGHT_TO_LEFT : { const SfxBoolItem *pItem = PTR_CAST(SfxBoolItem, pState); - DBG_ASSERT(pState? 0 != pItem: sal_True, "SfxBoolItem erwartet"); + DBG_ASSERT(pState? 0 != pItem: true, "SfxBoolItem expected"); rRuler.UpdateTextRTL(pItem); } break; @@ -164,3 +165,4 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/rlrcitem.hxx b/svx/source/dialog/rlrcitem.hxx index dccb5d97a2ec..507bf00d8e29 100644 --- a/svx/source/dialog/rlrcitem.hxx +++ b/svx/source/dialog/rlrcitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 3185263b4fe4..75d3a8dca672 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,9 +48,7 @@ #include <com/sun/star/text/RubyAdjust.hpp> #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#ifndef _CPPUHELPER_IMPLBASE3_HXX_ #include <cppuhelper/implbase1.hxx> -#endif #include <svtools/colorcfg.hxx> using namespace com::sun::star::uno; @@ -75,9 +74,7 @@ static const sal_Char cRubyIsAbove[] = "RubyIsAbove"; static const sal_Char cDisplayName[] = "DisplayName"; static const sal_Char cRubyCharStyleName[] = "RubyCharStyleName"; static const sal_Char cRubies[] = "Rubies"; -/* -----------------------------09.01.01 17:24-------------------------------- - ---------------------------------------------------------------------------*/ SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : SfxChildWindow(_pParent, nId) @@ -92,16 +89,12 @@ SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, sal_uInt16 nId, pDlg->Initialize( pInfo ); } -/* -----------------------------10.01.01 13:53-------------------------------- - ---------------------------------------------------------------------------*/ SfxChildWinInfo SvxRubyChildWindow::GetInfo() const { return SfxChildWindow::GetInfo(); } -/* -----------------------------09.01.01 17:17-------------------------------- - ---------------------------------------------------------------------------*/ class SvxRubyData_Impl : public cppu::WeakImplHelper1 < ::com::sun::star::view::XSelectionChangeListener > { @@ -209,9 +202,7 @@ void SvxRubyData_Impl::AssertOneEntry() pValues[4].Name = C2U(cRubyCharStyleName); } } -/* --------------------------------------------------------------------------- - ---------------------------------------------------------------------------*/ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW, Window* _pParent, const ResId& rResId ) : SfxModelessDialog( pBind, pCW, _pParent, rResId ), @@ -246,7 +237,7 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW, { xImpl = pImpl = new SvxRubyData_Impl; FreeResource(); - //#85638# automatic detection not yet available + // automatic detection not yet available aAutoDetectionCB.Hide(); aEditArr[0] = &aLeft1ED; aEditArr[1] = &aRight1ED; aEditArr[2] = &aLeft2ED; aEditArr[3] = &aRight2ED; @@ -286,18 +277,14 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW, aRight3ED.SetAccessibleName(rightLabelName); aRight4ED.SetAccessibleName(rightLabelName); } -/* -----------------------------09.01.01 17:17-------------------------------- - ---------------------------------------------------------------------------*/ SvxRubyDialog::~SvxRubyDialog() { ClearCharStyleList(); EventObject aEvent; xImpl->disposing(aEvent); } -/* -----------------------------01.02.01 10:29-------------------------------- - ---------------------------------------------------------------------------*/ void SvxRubyDialog::ClearCharStyleList() { for(sal_uInt16 i = 0; i < aCharStyleLB.GetEntryCount(); i++) @@ -307,9 +294,7 @@ void SvxRubyDialog::ClearCharStyleList() } aCharStyleLB.Clear(); } -/* -----------------------------09.01.01 17:17-------------------------------- - ---------------------------------------------------------------------------*/ sal_Bool SvxRubyDialog::Close() { pBindings->GetDispatcher()->Execute( SID_RUBY_DIALOG, @@ -317,9 +302,7 @@ sal_Bool SvxRubyDialog::Close() SFX_CALLMODE_RECORD); return sal_True; } -/* -----------------------------29.01.01 15:26-------------------------------- - ---------------------------------------------------------------------------*/ void SvxRubyDialog::Activate() { SfxModelessDialog::Activate(); @@ -389,7 +372,7 @@ void SvxRubyDialog::Activate() } catch(Exception&) { - DBG_ERROR("exception in style access"); + OSL_FAIL("exception in style access"); } if(sCharStyleSelect.Len()) aCharStyleLB.SelectEntry(sCharStyleSelect); @@ -401,16 +384,12 @@ void SvxRubyDialog::Activate() aPreviewWin.Invalidate(); } } -/* -----------------------------29.01.01 15:26-------------------------------- - ---------------------------------------------------------------------------*/ void SvxRubyDialog::Deactivate() { SfxModelessDialog::Deactivate(); } -/* -----------------------------30.01.01 15:35-------------------------------- - ---------------------------------------------------------------------------*/ void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight) { OUString sLeft, sRight; @@ -544,17 +523,13 @@ void SvxRubyDialog::Update() ScrollHdl_Impl(&aScrollSB); } -/* -----------------------------16.02.01 14:01-------------------------------- - ---------------------------------------------------------------------------*/ void SvxRubyDialog::GetCurrentText(String& rBase, String& rRuby) { rBase = aEditArr[nCurrentEdit * 2]->GetText(); rRuby = aEditArr[nCurrentEdit * 2 + 1]->GetText(); } -/* -----------------------------31.01.01 14:09-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll) { long nPos = pScroll->GetThumbPos(); @@ -570,9 +545,7 @@ IMPL_LINK(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll) aPreviewWin.Invalidate(); return 0; } -/* -----------------------------30.01.01 14:48-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, ApplyHdl_Impl, PushButton*, EMPTYARG) { const Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues(); @@ -596,22 +569,18 @@ IMPL_LINK(SvxRubyDialog, ApplyHdl_Impl, PushButton*, EMPTYARG) } catch(Exception& ) { - DBG_ERROR("Exception caught"); + OSL_FAIL("Exception caught"); } } return 0; } -/* -----------------------------29.01.01 09:38-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, CloseHdl_Impl, PushButton*, EMPTYARG) { Close(); return 0; } -/* -----------------------------29.01.01 15:10-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, StylistHdl_Impl, PushButton*, EMPTYARG) { SfxPoolItem* pState = 0; @@ -624,18 +593,14 @@ IMPL_LINK(SvxRubyDialog, StylistHdl_Impl, PushButton*, EMPTYARG) } return 0; } -/* -----------------------------30.01.01 15:32-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, AutomaticHdl_Impl, CheckBox*, pBox) { pImpl->UpdateRubyValues(pBox->IsChecked()); Update(); return 0; } -/* -----------------------------31.01.01 16:37-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox*, pBox) { AssertOneEntry(); @@ -655,9 +620,7 @@ IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox*, pBox) aPreviewWin.Invalidate(); return 0; } -/* -----------------------------01.06.01 10:24-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox*, pBox) { AssertOneEntry(); @@ -678,9 +641,7 @@ IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox*, pBox) aPreviewWin.Invalidate(); return 0; } -/* -----------------------------01.02.01 10:06-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, CharStyleHdl_Impl, ListBox*, EMPTYARG ) { AssertOneEntry(); @@ -703,9 +664,7 @@ IMPL_LINK(SvxRubyDialog, CharStyleHdl_Impl, ListBox*, EMPTYARG ) } return 0; } -/* -----------------------------16.02.01 08:35-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, EditModifyHdl_Impl, Edit*, pEdit) { for(sal_uInt16 i = 0; i < 8; i++) @@ -719,9 +678,7 @@ IMPL_LINK(SvxRubyDialog, EditModifyHdl_Impl, Edit*, pEdit) aPreviewWin.Invalidate(); return 0; } -/* -----------------------------17.07.01 09:11-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32*, pParam) { long nRet = 0; @@ -749,9 +706,7 @@ IMPL_LINK(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32*, pParam) } return nRet; } -/* -----------------------------20.07.2001 15:18------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, EditJumpHdl_Impl, sal_Int32*, pParam) { sal_uInt16 nIndex = USHRT_MAX; @@ -779,9 +734,7 @@ IMPL_LINK(SvxRubyDialog, EditJumpHdl_Impl, sal_Int32*, pParam) } return 0; }; -/* -----------------------------19.06.01 11:33-------------------------------- - ---------------------------------------------------------------------------*/ void SvxRubyDialog::AssertOneEntry() { pImpl->AssertOneEntry(); @@ -819,9 +772,6 @@ void SvxRubyDialog::DataChanged( const DataChangedEvent& rDCEvt ) UpdateColors(); } -/* -----------------------------29.01.01 15:44-------------------------------- - - ---------------------------------------------------------------------------*/ void lcl_MoveBox(long nOffset, Edit& rLeft, Edit& rRight) { Size aLeftSz(rLeft.GetSizePixel()); @@ -834,9 +784,7 @@ void lcl_MoveBox(long nOffset, Edit& rLeft, Edit& rRight) rRight.SetPosSizePixel(aRightPos, aRightSz); } -/* -----------------------------16.02.01 08:09-------------------------------- - ---------------------------------------------------------------------------*/ RubyPreview::RubyPreview(SvxRubyDialog& rParent, const ResId& rResId) : Window(&rParent, rResId), rParentDlg(rParent) @@ -850,9 +798,7 @@ RubyPreview::RubyPreview(SvxRubyDialog& rParent, const ResId& rResId) : SetBorderStyle( WINDOW_BORDER_MONO ); } -/* -----------------------------29.01.01 14:05-------------------------------- - ---------------------------------------------------------------------------*/ void RubyPreview::Paint( const Rectangle& /* rRect */ ) { Font aRubyFont = GetFont(); @@ -959,17 +905,13 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ ) } SetFont(aSaveFont); } -/* -----------------------------16.02.01 15:12-------------------------------- - ---------------------------------------------------------------------------*/ void RubyEdit::GetFocus() { GetModifyHdl().Call(this); Edit::GetFocus(); } -/* -----------------------------17.07.01 09:00-------------------------------- - ---------------------------------------------------------------------------*/ long RubyEdit::PreNotify( NotifyEvent& rNEvt ) { long nHandled = 0; @@ -996,3 +938,4 @@ long RubyEdit::PreNotify( NotifyEvent& rNEvt ) return nHandled; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/rubydialog.hrc b/svx/source/dialog/rubydialog.hrc index f22b1da10ea7..f22b1da10ea7 100644..100755 --- a/svx/source/dialog/rubydialog.hrc +++ b/svx/source/dialog/rubydialog.hrc diff --git a/svx/source/dialog/ruler.hrc b/svx/source/dialog/ruler.hrc index 1280b1237bc5..91abf6fd9c44 100644..100755 --- a/svx/source/dialog/ruler.hrc +++ b/svx/source/dialog/ruler.hrc @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -//!! Abhaegigkeit zu sv.hxx +//!! Dependence on sv.hxx #define ID_MM 1 #define ID_CM 2 #define ID_M 3 @@ -34,4 +34,5 @@ #define ID_MILE 10 #define ID_POINT 6 #define ID_PICA 7 - +#define ID_CHAR 11 +#define ID_LINE 12 diff --git a/svx/source/dialog/ruler.src b/svx/source/dialog/ruler.src index 4d0218f525ee..f076e051a664 100644 --- a/svx/source/dialog/ruler.src +++ b/svx/source/dialog/ruler.src @@ -65,8 +65,7 @@ Menu RID_SVXMN_RULER { Identifier = ID_FOOT ; Checkable = TRUE ; - /* ### ACHTUNG: Neuer Text in Resource? Fu : Fu */ - /* ### ACHTUNG: Neuer Text in Resource? Fu : Fu */ + /* ### ATTENTION: New text in Resource? Feet : Feet */ Text [ en-US ] = "Foot" ; }; MenuItem @@ -87,6 +86,18 @@ Menu RID_SVXMN_RULER Checkable = TRUE ; Text [ en-US ] = "Pica" ; }; + MenuItem + { + Identifier = ID_CHAR ; + Checkable = TRUE ; + Text[ en-US ] = "Char" ; + }; + MenuItem + { + Identifier = ID_LINE ; + Checkable = TRUE ; + Text[ en-US ] = "Line" ; + }; }; }; String RID_SVXSTR_RULER_TAB_LEFT diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index fa6936e7581e..091b715aee89 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,7 +64,7 @@ String SvxLongLRSpaceItem::GetValueText() const #define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) #define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L)) -sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -82,18 +83,18 @@ sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_u case MID_LEFT: nVal = lLeft; break; case MID_RIGHT: nVal = lRight; break; - default: DBG_ERROR("Wrong MemberId!"); return sal_False; + default: OSL_FAIL("Wrong MemberId!"); return false; } if ( bConvert ) nVal = TWIP_TO_MM100( nVal ); rVal <<= nVal; - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -106,7 +107,7 @@ sal_Bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, s { lLeft = bConvert ? MM100_TO_TWIP( aLeftRightMargin.Left ) : aLeftRightMargin.Left; lRight = bConvert ? MM100_TO_TWIP( aLeftRightMargin.Right ) : aLeftRightMargin.Right; - return sal_True; + return true; } } else if ( rVal >>= nVal ) @@ -118,13 +119,13 @@ sal_Bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, s { case MID_LEFT: lLeft = nVal; break; case MID_RIGHT: lRight = nVal; break; - default: DBG_ERROR("Wrong MemberId!"); return sal_False; + default: OSL_FAIL("Wrong MemberId!"); return false; } - return sal_True; + return true; } - return sal_False; + return false; } //------------------------------------------------------------------------ @@ -189,7 +190,7 @@ String SvxLongULSpaceItem::GetValueText() const return String(); } -sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -203,23 +204,23 @@ sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_u aUpperLowerMargin.Upper = bConvert ? TWIP_TO_MM100( lLeft ) : lLeft; aUpperLowerMargin.Lower = bConvert ? TWIP_TO_MM100( lRight ) : lRight; rVal <<= aUpperLowerMargin; - return sal_True; + return true; } case MID_UPPER: nVal = lLeft; break; case MID_LOWER: nVal = lRight; break; - default: DBG_ERROR("Wrong MemberId!"); return sal_False; + default: OSL_FAIL("Wrong MemberId!"); return false; } if ( bConvert ) nVal = TWIP_TO_MM100( nVal ); rVal <<= nVal; - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -232,7 +233,7 @@ sal_Bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, s { lLeft = bConvert ? MM100_TO_TWIP( aUpperLowerMargin.Upper ) : aUpperLowerMargin.Upper; lRight = bConvert ? MM100_TO_TWIP( aUpperLowerMargin.Lower ) : aUpperLowerMargin.Lower; - return sal_True; + return true; } } else if ( rVal >>= nVal ) @@ -244,13 +245,13 @@ sal_Bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, s { case MID_UPPER: lLeft = nVal; break; case MID_LOWER: lRight = nVal; break; - default: DBG_ERROR("Wrong MemberId!"); return sal_False; + default: OSL_FAIL("Wrong MemberId!"); return false; } - return sal_True; + return true; } - return sal_False; + return false; } //------------------------------------------------------------------------ @@ -307,7 +308,7 @@ int SvxPagePosSizeItem::operator==( const SfxPoolItem& rCmp) const lHeight == ((const SvxPagePosSizeItem &)rCmp).lHeight; } -sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -322,7 +323,7 @@ sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_u aPagePosSize.Width = lWidth; aPagePosSize.Height = lHeight; rVal <<= aPagePosSize; - return sal_True; + return true; } case MID_X: nVal = aPos.X(); break; @@ -330,14 +331,14 @@ sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_u case MID_WIDTH: nVal = lWidth; break; case MID_HEIGHT: nVal = lHeight; break; - default: DBG_ERROR("Wrong MemberId!"); return sal_False; + default: OSL_FAIL("Wrong MemberId!"); return false; } rVal <<= nVal; - return sal_True; + return true; } -sal_Bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; @@ -365,13 +366,13 @@ sal_Bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, s case MID_WIDTH: lWidth = nVal; break; case MID_HEIGHT: lHeight = nVal; break; - default: DBG_ERROR("Wrong MemberId!"); return sal_False; + default: OSL_FAIL("Wrong MemberId!"); return sal_False; } - return sal_True; + return true; } - return sal_False; + return false; } //------------------------------------------------------------------------ @@ -568,7 +569,7 @@ const SvxColumnItem &SvxColumnItem::operator=(const SvxColumnItem &rCopy) sal_Bool SvxColumnItem::CalcOrtho() const { const sal_uInt16 nCount = Count(); - DBG_ASSERT(nCount >= 2, "keine Spalten"); + DBG_ASSERT(nCount >= 2, "no columns"); if(nCount < 2) return sal_False; @@ -577,7 +578,7 @@ sal_Bool SvxColumnItem::CalcOrtho() const if( (*this)[i].GetWidth() != nColWidth) return sal_False; } - //!! Breite Trenner + //!! Wide divider return sal_True; } @@ -595,27 +596,27 @@ long SvxColumnItem::GetVisibleRight() const return (*this)[nIdx].nEnd; } -sal_Bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) { case MID_COLUMNARRAY: { - return sal_False; + return false; } case MID_RIGHT: rVal <<= nRight; break; case MID_LEFT: rVal <<= nLeft; break; case MID_ORTHO: rVal <<= (sal_Bool) bOrtho; break; case MID_ACTUAL: rVal <<= (sal_Int32) nActColumn; break; case MID_TABLE: rVal <<= (sal_Bool) bTable; break; - default: DBG_ERROR("Wrong MemberId!"); return sal_False; + default: OSL_FAIL("Wrong MemberId!"); return sal_False; } - return sal_True; + return true; } -sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; sal_Int32 nVal = 0; @@ -623,17 +624,17 @@ sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt { case MID_COLUMNARRAY: { - return sal_False; + return false; } case MID_RIGHT: rVal >>= nRight; break; case MID_LEFT: rVal >>= nLeft; break; case MID_ORTHO: rVal >>= nVal; bOrtho = (sal_Bool) nVal; break; case MID_ACTUAL: rVal >>= nVal; nActColumn = (sal_uInt16) nVal; break; case MID_TABLE: rVal >>= nVal; bTable = (sal_Bool) nVal; break; - default: DBG_ERROR("Wrong MemberId!"); return sal_False; + default: OSL_FAIL("Wrong MemberId!"); return sal_False; } - return sal_True; + return true; } //------------------------------------------------------------------------ @@ -706,7 +707,7 @@ SvxObjectItem::SvxObjectItem( const SvxObjectItem& rCopy ) : { } -sal_Bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) @@ -717,17 +718,17 @@ sal_Bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM case MID_END_Y : rVal <<= nEndY; break; case MID_LIMIT : rVal <<= bLimits; break; default: - DBG_ERROR( "Wrong MemberId" ); + OSL_FAIL( "Wrong MemberId" ); return sal_False; } - return sal_True; + return true; } -sal_Bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet=sal_False; + bool bRet = false; switch ( nMemberId ) { case MID_START_X : bRet = (rVal >>= nStartX); break; @@ -735,9 +736,10 @@ sal_Bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt case MID_END_X : bRet = (rVal >>= nEndX); break; case MID_END_Y : bRet = (rVal >>= nEndY); break; case MID_LIMIT : bRet = (rVal >>= bLimits); break; - default: DBG_ERROR( "Wrong MemberId" ); + default: OSL_FAIL( "Wrong MemberId" ); } return bRet; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src index 44982cee0751..7be731e08dc9 100644 --- a/svx/source/dialog/sdstring.src +++ b/svx/source/dialog/sdstring.src @@ -28,11 +28,10 @@ #include <svx/dialogs.hrc> // pragma ------------------------------------------------------------------- - // Strings fuer die Draw-Dialoge -------------------------------------------- + // Strings for the Draw-Dialog -------------------------------------------- String RID_SVXSTR_SOLID { - /* ### ACHTUNG: Neuer Text in Resource? Durchgngig : Durchgngig */ - /* ### ACHTUNG: Neuer Text in Resource? Durchgngig : Durchgngig */ + /* ### ATTENTION: New text in Resource? Continuous : Continuous */ Text [ en-US ] = "Continuous" ; }; String RID_SVXSTR_GRADIENT @@ -66,8 +65,7 @@ String RID_SVXSTR_LINEEND String RID_SVXSTR_CLOSE { - /* ### ACHTUNG: Neuer Text in Resource? Schlieen : Schlieen */ - /* ### ACHTUNG: Neuer Text in Resource? Schlieen : Schlieen */ + /* ### ATTENTION: New text in Resource? Close : Close */ Text [ en-US ] = "Close" ; }; String RID_SVXSTR_BLACK @@ -80,14 +78,12 @@ String RID_SVXSTR_BLUE }; String RID_SVXSTR_GREEN { - /* ### ACHTUNG: Neuer Text in Resource? Grn : Grn */ - /* ### ACHTUNG: Neuer Text in Resource? Grn : Grn */ + /* ### ATTENTION: New text in Resource? Green : Green */ Text [ en-US ] = "Green" ; }; String RID_SVXSTR_CYAN { - /* ### ACHTUNG: Neuer Text in Resource? Trkis : Trkis */ - /* ### ACHTUNG: Neuer Text in Resource? Trkis : Trkis */ + /* ### ATTENTION: New text in Resource? Turquoise : Turquoise */ Text [ en-US ] = "Turquoise" ; }; String RID_SVXSTR_RED @@ -96,7 +92,7 @@ String RID_SVXSTR_RED }; String RID_SVXSTR_MAGENTA { - /* ### ACHTUNG: Neuer Text in Resource? Magenta : Violett */ + /* ### ATTENTION: New text in Resource? Magenta : Violett */ Text [ en-US ] = "Magenta" ; }; String RID_SVXSTR_BROWN @@ -117,14 +113,12 @@ String RID_SVXSTR_LIGHTBLUE }; String RID_SVXSTR_LIGHTGREEN { - /* ### ACHTUNG: Neuer Text in Resource? Hellgrn : Hellgrn */ - /* ### ACHTUNG: Neuer Text in Resource? Hellgrn : Hellgrn */ + /* ### ATTENTION: New text in Resource? Light green : Light green */ Text [ en-US ] = "Light green" ; }; String RID_SVXSTR_LIGHTCYAN { - /* ### ACHTUNG: Neuer Text in Resource? Helltrkis : Helltrkis */ - /* ### ACHTUNG: Neuer Text in Resource? Helltrkis : Helltrkis */ + /* ### ATTENTION: New text in Resource? Light cyan : Light cyan */ Text [ en-US ] = "Light cyan" ; }; String RID_SVXSTR_LIGHTRED @@ -133,7 +127,7 @@ String RID_SVXSTR_LIGHTRED }; String RID_SVXSTR_LIGHTMAGENTA { - /* ### ACHTUNG: Neuer Text in Resource? Hellmagenta : Hellviolett */ + /* ### ATTENTION: New text in Resource? Light magenta : Light magenta */ Text [ en-US ] = "Light magenta" ; }; String RID_SVXSTR_YELLOW @@ -142,8 +136,7 @@ String RID_SVXSTR_YELLOW }; String RID_SVXSTR_WHITE { - /* ### ACHTUNG: Neuer Text in Resource? Wei : Wei */ - /* ### ACHTUNG: Neuer Text in Resource? Wei : Wei */ + /* ### ATTENTION: New text in Resource? White : White */ Text [ en-US ] = "White" ; }; String RID_SVXSTR_BLUEGREY @@ -369,138 +362,138 @@ String RID_SVXSTR_LINEJOINT_ROUND // Reference-strings for standardcolor-table // -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BLACK_DEF { Text = "Black" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BLUE_DEF { Text = "Blue" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_GREEN_DEF { Text = "Green" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_CYAN_DEF { Text = "Turquoise" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_RED_DEF { Text = "Red" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_MAGENTA_DEF { Text = "Magenta" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BROWN_DEF { Text = "Brown" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_GREY_DEF { Text = "Gray" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LIGHTGREY_DEF { Text = "Light gray" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LIGHTBLUE_DEF { Text = "Light blue" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LIGHTGREEN_DEF { Text = "Light green" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LIGHTCYAN_DEF { Text = "Light cyan" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LIGHTRED_DEF { Text = "Light red" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LIGHTMAGENTA_DEF { Text = "Light magenta" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_YELLOW_DEF { Text = "Yellow" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_WHITE_DEF { Text = "White" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BLUEGREY_DEF { Text = "Blue gray" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_ORANGE_DEF { Text = "Orange" ; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_VIOLET_DEF { Text = "Violet"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BORDEAUX_DEF { Text = "Bordeaux"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_PALE_YELLOW_DEF { Text = "Pale yellow"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_PALE_GREEN_DEF { Text = "Pale green"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_DKVIOLET_DEF { Text = "Dark violet"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_SALMON_DEF { Text = "Salmon"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_SEABLUE_DEF { Text = "Sea blue"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_COLOR_SUN_DEF { // attention: this is the color string for the Sun Microsystems specific colors !!! Text = "Sun"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_COLOR_CHART_DEF { Text = "Chart"; @@ -511,57 +504,351 @@ String RID_SVXSTR_COLOR_CHART_DEF // Reference-strings for standard-gradient-table // -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_GRDT0_DEF { Text = "Gradient"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_GRDT1_DEF { Text = "Linear blue/white"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_GRDT2_DEF { Text = "Linear magenta/green"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_GRDT3_DEF { Text = "Linear yellow/brown"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_GRDT4_DEF { Text = "Radial green/black"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_GRDT5_DEF { Text = "Radial red/yellow"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_GRDT6_DEF { Text = "Rectangular red/white"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_GRDT7_DEF { Text = "Square yellow/white"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_GRDT8_DEF { Text = "Ellipsoid blue grey/light blue"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_GRDT9_DEF { Text = "Axial light red/white"; }; +/* do not translate */ +String RID_SVXSTR_GRDT10_DEF +{ + Text = "Diagonal 1l"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT11_DEF +{ + Text = "Diagonal 1r"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT12_DEF +{ + Text = "Diagonal 2l"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT13_DEF +{ + Text = "Diagonal 2r"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT14_DEF +{ + Text = "Diagonal 3l"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT15_DEF +{ + Text = "Diagonal 3r"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT16_DEF +{ + Text = "Diagonal 4l"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT17_DEF +{ + Text = "Diagonal 4r"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT18_DEF +{ + Text = "Diagonal Blue"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT19_DEF +{ + Text = "Diagonal Green"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT20_DEF +{ + Text = "Diagonal Orange"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT21_DEF +{ + Text = "Diagonal Red"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT22_DEF +{ + Text = "Diagonal Turquoise"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT23_DEF +{ + Text = "Diagonal Violet"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT24_DEF +{ + Text = "From a Corner"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT25_DEF +{ + Text = "From a Corner, Blue"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT26_DEF +{ + Text = "From a Corner, Green"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT27_DEF +{ + Text = "From a Corner, Orange"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT28_DEF +{ + Text = "From a Corner, Red"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT29_DEF +{ + Text = "From a Corner, Turquoise"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT30_DEF +{ + Text = "From a Corner, Violet"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT31_DEF +{ + Text = "From the Middle"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT32_DEF +{ + Text = "From the Middle, Blue"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT33_DEF +{ + Text = "From the Middle, Green"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT34_DEF +{ + Text = "From the Middle, Orange"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT35_DEF +{ + Text = "From the Middle, Red"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT36_DEF +{ + Text = "From the Middle, Turquoise"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT37_DEF +{ + Text = "From the Middle, Violet"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT38_DEF +{ + Text = "Horizontal"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT39_DEF +{ + Text = "Horizontal Blue"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT40_DEF +{ + Text = "Horizontal Green"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT41_DEF +{ + Text = "Horizontal Orange"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT42_DEF +{ + Text = "Horizontal Red"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT43_DEF +{ + Text = "Horizontal Turquoise"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT44_DEF +{ + Text = "Horizontal Violet"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT45_DEF +{ + Text = "Radial"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT46_DEF +{ + Text = "Radial Blue"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT47_DEF +{ + Text = "Radial Green"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT48_DEF +{ + Text = "Radial Orange"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT49_DEF +{ + Text = "Radial Red"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT50_DEF +{ + Text = "Radial Turquoise"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT51_DEF +{ + Text = "Radial Violet"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT52_DEF +{ + Text = "Vertical"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT53_DEF +{ + Text = "Vertical Blue"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT54_DEF +{ + Text = "Vertical Green"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT55_DEF +{ + Text = "Vertical Orange"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT56_DEF +{ + Text = "Vertical Red"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT57_DEF +{ + Text = "Vertical Turquoise"; +}; + +/* do not translate */ +String RID_SVXSTR_GRDT58_DEF +{ + Text = "Vertical Violet"; +}; + String RID_SVXSTR_GRDT0 { Text [ en-US ] = "Gradient"; @@ -603,65 +890,318 @@ String RID_SVXSTR_GRDT9 Text [ en-US ] = "Axial light red/white"; }; +String RID_SVXSTR_GRDT10 +{ + Text [ en-US ] = "Diagonal 1l"; + Text [ x-comment ] = "l means left"; +}; + +String RID_SVXSTR_GRDT11 +{ + Text [ en-US ] = "Diagonal 1r"; + Text [ x-comment ] = "r means right"; +}; + +String RID_SVXSTR_GRDT12 +{ + Text [ en-US ] = "Diagonal 2l"; + Text [ x-comment ] = "l means left"; +}; + +String RID_SVXSTR_GRDT13 +{ + Text [ en-US ] = "Diagonal 2r"; + Text [ x-comment ] = "r means right"; +}; + +String RID_SVXSTR_GRDT14 +{ + Text [ en-US ] = "Diagonal 3l"; + Text [ x-comment ] = "l means left"; +}; + +String RID_SVXSTR_GRDT15 +{ + Text [ en-US ] = "Diagonal 3r"; + Text [ x-comment ] = "r means right"; +}; + +String RID_SVXSTR_GRDT16 +{ + Text [ en-US ] = "Diagonal 4l"; + Text [ x-comment ] = "l means left"; +}; + +String RID_SVXSTR_GRDT17 +{ + Text [ en-US ] = "Diagonal 4r"; + Text [ x-comment ] = "r means right"; +}; + +String RID_SVXSTR_GRDT18 +{ + Text [ en-US ] = "Diagonal Blue"; +}; + +String RID_SVXSTR_GRDT19 +{ + Text [ en-US ] = "Diagonal Green"; +}; + +String RID_SVXSTR_GRDT20 +{ + Text [ en-US ] = "Diagonal Orange"; +}; + +String RID_SVXSTR_GRDT21 +{ + Text [ en-US ] = "Diagonal Red"; +}; + +String RID_SVXSTR_GRDT22 +{ + Text [ en-US ] = "Diagonal Turquoise"; +}; + +String RID_SVXSTR_GRDT23 +{ + Text [ en-US ] = "Diagonal Violet"; +}; + +String RID_SVXSTR_GRDT24 +{ + Text [ en-US ] = "From a Corner"; +}; + +String RID_SVXSTR_GRDT25 +{ + Text [ en-US ] = "From a Corner, Blue"; +}; + +String RID_SVXSTR_GRDT26 +{ + Text [ en-US ] = "From a Corner, Green"; +}; + +String RID_SVXSTR_GRDT27 +{ + Text [ en-US ] = "From a Corner, Orange"; +}; + +String RID_SVXSTR_GRDT28 +{ + Text [ en-US ] = "From a Corner, Red"; +}; + +String RID_SVXSTR_GRDT29 +{ + Text [ en-US ] = "From a Corner, Turquoise"; +}; + +String RID_SVXSTR_GRDT30 +{ + Text [ en-US ] = "From a Corner, Violet"; +}; + +String RID_SVXSTR_GRDT31 +{ + Text [ en-US ] = "From the Middle"; +}; + +String RID_SVXSTR_GRDT32 +{ + Text [ en-US ] = "From the Middle, Blue"; +}; + +String RID_SVXSTR_GRDT33 +{ + Text [ en-US ] = "From the Middle, Green"; +}; + +String RID_SVXSTR_GRDT34 +{ + Text [ en-US ] = "From the Middle, Orange"; +}; + +String RID_SVXSTR_GRDT35 +{ + Text [ en-US ] = "From the Middle, Red"; +}; + +String RID_SVXSTR_GRDT36 +{ + Text [ en-US ] = "From the Middle, Turquoise"; +}; + +String RID_SVXSTR_GRDT37 +{ + Text [ en-US ] = "From the Middle, Violet"; +}; + +String RID_SVXSTR_GRDT38 +{ + Text [ en-US ] = "Horizontal"; +}; + +String RID_SVXSTR_GRDT39 +{ + Text [ en-US ] = "Horizontal Blue"; +}; + +String RID_SVXSTR_GRDT40 +{ + Text [ en-US ] = "Horizontal Green"; +}; + +String RID_SVXSTR_GRDT41 +{ + Text [ en-US ] = "Horizontal Orange"; +}; + +String RID_SVXSTR_GRDT42 +{ + Text [ en-US ] = "Horizontal Red"; +}; + +String RID_SVXSTR_GRDT43 +{ + Text [ en-US ] = "Horizontal Turquoise"; +}; + +String RID_SVXSTR_GRDT44 +{ + Text [ en-US ] = "Horizontal Violet"; +}; + +String RID_SVXSTR_GRDT45 +{ + Text [ en-US ] = "Radial"; +}; + +String RID_SVXSTR_GRDT46 +{ + Text [ en-US ] = "Radial Blue"; +}; + +String RID_SVXSTR_GRDT47 +{ + Text [ en-US ] = "Radial Green"; +}; + +String RID_SVXSTR_GRDT48 +{ + Text [ en-US ] = "Radial Orange"; +}; + +String RID_SVXSTR_GRDT49 +{ + Text [ en-US ] = "Radial Red"; +}; + +String RID_SVXSTR_GRDT50 +{ + Text [ en-US ] = "Radial Turquoise"; +}; + +String RID_SVXSTR_GRDT51 +{ + Text [ en-US ] = "Radial Violet"; +}; + +String RID_SVXSTR_GRDT52 +{ + Text [ en-US ] = "Vertical"; +}; + +String RID_SVXSTR_GRDT53 +{ + Text [ en-US ] = "Vertical Blue"; +}; + +String RID_SVXSTR_GRDT54 +{ + Text [ en-US ] = "Vertical Green"; +}; + +String RID_SVXSTR_GRDT55 +{ + Text [ en-US ] = "Vertical Orange"; +}; + +String RID_SVXSTR_GRDT56 +{ + Text [ en-US ] = "Vertical Red"; +}; + +String RID_SVXSTR_GRDT57 +{ + Text [ en-US ] = "Vertical Turquoise"; +}; + +String RID_SVXSTR_GRDT58 +{ + Text [ en-US ] = "Vertical Violet"; +}; + /////////////////////////////////////////////////////////////////////////////// // // Reference-strings for standard-hatch-table // -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_HATCH0_DEF { Text = "Black 45 Degrees Wide"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_HATCH1_DEF { Text = "Black 45 Degrees"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_HATCH2_DEF { Text = "Black -45 Degrees"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_HATCH3_DEF { Text = "Black 90 Degrees"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_HATCH4_DEF { Text = "Red Crossed 45 Degrees"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_HATCH5_DEF { Text = "Red Crossed 0 Degrees"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_HATCH6_DEF { Text = "Blue Crossed 45 Degrees"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_HATCH7_DEF { Text = "Blue Crossed 0 Degrees"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_HATCH8_DEF { Text = "Blue Triple 90 Degrees"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_HATCH9_DEF { Text = "Black 0 Degrees"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_HATCH10_DEF { - Text = "Hatch"; + Text = "Hatching"; }; String RID_SVXSTR_HATCH0 @@ -714,113 +1254,113 @@ String RID_SVXSTR_HATCH10 // Reference-strings for standard-bitmap-table // -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP0_DEF { Text = "Empty"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP1_DEF { Text = "Sky"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP2_DEF { Text = "Aqua"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP3_DEF { Text = "Coarse"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP4_DEF { Text = "Space Metal"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP5_DEF { Text = "Space"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP6_DEF { Text = "Metal"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP7_DEF { Text = "Wet"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP8_DEF { Text = "Marble"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP9_DEF { Text = "Linen"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP10_DEF { Text = "Stone"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP11_DEF { Text = "Pebbles"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP12_DEF { Text = "Wall"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP13_DEF { Text = "Red Wall"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP14_DEF { Text = "Pattern"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP15_DEF { Text = "Leaves"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP16_DEF { Text = "Lawn Artificial"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP17_DEF { Text = "Daisy"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP18_DEF { Text = "Orange"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP19_DEF { Text = "Fiery"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP20_DEF { Text = "Roses"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_BMP21_DEF { Text = "Bitmape"; @@ -920,67 +1460,73 @@ String RID_SVXSTR_BMP21 // Reference-strings for standard-dash-table // -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_DASH0_DEF { Text = "Ultrafine Dashed"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_DASH1_DEF { Text = "Fine Dashed"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_DASH2_DEF { Text = "Ultrafine 2 Dots 3 Dashes"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_DASH3_DEF { Text = "Fine Dotted"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_DASH4_DEF { Text = "Line with Fine Dots"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_DASH5_DEF { Text = "Fine Dashed (var)"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_DASH6_DEF { Text = "3 Dashes 3 Dots (var)"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_DASH7_DEF { Text = "Ultrafine Dotted (var)"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_DASH8_DEF { Text = "Line Style 9"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_DASH9_DEF { Text = "2 Dots 1 Dash"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_DASH10_DEF { Text = "Dashed (var)"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_DASH11_DEF { Text = "Dash"; }; +/* do not translate */ +String RID_SVXSTR_DASH12_DEF +{ + Text = "Line Style"; +}; + String RID_SVXSTR_DASH0 { Text [ en-US ] = "Ultrafine dashed"; @@ -1030,72 +1576,83 @@ String RID_SVXSTR_DASH11 Text [ en-US ] = "Dashed"; }; +String RID_SVXSTR_DASH12 +{ + Text [ en-US ] = "Line Style"; +}; + /////////////////////////////////////////////////////////////////////////////// // // Reference-strings for standard-line-end-table // -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LEND0_DEF { Text = "Arrow concave"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LEND1_DEF { Text = "Square 45"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LEND2_DEF { Text = "Small Arrow"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LEND3_DEF { Text = "Dimension Lines"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LEND4_DEF { Text = "Double Arrow"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LEND5_DEF { Text = "Rounded short Arrow"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LEND6_DEF { Text = "Symmetric Arrow"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LEND7_DEF { Text = "Line Arrow"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LEND8_DEF { Text = "Rounded large Arrow"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LEND9_DEF { Text = "Circle"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LEND10_DEF { Text = "Square"; }; -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_LEND11_DEF { Text = "Arrow"; }; +/* do not translate */ +String RID_SVXSTR_LEND12_DEF +{ + Text = "Arrowhead"; +}; + String RID_SVXSTR_LEND0 { Text [ en-US ] = "Arrow concave"; @@ -1145,12 +1702,17 @@ String RID_SVXSTR_LEND11 Text [ en-US ] = "Arrow"; }; +String RID_SVXSTR_LEND12 +{ + Text [ en-US ] = "Arrowhead"; +}; + /////////////////////////////////////////////////////////////////////////////// // // Reference-strings for standard transparence gradients // -/* nicht uebersetzen */ +/* do not translate */ String RID_SVXSTR_TRASNGR0_DEF { Text = "Transparency"; @@ -1178,15 +1740,175 @@ StringArray RID_SVXSTR_FIELDUNIT_TABLE < "Miles" ; FUNIT_MILE ; > ; < "Pica" ; FUNIT_PICA ; > ; < "Point" ; FUNIT_POINT ; > ; + < "Char" ; FUNIT_CHAR ; > ; + < "Line" ; FUNIT_LINE ; > ; }; }; -// unbekannte Zeichenfarbe +// unknown text color String RID_SVXSTR_COLOR_USER { Text [ en-US ] = "User" ; }; +String RID_SVXSTR_LIBRE_GREEN_1 +{ + Text [ en-US ] = "Green 1 (LibreOffice Main Color)" ; +}; + +String RID_SVXSTR_LIBRE_GREEN_ACCENT +{ + Text [ en-US ] = "Green Accent" ; +}; + +String RID_SVXSTR_LIBRE_BLUE_ACCENT +{ + Text [ en-US ] = "Blue Accent" ; +}; + +String RID_SVXSTR_LIBRE_ORANGE_ACCENT +{ + Text [ en-US ] = "Orange Accent" ; +}; + +String RID_SVXSTR_LIBRE_PURPLE +{ + Text [ en-US ] = "Purple" ; +}; + +String RID_SVXSTR_LIBRE_PURPLE_ACCENT +{ + Text [ en-US ] = "Purple Accent" ; +}; + +String RID_SVXSTR_LIBRE_YELLOW_ACCENT +{ + Text [ en-US ] = "Yellow Accent" ; +}; + +String RID_SVXSTR_LIBRE_GREEN_1_DEF +{ + Text = "Green 1 (LibreOffice Main Color)" ; +}; + +String RID_SVXSTR_LIBRE_GREEN_ACCENT_DEF +{ + Text = "Green Accent" ; +}; + +String RID_SVXSTR_LIBRE_BLUE_ACCENT_DEF +{ + Text = "Blue Accent" ; +}; + +String RID_SVXSTR_LIBRE_ORANGE_ACCENT_DEF +{ + Text = "Orange Accent" ; +}; + +String RID_SVXSTR_LIBRE_PURPLE_DEF +{ + Text = "Purple" ; +}; + +String RID_SVXSTR_LIBRE_PURPLE_ACCENT_DEF +{ + Text = "Purple Accent" ; +}; + +String RID_SVXSTR_LIBRE_YELLOW_ACCENT_DEF +{ + Text = "Yellow Accent" ; +}; + +String RID_SVXSTR_TANGO_BUTTER +{ + Text [ en-US ] = "Tango: Butter" ; + Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; +}; + +String RID_SVXSTR_TANGO_ORANGE +{ + Text [ en-US ] = "Tango: Orange" ; + Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; +}; + +String RID_SVXSTR_TANGO_CHOCOLATE +{ + Text [ en-US ] = "Tango: Chocolate" ; + Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; +}; + +String RID_SVXSTR_TANGO_CHAMELEON +{ + Text [ en-US ] = "Tango: Chameleon" ; + Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; +}; + +String RID_SVXSTR_TANGO_SKY_BLUE +{ + Text [ en-US ] = "Tango: Sky Blue" ; + Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; +}; + +String RID_SVXSTR_TANGO_PLUM +{ + Text [ en-US ] = "Tango: Plum" ; + Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; +}; + +String RID_SVXSTR_TANGO_SCARLET_RED +{ + Text [ en-US ] = "Tango: Scarlet Red" ; + Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; +}; + +String RID_SVXSTR_TANGO_ALUMINIUM +{ + Text [ en-US ] = "Tango: Aluminium" ; + Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; +}; + +String RID_SVXSTR_TANGO_BUTTER_DEF +{ + Text = "Tango: Butter" ; +}; + +String RID_SVXSTR_TANGO_ORANGE_DEF +{ + Text = "Tango: Orange" ; +}; + +String RID_SVXSTR_TANGO_CHOCOLATE_DEF +{ + Text = "Tango: Chocolate" ; +}; + +String RID_SVXSTR_TANGO_CHAMELEON_DEF +{ + Text = "Tango: Chameleon" ; +}; + +String RID_SVXSTR_TANGO_SKY_BLUE_DEF +{ + Text = "Tango: Sky Blue" ; +}; + +String RID_SVXSTR_TANGO_PLUM_DEF +{ + Text = "Tango: Plum" ; +}; + +String RID_SVXSTR_TANGO_SCARLET_RED_DEF +{ + Text = "Tango: Scarlet Red" ; +}; + +String RID_SVXSTR_TANGO_ALUMINIUM_DEF +{ + Text = "Tango: Aluminium" ; +}; + String RID_SVXSTR_GALLERYPROPS_GALTHEME { Text [ en-US ] = "Gallery Theme" ; diff --git a/svx/source/dialog/sendreportgen.cxx b/svx/source/dialog/sendreportgen.cxx index 00295556164f..5335991f0a77 100644 --- a/svx/source/dialog/sendreportgen.cxx +++ b/svx/source/dialog/sendreportgen.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,3 +52,5 @@ namespace svx{ } // namespace DocRecovery } // namespace svx + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx index d59bc9bb1cba..ae1de194fcf2 100644 --- a/svx/source/dialog/sendreportunx.cxx +++ b/svx/source/dialog/sendreportunx.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -270,3 +271,5 @@ namespace svx{ } // namespace DocRecovery } // namespace svx + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx index 7d15a0e2c65e..5804f1dfb4cd 100644 --- a/svx/source/dialog/sendreportw32.cxx +++ b/svx/source/dialog/sendreportw32.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,13 +32,12 @@ #define UNICODE #define _UNICODE - -#include <tools/svwin.h> - -#define WIN32_LEAN_AND_MEAN +#include <prewin.h> +#include <postwin.h> #include <tchar.h> #include <stdio.h> #include <systools/win32/uwinapi.h> +#include <sal/macros.h> // need to undef min and max macros from MS headers here to make // the std::min and std::max from stl visible again @@ -97,7 +97,7 @@ namespace svx{ if ( ERROR_SUCCESS == RegReadValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\LibreOffice\\CrashReport"), TEXT("HTTPProxyServer"), szBuffer, sizeof(szBuffer) ) ) @@ -106,7 +106,7 @@ namespace svx{ DWORD dwProxyPort; if ( ERROR_SUCCESS == RegReadValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\LibreOffice\\CrashReport"), TEXT("HTTPProxyPort"), &dwProxyPort, sizeof(dwProxyPort) ) ) @@ -117,7 +117,7 @@ namespace svx{ if ( ERROR_SUCCESS == RegReadValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\LibreOffice\\CrashReport"), TEXT("ReturnAddress"), szBuffer, sizeof(szBuffer) ) ) @@ -126,7 +126,7 @@ namespace svx{ DWORD fAllowContact = sal_False; RegReadValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\LibreOffice\\CrashReport"), TEXT("AllowContact"), &fAllowContact, sizeof(fAllowContact) ); @@ -135,7 +135,7 @@ namespace svx{ DWORD uInternetConnection = 0; RegReadValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\LibreOffice\\CrashReport"), TEXT("HTTPConnection"), &uInternetConnection, sizeof(uInternetConnection) ); @@ -149,7 +149,7 @@ namespace svx{ const _TCHAR *lpHTTPProxyServer = reinterpret_cast<LPCTSTR>(maParams.maHTTPProxyServer.GetBuffer()); RegWriteValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\LibreOffice\\CrashReport"), TEXT("HTTPProxyServer"), REG_SZ, lpHTTPProxyServer, sizeof(TCHAR) * (_tcslen(lpHTTPProxyServer) + 1) ); @@ -159,7 +159,7 @@ namespace svx{ RegWriteValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\LibreOffice\\CrashReport"), TEXT("HTTPProxyPort"), REG_DWORD, &dwProxyPort, sizeof(DWORD) ); @@ -167,7 +167,7 @@ namespace svx{ DWORD fAllowContact = IsContactAllowed(); RegWriteValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\LibreOffice\\CrashReport"), TEXT("AllowContact"), REG_DWORD, &fAllowContact, sizeof(DWORD) ); @@ -177,7 +177,7 @@ namespace svx{ RegWriteValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\LibreOffice\\CrashReport"), TEXT("HTTPConnection"), REG_DWORD, &uInternetConnection, sizeof(DWORD) ); @@ -185,7 +185,7 @@ namespace svx{ const _TCHAR *lpEmail = reinterpret_cast<LPCTSTR>(GetEMailAddress().GetBuffer()); RegWriteValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\LibreOffice\\CrashReport"), TEXT("ReturnAddress"), REG_SZ, lpEmail, sizeof(TCHAR) * (_tcslen(lpEmail) + 1) ); @@ -198,7 +198,7 @@ namespace svx{ TCHAR szTempPath[MAX_PATH]; TCHAR szFileName[MAX_PATH]; - GetTempPath( elementsof(szTempPath), szTempPath ); + GetTempPath( SAL_N_ELEMENTS(szTempPath), szTempPath ); GetTempFileName( szTempPath, TEXT("DSC"), 0, szFileName ); FILE *fp = _tfopen( szFileName, _T("wb") ); @@ -225,7 +225,7 @@ namespace svx{ ZeroMemory( &StartupInfo, sizeof(StartupInfo) ); StartupInfo.cb = sizeof(StartupInfo.cb); - sntprintf( szBuffer, elementsof(szBuffer), + sntprintf( szBuffer, SAL_N_ELEMENTS(szBuffer), _T("%s -noui -load -send"), szPath ); @@ -258,3 +258,5 @@ namespace svx{ } // namespace DocRecovery } // namespace svx + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx index 199464a0966c..93444e81a7c3 100644 --- a/svx/source/dialog/simptabl.cxx +++ b/svx/source/dialog/simptabl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ #include <svx/simptabl.hxx> #include <vcl/svapp.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <unotools/intlwrapper.hxx> // SvxSimpTblContainer ------------------------------------------------------ @@ -226,7 +225,6 @@ void SvxSimpleTable::Paint( const Rectangle& rRect ) SvHeaderTabListBox::Paint(rRect ); sal_uInt16 nPrivTabCount = TabCount(); - sal_uInt16 nPos = 0; sal_uInt16 nNewSize = ( nPrivTabCount > 0 ) ? (sal_uInt16)GetTab(0) : 0; long nOffset=-GetXOffset(); @@ -240,6 +238,7 @@ void SvxSimpleTable::Paint( const Rectangle& rRect ) if(nPrivTabCount>aHeaderBar.GetItemCount()) nPrivTabCount=aHeaderBar.GetItemCount(); + sal_uInt16 nPos = 0; for(sal_uInt16 i=1;i<nPrivTabCount;i++) { nNewSize = static_cast< sal_uInt16 >( GetTab(i) ) - nPos; @@ -442,15 +441,14 @@ void SvxSimpleTable::HBarEndDrag() { HideTracking(); sal_uInt16 nPrivTabCount=TabCount(); - sal_uInt16 nPos=0; - sal_uInt16 nNewSize=0; if(nPrivTabCount) { if(nPrivTabCount>aHeaderBar.GetItemCount()) nPrivTabCount=aHeaderBar.GetItemCount(); - //for(sal_uInt16 i=1;i<=nPrivTabCount;i++) + sal_uInt16 nPos=0; + sal_uInt16 nNewSize=0; for(sal_uInt16 i=1;i<nPrivTabCount;i++) { nNewSize = static_cast< sal_uInt16 >( aHeaderBar.GetItemSize(i) ) + nPos; @@ -577,3 +575,4 @@ IMPL_LINK( SvxSimpleTable, CompareHdl, SvSortData*, pData) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index fe60ac939811..133076716d8a 100644 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,15 +30,12 @@ #include "precompiled_svx.hxx" // include --------------------------------------------------------------- -#include <tools/pstm.hxx> #include <svl/intitem.hxx> #include <sfx2/objsh.hxx> #include <svx/svxids.hrc> -#define _SVX_SRCHDLG_CXX // damit private-Methoden vom SrchDlg bekannt sind - - +#define _SVX_SRCHDLG_CXX // so that private methods from SrchDlgare known #include "srchctrl.hxx" #include "svx/srchdlg.hxx" @@ -88,3 +86,4 @@ void SvxSearchController::StateChanged( sal_uInt16 nSID, SfxItemState eState, } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/srchctrl.hxx b/svx/source/dialog/srchctrl.hxx index 6320ddeb8420..391a2a06460d 100644 --- a/svx/source/dialog/srchctrl.hxx +++ b/svx/source/dialog/srchctrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 97dc2cfaf76d..e8b79497ae70 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -// include --------------------------------------------------------------- +#include <sal/macros.h> #include <vcl/wrkwin.hxx> #include <vcl/morebtn.hxx> #include <vcl/msgbox.hxx> @@ -72,7 +73,7 @@ #include "svx/dlgutil.hxx" #include <editeng/brshitem.hxx> #include <tools/resary.hxx> -#include <svx/svxdlg.hxx> //CHINA001 +#include <svx/svxdlg.hxx> #include <sfx2/layout-pre.hxx> @@ -103,9 +104,6 @@ using namespace comphelper; SV_IMPL_VARARR(SrchAttrItemList, SearchAttrItem); -//#define NotifyApp( nId ) -// rBindings.ExecuteSynchron( nId, (const SfxPoolItem**)&pSearchItem, 0L ) - #define GetCheckBoxValue( rBox ) \ rBox.IsEnabled() ? rBox.IsChecked() : sal_False @@ -144,12 +142,12 @@ struct SearchDlg_Impl bDeltaCalculated( sal_False ), pRanges ( NULL ) { - aCommand1URL.Complete = aCommand1URL.Main = rtl::OUString::createFromAscii("vnd.sun.search:SearchViaComponent1"); - aCommand1URL.Protocol = rtl::OUString::createFromAscii("vnd.sun.search:"); - aCommand1URL.Path = rtl::OUString::createFromAscii("SearchViaComponent1"); - aCommand2URL.Complete = aCommand2URL.Main = rtl::OUString::createFromAscii("vnd.sun.search:SearchViaComponent2"); - aCommand2URL.Protocol = rtl::OUString::createFromAscii("vnd.sun.search:"); - aCommand2URL.Path = rtl::OUString::createFromAscii("SearchViaComponent2"); + aCommand1URL.Complete = aCommand1URL.Main = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.search:SearchViaComponent1")); + aCommand1URL.Protocol = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.search:")); + aCommand1URL.Path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SearchViaComponent1")); + aCommand2URL.Complete = aCommand2URL.Main = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.search:SearchViaComponent2")); + aCommand2URL.Protocol = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.search:")); + aCommand2URL.Path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SearchViaComponent2")); } ~SearchDlg_Impl() { delete[] pRanges; } }; @@ -160,26 +158,29 @@ void ListToStrArr_Impl( sal_uInt16 nId, SvStringsDtor& rStrLst, ComboBox& rCBox { SfxStringListItem* pSrchItem = (SfxStringListItem*)SFX_APP()->GetItem( nId ); - List* pLst = pSrchItem ? pSrchItem->GetList() : 0; - if ( pLst ) - for ( sal_uInt16 i = 0; i < pLst->Count(); ++i ) + if (pSrchItem) + { + std::vector<String> aLst = pSrchItem->GetList(); + + for ( sal_uInt16 i = 0; i < aLst.size(); ++i ) { - String* pTmp = new String( *(String*)( pLst->GetObject(i) ) ); + String* pTmp = new String(aLst[i]); rStrLst.Insert( pTmp, rStrLst.Count() ); rCBox.InsertEntry( *pTmp ); } + } } // ----------------------------------------------------------------------- void StrArrToList_Impl( sal_uInt16 nId, const SvStringsDtor& rStrLst ) { - DBG_ASSERT( rStrLst.Count(), "vorher abpruefen!!" ); - List aLst; + DBG_ASSERT( rStrLst.Count(), "check in advance"); + std::vector<String> aLst; for ( sal_uInt16 i = 0; i < rStrLst.Count(); ++i ) - aLst.Insert( rStrLst[ i ], LIST_APPEND ); + aLst.push_back( *rStrLst[ i ]); SFX_APP()->PutItem( SfxStringListItem( nId, &aLst ) ); } @@ -221,7 +222,7 @@ void SearchAttrItemList::Put( const SfxItemSet& rSet ) while ( sal_True ) { - // nur testen, ob vorhanden ist ? + // only test that it is available? if( IsInvalidItem( pItem ) ) { nWhich = rSet.GetWhichByPos( aIter.GetCurPos() ); @@ -271,7 +272,7 @@ void SearchAttrItemList::Clear() // ----------------------------------------------------------------------- -// l"oscht die Pointer auf die Items +// Deletes the pointer to the items void SearchAttrItemList::Remove( sal_uInt16 nPos, sal_uInt16 nLen ) { if ( nPos + nLen > Count() ) @@ -326,7 +327,7 @@ void SearchAttrItemList::Remove( sal_uInt16 nPos, sal_uInt16 nLen ) aSimilarityBox ( this, SVX_RES( CB_SIMILARITY) ), \ aSimilarityBtn ( this, SVX_RES( PB_SIMILARITY) ), \ aLayoutBtn ( this, SVX_RES( CB_LAYOUTS ) ), \ - aNotesBtn ( this, SVX_RES( CB_NOTES ) ), \ + aNotesBtn ( this, SVX_RES( CB_COMMENTS ) ), \ aJapMatchFullHalfWidthCB( this, SVX_RES( CB_JAP_MATCH_FULL_HALF_WIDTH ) ),\ aJapOptionsCB ( this, SVX_RES( CB_JAP_SOUNDS_LIKE ) ), \ aJapOptionsBtn ( this, SVX_RES( PB_JAP_OPTIONS ) ), \ @@ -439,14 +440,14 @@ void SvxSearchDialog::Construct_Impl() #endif /* !ENABLE_LAYOUT */ EnableControls_Impl( 0 ); - // alten Text des aWordBtn's merken + // Store old Text from aWordBtn aCalcStr += sal_Unicode('#'); aCalcStr += aWordBtn.GetText(); aLayoutStr = SVX_RESSTR( RID_SVXSTR_SEARCH_STYLES ); aStylesStr = aLayoutBtn.GetText(); - // gemerkte Such-Strings von der Applikation holen + // Get stored search-strings from the application ListToStrArr_Impl( SID_SEARCHDLG_SEARCHSTRINGS, aSearchStrings, aSearchLB ); ListToStrArr_Impl( SID_SEARCHDLG_REPLACESTRINGS, @@ -458,7 +459,7 @@ void SvxSearchDialog::Construct_Impl() FreeResource(); InitControls_Impl(); - // Attribut-Sets nur einmal im Ctor() besorgen + // Get attribut sets only once in construtor() const SfxPoolItem* ppArgs[] = { pSearchItem, 0 }; const SvxSetItem* pSrchSetItem = (const SvxSetItem*) rBindings.GetDispatcher()->Execute( FID_SEARCH_SEARCHSET, SFX_CALLMODE_SLOT, ppArgs ); @@ -472,7 +473,7 @@ void SvxSearchDialog::Construct_Impl() if ( pReplSetItem ) InitAttrList_Impl( 0, &pReplSetItem->GetItemSet() ); - // Controller erzeugen und gleich aktualisieren + // Create controller and update at once rBindings.EnterRegistrations(); pSearchController = new SvxSearchController( SID_SEARCH_ITEM, rBindings, *this ); @@ -506,7 +507,7 @@ void SvxSearchDialog::Construct_Impl() // vnd.sun.star::SearchViaComponent1 and 2 are supported const uno::Reference< frame::XFrame >xFrame = rBindings.GetActiveFrame(); const uno::Reference< frame::XDispatchProvider > xDispatchProv(xFrame, uno::UNO_QUERY); - rtl::OUString sTarget = rtl::OUString::createFromAscii("_self"); + rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("_self")); bool bSearchComponent1 = false; bool bSearchComponent2 = false; @@ -523,10 +524,6 @@ void SvxSearchDialog::Construct_Impl() if( bSearchComponent1 || bSearchComponent2 ) { - //get the labels of the FixedLine and the buttons - // "/org.openoffice.Office.Common/SearchOptions/ComponentSearchGroupLabel - // "/org.openoffice.Office.Common/SearchOptions/ComponentSearchCommandLabel1 - // "/org.openoffice.Office.Common/SearchOptions/ComponentSearchCommandLabel2 try { uno::Reference< lang::XMultiServiceFactory > xMgr = getProcessServiceFactory(); @@ -638,10 +635,8 @@ sal_Bool SvxSearchDialog::Close() aOpt.SetWholeWordsOnly ( aWordBtn .IsChecked() ); aOpt.SetBackwards ( aBackwardsBtn .IsChecked() ); aOpt.SetUseRegularExpression ( aRegExpBtn .IsChecked() ); - //aOpt.SetMatchCase ( aMatchCaseCB .IsChecked() ); aOpt.SetSearchForStyles ( aLayoutBtn .IsChecked() ); aOpt.SetSimilaritySearch ( aSimilarityBox .IsChecked() ); - //aOpt.SetMatchFullHalfWidthForms ( !aJapMatchFullHalfWidthCB.IsChecked() ); aOpt.SetUseAsianOptions ( aJapOptionsCB .IsChecked() ); aOpt.SetNotes ( aNotesBtn .IsChecked() ); @@ -667,6 +662,11 @@ sal_Int32 SvxSearchDialog::GetTransliterationFlags() const return nTransliterationFlags; } +void SvxSearchDialog::SetSaveToModule(bool b) +{ + pImpl->bSaveToModule = b; +} + // ----------------------------------------------------------------------- void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings ) @@ -785,10 +785,10 @@ void SvxSearchDialog::CalculateDelta_Impl() try { ::rtl::OUString aModuleIdentifier = xModuleManager->identify( xFrame ); - bCalcApp = aModuleIdentifier.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ); - bDrawApp = aModuleIdentifier.equalsAscii( "com.sun.star.drawing.DrawingDocument" ); - bImpressApp = aModuleIdentifier.equalsAscii( "com.sun.star.presentation.PresentationDocument" ); - bWriterApp = aModuleIdentifier.equalsAscii( "com.sun.star.text.TextDocument" ); + bCalcApp = aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ); + bDrawApp = aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ); + bImpressApp = aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ); + bWriterApp = aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextDocument" ) ); } catch ( uno::Exception& ) { @@ -897,7 +897,7 @@ void SvxSearchDialog::CalculateDelta_Impl() if ( nOffset > 0 ) { long nH = LogicToPixel( Size( 0, nOffset ), MAP_APPFONT ).Height(); - for ( i = 0; i < sizeof( pWins ) / sizeof( pWins[ 0 ] ); ++i, ++pCurrent ) + for ( i = 0; i < SAL_N_ELEMENTS( pWins ); ++i, ++pCurrent ) { if ( ( bCalcApp && i < nCalcCtrlCount ) || ( i == nCalcCtrlCount && aCJKOptions.IsCJKFontEnabled() ) @@ -934,9 +934,36 @@ void SvxSearchDialog::CalculateDelta_Impl() // ----------------------------------------------------------------------- +namespace { + +class ToggleSaveToModule +{ +public: + ToggleSaveToModule(SvxSearchDialog& rDialog, bool bValue) : + mrDialog(rDialog), mbValue(bValue) + { + mrDialog.SetSaveToModule(mbValue); + } + + ~ToggleSaveToModule() + { + mrDialog.SetSaveToModule(!mbValue); + } +private: + SvxSearchDialog& mrDialog; + bool mbValue; +}; + +} + void SvxSearchDialog::Init_Impl( int bSearchPattern ) { DBG_ASSERT( pSearchItem, "SearchItem == 0" ); + + // We don't want to save any intermediate state to the module while the + // dialog is being initialized. + ToggleSaveToModule aNoModuleSave(*this, false); + bWriter = ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_WRITER ); pImpl->bMultiLineEdit = sal_False; @@ -987,7 +1014,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) CalculateDelta_Impl(); - bool bDraw = sal_False; + bool bDraw = false; if ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_CALC ) { Link aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl ); @@ -1025,7 +1052,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) if ( ( nModifyFlag & MODIFY_ALLTABLES ) == 0 ) aAllSheetsCB.Check( pSearchItem->IsAllTables() ); - // nur im Writer Suche nach Formatierung + // only look for formatting in Writer aFormatBtn.Hide(); aNoFormatBtn.Hide(); aAttributeBtn.Hide(); @@ -1041,7 +1068,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) aRegExpBtn.Hide(); aLayoutBtn.Hide(); - // nur im Writer Suche nach Formatierung + // only look for formatting in Writer aFormatBtn.Hide(); aNoFormatBtn.Hide(); aAttributeBtn.Hide(); @@ -1051,7 +1078,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) { if ( !pSearchList ) { - // Attribut-Sets besorgen, wenn noch nicht geschehen + // Get attribute sets, if it not has been done already const SfxPoolItem* ppArgs[] = { pSearchItem, 0 }; const SvxSetItem* pSrchSetItem = (const SvxSetItem*)rBindings.GetDispatcher()->Execute( FID_SEARCH_SEARCHSET, SFX_CALLMODE_SLOT, ppArgs ); @@ -1065,14 +1092,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) if ( pReplSetItem ) InitAttrList_Impl( 0, &pReplSetItem->GetItemSet() ); } -/* - aFormatBtn.Show(); - aNoFormatBtn.Show(); - aAttributeBtn.Show(); -*/ } -// pMoreBtn->SetState( sal_False ); -// pMoreBtn->Hide(); } if ( 0 && !bDraw ) //!!!!! @@ -1081,17 +1101,15 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) aLayoutBtn.Show(); } - // "Ahnlichkeitssuche? + // similarity search? if ( ( nModifyFlag & MODIFY_SIMILARITY ) == 0 ) aSimilarityBox.Check( pSearchItem->IsLevenshtein() ); bSet = sal_True; - pImpl->bSaveToModule = sal_False; FlagHdl_Impl( &aSimilarityBox ); FlagHdl_Impl( &aJapOptionsCB ); - pImpl->bSaveToModule = sal_True; - bool bDisableSearch = sal_False; + bool bDisableSearch = false; SfxViewShell* pViewShell = SfxViewShell::Current(); if ( pViewShell ) @@ -1107,14 +1125,14 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) } } - // Patternsuche und es wurden keine AttrSets "ubergeben + // Pattern Search and there were no AttrSets given if ( bSearchPattern ) { SfxObjectShell* pShell = SfxObjectShell::Current(); if ( pShell && pShell->GetStyleSheetPool() ) { - // Vorlagen beschaffen + // Templates designed aSearchTmplLB .Clear(); aReplaceTmplLB.Clear(); SfxStyleSheetBasePool* pStylePool = pShell->GetStyleSheetPool(); @@ -1136,7 +1154,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) aSearchTmplLB.Show(); if ( bConstruct ) - // nur nach dem Erzeugen den Fokus grappen + // Grab focus only after creating aSearchTmplLB.GrabFocus(); aReplaceTmplLB.Show(); aSearchLB.Hide(); @@ -1175,7 +1193,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) aSearchLB.Show(); if ( bConstruct ) - // nur nach dem Erzeugen den Fokus grappen + // Grab focus only after creating aSearchLB.GrabFocus(); aReplaceLB.Show(); aSearchTmplLB.Hide(); @@ -1270,7 +1288,7 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, memcpy( pImpl->pRanges, pTmp, sizeof(sal_uInt16) * nCnt ); } - // sorge daf"ur, das die Texte der Attribute richtig stehen + // See to it that are the texts of the attributes are correct String aDesc; if ( pSSet ) @@ -1408,7 +1426,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) EnableControl_Impl( &aSimilarityBox ); } - // Such-String vorhanden? dann Buttons enablen + // Search-string in place? then enable Buttons bSet = sal_True; ModifyHdl_Impl( &aSearchLB ); } @@ -1508,7 +1526,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) else if ( pBtn == &aReplaceAllBtn ) pSearchItem->SetCommand( SVX_SEARCHCMD_REPLACE_ALL ); - // wenn nach Vorlagen gesucht wird, dann Format-Listen l"oschen + // when looking for templates, delete format lists if ( !bFormat && pSearchItem->GetPattern() ) { if ( pSearchList ) @@ -1539,12 +1557,6 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) } else if ( pBtn == &aSimilarityBtn ) { -//CHINA001 SvxSearchSimilarityDialog* pDlg = -//CHINA001 new SvxSearchSimilarityDialog( this, -//CHINA001 pSearchItem->IsLEVRelaxed(), -//CHINA001 pSearchItem->GetLEVOther(), -//CHINA001 pSearchItem->GetLEVShorter(), -//CHINA001 pSearchItem->GetLEVLonger() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { @@ -1553,7 +1565,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) pSearchItem->GetLEVOther(), pSearchItem->GetLEVShorter(), pSearchItem->GetLEVLonger() ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); if ( pDlg && pDlg->Execute() == RET_OK ) { pSearchItem->SetLEVRelaxed( pDlg->IsRelaxed() ); @@ -1574,24 +1586,24 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) { AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( LAYOUT_THIS_WINDOW (this), aSet, pSearchItem->GetTransliterationFlags() ); - DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 - int nRet = aDlg->Execute(); //CHINA001 int nRet = aDlg.Execute(); + DBG_ASSERT(aDlg, "Dialogdiet fail!"); + int nRet = aDlg->Execute(); if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true { - sal_Int32 nFlags = aDlg->GetTransliterationFlags(); //CHINA001 sal_Int32 nFlags = aDlg.GetTransliterationFlags(); + sal_Int32 nFlags = aDlg->GetTransliterationFlags(); pSearchItem->SetTransliterationFlags( nFlags ); ApplyTransliterationFlags_Impl( nFlags ); } - delete aDlg; //add for CHINA001 + delete aDlg; } } else if(pBtn == &aSearchComponent1PB || pBtn == &aSearchComponent2PB ) { uno::Sequence < beans::PropertyValue > aArgs(2); beans::PropertyValue* pArgs = aArgs.getArray(); - pArgs[0].Name = ::rtl::OUString::createFromAscii("SearchString"); + pArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SearchString")); pArgs[0].Value <<= ::rtl::OUString(aSearchLB.GetText()); - pArgs[1].Name = ::rtl::OUString::createFromAscii("ParentWindow"); + pArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")); pArgs[1].Value <<= VCLUnoHelper::GetInterface( LAYOUT_THIS_WINDOW (this) ); if(pBtn == &aSearchComponent1PB) { @@ -1617,16 +1629,23 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd ) else bSet = sal_False; + // Calc allows searching for empty cells. + bool bAllowEmptySearch = (pSearchItem->GetAppFlag() == SVX_SEARCHAPP_CALC); + if ( pEd == &aSearchLB || pEd == &aReplaceLB ) { - xub_StrLen nLBTxtLen = aSearchLB.GetText().Len(), nTxtLen; + xub_StrLen nSrchTxtLen = aSearchLB.GetText().Len(); + xub_StrLen nReplTxtLen = 0; + if (bAllowEmptySearch) + nReplTxtLen = aReplaceLB.GetText().Len(); + xub_StrLen nAttrTxtLen = 0; if ( !pImpl->bMultiLineEdit ) - nTxtLen = aSearchAttrText.GetText().Len(); + nAttrTxtLen = aSearchAttrText.GetText().Len(); else - nTxtLen = pImpl->aSearchFormats.GetText().Len(); + nAttrTxtLen = pImpl->aSearchFormats.GetText().Len(); - if ( nLBTxtLen || nTxtLen ) + if (nSrchTxtLen || nReplTxtLen || nAttrTxtLen) { EnableControl_Impl( &aSearchBtn ); EnableControl_Impl( &aReplaceBtn ); @@ -1667,7 +1686,7 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG ) { sal_uInt16 nId = 0; - // Vorlagen-Controller enablen + // Enable templates controller switch ( pSearchItem->GetFamily() ) { case SFX_STYLE_FAMILY_CHAR: @@ -1686,7 +1705,7 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG ) break; default: - DBG_ERROR( "StyleSheetFamily wurde geaendert?" ); + OSL_FAIL( "StyleSheetFamily was changed?" ); } rBindings.EnterRegistrations(); @@ -1720,7 +1739,7 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG ) } else { - // Vorlagen-Controller disablen + // Disable templates controller rBindings.EnterRegistrations(); DELETEZ( pFamilyController ); rBindings.LeaveRegistrations(); @@ -1764,14 +1783,14 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,sal_Bool _bSearch ) SvStringsDtor* pArr = _bSearch ? &aSearchStrings : &aReplaceStrings; ComboBox* pListBox = _bSearch ? &aSearchLB : &aReplaceLB; - // identische Strings ignorieren + // ignore identical strings for ( sal_uInt16 i = 0; i < pArr->Count(); ++i ) { if ( COMPARE_EQUAL == (*pArr)[i]->CompareTo( rStr ) ) return; } - // bei maximaler Belegung "altesten Eintrag l"oschen (ListBox und Array) + // delete oldest entry at maximum occupancy (ListBox and Array) String* pInsStr; if ( pArr->Count() >= REMEMBER_SIZE ) @@ -1792,7 +1811,6 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,sal_Bool _bSearch ) void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) { -// SetUpdateMode( sal_False ); String aOldSrch( aSearchTmplLB .GetSelectEntry() ); String aOldRepl( aReplaceTmplLB.GetSelectEntry() ); aSearchTmplLB .Clear(); @@ -1827,8 +1845,6 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) EnableControl_Impl( &aReplaceBtn ); EnableControl_Impl( &aReplaceAllBtn ); } -// FlagHdl_Impl(0); -// SetUpdateMode( sal_True ); } // ----------------------------------------------------------------------- @@ -1850,19 +1866,19 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) } else if ( !IsVisible() ) Show(); - bool bNoSearch = sal_True; + bool bNoSearch = true; sal_Bool bEnableSearch = ( SEARCH_OPTIONS_SEARCH & nOptions ) != 0; aSearchBtn.Enable(bEnableSearch); if( bEnableSearch ) - bNoSearch = sal_False; + bNoSearch = false; if ( ( SEARCH_OPTIONS_SEARCH_ALL & nOptions ) != 0 ) { aSearchAllBtn.Enable(); - bNoSearch = sal_False; + bNoSearch = false; } else aSearchAllBtn.Disable(); @@ -1872,7 +1888,7 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) aReplaceText.Enable(); aReplaceLB.Enable(); aReplaceTmplLB.Enable(); - bNoSearch = sal_False; + bNoSearch = false; } else { @@ -1884,7 +1900,7 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) if ( ( SEARCH_OPTIONS_REPLACE_ALL & nOptions ) != 0 ) { aReplaceAllBtn.Enable(); - bNoSearch = sal_False; + bNoSearch = false; } else aReplaceAllBtn.Disable(); @@ -1903,10 +1919,7 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) aBackwardsBtn.Enable(); else aBackwardsBtn.Disable(); - //!if ( ( SEARCH_OPTIONS_NOTES & nOptions ) != 0 ) aNotesBtn.Enable(); - //!else - //! aNotesBtn.Disable(); if ( ( SEARCH_OPTIONS_REG_EXP & nOptions ) != 0 ) aRegExpBtn.Enable(); else @@ -1935,16 +1948,7 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) aFormatBtn.Disable(); aNoFormatBtn.Disable(); } -/* - if ( ( SEARCH_OPTIONS_MORE & nOptions ) != 0 && - pSearchItem && pSearchItem->GetAppFlag() == SVX_SEARCHAPP_CALC ) - pMoreBtn->Enable(); - else - { - pMoreBtn->SetState( sal_False ); - pMoreBtn->Disable(); - } -*/ + if ( ( SEARCH_OPTIONS_SIMILARITY & nOptions ) != 0 ) { aSimilarityBox.Enable(); @@ -2000,7 +2004,7 @@ void SvxSearchDialog::EnableControl_Impl( Control* pCtrl ) aBackwardsBtn.Enable(); return; } - if ( &aNotesBtn == pCtrl /*! && ( SEARCH_OPTIONS_NOTES & nOptions ) != 0 */ ) + if ( &aNotesBtn == pCtrl ) { aNotesBtn.Enable(); return; @@ -2178,12 +2182,12 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG ) aSet.DisableItem(rPool.GetWhich(SID_ATTR_PARA_PAGEBREAK)); aSet.DisableItem(rPool.GetWhich(SID_ATTR_PARA_KEEP)); - //CHINA001 SvxSearchFormatDialog* pDlg = new SvxSearchFormatDialog( this, aSet ); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { SfxAbstractTabDialog* pDlg = pFact->CreateTabItemDialog( LAYOUT_THIS_WINDOW (this), aSet, RID_SVXDLG_SEARCHFORMAT ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); aTxt.Insert( pDlg->GetText(), 0 ); pDlg->SetText( aTxt ); @@ -2209,7 +2213,7 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG ) if( aOutSet.Count() ) pList->Put( aOutSet ); - PaintAttrText_Impl(); // AttributText in GroupBox setzen + PaintAttrText_Impl(); // Set AttributText in GroupBox } delete pDlg; } @@ -2255,12 +2259,11 @@ IMPL_LINK( SvxSearchDialog, AttributeHdl_Impl, Button *, EMPTYARG ) if ( !pSearchList || !pImpl->pRanges ) return 0; - //CHINA001 SvxSearchAttributeDialog* pDlg = new SvxSearchAttributeDialog( this, *pSearchList, pImpl->pRanges ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { VclAbstractDialog* pDlg = pFact->CreateSvxSearchAttributeDialog( LAYOUT_THIS_WINDOW (this), *pSearchList, pImpl->pRanges ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); pDlg->Execute(); delete pDlg; } @@ -2339,7 +2342,7 @@ String& SvxSearchDialog::BuildAttrText_Impl( String& rStr, if ( !pList ) return rStr; - // Metrik abfragen + // Metric query SfxMapUnit eMapUnit = SFX_MAPUNIT_CM; FieldUnit eFieldUnit = pSh->GetModule()->GetFieldUnit(); switch ( eFieldUnit ) @@ -2377,7 +2380,7 @@ String& SvxSearchDialog::BuildAttrText_Impl( String& rStr, } else if ( rItem.nSlot == SID_ATTR_BRUSH_CHAR ) { - //Sonderbehandlung fuer Zeichenhintergrund + // Special treatment for text background rStr += SVX_RESSTR( RID_SVXITEMS_BRUSH_CHAR ); } else @@ -2555,3 +2558,4 @@ SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const return aInfo; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/srchdlg.hrc b/svx/source/dialog/srchdlg.hrc index 6632b11fd7c8..c2c00a513948 100644..100755 --- a/svx/source/dialog/srchdlg.hrc +++ b/svx/source/dialog/srchdlg.hrc @@ -80,7 +80,7 @@ #define RB_CALC_COLUMNS 58 #define CB_ALL_SHEETS 59 -#define CB_NOTES 60 +#define CB_COMMENTS 60 #define IMG_MOREBTN_DOWN 100 #define IMG_MOREBTN_UP 101 diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src index f82d4f06cb88..06e088b60b6b 100644 --- a/svx/source/dialog/srchdlg.src +++ b/svx/source/dialog/srchdlg.src @@ -301,13 +301,13 @@ ModelessDialog RID_SVXDLG_SEARCH TabStop = TRUE ; Hide = TRUE ; }; - CheckBox CB_NOTES + CheckBox CB_COMMENTS { - HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES"; + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_COMMENTS"; Pos = MAP_APPFONT ( 12 , 232 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "Notes"; + Text [ en-US ] = "Comments"; }; CheckBox CB_JAP_MATCH_FULL_HALF_WIDTH { diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx index 0cd6421f5a77..fa3ce019074e 100644 --- a/svx/source/dialog/stddlg.cxx +++ b/svx/source/dialog/stddlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ // include --------------------------------------------------------------- -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svx/stddlg.hxx> @@ -59,9 +58,10 @@ SvxStandardDialog::SvxStandardDialog( Window *pParent, const ResId &rResId ) : // ----------------------------------------------------------------------- -__EXPORT SvxStandardDialog::~SvxStandardDialog() +SvxStandardDialog::~SvxStandardDialog() { } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx index 47cb66850e9f..10b4f0750210 100644 --- a/svx/source/dialog/strarray.cxx +++ b/svx/source/dialog/strarray.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,4 @@ long SvxStringArray::GetValueByStr( const String& rStr ) const } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index dd4b03147445..20b3b62c8676 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,16 +29,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/dialmgr.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <tools/shl.hxx> #include <i18npool/mslangid.hxx> #include <svtools/valueset.hxx> #include <svl/languageoptions.hxx> -#ifndef _SVX_HELPID_HRC #include <helpid.hrc> -#endif #include <editeng/numitem.hxx> #include <svl/eitem.hxx> #include <vcl/svapp.hxx> @@ -103,10 +100,7 @@ static const sal_Char cSuffix[] = "Suffix"; static const sal_Char cBulletChar[] = "BulletChar"; static const sal_Char cBulletFontName[] = "BulletFontName"; -/* -----------------28.10.98 08:32------------------- - * - * --------------------------------------------------*/ -// Die Auswahl an Bullets aus den StarSymbol +// The selection of bullets from the star symbol static const sal_Unicode aBulletTypes[] = { 0x2022, @@ -158,7 +152,7 @@ static void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType, } void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) { - static sal_uInt16 __READONLY_DATA aLinesArr[] = + static sal_uInt16 aLinesArr[] = { 15, 10, 20, 30, @@ -209,8 +203,8 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) if(!pVDev) { - // Die Linien werden nur einmalig in das VirtualDevice gepainted - // nur die Gliederungspage bekommt es aktuell + // The lines are only one time in the virtual device, only the outline + // page is currently done pVDev = new VirtualDevice(*pDev); pVDev->SetMapMode(pDev->GetMapMode()); pVDev->EnableRTL( IsRTLEnabled() ); @@ -222,7 +216,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) if(aBackColor == aLineColor) aLineColor.Invert(); pVDev->SetLineColor(aLineColor); - // Linien nur einmalig Zeichnen + // Draw line only once if(nPageType != NUM_PAGETYPE_NUM) { Point aStart(aBLPos.X() + nRectWidth *25 / 100,0); @@ -239,7 +233,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) pDev->DrawOutDev( aRect.TopLeft(), aRectSize, aOrgRect.TopLeft(), aRectSize, *pVDev ); - // jetzt kommt der Text + // Now comes the text const OUString sValue(C2U(cValue)); if( NUM_PAGETYPE_SINGLENUM == nPageType || NUM_PAGETYPE_BULLET == nPageType ) @@ -271,10 +265,10 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) } catch(Exception&) { - DBG_ERROR("Exception in DefaultNumberingProvider::makeNumberingString"); + OSL_FAIL("Exception in DefaultNumberingProvider::makeNumberingString"); } } - // knapp neben dem linken Rand beginnen + // start just next to the left edge aStart.X() = aBLPos.X() + 2; aStart.Y() -= pDev->GetTextHeight()/2; } @@ -343,7 +337,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) } catch(Exception&) { - DBG_ERROR("Exception in DefaultNumberingProvider::makeNumberingString"); + OSL_FAIL("Exception in DefaultNumberingProvider::makeNumberingString"); } aLeft.Y() -= (pDev->GetTextHeight()/2); @@ -391,7 +385,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) } long nLineTop = nStartY + nRectHeight * aLinesArr[2 * i + 1]/100 ; - Point aLineLeft(aLeft.X() /*+ nStartX + nRectWidth * aLinesArr[2 * i]/ 100*/, nLineTop ); + Point aLineLeft(aLeft.X(), nLineTop ); Point aLineRight(nStartX + nRectWidth * 90 /100, nLineTop ); pVDev->DrawLine(aLineLeft, aLineRight); } @@ -403,7 +397,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) static sal_Bool bAssert = sal_False; if(!bAssert) { - DBG_ERROR("exception in ::UserDraw"); + OSL_FAIL("exception in ::UserDraw"); bAssert = sal_True; } } @@ -422,11 +416,6 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) pDev->SetLineColor(aOldColor); } -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ - SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType ) : ValueSet( pParent, rResId ), @@ -449,17 +438,11 @@ SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 } } -/*-----------------08.02.97 12.38------------------- - ---------------------------------------------------*/ - - SvxNumValueSet::~SvxNumValueSet() +SvxNumValueSet::~SvxNumValueSet() { delete pVDev; } -/* -----------------------------30.01.01 16:24-------------------------------- - ---------------------------------------------------------------------------*/ void SvxNumValueSet::SetNumberingSettings( const Sequence<Sequence<PropertyValue> >& aNum, Reference<XNumberingFormatter>& xFormat, @@ -477,9 +460,7 @@ void SvxNumValueSet::SetNumberingSettings( SetItemText( i + 1, SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i )); } } -/* -----------------------------31.01.01 09:50-------------------------------- - ---------------------------------------------------------------------------*/ void SvxNumValueSet::SetOutlineNumberingSettings( Sequence<Reference<XIndexAccess> >& rOutline, Reference<XNumberingFormatter>& xFormat, @@ -498,10 +479,9 @@ void SvxNumValueSet::SetOutlineNumberingSettings( } } -SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId/*, const List& rStrNames*/ ) : +SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId ) : SvxNumValueSet( pParent, rResId, NUM_PAGETYPE_BMP ), -// rStrList ( rStrNames ), bGrfNotFound( sal_False ) { @@ -512,20 +492,13 @@ SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId/*, co aFormatTimer.SetTimeoutHdl(LINK(this, SvxBmpNumValueSet, FormatHdl_Impl)); } -/*-----------------13.02.97 09.41------------------- - ---------------------------------------------------*/ - - SvxBmpNumValueSet::~SvxBmpNumValueSet() +SvxBmpNumValueSet::~SvxBmpNumValueSet() { GalleryExplorer::EndLocking(GALLERY_THEME_BULLETS); aFormatTimer.Stop(); } -/*-----------------13.02.97 09.41------------------- - ---------------------------------------------------*/ -void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) +void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) { SvxNumValueSet::UserDraw(rUDEvt); @@ -555,13 +528,9 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) } } -/*-----------------14.02.97 07.34------------------- - ---------------------------------------------------*/ - IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG) { - // nur, wenn eine Grafik nicht da war, muss formatiert werden + // only when a graphics was not there, it needs to be formatted if(bGrfNotFound) { bGrfNotFound = sal_False; @@ -570,3 +539,5 @@ IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG) Invalidate(); return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/svxdlg.cxx b/svx/source/dialog/svxdlg.cxx index 4ee81686e9c0..aba11a2eb35c 100644 --- a/svx/source/dialog/svxdlg.cxx +++ b/svx/source/dialog/svxdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,3 +40,4 @@ SvxAbstractDialogFactory::~SvxAbstractDialogFactory() { } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx index 8a77fcfc6ef3..247e3f94e0b1 100644 --- a/svx/source/dialog/svxgrahicitem.cxx +++ b/svx/source/dialog/svxgrahicitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ SfxPoolItem* SvxGraphicItem::Clone( SfxItemPool * ) const { return new SvxGraphicItem( *this ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index abc25d865d06..bb8e2aa697f7 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,9 +53,7 @@ #include <editeng/tstpitem.hxx> #include <editeng/lrspitem.hxx> #include "editeng/protitem.hxx" -#ifndef _APP_HXX #include <vcl/svapp.hxx> -#endif #ifndef RULER_TAB_RTL #define RULER_TAB_RTL ((sal_uInt16)0x0010) #endif @@ -73,7 +72,7 @@ namespace { ::rtl::OUString sAppName; uno::Sequence<beans::PropertyValue> source; - ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString::createFromAscii("SfxRuler")); + ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxRuler"))); ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source); } } @@ -145,7 +144,7 @@ void DebugTabStops_Impl(const SvxTabStopItem& rTabs) { String aTmp("Tabs: "); - // Def Tabs loeschen + // Delete Def Tabs for(sal_uInt16 i = 0; i < rTabs.Count(); ++i) { aTmp += String(rTabs[i].GetTabPos() / 56); @@ -241,11 +240,10 @@ struct SvxRuler_Impl { SfxBoolItem* pTextRTLItem; sal_uInt16 nControlerItems; sal_uInt16 nIdx; - sal_uInt16 nColLeftPix, nColRightPix; // Pixelwerte fuer linken / rechten Rand - // bei Spalten; gepuffert, um Umrechenfehler - // zu vermeiden. - // Muesste vielleicht fuer weitere Werte - // aufgebohrt werden + sal_uInt16 nColLeftPix, nColRightPix; // Pixel values for left / right edge + // For columns; buffered to prevent + // recalculation errors + // May be has to be widen for future values sal_Bool bIsTableRows : 1; // pColumnItem contains table rows instead of columns //#i24363# tab stops relative to indent sal_Bool bIsTabsRelativeToIndent : 1; // Tab stops relative to paragraph indent? @@ -291,38 +289,38 @@ void SvxRuler_Impl::SetPercSize(sal_uInt16 nSize) } -// Konstruktor des Lineals +// Constructor of the ruler // SID_ATTR_ULSPACE, SID_ATTR_LRSPACE -// erwartet als Parameter SvxULSpaceItem f"ur Seitenr"ander -// (entweder links/rechts oder oben/unten) -// Lineal: SetMargin1, SetMargin2 +// expects as parameter SvxULSpaceItem for page edge +// (either left/right or top/bottom) +// Ruler: SetMargin1, SetMargin2 // SID_RULER_PAGE_POS -// erwartet als Parameter Anfangswert der Seite sowie Seitenbreite -// Lineal: SetPagePos +// expectes as parameter the initial value of the page and page width +// Ruler: SetPagePos // SID_ATTR_TABSTOP -// erwartet: SvxTabStopItem -// Lineal: SetTabs +// expects: SvxTabStopItem +// Ruler: SetTabs // SID_ATTR_PARA_LRSPACE -// linker, rechter Absatzrand bei H-Lineal -// Lineal: SetIndents +// left, right paragraph edge in H-ruler +// Ruler: SetIndents // SID_RULER_BORDERS -// Tabellenraender, Spalten -// erwartet: so etwas wie SwTabCols -// Lineal: SetBorders +// Table borders, columns +// expects: something like SwTabCols +// Ruler: SetBorders SvxRuler::SvxRuler ( Window* pParent, // StarView Parent - Window* pWin, // Ausgabefenster; wird fuer Umrechnung logische - // Einheiten <-> Pixel verwendet - sal_uInt16 flags, // Anzeige Flags, siehe ruler.hxx - SfxBindings &rBindings, // zugeordnete Bindings + Window* pWin, // Output window: is used for conversion + // logical units <-> pixels + sal_uInt16 flags, // Display flags, see ruler.hxx + SfxBindings &rBindings, // associated Bindings WinBits nWinStyle // StarView WinBits ) : Ruler(pParent, nWinStyle), @@ -338,8 +336,7 @@ SvxRuler::SvxRuler pObjectItem(0), pEditWin(pWin), pRuler_Imp(new SvxRuler_Impl), - bAppSetNullOffset(sal_False), //Wird der 0-Offset des Lineals - //durch die appl. gesetzt? + bAppSetNullOffset(sal_False), // Is the 0-offset of the ruler set by the application? lLogicNullOffset(0), lAppNullOffset(LONG_MAX), lMinFrame(5), @@ -353,7 +350,7 @@ SvxRuler::SvxRuler lTabPos(-1), pTabs(0), pIndents(0), - pBorders(new RulerBorder[1]), //wg 1 Spaltiger Tabellen + pBorders(new RulerBorder[1]), // due to one column tables nBorderCount(0), pObjectBorders(0), pBindings(&rBindings), @@ -364,21 +361,18 @@ SvxRuler::SvxRuler bListening(sal_False), bActive(sal_True) -/* - [Beschreibung] - - ctor; - Datenpuffer initialisieren; ControllerItems werden erzeugt +/* [Description] + Constructor; Initialize data buffer; controller items are created */ { memset(pCtrlItem, 0, sizeof(SvxRulerItem *) * CTRL_ITEM_COUNT); rBindings.EnterRegistrations(); - // Unterstuetzte Items anlegen + // Create Supported Items sal_uInt16 i = 0; - // Seitenraender + // Page edges pCtrlItem[i++] = new SvxRulerItem(SID_RULER_LR_MIN_MAX, *this, rBindings); if((nWinStyle & WB_VSCROLL) == WB_VSCROLL) @@ -392,7 +386,7 @@ SvxRuler::SvxRuler pCtrlItem[i++] = new SvxRulerItem(SID_ATTR_LONG_LRSPACE, *this, rBindings); } - // Seitenposition + // Page Position pCtrlItem[i++] = new SvxRulerItem(SID_RULER_PAGE_POS, *this, rBindings); if((nFlags & SVXRULER_SUPPORT_TABS) == SVXRULER_SUPPORT_TABS) @@ -456,14 +450,11 @@ SvxRuler::SvxRuler } -__EXPORT SvxRuler::~SvxRuler() -/* - [Beschreibung] - - Destruktor Lineal - Freigabe interner Puffer +SvxRuler::~SvxRuler() +/* [Description] + Destructor ruler; release internal buffer */ { REMOVE_DEBUG_WINDOW @@ -494,12 +485,9 @@ __EXPORT SvxRuler::~SvxRuler() pBindings->LeaveRegistrations(); } -/* - - [Beschreibung] - - Interne Umrechenroutinen +/* [Description] + Internal conversion routines */ long SvxRuler::ConvertHPosPixel(long nVal) const @@ -594,15 +582,12 @@ inline sal_uInt16 SvxRuler::GetObjectBordersOff(sal_uInt16 nIdx) const } - void SvxRuler::UpdateFrame() -/* - [Beschreibung] - - Linken, oberen Rand aktualisieren - Items werden in die Darstellung des Lineals uebersetzt. +/* [Description] + Update Upper Left edge. + Items are translated into the representation of the ruler. */ { @@ -613,7 +598,7 @@ void SvxRuler::UpdateFrame() if(pLRSpaceItem && pPagePosItem) { - // wenn keine Initialisierung durch App Defaultverhalten + // if no initialization by default app behavior const long nOld = lLogicNullOffset; lLogicNullOffset = pColumnItem? pColumnItem->GetLeft(): pLRSpaceItem->GetLeft(); @@ -628,7 +613,7 @@ void SvxRuler::UpdateFrame() else SetMargin1( ConvertHPosPixel( lAppNullOffset ), nMarginStyle ); long lRight = 0; - // bei Tabelle rechten Rand der Tabelle auswerten + // evaluate the table right edge of the table if(pColumnItem && pColumnItem->IsTable()) lRight = pColumnItem->GetRight(); else @@ -642,7 +627,7 @@ void SvxRuler::UpdateFrame() else if(pULSpaceItem && pPagePosItem) { - // Nullpunkt aus oberem Rand des umgebenden Rahmens + // relative the upper edge of the surrounding frame const long nOld = lLogicNullOffset; lLogicNullOffset = pColumnItem? pColumnItem->GetLeft(): pULSpaceItem->GetUpper(); @@ -665,7 +650,7 @@ void SvxRuler::UpdateFrame() } else { - // schaltet die Anzeige aus + // turns off the view SetMargin1(); SetMargin2(); } @@ -706,14 +691,12 @@ void SvxRuler::StartListening_Impl() void SvxRuler::UpdateFrame ( - const SvxLongLRSpaceItem *pItem // neuer Wert LRSpace + const SvxLongLRSpaceItem *pItem // new value LRSpace ) -/* - [Beschreibung] - - Neuen Wert fuer LRSpace merken; alten gfs. loeschen +/* [Description] + Store new value LRSpace; delete old ones if possible */ { @@ -729,14 +712,12 @@ void SvxRuler::UpdateFrame void SvxRuler::UpdateFrameMinMax ( - const SfxRectangleItem *pItem // Werte fuer MinMax + const SfxRectangleItem *pItem // value for MinMax ) -/* - [Beschreibung] - - Neuen Wert fuer MinMax setzen; alten gfs. loeschen +/* [Description] + Set new value for MinMax; delete old ones if possible */ { @@ -751,14 +732,12 @@ void SvxRuler::UpdateFrameMinMax void SvxRuler::UpdateFrame ( - const SvxLongULSpaceItem *pItem // neuer Wert + const SvxLongULSpaceItem *pItem // new value ) -/* - [Beschreibung] - - Rechten / unteren Rand aktualisieren +/* [Description] + Update Right/bottom margin */ @@ -776,9 +755,7 @@ void SvxRuler::Update( const SvxProtectItem* pItem ) { if( pItem ) pRuler_Imp->aProtectItem = *pItem; } -/* -----------------------------22.08.2002 13:10------------------------------ - ---------------------------------------------------------------------------*/ void SvxRuler::UpdateTextRTL(const SfxBoolItem* pItem) { if(bActive && bHorz) @@ -793,15 +770,13 @@ void SvxRuler::UpdateTextRTL(const SfxBoolItem* pItem) void SvxRuler::Update ( - const SvxColumnItem *pItem, // neuer Wert + const SvxColumnItem *pItem, // new value sal_uInt16 nSID //Slot Id to identify NULL items ) -/* - [Beschreibung] - - Neuen Wert fuer Spaltendarstellung setzen +/* [Description] + Set new value for column view */ { @@ -832,11 +807,10 @@ void SvxRuler::Update void SvxRuler::UpdateColumns() -/* - [Beschreibung] - Anzeige der Spaltendarstellung aktualisieren +/* [Description] + Update column view */ { if(pColumnItem && pColumnItem->Count() > 1) @@ -897,18 +871,16 @@ void SvxRuler::UpdateColumns() void SvxRuler::UpdateObject() -/* - [Beschreibung] - - Anzeige der Objektdarstellung aktualisieren +/* [Description] + Update view of object representation */ { if(pObjectItem) { - DBG_ASSERT(pObjectBorders, "kein Buffer"); - // !! zum Seitenrand + DBG_ASSERT(pObjectBorders, "no Buffer"); + // !! to the page margin long nMargin = pLRSpaceItem? pLRSpaceItem->GetLeft(): 0; pObjectBorders[0].nPos = ConvertPosPixel(pObjectItem->GetStartX() - @@ -934,27 +906,26 @@ void SvxRuler::UpdateObject() void SvxRuler::UpdatePara() -/* - [Beschreibung] +/* [Description] - Anzeige der Absatzeinzuege aktualisieren: - Linken Rand, Erstzeileneinzug, rechten Rand Absatz aktualisieren - pIndents[0] = Buffer fuer alten Einzug - pIndents[1] = Buffer fuer alten Einzug - pIndents[INDENT_FIRST_LINE] = Erstzeileneinzug - pIndents[3] = linker Rand - pIndents[4] = rechter Rand + Update the view for paragraph indents: + Left margin, first line indent, right margin paragraph update + pIndents[0] = Buffer for old intent + pIndents[1] = Buffer for old intent + pIndents[INDENT_FIRST_LINE] = First line indent + pIndents[3] = left margin + pIndents[4] = right margin pIndents[5] = left border distance pIndents[6] = right border distance */ { - // Abhaengigkeit zu PagePosItem + // Dependence on PagePosItem if(pParaItem && pPagePosItem && !pObjectItem) { sal_Bool bRTLText = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); - // Erstzeileneinzug, ist negativ zum linken Absatzrand + // First-line indent is negative to the left paragraph margin long nLeftFrameMargin = GetLeftFrameMargin(); long nRightFrameMargin = GetRightFrameMargin(); if(bRTLText) @@ -990,12 +961,12 @@ void SvxRuler::UpdatePara() } else { - // linker Rand + // left margin pIndents[INDENT_LEFT_MARGIN].nPos = ConvertHPosPixel( nLeftFrameMargin + pParaItem->GetTxtLeft() + lAppNullOffset); - // rechter Rand, immer negativ zum rechten Rand des umgebenden Frames + // right margin, always negative to the right edge of the surrounding frames pIndents[INDENT_RIGHT_MARGIN].nPos = ConvertHPosPixel( nRightFrameMargin - @@ -1022,20 +993,19 @@ void SvxRuler::UpdatePara() pIndents[INDENT_LEFT_MARGIN].nPos = pIndents[INDENT_RIGHT_MARGIN].nPos = 0; } - SetIndents(); // ausschalten + SetIndents(); // turn off } } void SvxRuler::UpdatePara ( - const SvxLRSpaceItem *pItem // neuer Wert Absatzeinzuege + const SvxLRSpaceItem *pItem // new value of paragraph indents ) -/* - [Beschreibung] +/* [Description] - Neuen Wert Absatzeinzuege merken + Store new value of paragraph indents */ { @@ -1048,8 +1018,9 @@ void SvxRuler::UpdatePara } } void SvxRuler::UpdateParaBorder(const SvxLRSpaceItem * pItem ) -/* - [Description] + +/* [Description] + Border distance */ @@ -1066,17 +1037,15 @@ void SvxRuler::UpdateParaBorder(const SvxLRSpaceItem * pItem ) void SvxRuler::UpdatePage() -/* - [Beschreibung] - - Anzeige von Postion und Breite der Seite aktualisieren +/* [Description] + Update view of position and width of page */ { if(pPagePosItem) { - // alle Objekte werden automatisch angepasst + // all objects are automatically adjusted if(bHorz) SetPagePos( pEditWin->LogicToPixel(pPagePosItem->GetPos()).X(), @@ -1111,9 +1080,8 @@ void SvxRuler::UpdatePage() lPos= bHorz ? aPos.X() : aPos.Y(); } -// Leider bekommen wir den Offset des Editfensters zum Lineal nie -// per Statusmeldung. Also setzen wir ihn selbst, wenn noetig. - +// Unfortunately, we get the offset of the edit window to the ruler never +// through a status message. So we set it ourselves if necessary. if(lPos!=pRuler_Imp->lOldWinPos) { pRuler_Imp->lOldWinPos=lPos; @@ -1124,14 +1092,12 @@ void SvxRuler::UpdatePage() void SvxRuler::Update ( - const SvxPagePosSizeItem *pItem // neuer Wert Seitenattribute + const SvxPagePosSizeItem *pItem // new value of page attributes ) -/* - [Beschreibung] - - Neuen Wert Seitenattribute merken +/* [Description] + Store new value of page attributes */ { @@ -1149,14 +1115,12 @@ void SvxRuler::Update void SvxRuler::SetDefTabDist ( - long l // Neuer Abstand fuer DefaultTabs in App-Metrik + long l // New distance for DefaultTabs in App-Metrics ) -/* - [Beschreibung] - - Neuer Abstand fuer DefaultTabs wird gesetzt +/* [Description] + New distance is set for DefaultTabs */ { @@ -1168,11 +1132,9 @@ void SvxRuler::SetDefTabDist long SvxRuler::GetDefTabDist() const -/* - [Beschreibung] - - Wert fuer DefaultTabs erfragen (wird in App.-Methik geliefert) +/* [Description] + Get value for DefaultTab (is delivered in App-metrics) */ { @@ -1182,11 +1144,9 @@ long SvxRuler::GetDefTabDist() const sal_uInt16 ToSvTab_Impl(SvxTabAdjust eAdj) -/* - [Beschreibung] - - Interne Konvertierungsroutinen zwischen SV-Tab.-Enum und Svx +/* [Description] + Internal convertion routine between SV-Tab.-Enum and Svx */ { @@ -1217,11 +1177,9 @@ SvxTabAdjust ToAttrTab_Impl(sal_uInt16 eAdj) void SvxRuler::UpdateTabs() -/* - [Beschreibung] - - Anzeige der Tabulatoren +/* [Description] + Update of Tabs */ { @@ -1229,8 +1187,8 @@ void SvxRuler::UpdateTabs() return; if(pPagePosItem && pParaItem && pTabStopItem && !pObjectItem) { - // Puffer fuer DefaultTabStop - // Abstand letzter Tab <-> Rechter Absatzrand / DefaultTabDist + // buffer for DefaultTabStop + // Distance last Tab <-> Right paragraph margin / DefaultTabDist sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); long nLeftFrameMargin = GetLeftFrameMargin(); long nRightFrameMargin = GetRightFrameMargin(); @@ -1258,7 +1216,7 @@ void SvxRuler::UpdateTabs() if(pTabStopItem->Count() + TAB_GAP + nDefTabBuf > nTabBufSize) { delete[] pTabs; - // 10 (GAP) auf Vorrat + // 10 (GAP) in stock nTabBufSize = pTabStopItem->Count() + TAB_GAP + nDefTabBuf + GAP; pTabs = new RulerTab[nTabBufSize]; } @@ -1284,7 +1242,7 @@ void SvxRuler::UpdateTabs() if(!pTabStopItem->Count()) pTabs[0].nPos = bRTL ? lRightPixMargin : lParaIndentPix; - // Rest mit Default-Tabs fuellen + // fill the rest with default Tabs if(bRTL) { for(j = 0; j < nDefTabBuf; ++j) @@ -1344,7 +1302,7 @@ void SvxRuler::UpdateTabs() } } SetTabs(nTabCount, pTabs+TAB_GAP); - DBG_ASSERT(nTabCount + TAB_GAP <= nTabBufSize, "BufferSize zu klein"); + DBG_ASSERT(nTabCount + TAB_GAP <= nTabBufSize, "BufferSize too small"); } else { @@ -1355,14 +1313,12 @@ void SvxRuler::UpdateTabs() void SvxRuler::Update ( - const SvxTabStopItem *pItem // Neuer Wert fuer Tabulatoren + const SvxTabStopItem *pItem // new value for tabs ) -/* - [Beschreibung] - - Neuen Wert fuer Tabulatoren merken; alten gfs. loeschen +/* [Description] + Store new value for tabs; delete old ones if possible */ { @@ -1382,14 +1338,12 @@ void SvxRuler::Update void SvxRuler::Update ( - const SvxObjectItem *pItem // Neuer Wert fuer Objekte + const SvxObjectItem *pItem // new value for objects ) -/* - [Beschreibung] - - Neuen Wert fuer Objekte merken +/* [Description] + Store new value for objects */ { @@ -1405,7 +1359,7 @@ void SvxRuler::Update void SvxRuler::SetNullOffsetLogic ( - long lVal // Setzen des logischen NullOffsets + long lVal // Setting of the logic NullOffsets ) { lAppNullOffset = lLogicNullOffset - lVal; @@ -1417,11 +1371,9 @@ void SvxRuler::SetNullOffsetLogic void SvxRuler::Update() -/* - [Beschreibung] - - Aktualisierung der Anzeige anstossen +/* [Description] + Perform update of view */ { @@ -1450,11 +1402,9 @@ inline long SvxRuler::GetPageWidth() const inline long SvxRuler::GetFrameLeft() const -/* - [Beschreibung] - - Erfragen des linken Randes in Pixeln +/* [Description] + Get Left margin in Pixels */ @@ -1466,11 +1416,9 @@ inline long SvxRuler::GetFrameLeft() const inline void SvxRuler::SetFrameLeft(long l) -/* - [Beschreibung] - - Setzen des linken Randes in Pixeln +/* [Description] + Set Left margin in Pixels */ { @@ -1487,10 +1435,9 @@ inline void SvxRuler::SetFrameLeft(long l) long SvxRuler::GetFirstLineIndent() const -/* - [Beschreibung] +/* [Description] - Erstzeileneinzug in Pixels erfragen + Get First-line indent in pixels */ { @@ -1500,10 +1447,9 @@ long SvxRuler::GetFirstLineIndent() const long SvxRuler::GetLeftIndent() const -/* - [Beschreibung] +/* [Description] - Linken Absatzrand in Pixels erfragen + Get Left paragraph margin in Pixels */ { @@ -1514,10 +1460,9 @@ long SvxRuler::GetLeftIndent() const long SvxRuler::GetRightIndent() const -/* - [Beschreibung] +/* [Description] - Rechten Absatzrand in Pixels erfragen + Get Right paragraph margin in Pixels */ { @@ -1527,20 +1472,17 @@ long SvxRuler::GetRightIndent() const long SvxRuler::GetLogicRightIndent() const -/* - [Beschreibung] +/* [Description] - Rechten Absatzrand in Logic erfragen + Get Right paragraph margin in Logic */ { return pParaItem ? GetRightFrameMargin()-pParaItem->GetRight() : GetRightFrameMargin(); } -// linker Rand in App-Werten; ist entweder der Seitenrand (=0) -// oder der linke Rand der Spalte, die im Spaltenattribut als -// altuelle Spalte eingestellt ist. - +// Left margin in App values, is either the margin (= 0) or the left edge of +// the column that is set in the column attribute as current column. long SvxRuler::GetLeftFrameMargin() const { // #126721# for some unknown reason the current column is set to 0xffff @@ -1556,7 +1498,7 @@ long SvxRuler::GetLeftFrameMargin() const inline long SvxRuler::GetLeftMin() const { - DBG_ASSERT(pMinMaxItem, "kein MinMax-Wert gesetzt"); + DBG_ASSERT(pMinMaxItem, "no MinMax value set"); return pMinMaxItem? bHorz? pMinMaxItem->GetValue().Left(): pMinMaxItem->GetValue().Top() : 0; @@ -1564,7 +1506,7 @@ inline long SvxRuler::GetLeftMin() const inline long SvxRuler::GetRightMax() const { - DBG_ASSERT(pMinMaxItem, "kein MinMax-Wert gesetzt"); + DBG_ASSERT(pMinMaxItem, "no MinMax value set"); return pMinMaxItem? bHorz? pMinMaxItem->GetValue().Right(): pMinMaxItem->GetValue().Bottom() : 0; @@ -1573,11 +1515,9 @@ inline long SvxRuler::GetRightMax() const long SvxRuler::GetRightFrameMargin() const -/* - [Beschreibung] - - Rechten umgebenden Rand erfragen (in logischen Einheiten) +/* [Description] + Get right frame margin (in logical units) */ { @@ -1594,7 +1534,7 @@ long SvxRuler::GetRightFrameMargin() const long l = lLogicNullOffset; - // gfs. rechten Tabelleneinzug abziehen + // If possible deduct right table entry if(pColumnItem && pColumnItem->IsTable()) l += pColumnItem->GetRight(); else if(bHorz && pLRSpaceItem) @@ -1619,12 +1559,10 @@ long SvxRuler::GetRightFrameMargin() const long SvxRuler::GetCorrectedDragPos( sal_Bool bLeft, sal_Bool bRight ) -/* - [Beschreibung] - - Korrigiert die Position innerhalb der errechneten Grenzwerte. - Die Grenzwerte sind in Pixel relativ zum Seitenrand. +/* [Description] + Corrects the position within the calculated limits. The limit values are in + pixels relative to the page edge. */ { @@ -1643,16 +1581,14 @@ ADD_DEBUG_TEXT("lDragPos: ", String::CreateFromInt32(lDragPos)) void ModifyTabs_Impl ( - sal_uInt16 nCount, // Anzahl Tabs - RulerTab *pTabs, // Tab-Puffer - long lDiff // zu addierende Differenz + sal_uInt16 nCount, // Number of Tabs + RulerTab *pTabs, // Tab buffer + long lDiff // difference to be added ) -/* - [Beschreibung] - - Hilfsroutine; alle Tabs um einen festen Wert verschieben +/* [Description] + Helper function, move all the tabs by a fixed value */ { if( pTabs ) @@ -1663,18 +1599,15 @@ void ModifyTabs_Impl void SvxRuler::DragMargin1() -/* - [Beschreibung] - - Draggen des linken Frame-Randes +/* [Description] + Dragging the left edge of frame */ { const long lDragPos = GetCorrectedDragPos( !TAB_FLAG || !NEG_FLAG, sal_True ); DrawLine_Impl(lTabPos, ( TAB_FLAG && NEG_FLAG ) ? 3 : 7, bHorz); if(pColumnItem&& - (//nDragType & DRAG_OBJECT_SIZE_LINEAR || - nDragType & DRAG_OBJECT_SIZE_PROPORTIONAL)) + (nDragType & DRAG_OBJECT_SIZE_PROPORTIONAL)) DragBorders(); AdjustMargin1(lDragPos); } @@ -1699,7 +1632,7 @@ void SvxRuler::AdjustMargin1(long lDiff) if(!pColumnItem && !pObjectItem && pParaItem) { - // Rechten Einzug an alter Position + // Right indent of the old position pIndents[INDENT_RIGHT_MARGIN].nPos -= _lDiff; SetIndents(INDENT_COUNT, pIndents+INDENT_GAP); } @@ -1716,7 +1649,7 @@ void SvxRuler::AdjustMargin1(long lDiff) SetBorders(pColumnItem->Count()-1, pBorders); if(pColumnItem->IsFirstAct()) { - // Rechten Einzug an alter Position + // Right indent of the old position if(pParaItem) { pIndents[INDENT_RIGHT_MARGIN].nPos -= _lDiff; @@ -1752,7 +1685,7 @@ void SvxRuler::AdjustMargin1(long lDiff) { if(!pColumnItem && !pObjectItem && pParaItem) { - // Linke Einzuege an alter Position + // Left indent of the old position pIndents[INDENT_FIRST_LINE].nPos += _lDiff; pIndents[INDENT_LEFT_MARGIN].nPos += _lDiff; SetIndents(INDENT_COUNT, pIndents+INDENT_GAP); @@ -1765,7 +1698,7 @@ void SvxRuler::AdjustMargin1(long lDiff) SetBorders(pColumnItem->Count()-1, pBorders); if(pColumnItem->IsFirstAct()) { - // Linke Einzuege an alter Position + // Left indent of the old position if(pParaItem) { pIndents[INDENT_FIRST_LINE].nPos += _lDiff; @@ -1795,11 +1728,10 @@ void SvxRuler::AdjustMargin1(long lDiff) void SvxRuler::DragMargin2() -/* - [Beschreibung] - Draggen des rechten Frame-Randes +/* [Description] + Dragging the right edge of frame */ { const long lDragPos = GetCorrectedDragPos( sal_True, !TAB_FLAG || !NEG_FLAG); @@ -1807,8 +1739,7 @@ void SvxRuler::DragMargin2() long lDiff = lDragPos - GetMargin2(); if(pRuler_Imp->bIsTableRows && !bHorz && pColumnItem&& - (//nDragType & DRAG_OBJECT_SIZE_LINEAR || - nDragType & DRAG_OBJECT_SIZE_PROPORTIONAL)) + (nDragType & DRAG_OBJECT_SIZE_PROPORTIONAL)) DragBorders(); sal_Bool bProtectColumns = @@ -1818,7 +1749,7 @@ void SvxRuler::DragMargin2() bProtectColumns ? 0 : RULER_MARGIN_SIZEABLE; SetMargin2( lDragPos, nMarginStyle ); - // Rechten Einzug an alter Position + // Right indent of the old position if((!pColumnItem || IsActLastColumn()) && pParaItem) { pIndents[INDENT_FIRST_LINE].nPos += lDiff; @@ -1828,11 +1759,10 @@ void SvxRuler::DragMargin2() void SvxRuler::DragIndents() -/* - [Beschreibung] - Draggen der Absatzeinzuege +/* [Description] + Dragging the paragraph indents */ { const long lDragPos = NEG_FLAG ? GetDragPos() : GetCorrectedDragPos(); @@ -1853,12 +1783,11 @@ void SvxRuler::DragIndents() void SvxRuler::DrawLine_Impl(long &_lTabPos, int nNew, sal_Bool Hori) -/* - [Beschreibung] - Ausgaberoutine fuer Hilfslinie beim Vereschieben von Tabs, Tabellen- - und anderen Spalten +/* [Description] + Output routine for the ledger line when moving tabs, tables and other + columns */ { if(Hori) @@ -1914,11 +1843,9 @@ void SvxRuler::DrawLine_Impl(long &_lTabPos, int nNew, sal_Bool Hori) void SvxRuler::DragTabs() -/* - [Beschreibung] - - Draggen von Tabs +/* [Description] + Dragging of Tabs */ { @@ -1935,7 +1862,7 @@ void SvxRuler::DragTabs() for(sal_uInt16 i = nIdx; i < nTabCount; ++i) { pTabs[i].nPos += nDiff; - // auf Maximum begrenzen + // limit on maximum if(pTabs[i].nPos > GetMargin2()) pTabs[nIdx].nStyle |= RULER_STYLE_INVISIBLE; else @@ -1949,7 +1876,7 @@ void SvxRuler::DragTabs() for(sal_uInt16 i = nIdx+1; i < nTabCount; ++i) { if(pTabs[i].nStyle & RULER_TAB_DEFAULT) - // bei den DefaultTabs kann abgebrochen werden + // can be canceled at the DefaultTabs break; long nDelta = pRuler_Imp->nTotalDist * pRuler_Imp->pPercBuf[i]; nDelta /= 1000; @@ -1977,24 +1904,6 @@ void SvxRuler::SetActive(sal_Bool bOn) if(bOn) { Activate(); -/* pBindings->Invalidate( SID_RULER_LR_MIN_MAX, sal_True, sal_True ); - pBindings->Update( SID_RULER_LR_MIN_MAX ); - pBindings->Invalidate( SID_ATTR_LONG_ULSPACE, sal_True, sal_True ); - pBindings->Update( SID_ATTR_LONG_ULSPACE ); - pBindings->Invalidate( SID_ATTR_LONG_LRSPACE, sal_True, sal_True ); - pBindings->Update( SID_ATTR_LONG_LRSPACE ); - pBindings->Invalidate( SID_RULER_PAGE_POS, sal_True, sal_True ); - pBindings->Update( SID_RULER_PAGE_POS ); - pBindings->Invalidate( SID_ATTR_TABSTOP, sal_True, sal_True ); - pBindings->Update( SID_ATTR_TABSTOP ); - pBindings->Invalidate( SID_ATTR_PARA_LRSPACE, sal_True, sal_True ); - pBindings->Update( SID_ATTR_PARA_LRSPACE ); - pBindings->Invalidate( SID_RULER_BORDERS, sal_True, sal_True ); - pBindings->Update( SID_RULER_BORDERS ); - pBindings->Invalidate( SID_RULER_OBJECT, sal_True, sal_True ); - pBindings->Update( SID_RULER_OBJECT ); - pBindings->Invalidate( SID_RULER_PROTECT, sal_True, sal_True ); - pBindings->Update( SID_RULER_PROTECT );*/ } else Deactivate(); @@ -2017,15 +1926,13 @@ void SvxRuler::SetActive(sal_Bool bOn) void SvxRuler::UpdateParaContents_Impl ( - long l, // Differenz - UpdateType eType // Art (alle, links oder rechts) + long l, // Difference + UpdateType eType // Art (all, left or right) ) -/* - [Beschreibung] - - Hilfsroutine; Mitfuehren von Tabulatoren und Absatzraendern +/* [Description] + Helper function; carry Tabs and Paragraph Margins */ { switch(eType) { @@ -2052,14 +1959,11 @@ void SvxRuler::UpdateParaContents_Impl } - void SvxRuler::DragBorders() -/* - [Beschreibung] - - Draggen von Borders (Tabellen- und anderen Spalten) +/* [Description] + Dragging of Borders (Tables and other columns) */ { sal_Bool bLeftIndentsCorrected = sal_False, bRightIndentsCorrected = sal_False; @@ -2089,24 +1993,22 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi lPos-nDragOffset - pBorders[nIdx].nPos : GetDragType() == RULER_TYPE_MARGIN1 ? lPos - pRuler_Imp->lLastLMargin : lPos - pRuler_Imp->lLastRMargin; -// pBorders[nIdx].nPos += lDiff; -// lDiff = pBorders[nIdx].nPos - nOld; if(nDragType & DRAG_OBJECT_SIZE_LINEAR) { - long nRight = GetMargin2()-lMinFrame; // rechter Begrenzer + long nRight = GetMargin2()-lMinFrame; // Right limiters for(int i = nBorderCount-2; i >= nIdx; --i) { long l = pBorders[i].nPos; pBorders[i].nPos += lDiff; pBorders[i].nPos = Min(pBorders[i].nPos, nRight - pBorders[i].nWidth); nRight = pBorders[i].nPos - lMinFrame; - // RR der Spalte aktualisieren + // RR update the column if(i == GetActRightColumn()) { UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_RIGHT); bRightIndentsCorrected = sal_True; } - // LAR, EZE der Spalte aktualisieren + // LAR, EZE update the column else if(i == GetActLeftColumn()) { UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_LEFT); @@ -2122,7 +2024,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi switch(GetDragType()) { default: ;//prevent warning - DBG_ERROR("svx::SvxRuler::DragBorders(), unknown drag type!" ); + OSL_FAIL("svx::SvxRuler::DragBorders(), unknown drag type!" ); case RULER_TYPE_BORDER: if(pRuler_Imp->bIsTableRows) { @@ -2156,7 +2058,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi break; case RULER_TYPE_MARGIN2: nLimit = 0; - lLeft= 0;//pRuler_Imp->lLastRMargin + lDiff; + lLeft= 0; nStartLimit = nBorderCount - 2; pRuler_Imp->nTotalDist += lDiff; break; @@ -2170,7 +2072,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi (pRuler_Imp->nTotalDist*pRuler_Imp->pPercBuf[i])/1000+ pRuler_Imp->pBlockBuf[i]; - // RR der Spalte aktualisieren + // RR update the column if(!pRuler_Imp->bIsTableRows) { if(i == GetActRightColumn()) @@ -2178,7 +2080,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_RIGHT); bRightIndentsCorrected = sal_True; } - // LAR, EZE der Spalte aktualisieren + // LAR, EZE update the column else if(i == GetActLeftColumn()) { UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_LEFT); @@ -2211,16 +2113,14 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi //This includes the left border when the table is not limited //to a lower frame border. int nLimit; - long lLeft; if(GetDragType()==RULER_TYPE_BORDER) { nLimit=nIdx+1; - lLeft=(pBorders[nIdx].nPos+=lDiff); + pBorders[nIdx].nPos+=lDiff; } else { nLimit=0; - lLeft=pRuler_Imp->lLastLMargin+lDiff; } //in vertical tables the left borders have to be moved if(bHorz) @@ -2279,11 +2179,9 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi void SvxRuler::DragObjectBorder() -/* - [Beschreibung] - - Draggen von Objektraendern +/* [Description] + Dragging of object edges */ { if(RULER_DRAGSIZE_MOVE == GetDragSize()) @@ -2299,11 +2197,10 @@ void SvxRuler::DragObjectBorder() void SvxRuler::ApplyMargins() -/* - [Beschreibung] - Anwenden von Randeinstellungen; durch Draggen veraendert. +/* [Description] + Applying margins; changed by dragging. */ { const SfxPoolItem *pItem = 0; @@ -2364,11 +2261,10 @@ void SvxRuler::ApplyMargins() void SvxRuler::ApplyIndents() -/* - [Beschreibung] - Anwenden von Absatzeinstellungen; durch Draggen veraendert. +/* [Description] + Applying paragraph settings; changed by dragging. */ { long nNewTxtLeft; @@ -2408,9 +2304,10 @@ void SvxRuler::ApplyIndents() lAppNullOffset, pParaItem->GetTxtFirstLineOfst()); - // #62986# : Ist der neue TxtLeft kleiner als der alte FirstLineIndent, - // dann geht die Differenz verloren und der Absatz wird insgesamt - // zu weit eingerueckt, deswegen erst den FirstLineOffset setzen, dann den TxtLeft + // If the new TxtLeft is smaller than the old FirstLineIndent, then the + // difference is lost and the paragraph is in total indented too far, + // so first set the FirstLineOffset, then the TxtLeft + if(bRTL) { long nLeftFrameMargin = GetLeftFrameMargin(); @@ -2473,11 +2370,10 @@ void SvxRuler::ApplyIndents() void SvxRuler::ApplyTabs() -/* - [Beschreibung] - Anwenden von Tabulatoreinstellungen; durch Draggen veraendert. +/* [Description] + Apply tab settings, changed by dragging. */ { sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); @@ -2562,11 +2458,10 @@ void SvxRuler::ApplyTabs() void SvxRuler::ApplyBorders() -/* - [Beschreibung] - Anwenden von (Tabellen-)Spalteneinstellungen; durch Draggen veraendert. +/* [Description] + Applying (table) column settings; changed by dragging. */ { if(pColumnItem->IsTable()) @@ -2596,8 +2491,8 @@ void SvxRuler::ApplyBorders() pBorders[i].nWidth) - lAppNullOffset, (*pColumnItem)[i+1].nStart); - // Es kann sein, dass aufgrund der PIXEL_H_ADJUST rejustierung auf - // alte Werte die Breite < 0 wird. Das rerejustieren wir. + // It may be that, due to the PIXEL_H_ADJUST readjustment to old values, + // the width becomes < 0. This we readjust. if( nEnd > nStart ) nStart = nEnd; } @@ -2612,14 +2507,13 @@ void SvxRuler::ApplyBorders() } void SvxRuler::ApplyObject() -/* - [Beschreibung] - Anwenden von Objekteinstellungen; durch Draggen veraendert. +/* [Description] + Applying object settings, changed by dragging. */ { - // zum Seitenrand + // to the page margin long nMargin = pLRSpaceItem? pLRSpaceItem->GetLeft(): 0; pObjectItem->SetStartX( PixelAdjust( @@ -2642,12 +2536,11 @@ void SvxRuler::ApplyObject() } void SvxRuler::PrepareProportional_Impl(RulerType eType) -/* - [Beschreibung] - Vorbereitung proportionales Draggen; es wird der proportionale - Anteil bezogen auf die Gesamtbreite in Promille berechnet. +/* [Description] + Preparation proportional dragging, and it is calculated based on the + proportional share of the total width in parts per thousand. */ { pRuler_Imp->nTotalDist = GetMargin2(); @@ -2657,7 +2550,7 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType) case RULER_TYPE_MARGIN1: case RULER_TYPE_BORDER: { - DBG_ASSERT(pColumnItem, "kein ColumnItem"); + DBG_ASSERT(pColumnItem, "no ColumnItem"); pRuler_Imp->SetPercSize(pColumnItem->Count()); @@ -2774,15 +2667,14 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType) void SvxRuler::EvalModifier() -/* - [Beschreibung] +/* [Description] - Modifier Draggen auswerten + Eval Drag Modifier - Shift: Linear verschieben - Control: Proportional verschieben - Shift+Control: Tabelle: nur aktuelle Zeile - alt: Bemassungspfeile (n.i.) //!! + Shift: move linear + Control: move proportional + Shift+Control: Table: only current line + Alt: dimension arrows (not implemented) //!! */ @@ -2803,7 +2695,8 @@ void SvxRuler::EvalModifier() const RulerType eType = GetDragType(); nDragType = DRAG_OBJECT_SIZE_PROPORTIONAL; if( RULER_TYPE_TAB == eType || - ( ( RULER_TYPE_BORDER == eType || RULER_TYPE_MARGIN1 == eType || RULER_TYPE_MARGIN2 == eType) && + ( ( RULER_TYPE_BORDER == eType || RULER_TYPE_MARGIN1 == eType || + RULER_TYPE_MARGIN2 == eType ) && pColumnItem ) ) PrepareProportional_Impl(eType); break; @@ -2813,22 +2706,20 @@ void SvxRuler::EvalModifier() GetDragType()!=RULER_TYPE_MARGIN2) nDragType = DRAG_OBJECT_ACTLINE_ONLY; break; - // alt: Bemassungspfeile + // ALT: Dimension arrows } } -void __EXPORT SvxRuler::Click() - -/* - [Beschreibung] +void SvxRuler::Click() - Ueberladener Handler SV; setzt Tab per Dispatcheraufruf +/* [Description] + Overloaded handler SV; sets Tab per dispatcher call */ { - lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/Click")); + lcl_logRulerUse(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".special://SfxRuler/Click"))); Ruler::Click(); if( bActive ) { @@ -2879,16 +2770,15 @@ void __EXPORT SvxRuler::Click() sal_Bool SvxRuler::CalcLimits ( - long &nMax1, // zu setzenden Minimalwert - long &nMax2, // zu setzenden Maximalwert + long &nMax1, // minimum value to be set + long &nMax2, // minimum value to be set sal_Bool ) const -/* - [Beschreibung] - Defaultimplementierung der virtuellen Funktion; kann die Applikation - ueberladen, um eine eigene Grenzwertbehandlung zu implementieren. - Die Werte sind auf die Seite bezogen. +/* [Description] + + Default implementation of the virtual function; the application can be + overloaded to implement customized limits. The values are based on the page. */ { nMax1 = LONG_MIN; @@ -2899,12 +2789,10 @@ sal_Bool SvxRuler::CalcLimits void SvxRuler::CalcMinMax() -/* - [Beschreibung] - - Berechnet die Grenzwerte fuers Draggen; diese sind in Pixeln - relativ zum Seitenrand +/* [Description] + Calculates the limits for dragging; which are in pixels relative to the + page edge */ { @@ -2914,8 +2802,8 @@ void SvxRuler::CalcMinMax() switch(GetDragType()) { case RULER_TYPE_MARGIN1: - { // linker Rand umgebender Frame - // DragPos - NOf zwischen links - rechts + { // left edge of the surrounding Frame + // DragPos - NOf between left - right pRuler_Imp->lMaxLeftLogic = GetLeftMin(); nMaxLeft=ConvertSizePixel(pRuler_Imp->lMaxLeftLogic); @@ -2937,7 +2825,8 @@ void SvxRuler::CalcMinMax() else if(pRuler_Imp->bIsTableRows) { //top border is not moveable when table rows are displayed - // protection of content means the margin is not moveable - it's just a page break inside of a cell + // protection of content means the margin is not moveable + // - it's just a page break inside of a cell if(bHorz && !pRuler_Imp->aProtectItem.IsCntntProtected()) { nMaxLeft = pBorders[0].nMinPos + lNullPix; @@ -2953,7 +2842,6 @@ void SvxRuler::CalcMinMax() else { if(nDragType & DRAG_OBJECT_SIZE_PROPORTIONAL) - //nDragType & DRAG_OBJECT_SIZE_LINEAR) { nMaxRight=lNullPix+CalcPropMaxRight(); } @@ -2988,7 +2876,7 @@ void SvxRuler::CalcMinMax() else nMaxRight +=GetRightIndent() - Max(GetFirstLineIndent(), GetLeftIndent()); - // den linken Tabellen-Rand nicht ueber den Seitenrand ziehen + // Do not drag the left table edge over the edge of the page if(pLRSpaceItem&&pColumnItem->IsTable()) { long nTmp=ConvertSizePixel(pLRSpaceItem->GetLeft()); @@ -3000,7 +2888,7 @@ void SvxRuler::CalcMinMax() break; } case RULER_TYPE_MARGIN2: - { // rechter Rand umgebender Frame + { // right edge of the surrounding Frame pRuler_Imp->lMaxRightLogic = pMinMaxItem ? GetPageWidth() - GetRightMax() : GetPageWidth(); @@ -3052,7 +2940,7 @@ void SvxRuler::CalcMinMax() else { nMaxLeft = lMinFrame + lNullPix; - if(IsActLastColumn() || pColumnItem->Count() < 2 ) //Falls letzte Spalte aktiv + if(IsActLastColumn() || pColumnItem->Count() < 2 ) //If last active column { if(bRTL) { @@ -3080,7 +2968,7 @@ void SvxRuler::CalcMinMax() break; } case RULER_TYPE_BORDER: - { // Tabelle, Spalten (Modifier) + { // Table, column (Modifier) const sal_uInt16 nIdx = GetDragAryPos(); switch(GetDragSize()) { @@ -3209,7 +3097,7 @@ void SvxRuler::CalcMinMax() nMaxLeft += nDragOffset; // nMaxRight - // linear / proprotional verschieben + // linear / proprotional move if(DRAG_OBJECT_SIZE_PROPORTIONAL & nDragType|| (DRAG_OBJECT_SIZE_LINEAR & nDragType) ) { @@ -3223,7 +3111,7 @@ void SvxRuler::CalcMinMax() else { if(nRightCol==USHRT_MAX) - { // letzte Spalte + { // last column nMaxRight = GetMargin2() + lNullPix; if(IsActLastColumn()) { @@ -3300,7 +3188,7 @@ void SvxRuler::CalcMinMax() case RULER_DRAGSIZE_2: { nMaxLeft = lNullPix + pBorders[nIdx].nPos; - if(nIdx == pColumnItem->Count()-2) { // letzte Spalte + if(nIdx == pColumnItem->Count()-2) { // last column nMaxRight = GetMargin2() + lNullPix; if(pColumnItem->IsLastAct()) { nMaxRight -= @@ -3345,7 +3233,7 @@ void SvxRuler::CalcMinMax() pBorders[pColumnItem->GetActColumn()-1].nWidth; nMaxRight = lNullPix + GetMargin2(); - // zusammem draggen + // Dragging along if((INDENT_FIRST_LINE - INDENT_GAP) != nIdx && (nDragType & DRAG_OBJECT_LEFT_INDENT_ONLY) != DRAG_OBJECT_LEFT_INDENT_ONLY) @@ -3365,7 +3253,7 @@ void SvxRuler::CalcMinMax() pBorders[pColumnItem->GetActColumn()-1].nWidth; nMaxRight = lNullPix + GetRightIndent() - lMinFrame; - // zusammem draggen + // Dragging along if((INDENT_FIRST_LINE - INDENT_GAP) != nIdx && (nDragType & DRAG_OBJECT_LEFT_INDENT_ONLY) != DRAG_OBJECT_LEFT_INDENT_ONLY) @@ -3420,8 +3308,8 @@ void SvxRuler::CalcMinMax() } case RULER_TYPE_TAB: // Tabs (Modifier) /* - links = NOf + Max(LAR, EZ) - rechts = NOf + RAR + left = NOf + Max(LAR, EZ) + right = NOf + RAR */ nMaxLeft = bRTL ? lNullPix + GetRightIndent() : lNullPix + Min(GetFirstLineIndent(), GetLeftIndent()); @@ -3446,24 +3334,22 @@ void SvxRuler::CalcMinMax() } -long __EXPORT SvxRuler::StartDrag() +long SvxRuler::StartDrag() -/* - [Beschreibung] +/* [Description] - Beginn eines Drag-Vorgangs (SV-Handler); wertet Modifier aus - und berechnet Grenzwerte + Beginning of a drag operation (SV-handler) evaluates modifier and + calculated values - [Querverweise] + [Cross-reference] <SvxRuler::EvalModifier()> <SvxRuler::CalcMinMax()> <SvxRuler::EndDrag()> - */ { - lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/StartDrag")); + lcl_logRulerUse(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".special://SfxRuler/StartDrag"))); sal_Bool bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected(); if(!bValid) return sal_False; @@ -3476,8 +3362,8 @@ long __EXPORT SvxRuler::StartDrag() if(bOk) { lInitialDragPos = GetDragPos(); switch(GetDragType()) { - case RULER_TYPE_MARGIN1: // linker Rand umgebender Frame - case RULER_TYPE_MARGIN2: // rechter Rand umgebender Frame + case RULER_TYPE_MARGIN1: // left edge of the surrounding Frame + case RULER_TYPE_MARGIN2: // right edge of the surrounding Frame if((bHorz && pLRSpaceItem) || (!bHorz && pULSpaceItem)) { if(pColumnItem) @@ -3488,7 +3374,7 @@ long __EXPORT SvxRuler::StartDrag() else bOk = sal_False; break; - case RULER_TYPE_BORDER: // Tabelle, Spalten (Modifier) + case RULER_TYPE_BORDER: // Table, column (Modifier) if(pColumnItem) { nDragOffset = pColumnItem->IsTable()? 0 : @@ -3499,11 +3385,11 @@ long __EXPORT SvxRuler::StartDrag() else nDragOffset = 0; break; - case RULER_TYPE_INDENT: { // Absatzeinzuege (Modifier) + case RULER_TYPE_INDENT: { // Paragraph indents (Modifier) if( bContentProtected ) return sal_False; sal_uInt16 nIndent = INDENT_LEFT_MARGIN; - if((nIndent) == GetDragAryPos() + INDENT_GAP) { // Linker Absatzeinzug + if((nIndent) == GetDragAryPos() + INDENT_GAP) { // Left paragraph indent pIndents[0] = pIndents[INDENT_FIRST_LINE]; pIndents[0].nStyle |= RULER_STYLE_DONTKNOW; EvalModifier(); @@ -3532,12 +3418,11 @@ long __EXPORT SvxRuler::StartDrag() } -void __EXPORT SvxRuler::Drag() -/* - [Beschreibung] +void SvxRuler::Drag() - SV-Draghandler +/* [Description] + SV-Draghandler */ { if(IsDragCanceled()) @@ -3546,18 +3431,18 @@ void __EXPORT SvxRuler::Drag() return; } switch(GetDragType()) { - case RULER_TYPE_MARGIN1: // linker Rand umgebender Frame + case RULER_TYPE_MARGIN1: // left edge of the surrounding Frame DragMargin1(); pRuler_Imp->lLastLMargin=GetMargin1(); break; - case RULER_TYPE_MARGIN2: // rechter Rand umgebender Frame + case RULER_TYPE_MARGIN2: // right edge of the surrounding Frame DragMargin2(); pRuler_Imp->lLastRMargin = GetMargin2(); break; - case RULER_TYPE_INDENT: // Absatzeinzuege + case RULER_TYPE_INDENT: // Paragraph indents DragIndents(); break; - case RULER_TYPE_BORDER: // Tabelle, Spalten + case RULER_TYPE_BORDER: // Table, columns if(pColumnItem) DragBorders(); else if(pObjectItem) @@ -3572,18 +3457,16 @@ void __EXPORT SvxRuler::Drag() } -void __EXPORT SvxRuler::EndDrag() -/* - [Beschreibung] +void SvxRuler::EndDrag() - SV-Handler; wird beim Beenden des Draggens gerufen. - Stoesst die Aktualisierung der Daten der Applikation an, indem - durch Aufruf der jeweiligen Apply...()- Methoden die Daten an die - Applikation geschickt werden. +/* [Description] + SV-handler; is called when ending the dragging. Triggers the updating of data + on the application, by calling the respective Apply...() methods to send the + data to the application. */ { - lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/EndDrag")); + lcl_logRulerUse(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".special://SfxRuler/EndDrag"))); const sal_Bool bUndo = IsDragCanceled(); const long lPos = GetDragPos(); DrawLine_Impl(lTabPos, 6, bHorz); @@ -3591,8 +3474,8 @@ void __EXPORT SvxRuler::EndDrag() if(!bUndo) switch(GetDragType()) { - case RULER_TYPE_MARGIN1: // linker, oberer Rand umgebender Frame - case RULER_TYPE_MARGIN2: // rechter, unterer Rand umgebender Frame + case RULER_TYPE_MARGIN1: // upper left edge of the surrounding Frame + case RULER_TYPE_MARGIN2: // lower right edge of the surrounding Frame { if(!pColumnItem || !pColumnItem->IsTable()) ApplyMargins(); @@ -3604,7 +3487,7 @@ void __EXPORT SvxRuler::EndDrag() } break; - case RULER_TYPE_BORDER: // Tabelle, Spalten + case RULER_TYPE_BORDER: // Table, columns if(lInitialDragPos != lPos || (pRuler_Imp->bIsTableRows && bHorz)) //special case - the null offset is changed here { @@ -3618,7 +3501,7 @@ void __EXPORT SvxRuler::EndDrag() ApplyObject(); } break; - case RULER_TYPE_INDENT: // Absatzeinzuege + case RULER_TYPE_INDENT: // Paragraph indents if(lInitialDragPos != lPos) ApplyIndents(); SetIndents(INDENT_COUNT, pIndents+INDENT_GAP); @@ -3639,22 +3522,19 @@ void __EXPORT SvxRuler::EndDrag() { pCtrlItem[i]->ClearCache(); pCtrlItem[i]->GetBindings().Invalidate(pCtrlItem[i]->GetId()); - // pCtrlItem[i]->UnBind(); -// pCtrlItem[i]->ReBind(); } } -void __EXPORT SvxRuler::ExtraDown() +void SvxRuler::ExtraDown() -/* - [Beschreibung] +/* [Description] - Ueberladene SV-Methode; setzt den neuen Typ fuer den Defaulttabulator. + Overloaded SV method, sets the new type for the Default tab. */ { - // Tabulator Typ umschalten + // Switch Tab Type if(pTabStopItem && (nFlags & SVXRULER_SUPPORT_TABS) == SVXRULER_SUPPORT_TABS) { ++nDefTabType; @@ -3666,20 +3546,16 @@ void __EXPORT SvxRuler::ExtraDown() } -void __EXPORT SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint) -/* - - [Beschreibung] +void SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint) - Benachrichtigung durch die Bindings, dass die Statusaktualisierung - beendet ist. - Das Lineal aktualisiert seine Darstellung und meldet sich bei den - Bindings wieder ab. +/* [Description] + Report through the bindings that the status update is completed. The ruler + updates its appearance and gets registered again in the bindings. */ { - // Aktualisierung anstossen + // start update if(bActive && rHint.Type() == TYPE(SfxSimpleHint) && ((SfxSimpleHint&) rHint ).GetId() == SFX_HINT_UPDATEDONE ) { @@ -3693,11 +3569,9 @@ void __EXPORT SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint) IMPL_LINK_INLINE_START( SvxRuler, MenuSelect, Menu *, pMenu ) -/* - [Beschreibung] - - Handler des Kontextmenues fuer das Umschalten der Masseinheit +/* [Description] + Handler of the context menus for switching the unit of measurement */ { @@ -3709,11 +3583,9 @@ IMPL_LINK_INLINE_END( SvxRuler, MenuSelect, Menu *, pMenu ) IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu ) -/* - [Beschreibung] - - Handler des Tabulatormenues fuer das Setzen des Typs +/* [Description] + Handler of the tab menu for setting the type */ { @@ -3734,11 +3606,9 @@ IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu ) void SvxRuler::Command( const CommandEvent& rCEvt ) -/* - [Beschreibung] - - Mauskontextmenue fuer das Umschalten der Masseinheit +/* [Description] + Mouse context menu for switching the unit of measurement */ { @@ -3768,7 +3638,7 @@ void SvxRuler::Command( const CommandEvent& rCEvt ) String(ResId(RID_SVXSTR_RULER_START+i, DIALOG_MGR())), Image(aDev.GetBitmap(Point(), aSz), Color(COL_WHITE))); aMenu.CheckItem(i+1, i == pTabs[pRuler_Imp->nIdx+TAB_GAP].nStyle); - aDev.SetOutputSize(aSz); // device loeschen + aDev.SetOutputSize(aSz); // delete device } aMenu.Execute( this, rCEvt.GetMousePosPixel() ); } @@ -3788,8 +3658,17 @@ void SvxRuler::Command( const CommandEvent& rCEvt ) (nId == FUNIT_M || nId == FUNIT_KM || nId == FUNIT_FOOT || - nId == FUNIT_MILE )) - aMenu.RemoveItem(i - 1); + nId == FUNIT_MILE || + nId == FUNIT_CHAR || + nId == FUNIT_LINE )) + { + if (( nId == FUNIT_CHAR ) && bHorz ) + ; + else if (( nId == FUNIT_LINE ) && !bHorz ) + ; + else + aMenu.RemoveItem(i - 1); + } } aMenu.Execute( this, rCEvt.GetMousePosPixel() ); } @@ -3804,7 +3683,7 @@ sal_uInt16 SvxRuler::GetActRightColumn( { if( nAct == USHRT_MAX ) nAct = pColumnItem->GetActColumn(); - else nAct++; //Damit man die ActDrag uebergeben kann + else nAct++; //To be able to pass on the ActDrag sal_Bool bConsiderHidden = !bForceDontConsiderHidden && !( nDragType & DRAG_OBJECT_ACTLINE_ONLY ); @@ -3860,9 +3739,8 @@ long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const if(!(nDragType & DRAG_OBJECT_SIZE_LINEAR)) { - - // ausgehend vom rechten Rand die Mindestbreiten - // aller betroffenen Spalten abziehen + // Remove the minimum width for all affected columns + // starting from the right edge long _nMaxRight = GetMargin2()-GetMargin1(); long lFences=0; @@ -3901,7 +3779,7 @@ long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const else { sal_uInt16 nActCol; - if(nCol==USHRT_MAX) //CalcMinMax fuer LeftMargin + if(nCol==USHRT_MAX) //CalcMinMax for LeftMargin { lOldPos=GetMargin1(); } @@ -3966,11 +3844,11 @@ long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const } } } -/*-- 29.11.2007 08:24:23--------------------------------------------------- - //#i24363# tab stops relative to indent - -----------------------------------------------------------------------*/ + +// Tab stops relative to indent (#i24363#) void SvxRuler::SetTabsRelativeToIndent( sal_Bool bRel ) { pRuler_Imp->bIsTabsRelativeToIndent = bRel; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index b030a27c952a..452a54bce1a6 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,7 +72,7 @@ SvxSwFrameExample::~SvxSwFrameExample() void SvxSwFrameExample::InitColors_Impl( void ) { const StyleSettings& rSettings = GetSettings().GetStyleSettings(); - m_aBgCol = Color( rSettings.GetWindowColor() ); // old: COL_WHITE + m_aBgCol = Color( rSettings.GetWindowColor() ); sal_Bool bHC = rSettings.GetHighContrastMode(); @@ -81,9 +82,9 @@ void SvxSwFrameExample::InitColors_Impl( void ) m_aTxtCol = bHC? svtools::ColorConfig().GetColorValue(svtools::FONTCOLOR).nColor : - Color( COL_GRAY ); // old: COL_GRAY + Color( COL_GRAY ); m_aPrintAreaCol = bHC? m_aTxtCol : Color( COL_GRAY ); - m_aBorderCol = m_aTxtCol; // old: COL_BLACK; + m_aBorderCol = m_aTxtCol; m_aBlankCol = bHC? m_aTxtCol : Color( COL_LIGHTGRAY ); m_aBlankFrameCol = bHC? m_aTxtCol : Color( COL_GRAY ); } @@ -98,10 +99,6 @@ void SvxSwFrameExample::DataChanged( const DataChangedEvent& rDCEvt ) void SvxSwFrameExample::InitAllRects_Impl() { -// const Size aSz(GetOutputSizePixel()); - - // Seite -// aPage.SetSize(Size(aSz.Width() - 3, aSz.Height() - 3)); aPage.SetSize( GetOutputSizePixel() ); sal_uIntPtr nOutWPix = aPage.GetWidth(); @@ -144,22 +141,22 @@ void SvxSwFrameExample::InitAllRects_Impl() } aPagePrtArea = Rectangle(Point(nLBorder, nTBorder), Point((nOutWPix - 1) - nRBorder, (nOutHPix - 1) - nBBorder)); - // Beispiel-Text: Vorbereiten fuer die Textausgabe - // Eine Textzeile + // Example text: Preparing for the text output + // A line of text aTextLine = aPagePrtArea; aTextLine.SetSize(Size(aTextLine.GetWidth(), 2)); aTextLine.Left() += nLTxtBorder; aTextLine.Right() -= nRTxtBorder; aTextLine.Move(0, nTTxtBorder); - // Rechteck um Absatz incl. Raender + // Rectangle to edges including paragraph sal_uInt16 nLines = (sal_uInt16)((aPagePrtArea.GetHeight() / 2 - nTTxtBorder - nBTxtBorder) / (aTextLine.GetHeight() + 2)); aPara = aPagePrtArea; aPara.SetSize(Size(aPara.GetWidth(), (aTextLine.GetHeight() + 2) * nLines + nTTxtBorder + nBTxtBorder)); - // Rechteck um Absatz ohne Raender + // Rectangle around paragraph without borders aParaPrtArea = aPara; aParaPrtArea.Left() += nLTxtBorder; aParaPrtArea.Right() -= nRTxtBorder; @@ -191,14 +188,14 @@ void SvxSwFrameExample::InitAllRects_Impl() } } - // Innerer Frame fuer am Frame verankerte Rahmen + // Inner Frame anchored at the Frame aFrameAtFrame = aPara; aFrameAtFrame.Left() += 9; aFrameAtFrame.Right() -= 5; aFrameAtFrame.Bottom() += 5; aFrameAtFrame.SetPos(Point(aFrameAtFrame.Left() + 2, (aPagePrtArea.Bottom() - aFrameAtFrame.GetHeight()) / 2 + 5)); - // Groesse des zu positionierenden Rahmens + // Size of the frame to be positioned if (nAnchor != TextContentAnchorType_AS_CHARACTER) { sal_uIntPtr nLFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nLBorder : nLTxtBorder; @@ -477,15 +474,10 @@ void SvxSwFrameExample::Paint(const Rectangle&) { InitAllRects_Impl(); - // Schatten zeichnen -// Rectangle aShadow(aPage); -// aShadow += Point(3, 3); -// DrawRect_Impl(aShadow, Color(COL_GRAY), aTransColor); - - // Seite zeichnen + // Draw page DrawRect_Impl( aPage, m_aBgCol, m_aBorderCol ); - // PrintArea zeichnen + // Draw PrintArea Rectangle aRect = DrawInnerFrame_Impl( aPagePrtArea, m_aTransColor, m_aPrintAreaCol ); if (nAnchor == TextContentAnchorType_AT_FRAME) @@ -494,8 +486,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) long lXPos = 0; long lYPos = 0; - // Horizontale Ausrichtung - // + // Horizontal alignment if (nAnchor != TextContentAnchorType_AS_CHARACTER) { switch (nHAlign) @@ -524,8 +515,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) else lXPos = aRect.Right() + 2; - // Vertikale Ausrichtung - // + // Vertical Alignment if (nAnchor != TextContentAnchorType_AS_CHARACTER) { switch (nVAlign) @@ -533,7 +523,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) case VertOrientation::BOTTOM: case VertOrientation::LINE_BOTTOM: { - // OD 12.11.2003 #i22341# + // #i22341# if ( nVRel != RelOrientation::TEXT_LINE ) { lYPos = aRect.Bottom() - aFrmSize.Height() + 1; @@ -552,7 +542,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) } case VertOrientation::NONE: { - // OD 12.11.2003 #i22341# + // #i22341# if ( nVRel != RelOrientation::CHAR && nVRel != RelOrientation::TEXT_LINE ) lYPos = aRect.Top() + aRelPos.Y(); else @@ -560,7 +550,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) break; } default: - // OD 12.11.2003 #i22341# + // #i22341# if ( nVRel != RelOrientation::TEXT_LINE ) { lYPos = aRect.Top(); @@ -588,10 +578,6 @@ void SvxSwFrameExample::Paint(const Rectangle&) lYPos = aRect.Bottom() - aFrmSize.Height() + 1; break; -/* case VertOrientation::NONE: - case VertOrientation::BOTTOM: - case VertOrientation::CHAR_TOP: - case VertOrientation::LINE_TOP:*/ default: lYPos = aRect.Top() - aRelPos.Y(); break; @@ -615,7 +601,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) if (aFrmRect.Bottom() > pOuterFrame->Bottom()) aFrmRect.Move(0, pOuterFrame->Bottom() - aFrmRect.Bottom()); - // Testabsatz zeichnen + // Draw Test paragraph const long nTxtLineHeight = aTextLine.GetHeight(); Rectangle aTxt(aTextLine); sal_Int32 nStep; @@ -640,12 +626,11 @@ void SvxSwFrameExample::Paint(const Rectangle&) if (nAnchor != TextContentAnchorType_AS_CHARACTER) { - // Text simulieren - // + // Simulate text const long nOldR = aTxt.Right(); const long nOldL = aTxt.Left(); - // OD 12.11.2003 #i22341# + // #i22341# const bool bIgnoreWrap = nAnchor == TextContentAnchorType_AT_CHARACTER && ( nHRel == RelOrientation::CHAR || nVRel == RelOrientation::CHAR || nVRel == RelOrientation::TEXT_LINE ); @@ -684,7 +669,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) if (nAnchor != TextContentAnchorType_AT_FRAME && aTxt.Bottom() > aParaPrtArea.Bottom()) { - // Text wurde durch Rahmen verdraengt, daher Para-Hoehe anpassen + // Text has been replaced by frame, so adjust parameters height sal_uIntPtr nDiff = aTxt.Bottom() - aParaPrtArea.Bottom(); aParaPrtArea.Bottom() += nDiff; aPara.Bottom() += nDiff; @@ -703,10 +688,10 @@ void SvxSwFrameExample::Paint(const Rectangle&) DrawRect_Impl(aDrawObj, m_aBlankCol, m_aBlankFrameCol ); } - // Rechteck zeichnen, zu dem der Rahmen ausgerichtet wird: + // Draw rectangle on which the frame is aligned: DrawRect_Impl(aRect, m_aTransColor, m_aAlignColor); - // Frame anzeigen + // Frame View sal_Bool bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? sal_True : bTrans; DrawRect_Impl( aFrmRect, bDontFill? m_aTransColor : m_aBgCol, m_aFrameColor ); } @@ -735,3 +720,4 @@ void SvxSwFrameExample::DrawRect_Impl(const Rectangle &rRect, const Color &rFill +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx index 5da8843489be..793ed5a24e74 100644 --- a/svx/source/dialog/swframeposstrings.cxx +++ b/svx/source/dialog/swframeposstrings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,23 +51,17 @@ SvxSwFramePosString_Impl::SvxSwFramePosString_Impl() : } FreeResource(); } -/*-- 04.03.2004 13:14:48--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxSwFramePosString::SvxSwFramePosString() : pImpl(new SvxSwFramePosString_Impl) { } -/*-- 04.03.2004 13:14:48--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxSwFramePosString::~SvxSwFramePosString() { delete pImpl; } -/*-- 04.03.2004 13:14:48--------------------------------------------------- - -----------------------------------------------------------------------*/ const String& SvxSwFramePosString::GetString(StringId eId) { DBG_ASSERT(eId >= 0 && eId < STR_MAX, "invalid StringId"); @@ -74,3 +69,5 @@ const String& SvxSwFramePosString::GetString(StringId eId) eId = LEFT; return pImpl->aStrings[eId]; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/swframeposstrings.src b/svx/source/dialog/swframeposstrings.src index c6a164630c5e..a4cc9764b645 100644 --- a/svx/source/dialog/swframeposstrings.src +++ b/svx/source/dialog/swframeposstrings.src @@ -236,7 +236,7 @@ Resource RID_SVXSW_FRAMEPOSITIONS { Text [ en-US ] = "Row" ; }; - // OD 05.01.2004 #i22341# + // #i22341# String STR_REL_LINE { Text [ en-US ] = "Line of text" ; diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 132ca585a87f..9f276fb90ec5 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -252,3 +253,4 @@ sal_Bool SvxTextEncodingBox::IsTextEncodingSelected( const rtl_TextEncoding nEnc return sal_False; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx index 74b60a08d2bd..f390b46edf24 100644 --- a/svx/source/dialog/txenctab.cxx +++ b/svx/source/dialog/txenctab.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,4 @@ rtl_TextEncoding SvxTextEncodingTable::GetTextEncoding( const String& rStr ) con return RTL_TEXTENCODING_DONTKNOW; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/ucsubset.src b/svx/source/dialog/ucsubset.src index 2a47777469ea..2a47777469ea 100755..100644 --- a/svx/source/dialog/ucsubset.src +++ b/svx/source/dialog/ucsubset.src diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx index ee152439254c..1ba6f31b2b1c 100644 --- a/svx/source/dialog/wrapfield.cxx +++ b/svx/source/dialog/wrapfield.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,4 @@ void WrapField::Down() } // namespace svx +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx index d64f7aeaa3a0..e353c2623c1c 100644 --- a/svx/source/engine3d/camera3d.cxx +++ b/svx/source/engine3d/camera3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,12 +31,6 @@ #include <svx/camera3d.hxx> #include <tools/stream.hxx> -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - Camera3D::Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt, double fFocalLen, double fBankAng) : aResetPos(rPos), @@ -51,24 +46,12 @@ Camera3D::Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLook SetFocalLength(fFocalLen); } -/************************************************************************* -|* -|* Default-Konstruktor -|* -\************************************************************************/ - Camera3D::Camera3D() { basegfx::B3DPoint aVector3D(0.0 ,0.0 ,1.0); Camera3D(aVector3D, basegfx::B3DPoint()); } -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - void Camera3D::Reset() { SetVPD(0); @@ -78,11 +61,7 @@ void Camera3D::Reset() SetFocalLength(fResetFocalLength); } -/************************************************************************* -|* -|* Defaultwerte fuer Reset setzen -|* -\************************************************************************/ +// Set default values for reset void Camera3D::SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt, double fFocalLen, double fBankAng) @@ -93,11 +72,7 @@ void Camera3D::SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoin fResetBankAngle = fBankAng; } -/************************************************************************* -|* -|* ViewWindow setzen und PRP anpassen -|* -\************************************************************************/ +// Set ViewWindow and adjust PRP void Camera3D::SetViewWindow(double fX, double fY, double fW, double fH) { @@ -106,12 +81,6 @@ void Camera3D::SetViewWindow(double fX, double fY, double fW, double fH) SetFocalLength(fFocalLength); } -/************************************************************************* -|* -|* Kameraposition setzen -|* -\************************************************************************/ - void Camera3D::SetPosition(const basegfx::B3DPoint& rNewPos) { if ( rNewPos != aPosition ) @@ -123,12 +92,6 @@ void Camera3D::SetPosition(const basegfx::B3DPoint& rNewPos) } } -/************************************************************************* -|* -|* Blickpunkt setzen -|* -\************************************************************************/ - void Camera3D::SetLookAt(const basegfx::B3DPoint& rNewLookAt) { if ( rNewLookAt != aLookAt ) @@ -139,12 +102,6 @@ void Camera3D::SetLookAt(const basegfx::B3DPoint& rNewLookAt) } } -/************************************************************************* -|* -|* Position und Blickpunkt setzen -|* -\************************************************************************/ - void Camera3D::SetPosAndLookAt(const basegfx::B3DPoint& rNewPos, const basegfx::B3DPoint& rNewLookAt) { @@ -159,12 +116,6 @@ void Camera3D::SetPosAndLookAt(const basegfx::B3DPoint& rNewPos, } } -/************************************************************************* -|* -|* seitlichen Neigungswinkel setzen -|* -\************************************************************************/ - void Camera3D::SetBankAngle(double fAngle) { basegfx::B3DVector aDiff(aPosition - aLookAt); @@ -176,7 +127,7 @@ void Camera3D::SetBankAngle(double fAngle) aPrj.setY(-1.0); } else - { // aPrj = Projektion von aDiff auf die XZ-Ebene + { // aPrj = Projection from aDiff on the XZ-plane aPrj.setY(0.0); if ( aDiff.getY() < 0.0 ) @@ -185,12 +136,12 @@ void Camera3D::SetBankAngle(double fAngle) } } - // von aDiff nach oben zeigenden View-Up-Vektor berechnen + // Calculate from aDiff to uppwards pointing View-Up-Vector aPrj = aPrj.getPerpendicular(aDiff); aPrj = aPrj.getPerpendicular(aDiff); aDiff.normalize(); - // auf Z-Achse rotieren, dort um BankAngle drehen und zurueck + // Rotate on Z axis, to rotate the BankAngle and back basegfx::B3DHomMatrix aTf; const double fV(sqrt(aDiff.getY() * aDiff.getY() + aDiff.getZ() * aDiff.getZ())); @@ -253,12 +204,6 @@ void Camera3D::SetBankAngle(double fAngle) SetVUV(aTf * aPrj); } -/************************************************************************* -|* -|* Brennweite setzen -|* -\************************************************************************/ - void Camera3D::SetFocalLength(double fLen) { if ( fLen < 5 ) @@ -267,11 +212,7 @@ void Camera3D::SetFocalLength(double fLen) fFocalLength = fLen; } -/************************************************************************* -|* -|* Um die Kameraposition drehen, LookAt wird dabei veraendert -|* -\************************************************************************/ +// To rotate the camera position, this changes LookAt void Camera3D::Rotate(double fHAngle, double fVAngle) { @@ -319,12 +260,7 @@ void Camera3D::Rotate(double fHAngle, double fVAngle) SetLookAt(aPosition + aDiff); } - -/************************************************************************* -|* -|* Um den Blickpunkt drehen, Position wird dabei veraendert -|* -\************************************************************************/ +// To rotate the view point, this changes the position void Camera3D::RotateAroundLookAt(double fHAngle, double fVAngle) { @@ -372,11 +308,7 @@ void Camera3D::RotateAroundLookAt(double fHAngle, double fVAngle) SetPosition(aLookAt + aDiff); } -/************************************************************************* -|* -|* FG: ??? Setzt wohl die Projektionsebene in eine bestimmte Tiefe -|* -\************************************************************************/ +// ??? this probably sets the projection plane in a certain depth void Camera3D::SetFocalLengthWithCorrect(double fLen) { @@ -390,3 +322,5 @@ void Camera3D::SetFocalLengthWithCorrect(double fLen) } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx index 6329ca2a3203..46feb2ded38f 100644 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,7 +38,7 @@ #include <svx/sdr/contact/viewcontactofe3dcube.hxx> ////////////////////////////////////////////////////////////////////////////// -// #110094# DrawContact section +// DrawContact section sdr::contact::ViewContact* E3dCubeObj::CreateObjectSpecificViewContact() { @@ -46,29 +47,20 @@ sdr::contact::ViewContact* E3dCubeObj::CreateObjectSpecificViewContact() TYPEINIT1(E3dCubeObj, E3dCompoundObject); -/************************************************************************* -|* -|* Konstruktor: | -|* 3D-Quader erzeugen; aPos: Zentrum oder links, unten, hinten |__ -|* (abhaengig von bPosIsCenter) / -|* -\************************************************************************/ - E3dCubeObj::E3dCubeObj(E3dDefaultAttributes& rDefault, basegfx::B3DPoint aPos, const basegfx::B3DVector& r3DSize) : E3dCompoundObject(rDefault) { - // Defaults setzen + // Set Defaults SetDefaultAttributes(rDefault); - // uebergebene drueberbuegeln - aCubePos = aPos; + aCubePos = aPos; // position centre or left, bottom, back (dependant on bPosIsCenter) aCubeSize = r3DSize; } E3dCubeObj::E3dCubeObj() : E3dCompoundObject() { - // Defaults setzen + // Set Defaults E3dDefaultAttributes aDefault; SetDefaultAttributes(aDefault); } @@ -81,53 +73,24 @@ void E3dCubeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) bPosIsCenter = rDefault.GetDefaultCubePosIsCenter(); } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dCubeObj::GetObjIdentifier() const { return E3D_CUBEOBJ_ID; } -/************************************************************************* -|* -|* Wandle das Objekt in ein Gruppenobjekt bestehend aus 6 Polygonen -|* -\************************************************************************/ +// Convert the object into a group object consisting of 6 polygons SdrObject *E3dCubeObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const { return NULL; } -/************************************************************************* -|* -|* Zuweisungsoperator -|* -\************************************************************************/ - -void E3dCubeObj::operator=(const SdrObject& rObj) +E3dCubeObj* E3dCubeObj::Clone() const { - // erstmal alle Childs kopieren - E3dCompoundObject::operator=(rObj); - - // weitere Parameter kopieren - const E3dCubeObj& r3DObj = (const E3dCubeObj&)rObj; - - aCubePos = r3DObj.aCubePos; - aCubeSize = r3DObj.aCubeSize; - bPosIsCenter = r3DObj.bPosIsCenter; - nSideFlags = r3DObj.nSideFlags; + return CloneHelper< E3dCubeObj >(); } -/************************************************************************* -|* -|* Lokale Parameter setzen mit Geometrieneuerzeugung -|* -\************************************************************************/ +// Set local parameters with geometry re-creating void E3dCubeObj::SetCubePos(const basegfx::B3DPoint& rNew) { @@ -165,11 +128,7 @@ void E3dCubeObj::SetSideFlags(sal_uInt16 nNew) } } -/************************************************************************* -|* -|* Get the name of the object (singular) -|* -\************************************************************************/ +// Get the name of the object (singular) void E3dCubeObj::TakeObjNameSingul(XubString& rName) const { @@ -185,11 +144,7 @@ void E3dCubeObj::TakeObjNameSingul(XubString& rName) const } } -/************************************************************************* -|* -|* Get the name of the object (plural) -|* -\************************************************************************/ +// Get the name of the object (plural) void E3dCubeObj::TakeObjNamePlural(XubString& rName) const { @@ -197,3 +152,5 @@ void E3dCubeObj::TakeObjNamePlural(XubString& rName) const } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx index e8473033ccf3..7ab3bf792481 100644 --- a/svx/source/engine3d/deflt3d.cxx +++ b/svx/source/engine3d/deflt3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,13 +35,8 @@ #include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> -/************************************************************************* -|* -|* Klasse zum verwalten der 3D-Default Attribute -|* -\************************************************************************/ +// Class to manage the 3D default attributes -// Konstruktor E3dDefaultAttributes::E3dDefaultAttributes() { Reset(); @@ -48,21 +44,21 @@ E3dDefaultAttributes::E3dDefaultAttributes() void E3dDefaultAttributes::Reset() { - // Compound-Objekt + // Compound object bDefaultCreateNormals = sal_True; bDefaultCreateTexture = sal_True; - // Cube-Objekt + // Cube object aDefaultCubePos = basegfx::B3DPoint(-500.0, -500.0, -500.0); aDefaultCubeSize = basegfx::B3DVector(1000.0, 1000.0, 1000.0); nDefaultCubeSideFlags = CUBE_FULL; bDefaultCubePosIsCenter = sal_False; - // Sphere-Objekt + // Sphere object aDefaultSphereCenter = basegfx::B3DPoint(0.0, 0.0, 0.0); aDefaultSphereSize = basegfx::B3DPoint(1000.0, 1000.0, 1000.0); - // Lathe-Objekt + // Lathe object nDefaultLatheEndAngle = 3600; bDefaultLatheSmoothed = sal_True; bDefaultLatheSmoothFrontBack = sal_False; @@ -70,7 +66,7 @@ void E3dDefaultAttributes::Reset() bDefaultLatheCloseFront = sal_True; bDefaultLatheCloseBack = sal_True; - // Extrude-Objekt + // Extrude object bDefaultExtrudeSmoothed = sal_True; bDefaultExtrudeSmoothFrontBack = sal_False; bDefaultExtrudeCharacterMode = sal_False; @@ -79,3 +75,5 @@ void E3dDefaultAttributes::Reset() } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx index 6fadec8cc9dc..283d24c42a42 100644 --- a/svx/source/engine3d/dragmt3d.cxx +++ b/svx/source/engine3d/dragmt3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,12 +48,6 @@ TYPEINIT1(E3dDragMethod, SdrDragMethod); -/************************************************************************* -|* -|* Konstruktor aller 3D-DragMethoden -|* -\************************************************************************/ - E3dDragMethod::E3dDragMethod ( SdrDragView &_rView, const SdrMarkList& rMark, @@ -63,8 +58,7 @@ E3dDragMethod::E3dDragMethod ( mbMoveFull(bFull), mbMovedAtAll(sal_False) { - // Fuer alle in der selektion befindlichen 3D-Objekte - // eine Unit anlegen + // Create a unit for all the 3D objects present in the selection const long nCnt(rMark.GetMarkCount()); static bool bDoInvalidate(false); long nObjs(0); @@ -113,8 +107,8 @@ E3dDragMethod::E3dDragMethod ( aNewUnit.maInvDisplayTransform.invert(); } - // SnapRects der beteiligten Objekte invalidieren, um eine - // Neuberechnung beim Setzen der Marker zu erzwingen + // Invalidate SnapRects of the objects involved, to force a + // recalculation for setting the marker if(bDoInvalidate) { pE3dObj->SetRectsDirty(); @@ -128,10 +122,10 @@ E3dDragMethod::E3dDragMethod ( aNewUnit.maWireframePoly.transform(aNewUnit.maTransform); } - // FullBound ermitteln + // Determine FullBound maFullBound.Union(pE3dObj->GetSnapRect()); - // Unit einfuegen + // Insert Unit maGrp.push_back(aNewUnit); } } @@ -145,11 +139,7 @@ void E3dDragMethod::TakeSdrDragComment(XubString& /*rStr*/) const { } -/************************************************************************* -|* -|* Erstelle das Drahtgittermodel fuer alle Aktionen -|* -\************************************************************************/ +// Create the wireframe model for all actions bool E3dDragMethod::BeginSdrDrag() { @@ -178,23 +168,17 @@ bool E3dDragMethod::BeginSdrDrag() return sal_True; } -/************************************************************************* -|* -|* Schluss -|* -\************************************************************************/ - bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/) { const sal_uInt32 nCnt(maGrp.size()); if(!mbMoveFull) { - // WireFrame ausblenden + // Hide wireframe Hide(); } - // Alle Transformationen anwenden und UnDo's anlegen + // Apply all transformations and create undo's if(mbMovedAtAll) { const bool bUndo = getSdrDragView().IsUndoEnabled(); @@ -221,12 +205,6 @@ bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/) return sal_True; } -/************************************************************************* -|* -|* Abbruch -|* -\************************************************************************/ - void E3dDragMethod::CancelSdrDrag() { if(mbMoveFull) @@ -237,7 +215,7 @@ void E3dDragMethod::CancelSdrDrag() for(sal_uInt32 nOb(0); nOb < nCnt; nOb++) { - // Transformation restaurieren + // Restore transformation E3dDragMethodUnit& rCandidate = maGrp[nOb]; E3DModifySceneSnapRectUpdater aUpdater(rCandidate.mp3DObj); rCandidate.mp3DObj->SetTransform(rCandidate.maInitTransform); @@ -246,27 +224,19 @@ void E3dDragMethod::CancelSdrDrag() } else { - // WireFrame ausblenden + // Hide WireFrame Hide(); } } -/************************************************************************* -|* -|* Gemeinsames MoveSdrDrag() -|* -\************************************************************************/ +// Common MoveSdrDrag() void E3dDragMethod::MoveSdrDrag(const Point& /*rPnt*/) { mbMovedAtAll = true; } -/************************************************************************* -|* -|* Zeichne das Drahtgittermodel -|* -\************************************************************************/ +// Draw the wire frame model // for migration from XOR to overlay void E3dDragMethod::CreateOverlayGeometry(::sdr::overlay::OverlayManager& rOverlayManager) @@ -324,7 +294,7 @@ E3dDragRotate::E3dDragRotate(SdrDragView &_rView, sal_Bool bFull) : E3dDragMethod(_rView, rMark, eConstr, bFull) { - // Zentrum aller selektierten Objekte in Augkoordinaten holen + // Get center of all selected objects in eye coordinates const sal_uInt32 nCnt(maGrp.size()); if(nCnt) @@ -346,7 +316,7 @@ E3dDragRotate::E3dDragRotate(SdrDragView &_rView, maGlobalCenter += aObjCenter; } - // Teilen durch Anzahl + // Divide by the number if(nCnt > 1) { maGlobalCenter /= (double)nCnt; @@ -366,19 +336,16 @@ E3dDragRotate::E3dDragRotate(SdrDragView &_rView, aInverseViewToEye.invert(); aRotCenter3D = aInverseViewToEye * aRotCenter3D; - // X,Y des RotCenter und Tiefe der gemeinsamen Objektmitte aus - // Rotationspunkt im Raum benutzen + // Use X,Y of the RotCenter and depth of the common object centre + // as rotation point in the space maGlobalCenter.setX(aRotCenter3D.getX()); maGlobalCenter.setY(aRotCenter3D.getY()); } } } -/************************************************************************* -|* -|* Das Objekt wird bewegt, bestimme die Winkel -|* -\************************************************************************/ + +//The object is moved, determine the angle void E3dDragRotate::MoveSdrDrag(const Point& rPnt) { @@ -387,7 +354,7 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt) if(DragStat().CheckMinMoved(rPnt)) { - // Modifier holen + // Get modifier sal_uInt16 nModifier = 0; if(getSdrDragView().ISA(E3dView)) { @@ -395,12 +362,12 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt) nModifier = rLastMouse.GetModifier(); } - // Alle Objekte rotieren + // Rotate all objects const sal_uInt32 nCnt(maGrp.size()); for(sal_uInt32 nOb(0); nOb < nCnt; nOb++) { - // Rotationswinkel bestimmen + // Determine rotation angle double fWAngle, fHAngle; E3dDragMethodUnit& rCandidate = maGrp[nOb]; @@ -430,11 +397,11 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt) fHAngle = (double)(((long) fHAngle + nSnap/2) / nSnap * nSnap); } - // nach radiant + // to radians fWAngle *= F_PI180; fHAngle *= F_PI180; - // Transformation bestimmen + // Determine transformation basegfx::B3DHomMatrix aRotMat; if(E3DDRAG_CONSTR_Y & meConstraint) { @@ -455,8 +422,7 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt) aRotMat.rotate(fHAngle, 0.0, 0.0); } - // Transformation in Eye-Koordinaten, dort rotieren - // und zurueck + // Transformation in eye coordinates, there rotate then and back const sdr::contact::ViewContactOfE3dScene& rVCScene = static_cast< sdr::contact::ViewContactOfE3dScene& >(rCandidate.mp3DObj->GetScene()->GetViewContact()); const drawinglayer::geometry::ViewInformation3D aViewInfo3D(rVCScene.getViewInformation3D()); basegfx::B3DHomMatrix aInverseOrientation(aViewInfo3D.getOrientation()); @@ -470,7 +436,7 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt) aTransMat *= aInverseOrientation; aTransMat *= rCandidate.maInvDisplayTransform; - // ...und anwenden + // ...and apply rCandidate.maTransform *= aTransMat; if(mbMoveFull) @@ -499,14 +465,9 @@ Pointer E3dDragRotate::GetSdrDragPointer() const return Pointer(POINTER_ROTATE); } -/************************************************************************* -|* -|* E3dDragMove -|* Diese DragMethod wird nur bei Translationen innerhalb von 3D-Scenen -|* benoetigt. Wird eine 3D-Scene selbst verschoben, so wird diese DragMethod -|* nicht verwendet. -|* -\************************************************************************/ +// E3dDragMove. This drag method is only required for translations inside +// 3D scenes. If a 3D-scene itself moved, then this drag method will drag +// not be used. TYPEINIT1(E3dDragMove, E3dDragMethod); @@ -545,11 +506,11 @@ E3dDragMove::E3dDragMove(SdrDragView &_rView, maScaleFixPos = maFullBound.TopLeft(); break; default: - // Bewegen des Objektes, HDL_MOVE + // Moving the object, HDL_MOVE break; } - // Override wenn IsResizeAtCenter() + // Override when IsResizeAtCenter() if(getSdrDragView().IsResizeAtCenter()) { meWhatDragHdl = HDL_USER; @@ -557,11 +518,7 @@ E3dDragMove::E3dDragMove(SdrDragView &_rView, } } -/************************************************************************* -|* -|* Das Objekt wird bewegt, bestimme die Translation -|* -\************************************************************************/ +// The object is moved, determine the translations void E3dDragMove::MoveSdrDrag(const Point& rPnt) { @@ -573,12 +530,12 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt) if(HDL_MOVE == meWhatDragHdl) { // Translation - // Bewegungsvektor bestimmen + // Determine the motion vector basegfx::B3DPoint aGlobalMoveHead((double)(rPnt.X() - maLastPos.X()), (double)(rPnt.Y() - maLastPos.Y()), 32768.0); basegfx::B3DPoint aGlobalMoveTail(0.0, 0.0, 32768.0); const sal_uInt32 nCnt(maGrp.size()); - // Modifier holen + // Get modifier sal_uInt16 nModifier(0); if(getSdrDragView().ISA(E3dView)) @@ -622,7 +579,7 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt) aMoveTail3D.setZ(fZwi); } - // Bewegungsvektor von Aug-Koordinaten nach Parent-Koordinaten + // Motion vector from eye coordinates to parent coordinates basegfx::B3DHomMatrix aInverseOrientation(aViewInfo3D.getOrientation()); aInverseOrientation.invert(); basegfx::B3DHomMatrix aCompleteTrans(rCandidate.maInvDisplayTransform * aInverseOrientation); @@ -653,8 +610,8 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt) } else { - // Skalierung - // Skalierungsvektor bestimmen + // Scaling + // Determine scaling vector Point aStartPos = DragStat().GetStart(); const sal_uInt32 nCnt(maGrp.size()); @@ -692,7 +649,7 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt) { case HDL_LEFT: case HDL_RIGHT: - // constrain to auf X -> Y equal + // to constrain on X -> Y equal aScNext.setY(aScFixPos.getY()); break; case HDL_UPPER: @@ -754,7 +711,7 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt) aNewTrans *= aInverseOrientation; aNewTrans *= rCandidate.maInvDisplayTransform; - // ...und anwenden + // ...and apply rCandidate.maTransform = aNewTrans; if(mbMoveFull) @@ -787,3 +744,5 @@ Pointer E3dDragMove::GetSdrDragPointer() const } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/e3dsceneupdater.cxx b/svx/source/engine3d/e3dsceneupdater.cxx index 8fdaaf3ffc29..d2fb1a691f31 100644 --- a/svx/source/engine3d/e3dsceneupdater.cxx +++ b/svx/source/engine3d/e3dsceneupdater.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -128,3 +129,5 @@ E3DModifySceneSnapRectUpdater::~E3DModifySceneSnapRectUpdater() ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx index 97658f4dcd68..bacb8b06781b 100644 --- a/svx/source/engine3d/e3dundo.cxx +++ b/svx/source/engine3d/e3dundo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,20 +39,12 @@ TYPEINIT1(E3dUndoAction, SfxUndoAction); -/************************************************************************\ -|* -|* Destruktor der Basisklasse -|* -\************************************************************************/ E3dUndoAction::~E3dUndoAction () { } -/************************************************************************\ -|* -|* Repeat gibt es nicht -|* -\************************************************************************/ +// Repeat does not exist + sal_Bool E3dUndoAction::CanRepeat(SfxRepeatTarget&) const { return sal_False; @@ -67,50 +60,30 @@ TYPEINIT1(E3dRotateUndoAction, E3dUndoAction); ************************************************************************/ -/************************************************************************\ -|* -|* Undodestruktor fuer 3D-Rotation -|* -\************************************************************************/ +// Undo destructor for 3D-Rotation + E3dRotateUndoAction::~E3dRotateUndoAction () { } -/************************************************************************\ -|* -|* Undo fuer 3D-Rotation ueber die Rotationsmatrizen -|* -\************************************************************************/ +// Undo for 3D-Rotation on the Rotation matrix + void E3dRotateUndoAction::Undo () { E3DModifySceneSnapRectUpdater aUpdater(pMy3DObj); pMy3DObj->SetTransform(aMyOldRotation); } -/************************************************************************\ -|* -|* Undo fuer 3D-Rotation ueber die Rotationsmatrizen -|* -\************************************************************************/ +// Redo for 3D-Rotation on the Rotation matrix + void E3dRotateUndoAction::Redo () { E3DModifySceneSnapRectUpdater aUpdater(pMy3DObj); pMy3DObj->SetTransform(aMyNewRotation); } -/************************************************************************* -|* -|* E3dAttributesUndoAction -|* -\************************************************************************/ - TYPEINIT1(E3dAttributesUndoAction, SdrUndoAction); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ E3dAttributesUndoAction::E3dAttributesUndoAction( SdrModel &rModel, E3dView* p3dView, E3dObject* pInObject, @@ -126,55 +99,36 @@ E3dAttributesUndoAction::E3dAttributesUndoAction( SdrModel &rModel, { } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ E3dAttributesUndoAction::~E3dAttributesUndoAction() { } -/************************************************************************* -|* -|* Undo() -|* Implementiert ueber Set3DAttributes(), um die Attribute nur an einer -|* Stelle pflegen zu muessen! -|* -\************************************************************************/ +// Undo() implemented through Set3DAttributes() to only maintain the attributes +// in one place + void E3dAttributesUndoAction::Undo() { E3DModifySceneSnapRectUpdater aUpdater(pObject); pObject->SetMergedItemSetAndBroadcast(aOldSet); } -/************************************************************************* -|* -|* Redo() -|* -\************************************************************************/ void E3dAttributesUndoAction::Redo() { E3DModifySceneSnapRectUpdater aUpdater(pObject); pObject->SetMergedItemSetAndBroadcast(aNewSet); } -/************************************************************************* -|* -|* Mehrfaches Undo nicht moeglich -|* -\************************************************************************/ +// Multiple Undo is not possible + sal_Bool E3dAttributesUndoAction::CanRepeat(SfxRepeatTarget& /*rView*/) const { return sal_False; } -/************************************************************************* -|* -|* Mehrfaches Undo nicht moeglich -|* -\************************************************************************/ +// Multiple Undo is not possible + void E3dAttributesUndoAction::Repeat() { } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index b3fdd6fd9b00..aa8ba478ea6f 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,7 +49,7 @@ #include <basegfx/polygon/b3dpolypolygontools.hxx> ////////////////////////////////////////////////////////////////////////////// -// #110094# DrawContact section +// DrawContact section sdr::contact::ViewContact* E3dExtrudeObj::CreateObjectSpecificViewContact() { @@ -66,12 +67,8 @@ sdr::properties::BaseProperties* E3dExtrudeObj::CreateObjectSpecificProperties() TYPEINIT1(E3dExtrudeObj, E3dCompoundObject); -/************************************************************************* -|* -|* Konstruktor, erzeugt zwei Deckelflaechen-PolyPolygone und (PointCount-1) -|* Seitenflaechen-Rechtecke aus dem uebergebenen PolyPolygon -|* -\************************************************************************/ +// Constructor creates a two cover surface PolyPolygon and (point-count 1) side +// surfaces rectangles from the passed PolyPolygon E3dExtrudeObj::E3dExtrudeObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPP, double fDepth) : E3dCompoundObject(rDefault), @@ -82,7 +79,7 @@ E3dExtrudeObj::E3dExtrudeObj(E3dDefaultAttributes& rDefault, const basegfx::B2DP aMirrorY.scale(1.0, -1.0); maExtrudePolygon.transform(aMirrorY); - // Defaults setzen + // Set Defaults SetDefaultAttributes(rDefault); // set extrude depth @@ -92,7 +89,7 @@ E3dExtrudeObj::E3dExtrudeObj(E3dDefaultAttributes& rDefault, const basegfx::B2DP E3dExtrudeObj::E3dExtrudeObj() : E3dCompoundObject() { - // Defaults setzen + // Set Defaults E3dDefaultAttributes aDefault; SetDefaultAttributes(aDefault); } @@ -105,44 +102,23 @@ void E3dExtrudeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) GetProperties().SetObjectItemDirect(Svx3DCloseFrontItem(rDefault.GetDefaultExtrudeCloseFront())); GetProperties().SetObjectItemDirect(Svx3DCloseBackItem(rDefault.GetDefaultExtrudeCloseBack())); - // Bei extrudes defaultmaessig StdTexture in X und Y + // For extrudes use StdTexture in X and Y by default GetProperties().SetObjectItemDirect(Svx3DTextureProjectionXItem(1)); GetProperties().SetObjectItemDirect(Svx3DTextureProjectionYItem(1)); } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dExtrudeObj::GetObjIdentifier() const { return E3D_EXTRUDEOBJ_ID; } -/************************************************************************* -|* -|* Zuweisungsoperator -|* -\************************************************************************/ - -void E3dExtrudeObj::operator=(const SdrObject& rObj) +E3dExtrudeObj* E3dExtrudeObj::Clone() const { - // erstmal alle Childs kopieren - E3dCompoundObject::operator=(rObj); - - // weitere Parameter kopieren - const E3dExtrudeObj& r3DObj = (const E3dExtrudeObj&)rObj; - - maExtrudePolygon = r3DObj.maExtrudePolygon; + return CloneHelper< E3dExtrudeObj >(); } -/************************************************************************* -|* -|* Lokale Parameter setzen mit Geometrieneuerzeugung -|* -\************************************************************************/ + +// Set local parameters with geometry re-creating void E3dExtrudeObj::SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew) { @@ -153,11 +129,7 @@ void E3dExtrudeObj::SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew) } } -/************************************************************************* -|* -|* Get the name of the object (singular) -|* -\************************************************************************/ +// Get the name of the object (singular) void E3dExtrudeObj::TakeObjNameSingul(XubString& rName) const { @@ -173,23 +145,13 @@ void E3dExtrudeObj::TakeObjNameSingul(XubString& rName) const } } -/************************************************************************* -|* -|* Get the name of the object (plural) -|* -\************************************************************************/ +// Get the name of the object (plural) void E3dExtrudeObj::TakeObjNamePlural(XubString& rName) const { rName=ImpGetResStr(STR_ObjNamePluralExtrude3d); } -/************************************************************************* -|* -|* Aufbrechen -|* -\************************************************************************/ - sal_Bool E3dExtrudeObj::IsBreakObjPossible() { return sal_True; @@ -262,3 +224,5 @@ SdrAttrObj* E3dExtrudeObj::GetBreakObj() } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index f1766f01c3ea..20d9c96739ab 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,7 +53,7 @@ #include <svx/dlgutil.hxx> #include <svx/dialmgr.hxx> -#include <svx/viewpt3d.hxx> // ProjectionType +#include <svx/viewpt3d.hxx> // Projection Type #include <svx/svxids.hrc> #include <svx/dialogs.hrc> @@ -72,17 +73,8 @@ SFX_IMPL_DOCKINGWINDOW( Svx3DChildWindow, SID_3D_WIN ) struct Svx3DWinImpl { SfxItemPool* pPool; - Image maImgLightOnH; - Image maImgLightOffH; }; -#define SETHCIMAGE(btn,res) \ -{ \ - Bitmap aBmp( SVX_RES( res ) ); \ - Image aImage( aBmp, COL_LIGHTMAGENTA ); \ - btn.SetModeImage( aImage, BMP_COLOR_HIGHCONTRAST ); \ -} - namespace { /** Get the dispatcher from the current view frame, or, if that is not available, from the given bindings. @@ -108,7 +100,7 @@ namespace { /************************************************************************* |* Svx3DWin - FloatingWindow \************************************************************************/ -__EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, +Svx3DWin::Svx3DWin( SfxBindings* pInBindings, SfxChildWindow *pCW, Window* pParent ) : SfxDockingWindow ( pInBindings, pCW, pParent, SVX_RES( RID_SVXFLOAT_3D ) ), @@ -121,7 +113,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnAssign ( this, SVX_RES( BTN_ASSIGN ) ), aFLGeometrie ( this, SVX_RES( FL_GEOMETRIE ) ), - // Geometrie + // Geometry aFtPercentDiagonal ( this, SVX_RES( FT_PERCENT_DIAGONAL ) ), aMtrPercentDiagonal ( this, SVX_RES( MTR_PERCENT_DIAGONAL ) ), aFtBackscale ( this, SVX_RES( FT_BACKSCALE ) ), @@ -146,7 +138,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnDoubleSided ( this, SVX_RES( BTN_DOUBLE_SIDED ) ), - // Darstellung + // Representation aFLRepresentation ( this, SVX_RES( FL_REPRESENTATION ) ), aFtShademode ( this, SVX_RES( FT_SHADEMODE ) ), aLbShademode ( this, SVX_RES( LB_SHADEMODE ) ), @@ -161,7 +153,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aFLCamera ( this, SVX_RES( FL_CAMERA ) ), aFLLight ( this, SVX_RES( FL_LIGHT ) ), - // Beleuchtung + // Lighting aBtnLight1 ( this, SVX_RES( BTN_LIGHT_1 ) ), aBtnLight2 ( this, SVX_RES( BTN_LIGHT_2 ) ), aBtnLight3 ( this, SVX_RES( BTN_LIGHT_3 ) ), @@ -182,14 +174,14 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnLightColor ( this, SVX_RES( BTN_LIGHT_COLOR ) ), - // #99694# Keyboard shortcuts activate the next control, so the + // Keyboard shortcuts activate the next control, so the // order needed to be changed here - aFTAmbientlight ( this, SVX_RES( FT_AMBIENTLIGHT ) ), // Text label + aFTAmbientlight ( this, SVX_RES( FT_AMBIENTLIGHT ) ), // Text label aLbAmbientlight ( this, SVX_RES( LB_AMBIENTLIGHT ) ), // ListBox aBtnAmbientColor ( this, SVX_RES( BTN_AMBIENT_COLOR ) ), // color button aFLTexture ( this, SVX_RES( FL_TEXTURE ) ), - // Texturen + // Textures aFtTexKind ( this, SVX_RES( FT_TEX_KIND ) ), aBtnTexLuminance ( this, SVX_RES( BTN_TEX_LUMINANCE ) ), aBtnTexColor ( this, SVX_RES( BTN_TEX_COLOR ) ), @@ -227,7 +219,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aCtlPreview ( this, SVX_RES( CTL_PREVIEW ) ), aCtlLightPreview ( this, SVX_RES( CTL_LIGHT_PREVIEW ) ), - // Unterer Bereich + // Lower Range aBtnConvertTo3D ( this, SVX_RES( BTN_CHANGE_TO_3D ) ), aBtnLatheObject ( this, SVX_RES( BTN_LATHE_OBJ ) ), aBtnPerspective ( this, SVX_RES( BTN_PERSPECTIVE ) ), @@ -249,65 +241,19 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, pControllerItem(0L), pConvertTo3DItem(0L), pConvertTo3DLatheItem(0L), -// pPool ( NULL ), mpImpl ( new Svx3DWinImpl() ), mpRemember2DAttributes(NULL), bOnly3DChanged ( sal_False ) { - String accname(SVX_RES(STR_COLOR_LIGHT_PRE)); + String accname(SVX_RES(RID_SVXFLOAT3D_COLOR_LIGHT_PRE)); aCtlLightPreview.SetAccessibleName(accname); aCtlPreview.SetAccessibleName(accname); aLbAmbientlight.SetAccessibleName(aFTAmbientlight.GetDisplayText()); - SETHCIMAGE( aBtnGeo, BMP_GEO_H ); - SETHCIMAGE( aBtnRepresentation, BMP_REPRESENTATION_H ); - SETHCIMAGE( aBtnLight, BMP_3DLIGHT_H ); - SETHCIMAGE( aBtnTexture, BMP_TEXTURE_H ); - SETHCIMAGE( aBtnMaterial, BMP_MATERIAL_H ); - SETHCIMAGE( aBtnUpdate, BMP_UPDATE_H ); - SETHCIMAGE( aBtnAssign, BMP_ASSIGN_H ); - SETHCIMAGE( aBtnNormalsObj, BMP_NORMALS_OBJ_H ); - SETHCIMAGE( aBtnNormalsFlat, BMP_NORMALS_FLAT_H ); - SETHCIMAGE( aBtnNormalsSphere, BMP_NORMALS_SPHERE_H ); - SETHCIMAGE( aBtnTwoSidedLighting, BMP_TWO_SIDED_LIGHTING_H ); - SETHCIMAGE( aBtnNormalsInvert, BMP_NORMALS_INVERT_H ); - SETHCIMAGE( aBtnDoubleSided, BMP_DOUBLE_SIDED_H ); - SETHCIMAGE( aBtnShadow3d, BMP_SHADOW_3D_H ); - SETHCIMAGE( aBtnLight1, BMP_LIGHT_H ); - SETHCIMAGE( aBtnLight2, BMP_LIGHT_H ); - SETHCIMAGE( aBtnLight3, BMP_LIGHT_H ); - SETHCIMAGE( aBtnLight4, BMP_LIGHT_H ); - SETHCIMAGE( aBtnLight5, BMP_LIGHT_H ); - SETHCIMAGE( aBtnLight6, BMP_LIGHT_H ); - SETHCIMAGE( aBtnLight7, BMP_LIGHT_H ); - SETHCIMAGE( aBtnLight8, BMP_LIGHT_H ); - SETHCIMAGE( aBtnLightColor, BMP_LIGHT_COLOR_H ); - SETHCIMAGE( aBtnAmbientColor, BMP_AMBIENT_COLOR_H ); - SETHCIMAGE( aBtnTexLuminance, BMP_TEX_LUMINANCE_H ); - SETHCIMAGE( aBtnTexColor, BMP_TEX_COLOR_H ); - SETHCIMAGE( aBtnTexReplace, BMP_TEX_REPLACE_H ); - SETHCIMAGE( aBtnTexModulate, BMP_TEX_MODULATE_H ); - SETHCIMAGE( aBtnTexBlend, BMP_TEX_BLEND_H ); - SETHCIMAGE( aBtnTexParallelX, BMP_TEX_PARALLEL_H ); - SETHCIMAGE( aBtnTexCircleX, BMP_TEX_CIRCLE_H ); - SETHCIMAGE( aBtnTexObjectX, BMP_TEX_OBJECT_H ); - SETHCIMAGE( aBtnTexParallelY, BMP_TEX_PARALLEL_H ); - SETHCIMAGE( aBtnTexCircleY, BMP_TEX_CIRCLE_H ); - SETHCIMAGE( aBtnTexObjectY, BMP_TEX_OBJECT_H ); - SETHCIMAGE( aBtnTexFilter, BMP_TEX_FILTER_H ); - SETHCIMAGE( aBtnMatColor, BMP_COLORDLG_H ); - SETHCIMAGE( aBtnEmissionColor, BMP_COLORDLG_H ); - SETHCIMAGE( aBtnSpecularColor, BMP_COLORDLG_H ); - SETHCIMAGE( aBtnPerspective, BMP_PERSPECTIVE_H ); - SETHCIMAGE( aBtnConvertTo3D, BMP_CHANGE_TO_3D_H ); - SETHCIMAGE( aBtnLatheObject, BMP_LATHE_OBJ_H ); - mpImpl->pPool = NULL; - mpImpl->maImgLightOnH = Image( SVX_RES( RID_SVXIMAGE_LIGHT_ON_H ) ); - mpImpl->maImgLightOffH = Image( SVX_RES( RID_SVXIMAGE_LIGHT_OFF_H ) ); FreeResource(); - // Metrik einstellen + // Set Metric eFUnit = pInBindings->GetDispatcher()->GetModule()->GetFieldUnit(); aMtrDepth.SetUnit( eFUnit ); @@ -333,7 +279,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnConvertTo3D.SetClickHdl( aLink ); aBtnLatheObject.SetClickHdl( aLink ); - // Geometrie + // Geometry aBtnNormalsObj.SetClickHdl( aLink ); aBtnNormalsFlat.SetClickHdl( aLink ); aBtnNormalsSphere.SetClickHdl( aLink ); @@ -341,10 +287,10 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnNormalsInvert.SetClickHdl( aLink ); aBtnDoubleSided.SetClickHdl( aLink ); - // Darstellung + // Representation aBtnShadow3d.SetClickHdl( aLink ); - // Beleuchtung + // Lighting aBtnLight1.SetClickHdl( aLink ); aBtnLight2.SetClickHdl( aLink ); aBtnLight3.SetClickHdl( aLink ); @@ -354,12 +300,11 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnLight7.SetClickHdl( aLink ); aBtnLight8.SetClickHdl( aLink ); - // Texturen + // Textures aBtnTexLuminance.SetClickHdl( aLink ); aBtnTexColor.SetClickHdl( aLink ); aBtnTexReplace.SetClickHdl( aLink ); aBtnTexModulate.SetClickHdl( aLink ); - //aBtnTexBlend.SetClickHdl( aLink ); aBtnTexParallelX.SetClickHdl( aLink ); aBtnTexCircleX.SetClickHdl( aLink ); aBtnTexObjectX.SetClickHdl( aLink ); @@ -399,7 +344,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aNumVertical.SetModifyHdl( aLink ); aMtrSlant.SetModifyHdl( aLink ); - // Preview-Callback + // Preview callback aLink = LINK( this, Svx3DWin, ChangeLightCallbackHdl ); aCtlLightPreview.SetUserInteractiveChangeCallback(aLink); aLink = LINK( this, Svx3DWin, ChangeSelectionCallbackHdl ); @@ -410,7 +355,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, Construct(); - // Initiierung der Initialisierung der ColorLBs + // Initiation of the initialization of the ColorLBs SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); if (pDispatcher != NULL) { @@ -503,7 +448,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, } // ----------------------------------------------------------------------- -__EXPORT Svx3DWin::~Svx3DWin() +Svx3DWin::~Svx3DWin() { //delete pMatFavSetList; delete p3DView; @@ -532,26 +477,25 @@ void Svx3DWin::Construct() // ----------------------------------------------------------------------- void Svx3DWin::Reset() { - // Diverse Initialisierungen, default ist AllAttributes + // Various initializations, default is AllAttributes aLbShademode.SelectEntryPos( 0 ); aMtrMatSpecularIntensity.SetValue( 50 ); aBtnLight1.Check(); ClickUpdateHdl( NULL ); - // Nichts selektieren, um Fehler beim erstselektieren zu vermeiden + // Select nothing, to avoid errors when selecting the first aCtlLightPreview.GetSvx3DLightControl().SelectLight(0); } bool Svx3DWin::GetUILightState( ImageButton& aBtn ) const { - return (aBtn.GetModeImage() == aImgLightOn) || (aBtn.GetModeImage() == mpImpl->maImgLightOnH); + return (aBtn.GetModeImage() == aImgLightOn); } void Svx3DWin::SetUILightState( ImageButton& aBtn, bool bState ) { aBtn.SetModeImage( bState ? aImgLightOn : aImgLightOff ); - aBtn.SetModeImage( bState ? mpImpl->maImgLightOnH : mpImpl->maImgLightOffH, BMP_COLOR_HIGHCONTRAST ); } // ----------------------------------------------------------------------- @@ -582,24 +526,22 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // construct field values const SfxPoolItem* pItem; - //sal_Bool bUpdate = sal_False; - // evtl. PoolUnit ermitteln + // Possible determine PoolUnit if( !mpImpl->pPool ) { mpImpl->pPool = rAttrs.GetPool(); - DBG_ASSERT( mpImpl->pPool, "Wo ist der Pool?" ); + DBG_ASSERT( mpImpl->pPool, "Where is the Pool? "); ePoolUnit = mpImpl->pPool->GetMetric( SID_ATTR_LINE_WIDTH ); } eFUnit = GetModuleFieldUnit( rAttrs ); -// Segmentanzahl aenderbar ? und andere Stati + // Segment Number Can be changed? and other states SfxItemState eState = rAttrs.GetItemState( SID_ATTR_3D_INTERN, sal_False, &pItem ); if( SFX_ITEM_SET == eState ) { sal_uInt32 nState = ( ( const SfxUInt32Item* )pItem )->GetValue(); - //sal_Bool bLathe = (sal_Bool) ( nState & 1 ); sal_Bool bExtrude = (sal_Bool) ( nState & 2 ); sal_Bool bSphere = (sal_Bool) ( nState & 4 ); sal_Bool bCube = (sal_Bool) ( nState & 8 ); @@ -608,7 +550,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( !bChart ) { - // Bei Cube-Objekten werden keine Segmente eingestellt + // For cube objects are no segments set aFtHorizontal.Enable( !bCube ); aNumHorizontal.Enable( !bCube ); aFtVertical.Enable( !bCube ); @@ -633,7 +575,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aMtrDepth.SetEmptyFieldValue(); } - // Nur bei Lathe-Objekten gibt es einen Endwinkel + // There is a final angle only for Lathe objects. aFtEndAngle.Enable( !bExtrude && !bCube && !bSphere ); aMtrEndAngle.Enable( !bExtrude && !bCube && !bSphere ); if( bExtrude || bCube || bSphere ) @@ -641,7 +583,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } else { - // Geometrie + // Geometry aFtHorizontal.Enable( sal_False ); aNumHorizontal.Enable( sal_False ); aNumHorizontal.SetEmptyFieldValue(); @@ -656,7 +598,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aMtrDepth.Enable( sal_False ); aMtrDepth.SetEmptyFieldValue(); - // Darstellung + // Representation aBtnShadow3d.Enable( sal_False ); aFtSlant.Enable( sal_False ); aMtrSlant.Enable( sal_False ); @@ -670,12 +612,12 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aMtrFocalLength.SetEmptyFieldValue(); aFLCamera.Enable( sal_False ); - // Unterer Bereich + //Lower Range aBtnConvertTo3D.Enable( sal_False ); aBtnLatheObject.Enable( sal_False ); } } -// Bitmapfuellung ? -> Status + // Bitmap fill ? -> Status sal_Bool bBitmap(sal_False); eState = rAttrs.GetItemState(XATTR_FILLSTYLE); if(eState != SFX_ITEM_DONTCARE) @@ -704,8 +646,8 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aFLTexture.Enable( bBitmap ); -// Geometrie - // Anzahl Segmente (horizontal) + // Geometry + // Number of segments (horizontal) if( aNumHorizontal.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_HORZ_SEGS); @@ -715,8 +657,6 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if(nValue != (sal_uInt32 )aNumHorizontal.GetValue()) { aNumHorizontal.SetValue( nValue ); - // evtl. am Ende... - // aCtlLightPreview.GetSvx3DLightControl().SetHorizontalSegments( (sal_uInt16)nValue ); bUpdate = sal_True; } else if( aNumHorizontal.IsEmptyFieldValue() ) @@ -732,7 +672,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Anzahl Segmente (vertikal) + //Number of segments (vertical) if( aNumVertical.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_VERT_SEGS); @@ -742,8 +682,6 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( nValue != (sal_uInt32) aNumVertical.GetValue() ) { aNumVertical.SetValue( nValue ); - // evtl. am Ende... - //aCtlLightPreview.GetSvx3DLightControl().SetVerticalSegments( (sal_uInt16)nValue ); bUpdate = sal_True; } else if( aNumVertical.IsEmptyFieldValue() ) @@ -759,7 +697,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Tiefe + // Depth if( aMtrDepth.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DEPTH); @@ -788,7 +726,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Doppelwandig/-seitig + // Double walled / Double sided eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DOUBLE_SIDED); if( eState != SFX_ITEM_DONTCARE ) { @@ -810,7 +748,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Kantenrundung + // Edge rounding if( aMtrPercentDiagonal.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_PERCENT_DIAGONAL); @@ -835,7 +773,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Tiefenskalierung + // Depth scaling if( aMtrBackscale.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_BACKSCALE); @@ -860,7 +798,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Endwinkel + // End angle if( aMtrEndAngle.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_END_ANGLE); @@ -883,7 +821,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Normalentyp + // Normal type eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_KIND); if( eState != SFX_ITEM_DONTCARE ) { @@ -912,7 +850,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Normalen invertieren + // Normal inverted eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_INVERT); if( eState != SFX_ITEM_DONTCARE ) { @@ -934,7 +872,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // 2-seitige Beleuchtung + // 2-sided lighting eState = rAttrs.GetItemState(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING); if( eState != SFX_ITEM_DONTCARE ) { @@ -956,7 +894,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } -// Darstellung + // Representation // Shademode eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADE_MODE); if( eState != SFX_ITEM_DONTCARE ) @@ -977,7 +915,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // 3D-Shatten + // 3D-Shadow eState = rAttrs.GetItemState(SDRATTR_3DOBJ_SHADOW_3D); if( eState != SFX_ITEM_DONTCARE ) { @@ -1001,7 +939,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Neigung (Schatten) + // Inclination (Shadow) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADOW_SLANT); if( eState != SFX_ITEM_DONTCARE ) { @@ -1021,7 +959,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Distanz + // Distance eState = rAttrs.GetItemState(SDRATTR_3DSCENE_DISTANCE); if( eState != SFX_ITEM_DONTCARE ) { @@ -1045,7 +983,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Brennweite + // Focal length eState = rAttrs.GetItemState(SDRATTR_3DSCENE_FOCAL_LENGTH); if( eState != SFX_ITEM_DONTCARE ) { @@ -1069,10 +1007,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } -// Beleuchtung +// Lighting Color aColor; basegfx::B3DVector aVector; - // Licht 1 (Farbe) + // Light 1 (Color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_1); if( eState != SFX_ITEM_DONTCARE ) { @@ -1092,7 +1030,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 1 (an/aus) + // Light 1 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_1); if( eState != SFX_ITEM_DONTCARE ) { @@ -1114,14 +1052,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 1 (Richtung) + // Light 1 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_1); if( eState != SFX_ITEM_DONTCARE ) { bUpdate = sal_True; } - // Licht 2 (Farbe) + //Light 2 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_2); if( eState != SFX_ITEM_DONTCARE ) { @@ -1141,7 +1079,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 2 (an/aus) + // Light 2 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_2); if( eState != SFX_ITEM_DONTCARE ) { @@ -1163,14 +1101,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 2 (Richtung) + //Light 2 (Direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_2); if( eState != SFX_ITEM_DONTCARE ) { bUpdate = sal_True; } - // Licht 3 (Farbe) + //Light 3 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_3); if( eState != SFX_ITEM_DONTCARE ) { @@ -1190,7 +1128,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 3 (an/aus) + // Ligh 3 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_3); if( eState != SFX_ITEM_DONTCARE ) { @@ -1212,14 +1150,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 3 (Richtung) + // Light 3 (Direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_3); if( eState != SFX_ITEM_DONTCARE ) { bUpdate = sal_True; } - // Licht 4 (Farbe) + // Light 4 (Color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_4); if( eState != SFX_ITEM_DONTCARE ) { @@ -1239,7 +1177,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 4 (an/aus) + // Light 4 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_4); if( eState != SFX_ITEM_DONTCARE ) { @@ -1261,14 +1199,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 4 (Richtung) + // Light 4 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_4); if( eState != SFX_ITEM_DONTCARE ) { bUpdate = sal_True; } - // Licht 5 (Farbe) + // Light 5 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_5); if( eState != SFX_ITEM_DONTCARE ) { @@ -1288,7 +1226,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 5 (an/aus) + // Light 5 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_5); if( eState != SFX_ITEM_DONTCARE ) { @@ -1310,14 +1248,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 5 (Richtung) + // Light 5 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_5); if( eState != SFX_ITEM_DONTCARE ) { bUpdate = sal_True; } - // Licht 6 (Farbe) + // Light 6 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_6); if( eState != SFX_ITEM_DONTCARE ) { @@ -1337,7 +1275,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 6 (an/aus) + // Light 6 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_6); if( eState != SFX_ITEM_DONTCARE ) { @@ -1359,14 +1297,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 6 (Richtung) + // Light 6 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_6); if( eState != SFX_ITEM_DONTCARE ) { bUpdate = sal_True; } - // Licht 7 (Farbe) + // Light 7 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_7); if( eState != SFX_ITEM_DONTCARE ) { @@ -1386,7 +1324,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 7 (an/aus) + // Light 7 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_7); if( eState != SFX_ITEM_DONTCARE ) { @@ -1408,14 +1346,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 7 (Richtung) + // Light 7 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_7); if( eState != SFX_ITEM_DONTCARE ) { bUpdate = sal_True; } - // Licht 8 (Farbe) + // Light 8 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_8); if( eState != SFX_ITEM_DONTCARE ) { @@ -1435,7 +1373,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 8 (an/aus) + // Light 8 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_8); if( eState != SFX_ITEM_DONTCARE ) { @@ -1457,14 +1395,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bUpdate = sal_True; } } - // Licht 8 (Richtung) + // Light 8 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_8); if( eState != SFX_ITEM_DONTCARE ) { bUpdate = sal_True; } - // Umgebungslicht + // Ambient light eState = rAttrs.GetItemState(SDRATTR_3DSCENE_AMBIENTCOLOR); if( eState != SFX_ITEM_DONTCARE ) { @@ -1486,7 +1424,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } -// Texturen +// Textures // Art if( bBitmap ) { @@ -1514,7 +1452,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Modus + // Mode eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_MODE); if( eState != SFX_ITEM_DONTCARE ) { @@ -1525,7 +1463,6 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) { aBtnTexReplace.Check( nValue == 1 ); aBtnTexModulate.Check( nValue == 2 ); - //aBtnTexBlend.Check( nValue == 2 ); bUpdate = sal_True; } } @@ -1536,12 +1473,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) { aBtnTexReplace.Check( sal_False ); aBtnTexModulate.Check( sal_False ); - //aBtnTexBlend.Check( sal_False ); bUpdate = sal_True; } } - // Projektion X + // Projection X eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_X); if( eState != SFX_ITEM_DONTCARE ) { @@ -1570,7 +1506,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Projektion Y + // Projection Y eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_Y); if( eState != SFX_ITEM_DONTCARE ) { @@ -1623,10 +1559,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } - // Material Favoriten + // Material Favorites aLbMatFavorites.SelectEntryPos( 0 ); - // Objektfarbe + // Object color eState = rAttrs.GetItemState(XATTR_FILLCOLOR); if( eState != SFX_ITEM_DONTCARE ) { @@ -1647,7 +1583,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Slebstleuchtfarbe + // Self-luminous color eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_EMISSION); if( eState != SFX_ITEM_DONTCARE ) { @@ -1668,7 +1604,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Glanzpunkt + // Specular eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_SPECULAR); if( eState != SFX_ITEM_DONTCARE ) { @@ -1689,7 +1625,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } } - // Glanzpunkt Intensitaet + // Specular Intensity eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY); if( eState != SFX_ITEM_DONTCARE ) { @@ -1710,8 +1646,8 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } -// Sonstige - // Perspektive +// Other + // Perspective eState = rAttrs.GetItemState(SDRATTR_3DSCENE_PERSPECTIVE); if( eState != SFX_ITEM_DONTCARE ) { @@ -1736,16 +1672,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( !bUpdate && !bOnly3DChanged ) { - // Eventuell sind aber die 2D-Attribute unterschiedlich. Vergleiche - // diese und entscheide - + // however the 2D attributes may be different. Compare these and decide bUpdate = sal_True; } if( bUpdate || bOnly3DChanged ) { - // Preview updaten + // Update preview SfxItemSet aSet(rAttrs); // set LineStyle hard to XLINE_NONE when it's not set so that @@ -1813,8 +1747,8 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } } -// Sonstige, muss vorne stehen da auf allen Seiten - // Perspektive +//Others must stand as the front on all sides + // Perspective if( aBtnPerspective.GetState() != STATE_DONTKNOW ) { sal_uInt16 nValue; @@ -1827,19 +1761,19 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_PERSPECTIVE); -// Geometrie - // evtl. PoolUnit ermitteln (Falls dies in Update() nicht passiert ist) +// Geometry + // Possible determine PoolUnit (in this case this haas not happend in Update() ) if( !mpImpl->pPool ) { - DBG_ERROR( "Kein Pool in GetAttr()! Evtl. inkompatibel zu drviewsi.cxx ?" ); + OSL_FAIL( "No Pool in GetAttr()! May be incompatible to drviewsi.cxx ?" ); mpImpl->pPool = rAttrs.GetPool(); - DBG_ASSERT( mpImpl->pPool, "Wo ist der Pool?" ); + DBG_ASSERT( mpImpl->pPool, "Where is the Pool?" ); ePoolUnit = mpImpl->pPool->GetMetric( SID_ATTR_LINE_WIDTH ); eFUnit = GetModuleFieldUnit( rAttrs ); } - // Anzahl Segmente (horizontal) + // Number of segments (horizontal) if( !aNumHorizontal.IsEmptyFieldValue() ) { sal_uInt32 nValue = static_cast<sal_uInt32>(aNumHorizontal.GetValue()); @@ -1848,7 +1782,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_HORZ_SEGS); - // Anzahl Segmente (vertikal) + // Number of segments (vertical) if( !aNumVertical.IsEmptyFieldValue() ) { sal_uInt32 nValue = static_cast<sal_uInt32>(aNumVertical.GetValue()); @@ -1857,7 +1791,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_VERT_SEGS); - // Tiefe + // Depth if( !aMtrDepth.IsEmptyFieldValue() ) { sal_uInt32 nValue = GetCoreValue( aMtrDepth, ePoolUnit ); @@ -1866,7 +1800,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_DEPTH); - // Doppelseitig + // Double-sided TriState eState = aBtnDoubleSided.GetState(); if( eState != STATE_DONTKNOW ) { @@ -1876,7 +1810,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_DOUBLE_SIDED); - // Kantenrundung + // Edge rounding if( !aMtrPercentDiagonal.IsEmptyFieldValue() ) { sal_uInt16 nValue = (sal_uInt16) aMtrPercentDiagonal.GetValue(); @@ -1885,7 +1819,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_PERCENT_DIAGONAL); - // Tiefenskalierung + // Depth scale if( !aMtrBackscale.IsEmptyFieldValue() ) { sal_uInt16 nValue = (sal_uInt16)aMtrBackscale.GetValue(); @@ -1894,7 +1828,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_BACKSCALE); - // Endwinkel + // End angle if( !aMtrEndAngle.IsEmptyFieldValue() ) { sal_uInt16 nValue = (sal_uInt16)aMtrEndAngle.GetValue(); @@ -1903,7 +1837,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_END_ANGLE); - // Normalentyp + // Normal type sal_uInt16 nValue = 99; if( aBtnNormalsObj.IsChecked() ) nValue = 0; @@ -1917,7 +1851,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_NORMALS_KIND); - // Normalen invertieren + // Normal inverted eState = aBtnNormalsInvert.GetState(); if( eState != STATE_DONTKNOW ) { @@ -1927,7 +1861,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_NORMALS_INVERT); - // 2-seitige Beleuchtung + // 2-sided lighting eState = aBtnTwoSidedLighting.GetState(); if( eState != STATE_DONTKNOW ) { @@ -1937,8 +1871,8 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING); -// Darstellung - // Shademode +// Representation + // Shade mode if( aLbShademode.GetSelectEntryCount() ) { nValue = aLbShademode.GetSelectEntryPos(); @@ -1947,7 +1881,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_SHADE_MODE); - // 3D-Shatten + // 3D-Shadow eState = aBtnShadow3d.GetState(); if( eState != STATE_DONTKNOW ) { @@ -1961,7 +1895,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_SHADOW); } - // Neigung (Schatten) + // Slant (Shadow) if( !aMtrSlant.IsEmptyFieldValue() ) { sal_uInt16 nValue2 = (sal_uInt16) aMtrSlant.GetValue(); @@ -1970,7 +1904,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_SHADOW_SLANT); - // Distanz + // Distance if( !aMtrDistance.IsEmptyFieldValue() ) { sal_uInt32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit ); @@ -1979,7 +1913,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_DISTANCE); - // Brennweite + // Focal length if( !aMtrFocalLength.IsEmptyFieldValue() ) { sal_uInt32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit ); @@ -1988,13 +1922,13 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_FOCAL_LENGTH); -// Beleuchtung +// Lighting Image aImg; basegfx::B3DVector aVector; Color aColor; const SfxItemSet aLightItemSet(aCtlLightPreview.GetSvx3DLightControl().Get3DAttributes()); - // Licht 1 Farbe + // Light 1 color if( aLbLight1.GetSelectEntryCount() ) { aColor = aLbLight1.GetSelectEntryColor(); @@ -2002,14 +1936,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_1); - // Licht 1 (an/aus) + // Light 1 (on/off) eState = aBtnLight1.GetState(); if( eState != STATE_DONTKNOW ) { sal_Bool bValue = GetUILightState( aBtnLight1 ); rAttrs.Put(Svx3DLightOnOff1Item(bValue)); - // Licht 1 (Richtung) + // Light 1 (direction) if( bValue ) { rAttrs.Put(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_1)); @@ -2019,7 +1953,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_1); - // Licht 2 Farbe + // Light 2 color if( aLbLight2.GetSelectEntryCount() ) { aColor = aLbLight2.GetSelectEntryColor(); @@ -2027,14 +1961,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_2); - // Licht 2 (an/aus) + // Light 2 (on/off) eState = aBtnLight2.GetState(); if( eState != STATE_DONTKNOW ) { sal_Bool bValue = GetUILightState( aBtnLight2 ); rAttrs.Put(Svx3DLightOnOff2Item(bValue)); - // Licht 2 (Richtung) + // Light 2 (direction) if( bValue ) { rAttrs.Put(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_2)); @@ -2043,7 +1977,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_2); - // Licht 3 Farbe + // Light 3 color if( aLbLight3.GetSelectEntryCount() ) { aColor = aLbLight3.GetSelectEntryColor(); @@ -2051,14 +1985,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_3); - // Licht 3 (an/aus) + // Light 3 (on/off) eState = aBtnLight3.GetState(); if( eState != STATE_DONTKNOW ) { sal_Bool bValue = GetUILightState( aBtnLight3 ); rAttrs.Put(Svx3DLightOnOff3Item(bValue)); - // Licht 3 (Richtung) + // Light 3 (direction) if( bValue ) { rAttrs.Put(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_3)); @@ -2067,7 +2001,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_3); - // Licht 4 Farbe + // Light 4 color if( aLbLight4.GetSelectEntryCount() ) { aColor = aLbLight4.GetSelectEntryColor(); @@ -2075,14 +2009,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_4); - // Licht 4 (an/aus) + // Light 4 (on/off) eState = aBtnLight4.GetState(); if( eState != STATE_DONTKNOW ) { sal_Bool bValue = GetUILightState( aBtnLight4 ); rAttrs.Put(Svx3DLightOnOff4Item(bValue)); - // Licht 4 (Richtung) + // Light 4 (direction) if( bValue ) { rAttrs.Put(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_4)); @@ -2091,7 +2025,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_4); - // Licht 5 Farbe + // Light 5 color if( aLbLight5.GetSelectEntryCount() ) { aColor = aLbLight5.GetSelectEntryColor(); @@ -2099,14 +2033,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_5); - // Licht 5 (an/aus) + // Light 5 (on/off) eState = aBtnLight5.GetState(); if( eState != STATE_DONTKNOW ) { sal_Bool bValue = GetUILightState( aBtnLight5 ); rAttrs.Put(Svx3DLightOnOff5Item(bValue)); - // Licht 5 (Richtung) + // Light 5 (direction) if( bValue ) { rAttrs.Put(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_5)); @@ -2115,7 +2049,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_5); - // Licht 6 Farbe + // Light 6 color if( aLbLight6.GetSelectEntryCount() ) { aColor = aLbLight6.GetSelectEntryColor(); @@ -2123,14 +2057,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_6); - // Licht 6 (an/aus) + // Light 6 (on/off) eState = aBtnLight6.GetState(); if( eState != STATE_DONTKNOW ) { sal_Bool bValue = GetUILightState( aBtnLight6 ); rAttrs.Put(Svx3DLightOnOff6Item(bValue)); - // Licht 6 (Richtung) + // Light 6 (direction) if( bValue ) { rAttrs.Put(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_6)); @@ -2139,7 +2073,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_6); - // Licht 7 Farbe + // Light 7 color if( aLbLight7.GetSelectEntryCount() ) { aColor = aLbLight7.GetSelectEntryColor(); @@ -2147,14 +2081,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_7); - // Licht 7 (an/aus) + // Light 7 (on/off) eState = aBtnLight7.GetState(); if( eState != STATE_DONTKNOW ) { sal_Bool bValue = GetUILightState( aBtnLight7 ); rAttrs.Put(Svx3DLightOnOff7Item(bValue)); - // Licht 7 (Richtung) + // Light 7 (direction) if( bValue ) { rAttrs.Put(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_7)); @@ -2163,7 +2097,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_7); - // Licht 8 Farbe + // Light 8 color if( aLbLight8.GetSelectEntryCount() ) { aColor = aLbLight8.GetSelectEntryColor(); @@ -2171,14 +2105,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_8); - // Licht 8 (an/aus) + // Light 8 (on/off) eState = aBtnLight8.GetState(); if( eState != STATE_DONTKNOW ) { sal_Bool bValue = GetUILightState( aBtnLight8 ); rAttrs.Put(Svx3DLightOnOff8Item(bValue)); - // Licht 8 (Richtung) + // Light 8 (direction) if( bValue ) { rAttrs.Put(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_8)); @@ -2187,7 +2121,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_8); - // Umgebungslicht + // Ambient light if( aLbAmbientlight.GetSelectEntryCount() ) { aColor = aLbAmbientlight.GetSelectEntryColor(); @@ -2196,7 +2130,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DSCENE_AMBIENTCOLOR); -// Texturen +// Textures // Art nValue = 3; if( aBtnTexLuminance.IsChecked() ) @@ -2210,21 +2144,19 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_3DOBJ_TEXTURE_KIND); - // Modus + // Mode nValue = 99; if( aBtnTexReplace.IsChecked() ) nValue = 1; else if( aBtnTexModulate.IsChecked() ) nValue = 2; - //else if( aBtnTexBlend.IsChecked() ) - // nValue = 2; if( nValue == 1 || nValue == 2 ) rAttrs.Put(Svx3DTextureModeItem(nValue)); else rAttrs.InvalidateItem(SDRATTR_3DOBJ_TEXTURE_MODE); - // Projektion X + // X projection nValue = 99; if( aBtnTexObjectX.IsChecked() ) nValue = 0; @@ -2238,7 +2170,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_TEXTURE_PROJ_X); - // Projektion Y + // Y projection nValue = 99; if( aBtnTexObjectY.IsChecked() ) nValue = 0; @@ -2265,7 +2197,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Material - // Objektfarbe + // Object color if( aLbMatColor.GetSelectEntryCount() ) { aColor = aLbMatColor.GetSelectEntryColor(); @@ -2276,7 +2208,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem( XATTR_FILLCOLOR ); } - // Slebstleuchtfarbe + // luminous color if( aLbMatEmission.GetSelectEntryCount() ) { aColor = aLbMatEmission.GetSelectEntryColor(); @@ -2285,7 +2217,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_MAT_EMISSION); - // Glanzpunkt + // Specular if( aLbMatSpecular.GetSelectEntryCount() ) { aColor = aLbMatSpecular.GetSelectEntryColor(); @@ -2294,7 +2226,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) else rAttrs.InvalidateItem(SDRATTR_3DOBJ_MAT_SPECULAR); - // Glanzpunkt Intensitaet + // Specular intensity if( !aMtrMatSpecularIntensity.IsEmptyFieldValue() ) { sal_uInt16 nValue2 = (sal_uInt16) aMtrMatSpecularIntensity.GetValue(); @@ -2305,12 +2237,12 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } // ----------------------------------------------------------------------- -void __EXPORT Svx3DWin::Resize() +void Svx3DWin::Resize() { if ( !IsFloatingMode() || !GetFloatingWindow()->IsRollUp() ) { - Size aWinSize( GetOutputSizePixel() ); // vorher rSize im Resizing() + Size aWinSize( GetOutputSizePixel() ); // why rSize in Resizing()? if( aWinSize.Height() >= GetMinOutputSizePixel().Height() && aWinSize.Width() >= GetMinOutputSizePixel().Width() ) @@ -2343,11 +2275,11 @@ void __EXPORT Svx3DWin::Resize() aFLTexture.Hide(); aFLMaterial.Hide(); - // Verschieben / Resizen + // Moving / resizing aBtnUpdate.SetPosPixel( aBtnUpdate.GetPosPixel() + aXPt ); aBtnAssign.SetPosPixel( aBtnAssign.GetPosPixel() + aXPt ); - // Preview-Controls + // Preview controls aObjSize = aCtlPreview.GetOutputSizePixel(); aObjSize.Width() += aDiffSize.Width(); aObjSize.Height() += aDiffSize.Height(); @@ -2366,7 +2298,7 @@ void __EXPORT Svx3DWin::Resize() aFLTexture.SetOutputSizePixel( aObjSize ); aFLMaterial.SetOutputSizePixel( aObjSize ); - // Y-Position der unteren Buttons + // Y-position of the lower buttons aBtnConvertTo3D.SetPosPixel( aBtnConvertTo3D.GetPosPixel() + aYPt ); aBtnLatheObject.SetPosPixel( aBtnLatheObject.GetPosPixel() + aYPt ); aBtnPerspective.SetPosPixel( aBtnPerspective.GetPosPixel() + aYPt ); @@ -2415,7 +2347,7 @@ IMPL_LINK( Svx3DWin, ClickUpdateHdl, void *, EMPTYARG ) } else { - // Controls koennen u.U. disabled sein + // Controls can be disabled during certain circumstances } return( 0L ); @@ -2442,7 +2374,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) if( pBtn ) { - // Da das permanente Updaten der Preview zu teuer waere + // Since the permanent updating of the preview would be too expensive sal_Bool bUpdatePreview = aBtnLight.IsChecked(); aBtnGeo.Check( &aBtnGeo == pBtn ); @@ -2462,7 +2394,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) if( aBtnMaterial.IsChecked() ) eViewType = VIEWTYPE_MATERIAL; - // Geometrie + // Geometry if( eViewType == VIEWTYPE_GEO ) { aFtHorizontal.Show(); @@ -2514,7 +2446,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aBtnDoubleSided.Hide(); } - // Darstellung + // Representation if( eViewType == VIEWTYPE_REPRESENTATION ) { aFtShademode.Show(); @@ -2546,7 +2478,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aFLRepresentation.Hide(); } - // Beleuchtung + // Lighting if( eViewType == VIEWTYPE_LIGHT ) { aBtnLight1.Show(); @@ -2557,17 +2489,12 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aBtnLight6.Show(); aBtnLight7.Show(); aBtnLight8.Show(); - //aLbLight1.Show(); aBtnLightColor.Show(); aFTLightsource.Show(); aLbAmbientlight.Show(); aBtnAmbientColor.Show(); aFTAmbientlight.Show(); aFLLight.Show(); - //aFtLightX.Show(); - //aFtLightY.Show(); - //aFtLightZ.Show(); - //aGrpLightInfo.Show(); ColorLB* pLb = GetLbByButton(); if( pLb ) @@ -2608,7 +2535,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) } } - // Texturen + // Textures if( eViewType == VIEWTYPE_TEXTURE ) { aFtTexKind.Show(); @@ -2617,7 +2544,6 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aFtTexMode.Show(); aBtnTexReplace.Show(); aBtnTexModulate.Show(); - //aBtnTexBlend.Show(); aFtTexProjectionX.Show(); aBtnTexParallelX.Show(); aBtnTexCircleX.Show(); @@ -2721,7 +2647,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) { nSId = SID_CONVERT_TO_3D_LATHE_FAST; } - // Geometrie + // Geometry else if( pBtn == &aBtnNormalsObj || pBtn == &aBtnNormalsFlat || pBtn == &aBtnNormalsSphere ) @@ -2740,7 +2666,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) pBtn == &aBtnLight7 || pBtn == &aBtnLight8 ) { - // Beleuchtung + // Lighting ColorLB* pLb = GetLbByButton( pBtn ); pLb->Show(); @@ -2800,7 +2726,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) ClickLightHdl( pBtn ); bUpdatePreview = sal_True; } - // Texturen + // Textures else if( pBtn == &aBtnTexLuminance || pBtn == &aBtnTexColor ) { @@ -2809,12 +2735,10 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) bUpdatePreview = sal_True; } else if( pBtn == &aBtnTexReplace || - pBtn == &aBtnTexModulate )// || - //pBtn == &aBtnTexBlend ) + pBtn == &aBtnTexModulate ) { aBtnTexReplace.Check( pBtn == &aBtnTexReplace ); aBtnTexModulate.Check( pBtn == &aBtnTexModulate ); - //aBtnTexBlend.Check( pBtn == &aBtnTexBlend ); bUpdatePreview = sal_True; } else if( pBtn == &aBtnTexParallelX || @@ -2842,7 +2766,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) aMtrSlant.Enable( pBtn->IsChecked() ); bUpdatePreview = sal_True; } - // Sonstige (keine Gruppen) + // Other (no groups) else if( pBtn != NULL ) { pBtn->Check( !pBtn->IsChecked() ); @@ -2932,7 +2856,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) } break; - case 3: // Chrom + case 3: // Chrome { aColObj = Color(36,117,153); aColEmis = Color(18,30,51); @@ -2941,7 +2865,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) } break; - case 4: // Plastik + case 4: // Plastic { aColObj = Color(255,48,57); aColEmis = Color(35,0,0); @@ -2950,7 +2874,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) } break; - case 5: // Holz + case 5: // Wood { aColObj = Color(153,71,1); aColEmis = Color(21,22,0); @@ -2973,7 +2897,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) aLbMatFavorites.SelectEntryPos( 0 ); bUpdatePreview = sal_True; } - // Beleuchtung + // Lighting else if( p == &aLbAmbientlight ) { bUpdatePreview = sal_True; @@ -3066,12 +2990,7 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn ) // ----------------------------------------------------------------------- IMPL_LINK( Svx3DWin, DoubleClickHdl, void*, EMPTYARG ) { - //sal_uInt16 nItemId = aCtlFavorites.GetSelectItemId(); - - //SfxItemSet* pSet = (SfxItemSet*) pFavorSetList->GetObject( nItemId - 1 ); - //Update( *pSet ); - - // und zuweisen + // and assign ClickAssignHdl( NULL ); return( 0L ); @@ -3109,7 +3028,7 @@ IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, EMPTYARG ) ClickHdl( pBtn ); else { - // Zustand: Keine Lampe selektiert + // Status: No lamp selected if( aBtnLight1.IsChecked() ) { aBtnLight1.Check( sal_False ); @@ -3157,8 +3076,8 @@ IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, EMPTYARG ) } // ----------------------------------------------------------------------- -// Methode um sicherzustellen, dass die LB auch mit einer Farbe gesetzt ist -// Liefert sal_True zurueck, falls Farbe hinzugefuegt wurde +// Method to ensure that the LB is also associated with a color +// returns true if color was added // ----------------------------------------------------------------------- sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor ) { @@ -3193,7 +3112,7 @@ void Svx3DWin::UpdatePreview() if(bOnly3DChanged) { - // slot executen + // Execute slot SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); if (pDispatcher != NULL) { @@ -3201,21 +3120,21 @@ void Svx3DWin::UpdatePreview() pDispatcher->Execute( SID_3D_STATE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); } - // Flag zuruecksetzen + // Reset Flag bOnly3DChanged = sal_False; } - // ItemSet besorgen + // Get Itemset SfxItemSet aSet( pModel->GetItemPool(), SDRATTR_START, SDRATTR_END); - // Attribute holen und im Preview setzen + // Get Attributes and set the preview GetAttr( aSet ); aCtlPreview.Set3DAttributes( aSet ); aCtlLightPreview.GetSvx3DLightControl().Set3DAttributes( aSet ); } ////////////////////////////////////////////////////////////////////////////// -// document is to be reloaded, destroy remembered ItemSet (#83951#) +// document is to be reloaded, destroy remembered ItemSet void Svx3DWin::DocumentReload() { if(mpRemember2DAttributes) @@ -3239,7 +3158,7 @@ void Svx3DWin::InitColorLB( const SdrModel* pDoc ) aLbMatEmission.CopyEntries( aLbLight1 ); aLbMatSpecular.CopyEntries( aLbLight1 ); - // Erstmal... + // First... Color aColWhite( COL_WHITE ); Color aColBlack( COL_BLACK ); aLbLight1.SelectEntry( aColWhite ); @@ -3348,12 +3267,9 @@ ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn ) return( pLb ); }; -/************************************************************************* -|* -|* Ableitung vom SfxChildWindow als "Behaelter" fuer Effekte -|* -\************************************************************************/ -__EXPORT Svx3DChildWindow::Svx3DChildWindow( Window* _pParent, +// Derivation from SfxChildWindow as "containers" for effects + +Svx3DChildWindow::Svx3DChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -3367,11 +3283,6 @@ __EXPORT Svx3DChildWindow::Svx3DChildWindow( Window* _pParent, pWin->Initialize( pInfo ); } -/************************************************************************* -|* -|* ControllerItem fuer 3DStatus -|* -\************************************************************************/ Svx3DCtrlItem::Svx3DCtrlItem( sal_uInt16 _nId, Svx3DWin* pWin, SfxBindings* _pBindings) : @@ -3381,16 +3292,12 @@ Svx3DCtrlItem::Svx3DCtrlItem( sal_uInt16 _nId, } // ----------------------------------------------------------------------- -void __EXPORT Svx3DCtrlItem::StateChanged( sal_uInt16 /*nSId*/, +void Svx3DCtrlItem::StateChanged( sal_uInt16 /*nSId*/, SfxItemState /*eState*/, const SfxPoolItem* /*pItem*/ ) { } -/************************************************************************* -|* -|* ControllerItem fuer Status Slot SID_CONVERT_TO_3D -|* -\************************************************************************/ +// ControllerItem for Status Slot SID_CONVERT_TO_3D SvxConvertTo3DItem::SvxConvertTo3DItem(sal_uInt16 _nId, SfxBindings* _pBindings) : SfxControllerItem(_nId, *_pBindings), @@ -3415,3 +3322,4 @@ void SvxConvertTo3DItem::StateChanged(sal_uInt16 /*_nId*/, SfxItemState eState, } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src index c75ab16e19c2..3c90a26f838c 100644 --- a/svx/source/engine3d/float3d.src +++ b/svx/source/engine3d/float3d.src @@ -173,7 +173,7 @@ DockingWindow RID_SVXFLOAT_3D }; QuickHelpText [ en-US ] = "Assign" ; }; - // Unterer Teil + // Lower part ImageButton BTN_CHANGE_TO_3D { HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_CHANGE_TO_3D"; @@ -255,7 +255,7 @@ DockingWindow RID_SVXFLOAT_3D Maximum = 100 ; Last = 100 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; }; FixedText FT_BACKSCALE { @@ -276,7 +276,7 @@ DockingWindow RID_SVXFLOAT_3D SpinSize = 5 ; Maximum = 10000 ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; Last = 10000 ; }; FixedText FT_END_ANGLE @@ -333,7 +333,7 @@ DockingWindow RID_SVXFLOAT_3D Size = FIXED_LINE_SIZE; Text [ en-US ] = "Segments" ; }; - // Geometrie + // Geometry FixedText FT_HORIZONTAL { Pos = MAP_APPFONT ( FT_INDENT , SEGMENTS_START_Y+13 ) ; @@ -461,7 +461,7 @@ DockingWindow RID_SVXFLOAT_3D QuickHelpText [ en-US ] = "Double-Sided" ; }; - // Darstellung + // Representation FixedText FT_SHADEMODE { Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y ) ; @@ -588,7 +588,7 @@ DockingWindow RID_SVXFLOAT_3D Size = FIXED_LINE_SIZE; Text [ en-US ] = "Shading" ; }; - // Beleuchtung + // Lighting FixedText FT_LIGHTSOURCE { Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y ) ; @@ -819,7 +819,7 @@ DockingWindow RID_SVXFLOAT_3D Size = FIXED_LINE_SIZE ; Text [ en-US ] = "Illumination" ; }; - // Texturen + // Textures FixedText FT_TEX_KIND { Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y ) ; @@ -1025,16 +1025,6 @@ DockingWindow RID_SVXFLOAT_3D Text [ en-US ] = "Textures" ; }; // Material - /* Control CTL_MATERIAL - { - //HelpId = HID_SD_CTL_FAVORITES ; - Border = TRUE ; - Pos = MAP_APPFONT ( BORDER + 6 , GROUP_Y + 9 ) ; - Size = MAP_APPFONT ( GROUP_WIDTH - 12 , GROUP_HEIGHT - 15 ) ; - TabStop = TRUE ; - Hide = TRUE ; - }; -*/ // Materialeditor FixedText FT_MAT_FAVORITES { @@ -1173,39 +1163,15 @@ DockingWindow RID_SVXFLOAT_3D Repeat = TRUE ; Spin = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; Minimum = 1 ; First = 1 ; Maximum = 100 ; Last = 100 ; SpinSize = 1 ; }; - /* - ImageButton BTN_MAT_FAVORITES { HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_FAVORITES"; - Pos = MAP_APPFONT( BORDER, GROUP_PREV_Y+1 ); - Size = IMG_BUTTON_SIZE; - QuickHelpText = "Material Favoriten" ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "matfavor.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE; - }; - ImageButton BTN_MAT_EDITOR { HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_EDITOR"; - Pos = MAP_APPFONT( BORDER + BUTTON_WIDTH, GROUP_PREV_Y+1 ); - Size = IMG_BUTTON_SIZE; - QuickHelpText = "Material Editor" ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "matedit.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE; - }; -*/ FixedLine FL_MATERIAL { Pos = TOP_FIXED_LINE_POS; @@ -1213,155 +1179,6 @@ DockingWindow RID_SVXFLOAT_3D Text [ en-US ] = "Material" ; }; - Bitmap BMP_GEO_H - { - File = "3dgeo_h.bmp"; - }; - - Bitmap BMP_REPRESENTATION_H - { - File = "3drepres_h.bmp"; - }; - - Bitmap BMP_3DLIGHT_H - { - File = "3dlight_h.bmp"; - }; - - Bitmap BMP_TEXTURE_H - { - File = "3dtextur_h.bmp"; - }; - - Bitmap BMP_MATERIAL_H - { - File = "material_h.bmp"; - }; - - Bitmap BMP_UPDATE_H - { - File = "sc10350_h.bmp"; - }; - - Bitmap BMP_ASSIGN_H - { - File = "apply_h.bmp"; - }; - - Bitmap BMP_CHANGE_TO_3D_H - { - File = "convrt3d_h.bmp"; - }; - - Bitmap BMP_LATHE_OBJ_H - { - File = "rotate3d_h.bmp"; - }; - - Bitmap BMP_PERSPECTIVE_H - { - File = "persp3d_h.bmp"; - }; - - Bitmap BMP_NORMALS_OBJ_H - { - File = "normobjs_h.bmp"; - }; - - Bitmap BMP_NORMALS_FLAT_H - { - File = "normflat_h.bmp"; - }; - - Bitmap BMP_NORMALS_SPHERE_H - { - File = "normsphe_h.bmp"; - }; - - Bitmap BMP_NORMALS_INVERT_H - { - File = "invert3d_h.bmp"; - }; - - Bitmap BMP_TWO_SIDED_LIGHTING_H - { - File = "lght2sid_h.bmp"; - }; - - Bitmap BMP_DOUBLE_SIDED_H - { - File = "doublesi_h.bmp"; - }; - - Bitmap BMP_SHADOW_3D_H - { - File = "shadow3d_h.bmp"; - }; - - Bitmap BMP_LIGHT_H - { - File = "light_h.bmp"; - }; - - Bitmap BMP_LIGHT_COLOR_H - { - File = "colordlg_h.bmp"; - }; - - Bitmap BMP_AMBIENT_COLOR_H - { - File = "colordlg_h.bmp"; - }; - - Bitmap BMP_TEX_LUMINANCE_H - { - File = "luminanc_h.bmp"; - }; - - Bitmap BMP_TEX_COLOR_H - { - File = "color_h.bmp"; - }; - - Bitmap BMP_TEX_REPLACE_H - { - File = "replac3d_h.bmp"; - }; - - Bitmap BMP_TEX_MODULATE_H - { - File = "modula3d_h.bmp"; - }; - - Bitmap BMP_TEX_BLEND_H - { - File = "blend3d_h.bmp"; - }; - - Bitmap BMP_TEX_OBJECT_H - { - File = "objspc3d_h.bmp"; - }; - - Bitmap BMP_TEX_PARALLEL_H - { - File = "parallel_h.bmp"; - }; - - Bitmap BMP_TEX_CIRCLE_H - { - File = "sphere3d_h.bmp"; - }; - - Bitmap BMP_TEX_FILTER_H - { - File = "filter3d_h.bmp"; - }; - - Bitmap BMP_COLORDLG_H - { - File = "colordlg_h.bmp"; - }; }; Image RID_SVXIMAGE_LIGHT_ON @@ -1376,72 +1193,48 @@ Image RID_SVXIMAGE_LIGHT_OFF MASKCOLOR }; -Image RID_SVXIMAGE_LIGHT_ON_H -{ - ImageBitmap = Bitmap { File = "lighton_h.bmp" ; }; - MASKCOLOR -}; - -Image RID_SVXIMAGE_LIGHT_OFF_H -{ - ImageBitmap = Bitmap { File = "light_h.bmp" ; }; - MASKCOLOR -}; - Image RID_SVXIMAGE_COLORDLG { ImageBitmap = Bitmap { File = "colordlg.bmp" ; }; MASKCOLOR }; -Image RID_SVXIMAGE_COLORDLG_H -{ - ImageBitmap = Bitmap { File = "colordlg_h.bmp" ; }; - MASKCOLOR -}; - -/*Image RID_SVXIMAGE_LIGHT_ON_SELECTED { - ImageBitmap = Bitmap { File = "lightons.bmp" ; }; - MASKCOLOR -}; -Image RID_SVXIMAGE_LIGHT_OFF_SELECTED { - ImageBitmap = Bitmap { File = "lightsel.bmp" ; }; - MASKCOLOR -};*/ - String RID_SVXFLOAT3D_FAVORITE { Text [ en-US ] = "Favorite"; }; + String RID_SVXFLOAT3D_FIX_X { Text [ en-US ] = "X"; }; + String RID_SVXFLOAT3D_FIX_Y { Text [ en-US ] = "Y"; }; + String RID_SVXFLOAT3D_FIX_Z { Text [ en-US ] = "Z"; }; + String RID_SVXFLOAT3D_FIX_R { Text [ en-US ] = "R:"; }; + String RID_SVXFLOAT3D_FIX_G { Text [ en-US ] = "G:"; }; + String RID_SVXFLOAT3D_FIX_B { Text [ en-US ] = "B:"; - }; -// IAccessibility2 implementation 2009. ------ -String STR_COLOR_LIGHT_PRE + +String RID_SVXFLOAT3D_COLOR_LIGHT_PRE { Text [ en-US ] = "Color Light Preview"; }; -// ------ IAccessibility2 implementation 2009. - diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx index c5e77870a073..e526061175c0 100644 --- a/svx/source/engine3d/helperhittest3d.cxx +++ b/svx/source/engine3d/helperhittest3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -293,3 +294,5 @@ bool checkHitSingle3DObject( ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/helperminimaldepth3d.cxx b/svx/source/engine3d/helperminimaldepth3d.cxx index b0f774c26fda..1ad7a6cf743b 100644 --- a/svx/source/engine3d/helperminimaldepth3d.cxx +++ b/svx/source/engine3d/helperminimaldepth3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -210,3 +211,5 @@ double getMinimalDepthInViewCoordinates(const E3dCompoundObject& rObject) ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/helperminimaldepth3d.hxx b/svx/source/engine3d/helperminimaldepth3d.hxx index 7fa1b11a8768..28fb9a3fb10e 100644 --- a/svx/source/engine3d/helperminimaldepth3d.hxx +++ b/svx/source/engine3d/helperminimaldepth3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ double getMinimalDepthInViewCoordinates(const E3dCompoundObject& rObject); #endif // INCLUDED_SVX_HELPERMINIMALDEPTH_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index 284394cc202c..3af96e0a2cec 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,7 +47,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> ////////////////////////////////////////////////////////////////////////////// -// #110094# DrawContact section +// DrawContact section sdr::contact::ViewContact* E3dLatheObj::CreateObjectSpecificViewContact() { @@ -64,12 +65,7 @@ sdr::properties::BaseProperties* E3dLatheObj::CreateObjectSpecificProperties() TYPEINIT1(E3dLatheObj, E3dCompoundObject); -/************************************************************************* -|* -|* Konstruktor aus 3D-Polygon, Scale gibt den Umrechnungsfaktor fuer -|* die Koordinaten an -|* -\************************************************************************/ +// Constructor from 3D polygon, scale is the conversion factor for the coordinates E3dLatheObj::E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon rPoly2D) : E3dCompoundObject(rDefault), @@ -80,11 +76,11 @@ E3dLatheObj::E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyP aMirrorY.scale(1.0, -1.0); maPolyPoly2D.transform(aMirrorY); - // Defaults setzen + // Set Defaults SetDefaultAttributes(rDefault); - // Ueberfluessige Punkte entfernen, insbesondere doppelte - // Start- und Endpunkte verhindern + // Superfluous items removed, in particular to prevent duplicate + // start and end points maPolyPoly2D.removeDoublePoints(); if(maPolyPoly2D.count()) @@ -101,16 +97,10 @@ E3dLatheObj::E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyP } } -/************************************************************************* -|* -|* Leer-Konstruktor -|* -\************************************************************************/ - E3dLatheObj::E3dLatheObj() : E3dCompoundObject() { - // Defaults setzen + // Set Defaults E3dDefaultAttributes aDefault; SetDefaultAttributes(aDefault); } @@ -124,51 +114,23 @@ void E3dLatheObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) GetProperties().SetObjectItemDirect(Svx3DCloseBackItem(rDefault.GetDefaultLatheCloseBack())); } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dLatheObj::GetObjIdentifier() const { return E3D_LATHEOBJ_ID; } -/************************************************************************* -|* -|* Zuweisungsoperator -|* -\************************************************************************/ - -void E3dLatheObj::operator=(const SdrObject& rObj) +E3dLatheObj* E3dLatheObj::Clone() const { - // erstmal alle Childs kopieren - E3dCompoundObject::operator=(rObj); - - // weitere Parameter kopieren - const E3dLatheObj& r3DObj = (const E3dLatheObj&)rObj; - - maPolyPoly2D = r3DObj.maPolyPoly2D; + return CloneHelper< E3dLatheObj >(); } -/************************************************************************* -|* -|* Wandle das Objekt in ein Gruppenobjekt bestehend aus n Polygonen -|* -\************************************************************************/ +// Convert the object to group object consisting of n polygons SdrObject *E3dLatheObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const { return NULL; } -/************************************************************************* -|* -|* Neue Segmentierung (Beschreibung siehe Header-File) -|* -\************************************************************************/ - void E3dLatheObj::ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs) { if ((nHSegs != GetHorizontalSegments() || nVSegs != GetVerticalSegments()) && @@ -181,11 +143,7 @@ void E3dLatheObj::ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs) } } -/************************************************************************* -|* -|* Lokale Parameter setzen mit Geometrieneuerzeugung -|* -\************************************************************************/ +// Set Local parameters set to re-create geometry void E3dLatheObj::SetPolyPoly2D(const basegfx::B2DPolyPolygon& rNew) { @@ -211,11 +169,7 @@ void E3dLatheObj::SetPolyPoly2D(const basegfx::B2DPolyPolygon& rNew) } } -/************************************************************************* -|* -|* Get the name of the object (singular) -|* -\************************************************************************/ +// Get the name of the object (singular) void E3dLatheObj::TakeObjNameSingul(XubString& rName) const { @@ -231,23 +185,13 @@ void E3dLatheObj::TakeObjNameSingul(XubString& rName) const } } -/************************************************************************* -|* -|* Get the name of the object (plural) -|* -\************************************************************************/ +// Get the name of the object (plural) void E3dLatheObj::TakeObjNamePlural(XubString& rName) const { rName=ImpGetResStr(STR_ObjNamePluralLathe3d); } -/************************************************************************* -|* -|* Aufbrechen -|* -\************************************************************************/ - sal_Bool E3dLatheObj::IsBreakObjPossible() { return sal_True; @@ -262,10 +206,10 @@ SdrAttrObj* E3dLatheObj::GetBreakObj() if(pPathObj) { - // Attribute setzen + // Set Attribute SfxItemSet aSet(GetObjectItemSet()); - // Linien aktivieren, um Objekt garantiert sichtbar zu machen + // Enable lines to guarantee that the object becomes visible aSet.Put(XLineStyleItem(XLINE_SOLID)); pPathObj->SetMergedItemSet(aSet); @@ -275,3 +219,5 @@ SdrAttrObj* E3dLatheObj::GetBreakObj() } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 64f43790513d..a31523b47ebd 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,11 +96,8 @@ using namespace com::sun::star; -/************************************************************************* -|* -|* Liste fuer 3D-Objekte -|* -\************************************************************************/ + +// List for 3D-Objects TYPEINIT1(E3dObjList, SdrObjList); @@ -119,27 +117,26 @@ E3dObjList::~E3dObjList() void E3dObjList::NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason) { - // Owner holen - DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "AW: Einfuegen 3DObject in Parent != 3DObject"); + // Get owner + DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "Insert 3D object in parent != 3DObject"); - // Ist es ueberhaupt ein 3D-Objekt? + // Is it even a 3D object? if(pObj && pObj->ISA(E3dObject)) { - // Normales 3D Objekt, einfuegen mittels + // Normal 3D object, insert means // call parent SdrObjList::NbcInsertObject(pObj, nPos, pReason); } else { - // Kein 3D Objekt, fuege in Seite statt in Szene ein... + // No 3D object, inserted a page in place in a scene ... GetOwnerObj()->GetPage()->InsertObject(pObj, nPos); } } void E3dObjList::InsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason) { - OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "Insert 3DObject in non-3D Parent"); - //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj()); + OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "Insert 3D object in non-3D Parent"); // call parent SdrObjList::InsertObject(pObj, nPos, pReason); @@ -153,8 +150,7 @@ void E3dObjList::InsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsert SdrObject* E3dObjList::NbcRemoveObject(sal_uIntPtr nObjNum) { - DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "AW: Entfernen 3DObject aus Parent != 3DObject"); - //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj()); + DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "Remove 3D object from Parent != 3DObject"); // call parent SdrObject* pRetval = SdrObjList::NbcRemoveObject(nObjNum); @@ -170,8 +166,7 @@ SdrObject* E3dObjList::NbcRemoveObject(sal_uIntPtr nObjNum) SdrObject* E3dObjList::RemoveObject(sal_uIntPtr nObjNum) { - OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "3DObject is removed from non-3D Parent"); - //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj()); + OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "3D object is removed from non-3D Parent"); // call parent SdrObject* pRetval = SdrObjList::RemoveObject(nObjNum); @@ -185,12 +180,6 @@ SdrObject* E3dObjList::RemoveObject(sal_uIntPtr nObjNum) return pRetval; } -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - ////////////////////////////////////////////////////////////////////////////// sdr::properties::BaseProperties* E3dObject::CreateObjectSpecificProperties() @@ -198,7 +187,7 @@ sdr::properties::BaseProperties* E3dObject::CreateObjectSpecificProperties() return new sdr::properties::E3dProperties(*this); } -//////////////////////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// TYPEINIT1(E3dObject, SdrAttrObj); @@ -216,22 +205,10 @@ E3dObject::E3dObject() bClosedObj = true; } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - E3dObject::~E3dObject() { } -/************************************************************************* -|* -|* Selektions-Flag setzen -|* -\************************************************************************/ - void E3dObject::SetSelected(bool bNew) { if((bool)mbIsSelected != bNew) @@ -250,11 +227,7 @@ void E3dObject::SetSelected(bool bNew) } } -/************************************************************************* -|* -|* Aufbrechen, default-Implementierungen -|* -\************************************************************************/ +// Break, default implementations sal_Bool E3dObject::IsBreakObjPossible() { @@ -266,11 +239,7 @@ SdrAttrObj* E3dObject::GetBreakObj() return 0L; } -/************************************************************************* -|* -|* SetRectsDirty muss ueber die lokale SdrSubList gehen -|* -\************************************************************************/ +// SetRectsDirty must be done through the local SdrSubList void E3dObject::SetRectsDirty(sal_Bool bNotMyself) { @@ -288,33 +257,17 @@ void E3dObject::SetRectsDirty(sal_Bool bNotMyself) } } -/************************************************************************* -|* -|* Inventor zurueckgeben -|* -\************************************************************************/ - sal_uInt32 E3dObject::GetObjInventor() const { return E3dInventor; } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dObject::GetObjIdentifier() const { return E3D_OBJECT_ID; } -/************************************************************************* -|* -|* Faehigkeiten des Objektes feststellen -|* -\************************************************************************/ +// Determine the capabilities of the object void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { @@ -337,25 +290,17 @@ void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const XFillStyle eFillStyle = ((XFillStyleItem&)(GetMergedItem(XATTR_FILLSTYLE))).GetValue(); rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT); - // Umwandeln von 3D-Koerpern in Gruppe von Polygonen: - // - // Erst mal nicht moeglich, da die Erzeugung einer Gruppe von - // 2D-Polygonen notwendig waere, die tiefensortiert werden muessten, - // also bei Durchdringugnen auch gegeneinander geschnitten werden - // muessten. Auch die Texturkoorinaten waeren ein ungeloestes - // Problem. + // Convert 3D objects in a group of polygons: + // At first not only possible, because the creation of a group of + // 2D polygons would be required which need to be sorted by depth, + // ie at intersections be cut relative to each other. Also the texture + // coorinates were an unsolved problem. rInfo.bCanConvToPoly = sal_False; rInfo.bCanConvToContour = sal_False; rInfo.bCanConvToPathLineToArea = sal_False; rInfo.bCanConvToPolyLineToArea = sal_False; } -/************************************************************************* -|* -|* Layer setzen -|* -\************************************************************************/ - void E3dObject::NbcSetLayer(SdrLayerID nLayer) { SdrAttrObj::NbcSetLayer(nLayer); @@ -371,11 +316,7 @@ void E3dObject::NbcSetLayer(SdrLayerID nLayer) } } -/************************************************************************* -|* -|* ObjList auch an SubList setzen -|* -\************************************************************************/ +// Set ObjList also on SubList void E3dObject::SetObjList(SdrObjList* pNewObjList) { @@ -383,39 +324,23 @@ void E3dObject::SetObjList(SdrObjList* pNewObjList) maSubList.SetUpList(pNewObjList); } -/************************************************************************* -|* -|* Layer setzen -|* -\************************************************************************/ - void E3dObject::SetPage(SdrPage* pNewPage) { SdrAttrObj::SetPage(pNewPage); maSubList.SetPage(pNewPage); } -/************************************************************************* -|* -|* Layer setzen -|* -\************************************************************************/ - void E3dObject::SetModel(SdrModel* pNewModel) { SdrAttrObj::SetModel(pNewModel); maSubList.SetModel(pNewModel); } -/************************************************************************* -|* -|* resize object, used from old 2d interfaces, e.g. in Move/Scale dialog -|* (F4) -|* -\************************************************************************/ +// resize object, used from old 2d interfaces, e.g. in Move/Scale dialog (F4) + void E3dObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - // Bewegung in X,Y im Augkoordinatensystem + // Movement in X, Y in the eye coordinate system E3dScene* pScene = GetScene(); if(pScene) @@ -435,7 +360,7 @@ void E3dObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti aInverseViewToEye.invert(); aScaleCenter3D = aInverseViewToEye * aScaleCenter3D; - // scale-faktoren holen + // Get scale factors double fScaleX(xFact); double fScaleY(yFact); @@ -453,7 +378,7 @@ void E3dObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti mFullTransform.invert(); mTrans *= mFullTransform; - // anwenden + // Apply basegfx::B3DHomMatrix mObjTrans(GetTransform()); mObjTrans *= mTrans; @@ -462,22 +387,19 @@ void E3dObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti } } -/************************************************************************* -|* -|* Objekt verschieben in 2D, wird bei Cursortasten benoetigt -|* -\************************************************************************/ + +// Move object in 2D is needed when using cursor keys + void E3dObject::NbcMove(const Size& rSize) { - // Bewegung in X,Y im Augkoordinatensystem + // Movement in X, Y in the eye coordinate system E3dScene* pScene = GetScene(); if(pScene) { - // Abmessungen der Szene in 3D und 2D als Vergleich + //Dimensions of the scene in 3D and 2D for comparison Rectangle aRect = pScene->GetSnapRect(); - // Transformation Weltkoordinaten bis eine VOR Objektkoordinaten holen basegfx::B3DHomMatrix mInvDispTransform; if(GetParentObj()) { @@ -498,7 +420,7 @@ void E3dObject::NbcMove(const Size& rSize) 0.0); basegfx::B3DPoint aPos(0.0, 0.0, 0.0); - // movement vektor to local coordinates of objects' parent + // movement vector to local coordinates of objects' parent basegfx::B3DHomMatrix aInverseOrientation(aViewInfo3D.getOrientation()); aInverseOrientation.invert(); basegfx::B3DHomMatrix aCompleteTrans(mInvDispTransform * aInverseOrientation); @@ -515,23 +437,13 @@ void E3dObject::NbcMove(const Size& rSize) } } -/************************************************************************* -|* -|* liefere die Sublist, aber nur dann, wenn darin Objekte enthalten sind ! -|* -\************************************************************************/ +// Return the sublist, but only if it contains objects! SdrObjList* E3dObject::GetSubList() const { return &(const_cast< E3dObjList& >(maSubList)); } -/************************************************************************* -|* -|* SnapRect berechnen -|* -\************************************************************************/ - void E3dObject::RecalcSnapRect() { maSnapRect = Rectangle(); @@ -547,13 +459,8 @@ void E3dObject::RecalcSnapRect() } } -/************************************************************************* -|* -|* Einfuegen eines 3D-Objekts an den Parent weitermelden, damit dieser -|* ggf. eine Sonderbehandlung fuer spezielle Objekte durchfuehren kann -|* (z.B. Light/Label in E3dScene) -|* -\************************************************************************/ +// Inform the parent about insertion of a 3D object, so that the parent is able +// treat the particualar objects in a special way (eg Light / Label in E3dScene) void E3dObject::NewObjectInserted(const E3dObject* p3DObj) { @@ -561,13 +468,8 @@ void E3dObject::NewObjectInserted(const E3dObject* p3DObj) GetParentObj()->NewObjectInserted(p3DObj); } -/************************************************************************* -|* -|* Parent ueber Aenderung der Struktur (z.B. durch Transformation) -|* informieren; dabei wird das Objekt, in welchem die Aenderung -|* aufgetreten ist, uebergeben -|* -\************************************************************************/ +// Inform parent of changes in the structure (eg by transformation), in this +// process the object in which the change has occurred is returned. void E3dObject::StructureChanged() { @@ -578,15 +480,9 @@ void E3dObject::StructureChanged() } } -/************************************************************************* -|* -|* 3D-Objekt einfuegen -|* -\************************************************************************/ - void E3dObject::Insert3DObj(E3dObject* p3DObj) { - DBG_ASSERT(p3DObj, "Insert3DObj mit NULL-Zeiger!"); + DBG_ASSERT(p3DObj, "Insert3DObj with NULL-pointer!"); SdrPage* pPg = pPage; maSubList.InsertObject(p3DObj); pPage = pPg; @@ -597,7 +493,7 @@ void E3dObject::Insert3DObj(E3dObject* p3DObj) void E3dObject::Remove3DObj(E3dObject* p3DObj) { - DBG_ASSERT(p3DObj, "Remove3DObj mit NULL-Zeiger!"); + DBG_ASSERT(p3DObj, "Remove3DObj with NULL-pointer!"); if(p3DObj->GetParentObj() == this) { @@ -610,12 +506,6 @@ void E3dObject::Remove3DObj(E3dObject* p3DObj) } } -/************************************************************************* -|* -|* Parent holen -|* -\************************************************************************/ - E3dObject* E3dObject::GetParentObj() const { E3dObject* pRetval = NULL; @@ -627,11 +517,7 @@ E3dObject* E3dObject::GetParentObj() const return pRetval; } -/************************************************************************* -|* -|* Uebergeordnetes Szenenobjekt bestimmen -|* -\************************************************************************/ +// Determine the top-level scene object E3dScene* E3dObject::GetScene() const { @@ -640,11 +526,7 @@ E3dScene* E3dObject::GetScene() const return NULL; } -/************************************************************************* -|* -|* umschliessendes Volumen inklusive aller Kindobjekte berechnen -|* -\************************************************************************/ +// Calculate enclosed volume, including all child objects basegfx::B3DRange E3dObject::RecalcBoundVolume() const { @@ -689,11 +571,7 @@ basegfx::B3DRange E3dObject::RecalcBoundVolume() const return aRetval; } -/************************************************************************* -|* -|* umschliessendes Volumen zurueckgeben und ggf. neu berechnen -|* -\************************************************************************/ +// Get enclosed volume and possibly recalculate it const basegfx::B3DRange& E3dObject::GetBoundVolume() const { @@ -710,11 +588,7 @@ void E3dObject::InvalidateBoundVolume() maLocalBoundVol.reset(); } -/************************************************************************* -|* -|* Aederung des BoundVolumes an alle Kindobjekte weitergeben -|* -\************************************************************************/ +// Pass on the changes of the BoundVolumes to all child objects void E3dObject::SetBoundVolInvalid() { @@ -731,11 +605,7 @@ void E3dObject::SetBoundVolInvalid() } } -/************************************************************************* -|* -|* Aederung der Transformation an alle Kindobjekte weitergeben -|* -\************************************************************************/ +// Pass on the changes in transformation to all child objects void E3dObject::SetTransformChanged() { @@ -753,12 +623,8 @@ void E3dObject::SetTransformChanged() } } -/************************************************************************* -|* -|* hierarchische Transformation ueber alle Parents bestimmen, in -|* maFullTransform ablegen und diese zurueckgeben -|* -\************************************************************************/ +// Define the hierarchical transformation over all Parents, store in +// maFullTransform and return them const basegfx::B3DHomMatrix& E3dObject::GetFullTransform() const { @@ -778,23 +644,11 @@ const basegfx::B3DHomMatrix& E3dObject::GetFullTransform() const return maFullTransform; } -/************************************************************************* -|* -|* Transformationsmatrix abfragen -|* -\************************************************************************/ - const basegfx::B3DHomMatrix& E3dObject::GetTransform() const { return maTransformation; } -/************************************************************************* -|* -|* Transformationsmatrix setzen -|* -\************************************************************************/ - void E3dObject::NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix) { if(maTransformation != rMatrix) @@ -805,17 +659,12 @@ void E3dObject::NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix) } } -/************************************************************************* -|* -|* Transformationsmatrix setzen mit Repaint-Broadcast -|* -\************************************************************************/ +// Set transformation matrix with repaint broadcast void E3dObject::SetTransform(const basegfx::B3DHomMatrix& rMatrix) { if(rMatrix != maTransformation) { - // #110094#-14 SendRepaintBroadcast(); NbcSetTransform(rMatrix); SetChanged(); BroadcastObjectChange(); @@ -823,24 +672,13 @@ void E3dObject::SetTransform(const basegfx::B3DHomMatrix& rMatrix) } } -/************************************************************************* -|* -|* Linien fuer die Wireframe-Darstellung des Objekts dem uebergebenen -|* basegfx::B3DPolygon hinzufuegen -|* -\************************************************************************/ - basegfx::B3DPolyPolygon E3dObject::CreateWireframe() const { const basegfx::B3DRange aBoundVolume(GetBoundVolume()); return basegfx::tools::createCubePolyPolygonFromB3DRange(aBoundVolume); } -/************************************************************************* -|* -|* Get the name of the object (singular) -|* -\************************************************************************/ +// Get the name of the object (singular) void E3dObject::TakeObjNameSingul(XubString& rName) const { @@ -856,25 +694,22 @@ void E3dObject::TakeObjNameSingul(XubString& rName) const } } -/************************************************************************* -|* -|* Get the name of the object (plural) -|* -\************************************************************************/ +// Get the name of the object (plural) void E3dObject::TakeObjNamePlural(XubString& rName) const { rName=ImpGetResStr(STR_ObjNamePluralObj3d); } -/************************************************************************* -|* -|* Zuweisungsoperator -|* -\************************************************************************/ +E3dObject* E3dObject::Clone() const +{ + return CloneHelper< E3dObject >(); +} -void E3dObject::operator=(const SdrObject& rObj) +E3dObject& E3dObject::operator=(const E3dObject& rObj) { + if( this == &rObj ) + return *this; SdrObject::operator=(rObj); const E3dObject& r3DObj = (const E3dObject&) rObj; @@ -883,37 +718,24 @@ void E3dObject::operator=(const SdrObject& rObj) maSubList.CopyObjects(*r3DObj.GetSubList()); } - // BoundVol kann uebernommen werden, da die Childs auch kopiert werden + // BoundVol can be copied since also the children are copied maLocalBoundVol = r3DObj.maLocalBoundVol; maTransformation = r3DObj.maTransformation; - // Da sich der Parent geaendert haben kann, Gesamttransformation beim - // naechsten Mal auf jeden Fall neu bestimmen + // Because the parent may have changed, definitely redefine the total + // transformation next time SetTransformChanged(); - // Selektionsstatus kopieren + // Copy selection status mbIsSelected = r3DObj.mbIsSelected; + return *this; } -/************************************************************************* -|* -|* erstelle neues GeoData-Objekt -|* -\************************************************************************/ - SdrObjGeoData *E3dObject::NewGeoData() const { - // Theoretisch duerfen auch nur Szenen ihre GeoDatas erstellen und verwalten !! - // AW: Dies stimmt nicht mehr, diese Stelle ist mit der neuen Engine OK! return new E3DObjGeoData; } -/************************************************************************* -|* -|* uebergebe aktuelle werte an das GeoData-Objekt -|* -\************************************************************************/ - void E3dObject::SaveGeoData(SdrObjGeoData& rGeo) const { SdrAttrObj::SaveGeoData (rGeo); @@ -922,12 +744,6 @@ void E3dObject::SaveGeoData(SdrObjGeoData& rGeo) const ((E3DObjGeoData &) rGeo).maTransformation = maTransformation; } -/************************************************************************* -|* -|* uebernehme werte aus dem GeoData-Objekt -|* -\************************************************************************/ - void E3dObject::RestGeoData(const SdrObjGeoData& rGeo) { maLocalBoundVol = ((E3DObjGeoData &) rGeo).maLocalBoundVol; @@ -936,34 +752,29 @@ void E3dObject::RestGeoData(const SdrObjGeoData& rGeo) SdrAttrObj::RestGeoData (rGeo); } -/************************************************************************* -|* -|* Rotation eines 3d-Koerpers -|* -\************************************************************************/ -// 2D-rotation eines 3D-Koerpers, normalerweise macht das die Szene selbst -// Ist aber eine korrekte Implementierung, denn alles was passiert ist eine -// Rotation um die Achse die senkrecht auf dem Bildschirm steht und zwar -// unabhaengig davon, wie die Szene bisher gedreht worden ist. +// 2D-rotation of a 3D-body, normally this is done by the scene itself. +// This is however a correct implementation, because everything that has +// happened is a rotation around the axis perpendicular to the screen and that +// is regardless of how the scene has been rotated up until now. void E3dObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs) { - // Also derzeit sind die Klebepunkte relativ zum aOutRect der Szene definiert. Vor dem Drehen - // werden die Klebepunkte relativ zur Seite definiert. Sie nehmen an der Drehung der Szene noch nicht Teil - // dafuer gibt es den - SetGlueReallyAbsolute(sal_True); + // So currently the glue points are defined relative to the scene aOutRect. + // Before turning the glue points are defined relative to the page. They + // take no part in the rotation of the scene. To ensure this, there is the + // SetGlueReallyAbsolute(sal_True); - // SendRepaintBroadcast(); double fWinkelInRad = nWink/100 * F_PI180; basegfx::B3DHomMatrix aRotateZ; aRotateZ.rotate(0.0, 0.0, fWinkelInRad); NbcSetTransform(aRotateZ * GetTransform()); - SetRectsDirty(); // Veranlasst eine Neuberechnung aller BoundRects - NbcRotateGluePoints(rRef,nWink,sn,cs); // Rotiert die Klebepunkte (die haben noch Koordinaten relativ - // zum Urpsung des Blattes - SetGlueReallyAbsolute(sal_False); // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert) + SetRectsDirty(); // This forces a recalculation of all BoundRects + NbcRotateGluePoints(rRef,nWink,sn,cs); // Rotate the glue points (who still + // have coordinates relative to the + // original page) + SetGlueReallyAbsolute(sal_False); // from now they are again relative to BoundRect (that is defined as aOutRect) } /*************************************************************************/ @@ -975,23 +786,17 @@ sdr::properties::BaseProperties* E3dCompoundObject::CreateObjectSpecificProperti return new sdr::properties::E3dCompoundProperties(*this); } -//////////////////////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// TYPEINIT1(E3dCompoundObject, E3dObject); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - E3dCompoundObject::E3dCompoundObject() : E3dObject(), aMaterialAmbientColor(), bCreateNormals(false), bCreateTexture(false) { - // Defaults setzen + // Set defaults E3dDefaultAttributes aDefault; SetDefaultAttributes(aDefault); } @@ -1002,35 +807,23 @@ E3dCompoundObject::E3dCompoundObject(E3dDefaultAttributes& rDefault) bCreateNormals(false), bCreateTexture(false) { - // Defaults setzen + // Set defaults SetDefaultAttributes(rDefault); } void E3dCompoundObject::SetDefaultAttributes(E3dDefaultAttributes& rDefault) { - // Defaults setzen + // Set defaults aMaterialAmbientColor = rDefault.GetDefaultAmbientColor(); bCreateNormals = rDefault.GetDefaultCreateNormals(); bCreateTexture = rDefault.GetDefaultCreateTexture(); } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - E3dCompoundObject::~E3dCompoundObject () { } -/************************************************************************* -|* -|* Drag-Polygon zurueckgeben -|* -\************************************************************************/ - basegfx::B2DPolyPolygon E3dCompoundObject::TakeXorPoly() const { basegfx::B2DPolyPolygon aRetval; @@ -1050,24 +843,12 @@ basegfx::B2DPolyPolygon E3dCompoundObject::TakeXorPoly() const return aRetval; } -/************************************************************************* -|* -|* Anzahl der Handles zurueckgeben -|* -\************************************************************************/ - sal_uInt32 E3dCompoundObject::GetHdlCount() const { - // 8 Eckpunkte + 1 E3dVolumeMarker (= Wireframe-Darstellung) + // 8 corners + 1 E3dVolumeMarker (= Wireframe representation) return 9L; } -/************************************************************************* -|* -|* Handle-Liste fuellen -|* -\************************************************************************/ - void E3dCompoundObject::AddToHdlList(SdrHdlList& rHdlList) const { const uno::Sequence< beans::PropertyValue > aEmptyParameters; @@ -1121,23 +902,11 @@ void E3dCompoundObject::AddToHdlList(SdrHdlList& rHdlList) const } } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dCompoundObject::GetObjIdentifier() const { return E3D_COMPOUNDOBJ_ID; } -/************************************************************************* -|* -|* SnapRect berechnen -|* -\************************************************************************/ - void E3dCompoundObject::RecalcSnapRect() { const uno::Sequence< beans::PropertyValue > aEmptyParameters; @@ -1182,31 +951,11 @@ void E3dCompoundObject::RecalcSnapRect() } } -/************************************************************************* -|* -|* Copy-Operator -|* -\************************************************************************/ - -void E3dCompoundObject::operator=(const SdrObject& rObj) +E3dCompoundObject* E3dCompoundObject::Clone() const { - // erstmal alle Childs kopieren - E3dObject::operator=(rObj); - - // weitere Parameter kopieren - const E3dCompoundObject& r3DObj = (const E3dCompoundObject&) rObj; - - bCreateNormals = r3DObj.bCreateNormals; - bCreateTexture = r3DObj.bCreateTexture; - aMaterialAmbientColor = r3DObj.aMaterialAmbientColor; + return CloneHelper< E3dCompoundObject >(); } -/************************************************************************* -|* -|* Parameter Geometrieerzeugung setzen -|* -\************************************************************************/ - void E3dCompoundObject::SetCreateNormals(sal_Bool bNew) { if(bCreateNormals != bNew) @@ -1225,11 +974,7 @@ void E3dCompoundObject::SetCreateTexture(sal_Bool bNew) } } -/************************************************************************* -|* -|* Material des Objektes -|* -\************************************************************************/ +// Material of the object void E3dCompoundObject::SetMaterialAmbientColor(const Color& rColor) { @@ -1239,11 +984,7 @@ void E3dCompoundObject::SetMaterialAmbientColor(const Color& rColor) } } -/************************************************************************* -|* -|* convert given basegfx::B3DPolyPolygon to screen coor -|* -\************************************************************************/ +// convert given basegfx::B3DPolyPolygon to screen coor basegfx::B2DPolyPolygon E3dCompoundObject::TransformToScreenCoor(const basegfx::B3DPolyPolygon& rCandidate) { @@ -1278,3 +1019,5 @@ sal_Bool E3dCompoundObject::IsAOrdNumRemapCandidate(E3dScene*& prScene) const ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx index be9edd9bf60f..83797deb1f40 100644 --- a/svx/source/engine3d/objfac3d.cxx +++ b/svx/source/engine3d/objfac3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,12 +39,6 @@ #include "svx/objfac3d.hxx" #include <svx/svdobj.hxx> -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - static sal_Bool bInit = sal_False; E3dObjFactory::E3dObjFactory() @@ -55,21 +50,11 @@ E3dObjFactory::E3dObjFactory() } } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - E3dObjFactory::~E3dObjFactory() { } -/************************************************************************* -|* -|* Chart-interne Objekte erzeugen -|* -\************************************************************************/ +// Generate chart internal objects IMPL_LINK( E3dObjFactory, MakeObject, SdrObjFactory*, pObjFactory) { @@ -87,10 +72,11 @@ IMPL_LINK( E3dObjFactory, MakeObject, SdrObjFactory*, pObjFactory) pObjFactory->pNewObj = new E3dCubeObj(); break; case E3D_SPHEREOBJ_ID: - // FG: ruft den dummy constructor, da dieser Aufruf nur beim Laden von Dokumenten erfolgt. - // die wirkliche Anzahkl Segmente wird aber erst nach dem Laden der Member festgelegt. - // dies hat zur Folge das die erste Kugel gleich wieder zerstoert wird, obwohl sie nie - // gebraucht worden ist. + // Gets the dummy constructor, as this is only called when + // loading documents. The actual number of segments is however + // determined only after loading the members. This will result + // in that the first sphere will be immediately destroyed, + // although it was never used. pObjFactory->pNewObj = new E3dSphereObj(123); break; case E3D_EXTRUDEOBJ_ID: @@ -108,3 +94,4 @@ IMPL_LINK( E3dObjFactory, MakeObject, SdrObjFactory*, pObjFactory) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index 7086aace6659..008ab42bf165 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,19 +39,13 @@ TYPEINIT1(E3dPolygonObj, E3dCompoundObject); ////////////////////////////////////////////////////////////////////////////// -// #110094# DrawContact section +// DrawContact section sdr::contact::ViewContact* E3dPolygonObj::CreateObjectSpecificViewContact() { return new sdr::contact::ViewContactOfE3dPolygon(*this); } -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - E3dPolygonObj::E3dPolygonObj( E3dDefaultAttributes& rDefault, const basegfx::B3DPolyPolygon& rPolyPoly3D, @@ -58,22 +53,16 @@ E3dPolygonObj::E3dPolygonObj( : E3dCompoundObject(rDefault), bLineOnly(bLinOnly) { - // Geometrie setzen + // Set geometry SetPolyPolygon3D(rPolyPoly3D); - // Default-Normals erzeugen + // Create default normals CreateDefaultNormals(); - // Default-Texturkoordinaten erzeugen + // Create default texture coordinates CreateDefaultTexture(); } -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - E3dPolygonObj::E3dPolygonObj( E3dDefaultAttributes& rDefault, const basegfx::B3DPolyPolygon& rPolyPoly3D, @@ -82,20 +71,14 @@ E3dPolygonObj::E3dPolygonObj( : E3dCompoundObject(rDefault), bLineOnly(bLinOnly) { - // Geometrie und Normalen setzen + // Set geometry and the normal SetPolyPolygon3D(rPolyPoly3D); SetPolyNormals3D(rPolyNormals3D); - // Default-Texturkoordinaten erzeugen + // Create default texture coordinates CreateDefaultTexture(); } -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - E3dPolygonObj::E3dPolygonObj( E3dDefaultAttributes& rDefault, const basegfx::B3DPolyPolygon& rPolyPoly3D, @@ -110,105 +93,85 @@ E3dPolygonObj::E3dPolygonObj( SetPolyTexture2D(rPolyTexture2D); } -/************************************************************************* -|* -|* Leer-Konstruktor -|* -\************************************************************************/ - E3dPolygonObj::E3dPolygonObj() : E3dCompoundObject(), bLineOnly(false) // added missing initialisation { - // Keine Geometrie erzeugen + // Create no geometry } -/************************************************************************* -|* -|* Default-Normalen erzeugen -|* -\************************************************************************/ - void E3dPolygonObj::CreateDefaultNormals() { basegfx::B3DPolyPolygon aPolyNormals; - // Komplettes PolyPolygon mit den Ebenennormalen anlegen + // Create a complete PolyPolygon with the plane normal for(sal_uInt32 a(0L); a < aPolyPoly3D.count(); a++) { - // Quellpolygon finden + // Find source polygon const basegfx::B3DPolygon aPolygon(aPolyPoly3D.getB3DPolygon(a)); - // Neues Polygon fuer Normalen anlegen + // Creating a new polygon for the normal basegfx::B3DPolygon aNormals; - // Normale holen (und umdrehen) + // Get normal (and invert) basegfx::B3DVector aNormal(-basegfx::tools::getNormal(aPolygon)); - // Neues Polygon fuellen + // Fill new polygon for(sal_uInt32 b(0L); b < aPolygon.count(); b++) { aNormals.append(aNormal); } - // Neues Polygon in PolyPolygon einfuegen + // Insert new polygon into the PolyPolygon aPolyNormals.append(aNormals); } - // Default-Normalen setzen + // Set default normal SetPolyNormals3D(aPolyNormals); } -/************************************************************************* -|* -|* Default-Texturkoordinaten erzeugen -|* -\************************************************************************/ - void E3dPolygonObj::CreateDefaultTexture() { basegfx::B2DPolyPolygon aPolyTexture; - - // Komplettes PolyPolygon mit den Texturkoordinaten anlegen - // Die Texturkoordinaten erstrecken sich ueber X,Y und Z - // ueber die gesamten Extremwerte im Bereich 0.0 .. 1.0 + // Create a complete PolyPolygon with the texture coordinates + // The texture coordinates extend over X,Y and Z + // on the whole extreme values in the range 0.0 .. 1.0 for(sal_uInt32 a(0L); a < aPolyPoly3D.count(); a++) { - // Quellpolygon finden + // Find source polygon const basegfx::B3DPolygon& aPolygon(aPolyPoly3D.getB3DPolygon(a)); - // Gesamtgroesse des Objektes feststellen + // Determine the total size of the object basegfx::B3DRange aVolume(basegfx::tools::getRange(aPolygon)); - // Normale holen + // Get normal basegfx::B3DVector aNormal(basegfx::tools::getNormal(aPolygon)); aNormal.setX(fabs(aNormal.getX())); aNormal.setY(fabs(aNormal.getY())); aNormal.setZ(fabs(aNormal.getZ())); - // Entscheiden, welche Koordinaten als Source fuer das - // Mapping benutzt werden sollen + // Decide which coordinates should be used as a source for the mapping sal_uInt16 nSourceMode = 0; - // Groessten Freiheitsgrad ermitteln + // Determine the greatest degree of freedom if(!(aNormal.getX() > aNormal.getY() && aNormal.getX() > aNormal.getZ())) { if(aNormal.getY() > aNormal.getZ()) { - // Y ist am groessten, benutze X,Z als mapping + // Y is the largest, use X,Z as mapping nSourceMode = 1; } else { - // Z ist am groessten, benutze X,Y als mapping + // Z is the largest, use X,Y as mapping nSourceMode = 2; } } - // Neues Polygon fuer Texturkoordinaten anlegen + // Create new polygon for texture coordinates basegfx::B2DPolygon aTexture; - // Neues Polygon fuellen + // Fill new polygon for(sal_uInt32 b(0L); b < aPolygon.count(); b++) { basegfx::B2DPoint aTex; @@ -216,21 +179,21 @@ void E3dPolygonObj::CreateDefaultTexture() switch(nSourceMode) { - case 0: // Quelle ist Y,Z + case 0: //Source is Y,Z if(aVolume.getHeight()) aTex.setX((aCandidate.getY() - aVolume.getMinY()) / aVolume.getHeight()); if(aVolume.getDepth()) aTex.setY((aCandidate.getZ() - aVolume.getMinZ()) / aVolume.getDepth()); break; - case 1: // Quelle ist X,Z + case 1: // Source is X,Z if(aVolume.getWidth()) aTex.setX((aCandidate.getX() - aVolume.getMinX()) / aVolume.getWidth()); if(aVolume.getDepth()) aTex.setY((aCandidate.getZ() - aVolume.getMinZ()) / aVolume.getDepth()); break; - case 2: // Quelle ist X,Y + case 2: // Source is X,Y if(aVolume.getWidth()) aTex.setX((aCandidate.getX() - aVolume.getMinX()) / aVolume.getWidth()); if(aVolume.getHeight()) @@ -241,49 +204,31 @@ void E3dPolygonObj::CreateDefaultTexture() aTexture.append(aTex); } - // Neues Polygon in PolyPolygon einfuegen + // Insert new polygon into the PolyPolygon aPolyTexture.append(aTexture); } - // Default-Texturkoordinaten setzen + // Set default Texture coordinates SetPolyTexture2D(aPolyTexture); } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - E3dPolygonObj::~E3dPolygonObj() { } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dPolygonObj::GetObjIdentifier() const { return E3D_POLYGONOBJ_ID; } -/************************************************************************* -|* -|* Polygon setzen -|* -\************************************************************************/ - void E3dPolygonObj::SetPolyPolygon3D(const basegfx::B3DPolyPolygon& rNewPolyPoly3D) { if ( aPolyPoly3D != rNewPolyPoly3D ) { - // Neues PolyPolygon; kopieren + // New PolyPolygon; copying aPolyPoly3D = rNewPolyPoly3D; - // Geometrie neu erzeugen + // Create new geometry ActionChanged(); } } @@ -292,10 +237,10 @@ void E3dPolygonObj::SetPolyNormals3D(const basegfx::B3DPolyPolygon& rNewPolyNorm { if ( aPolyNormals3D != rNewPolyNormals3D ) { - // Neue Normalen; kopieren + // New PolyPolygon; copying aPolyNormals3D = rNewPolyNormals3D; - // Geometrie neu erzeugen + // Create new geometry ActionChanged(); } } @@ -304,51 +249,26 @@ void E3dPolygonObj::SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyText { if ( aPolyTexture2D != rNewPolyTexture2D ) { - // Neue Texturkoordinaten; kopieren + // New PolyPolygon; copying aPolyTexture2D = rNewPolyTexture2D; - // Geometrie neu erzeugen + // Create new geometry ActionChanged(); } } -/************************************************************************* -|* -|* Wandle das Objekt in ein Gruppenobjekt bestehend aus 6 Polygonen -|* -\************************************************************************/ +// Convert the object into a group object consisting of 6 polygons SdrObject *E3dPolygonObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const { return NULL; } -/************************************************************************* -|* -|* Zuweisungsoperator -|* -\************************************************************************/ - -void E3dPolygonObj::operator=(const SdrObject& rObj) +E3dPolygonObj* E3dPolygonObj::Clone() const { - // erstmal alle Childs kopieren - E3dCompoundObject::operator=(rObj); - - // weitere Parameter kopieren - const E3dPolygonObj& r3DObj = (const E3dPolygonObj&)rObj; - - aPolyPoly3D = r3DObj.aPolyPoly3D; - aPolyNormals3D = r3DObj.aPolyNormals3D; - aPolyTexture2D = r3DObj.aPolyTexture2D; - bLineOnly = r3DObj.bLineOnly; + return CloneHelper< E3dPolygonObj >(); } -/************************************************************************* -|* -|* LineOnly setzen -|* -\************************************************************************/ - void E3dPolygonObj::SetLineOnly(sal_Bool bNew) { if(bNew != bLineOnly) @@ -359,3 +279,5 @@ void E3dPolygonObj::SetLineOnly(sal_Bool bNew) } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx index 2ee7f795afc2..bd2b081c7112 100644 --- a/svx/source/engine3d/polysc3d.cxx +++ b/svx/source/engine3d/polysc3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,15 +61,16 @@ E3dPolyScene::E3dPolyScene(E3dDefaultAttributes& rDefault) { } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dPolyScene::GetObjIdentifier() const { return E3D_POLYSCENE_ID; } +E3dPolyScene* E3dPolyScene::Clone() const +{ + return CloneHelper< E3dPolyScene >(); +} + // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 7fc40f1abc60..1708fad29b4f 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,14 +62,13 @@ #define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() ////////////////////////////////////////////////////////////////////////////// -// #110988# class ImpRemap3DDepth { sal_uInt32 mnOrdNum; double mfMinimalDepth; - // bitfield + // bit field unsigned mbIsScene : 1; public: @@ -92,6 +92,7 @@ ImpRemap3DDepth::ImpRemap3DDepth(sal_uInt32 nOrdNum, double fMinimalDepth) ImpRemap3DDepth::ImpRemap3DDepth(sal_uInt32 nOrdNum) : mnOrdNum(nOrdNum), + mfMinimalDepth(0.0), mbIsScene(sal_True) { } @@ -123,7 +124,6 @@ bool ImpRemap3DDepth::operator<(const ImpRemap3DDepth& rComp) const typedef ::std::vector< ImpRemap3DDepth > ImpRemap3DDepthVector; ////////////////////////////////////////////////////////////////////////////// -// #110988# class Imp3DDepthRemapper { @@ -192,30 +192,24 @@ sdr::properties::BaseProperties* E3dScene::CreateObjectSpecificProperties() } ////////////////////////////////////////////////////////////////////////////// -// #110094# DrawContact section +// DrawContact section sdr::contact::ViewContact* E3dScene::CreateObjectSpecificViewContact() { return new sdr::contact::ViewContactOfE3dScene(*this); } -//////////////////////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// TYPEINIT1(E3dScene, E3dObject); -/************************************************************************* -|* -|* E3dScene-Konstruktor -|* -\************************************************************************/ - E3dScene::E3dScene() : E3dObject(), aCamera(basegfx::B3DPoint(0.0, 0.0, 4.0), basegfx::B3DPoint()), mp3DDepthRemapper(0L), bDrawOnlySelected(false) { - // Defaults setzen + // Set defaults E3dDefaultAttributes aDefault; SetDefaultAttributes(aDefault); } @@ -226,27 +220,20 @@ E3dScene::E3dScene(E3dDefaultAttributes& rDefault) mp3DDepthRemapper(0L), bDrawOnlySelected(false) { - // Defaults setzen + // Set defaults SetDefaultAttributes(rDefault); } void E3dScene::SetDefaultAttributes(E3dDefaultAttributes& /*rDefault*/) { - // Fuer OS/2 die FP-Exceptions abschalten -#if defined(OS2) -#define SC_FPEXCEPTIONS_ON() _control87( MCW_EM, 0 ) -#define SC_FPEXCEPTIONS_OFF() _control87( MCW_EM, MCW_EM ) - SC_FPEXCEPTIONS_OFF(); -#endif - - // Fuer WIN95/NT die FP-Exceptions abschalten + // For WIN95/NT turn off the FP-Exceptions #if defined(WNT) #define SC_FPEXCEPTIONS_ON() _control87( _MCW_EM, 0 ) #define SC_FPEXCEPTIONS_OFF() _control87( _MCW_EM, _MCW_EM ) SC_FPEXCEPTIONS_OFF(); #endif - // Defaults setzen + // Set defaults aCamera.SetViewWindow(-2, -2, 4, 4); aCameraSet.SetDeviceRectangle(-2, 2, -2, 2); aCamera.SetDeviceWindow(Rectangle(0, 0, 10, 10)); @@ -267,15 +254,8 @@ void E3dScene::SetDefaultAttributes(E3dDefaultAttributes& /*rDefault*/) aCamera.SetFocalLength(fNew); } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - E3dScene::~E3dScene() { - // #110988# ImpCleanup3DDepthMapper(); } @@ -292,7 +272,6 @@ basegfx::B2DPolyPolygon E3dScene::TakeXorPoly() const return aRetval; } -// #110988# void E3dScene::ImpCleanup3DDepthMapper() { if(mp3DDepthRemapper) @@ -302,7 +281,6 @@ void E3dScene::ImpCleanup3DDepthMapper() } } -// #110988# sal_uInt32 E3dScene::RemapOrdNum(sal_uInt32 nNewOrdNum) const { if(!mp3DDepthRemapper) @@ -323,12 +301,6 @@ sal_uInt32 E3dScene::RemapOrdNum(sal_uInt32 nNewOrdNum) const return nNewOrdNum; } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dScene::GetObjIdentifier() const { return E3D_SCENE_ID; @@ -350,12 +322,6 @@ void E3dScene::SetBoundRectDirty() } } -/************************************************************************* -|* -|* SetSnapRect -|* -\************************************************************************/ - void E3dScene::NbcSetSnapRect(const Rectangle& rRect) { SetRectsDirty(); @@ -363,16 +329,9 @@ void E3dScene::NbcSetSnapRect(const Rectangle& rRect) aCamera.SetDeviceWindow(rRect); aCameraSet.SetViewportRectangle((Rectangle&)rRect); - // #110988# ImpCleanup3DDepthMapper(); } -/************************************************************************* -|* -|* Objekt verschieben -|* -\************************************************************************/ - void E3dScene::NbcMove(const Size& rSize) { Rectangle aNewSnapRect = GetSnapRect(); @@ -380,12 +339,6 @@ void E3dScene::NbcMove(const Size& rSize) NbcSetSnapRect(aNewSnapRect); } -/************************************************************************* -|* -|* Objekt Resizen -|* -\************************************************************************/ - void E3dScene::NbcResize(const Point& rRef, const Fraction& rXFact, const Fraction& rYFact) { @@ -394,51 +347,40 @@ void E3dScene::NbcResize(const Point& rRef, const Fraction& rXFact, NbcSetSnapRect(aNewSnapRect); } -/************************************************************************* -|* -|* Neue Kamera setzen, und dabei die Szene und ggf. das BoundVolume -|* als geaendert markieren -|* -\************************************************************************/ +// Set new camera, and thus mark the scene and if possible the bound volume +// as changed void E3dScene::SetCamera(const Camera3D& rNewCamera) { - // Alte Kamera setzen + // Set old camera aCamera = rNewCamera; ((sdr::properties::E3dSceneProperties&)GetProperties()).SetSceneItemsFromCamera(); SetRectsDirty(); - // Neue Kamera aus alter fuellen + // Fill new camera from old Camera3D& rCam = (Camera3D&)GetCamera(); - // Ratio abschalten + // Turn off ratio if(rCam.GetAspectMapping() == AS_NO_MAPPING) GetCameraSet().SetRatio(0.0); - // Abbildungsgeometrie setzen + // Set Imaging geometry basegfx::B3DPoint aVRP(rCam.GetViewPoint()); basegfx::B3DVector aVPN(aVRP - rCam.GetVRP()); basegfx::B3DVector aVUV(rCam.GetVUV()); - // #91047# use SetViewportValues() to set VRP, VPN and VUV as vectors, too. + // use SetViewportValues() to set VRP, VPN and VUV as vectors, too. // Else these values would not be exported/imported correctly. GetCameraSet().SetViewportValues(aVRP, aVPN, aVUV); - // Perspektive setzen + // Set perspective GetCameraSet().SetPerspective(rCam.GetProjection() == PR_PERSPECTIVE); GetCameraSet().SetViewportRectangle((Rectangle&)rCam.GetDeviceWindow()); - // #110988# ImpCleanup3DDepthMapper(); } -/************************************************************************* -|* -|* 3D-Objekt einfuegen -|* -\************************************************************************/ - void E3dScene::NewObjectInserted(const E3dObject* p3DObj) { E3dObject::NewObjectInserted(p3DObj); @@ -446,30 +388,20 @@ void E3dScene::NewObjectInserted(const E3dObject* p3DObj) if ( p3DObj == this ) return; - // #110988# ImpCleanup3DDepthMapper(); } -/************************************************************************* -|* -|* Parent ueber Aenderung eines Childs informieren -|* -\************************************************************************/ +// Inform parent of changes of a child void E3dScene::StructureChanged() { E3dObject::StructureChanged(); SetRectsDirty(); - // #110988# ImpCleanup3DDepthMapper(); } -/************************************************************************* -|* -|* Uebergeordnetes Szenenobjekt bestimmen -|* -\************************************************************************/ +// Determine the overall scene object E3dScene* E3dScene::GetScene() const { @@ -527,29 +459,27 @@ void E3dScene::removeAllNonSelectedObjects() } } -/************************************************************************* -|* -|* Zuweisungsoperator -|* -\************************************************************************/ +E3dScene* E3dScene::Clone() const +{ + return CloneHelper< E3dScene >(); +} -void E3dScene::operator=(const SdrObject& rObj) +E3dScene& E3dScene::operator=(const E3dScene& rObj) { + if( this == &rObj ) + return *this; E3dObject::operator=(rObj); const E3dScene& r3DObj = (const E3dScene&) rObj; aCamera = r3DObj.aCamera; - // neu ab 377: aCameraSet = r3DObj.aCameraSet; ((sdr::properties::E3dSceneProperties&)GetProperties()).SetSceneItemsFromCamera(); - // SetSnapRect(r3DObj.GetSnapRect()); InvalidateBoundVolume(); RebuildLists(); SetRectsDirty(); - // #110988# ImpCleanup3DDepthMapper(); // #i101941# @@ -564,22 +494,19 @@ void E3dScene::operator=(const SdrObject& rObj) // ActionChanged at the VC which will for this class // flush that cached data and initalize it's valid reconstruction GetViewContact().ActionChanged(); + return *this; } -/************************************************************************* -|* -|* Licht- und Labelobjektlisten neu aufbauen (nach Laden, Zuweisung) -|* -\************************************************************************/ +// Rebuild Light- and label- object lists rebuild (after loading, allocation) void E3dScene::RebuildLists() { - // zuerst loeschen + // first delete SdrLayerID nCurrLayerID = GetLayer(); SdrObjListIter a3DIterator(maSubList, IM_FLAT); - // dann alle Objekte in der Szene pruefen + // then examine all the objects in the scene while ( a3DIterator.IsMore() ) { E3dObject* p3DObj = (E3dObject*) a3DIterator.Next(); @@ -588,23 +515,11 @@ void E3dScene::RebuildLists() } } -/************************************************************************* -|* -|* erstelle neues GeoData-Objekt -|* -\************************************************************************/ - SdrObjGeoData *E3dScene::NewGeoData() const { return new E3DSceneGeoData; } -/************************************************************************* -|* -|* uebergebe aktuelle werte an das GeoData-Objekt -|* -\************************************************************************/ - void E3dScene::SaveGeoData(SdrObjGeoData& rGeo) const { E3dObject::SaveGeoData (rGeo); @@ -612,12 +527,6 @@ void E3dScene::SaveGeoData(SdrObjGeoData& rGeo) const ((E3DSceneGeoData &) rGeo).aCamera = aCamera; } -/************************************************************************* -|* -|* uebernehme werte aus dem GeoData-Objekt -|* -\************************************************************************/ - void E3dScene::RestGeoData(const SdrObjGeoData& rGeo) { // #i94832# removed E3DModifySceneSnapRectUpdater here. @@ -626,11 +535,7 @@ void E3dScene::RestGeoData(const SdrObjGeoData& rGeo) SetCamera (((E3DSceneGeoData &) rGeo).aCamera); } -/************************************************************************* -|* -|* Am StyleSheet wurde etwas geaendert, also Scene aendern -|* -\************************************************************************/ +// Something was changed in the style sheet, so change scene void E3dScene::Notify(SfxBroadcaster &rBC, const SfxHint &rHint) { @@ -638,10 +543,6 @@ void E3dScene::Notify(SfxBroadcaster &rBC, const SfxHint &rHint) E3dObject::Notify(rBC, rHint); } -/************************************************************************* -|* -\************************************************************************/ - void E3dScene::RotateScene (const Point& rRef, long /*nWink*/, double sn, double cs) { Point UpperLeft, LowerRight, Center, NewCenter; @@ -656,13 +557,14 @@ void E3dScene::RotateScene (const Point& rRef, long /*nWink*/, double sn, double Rectangle RectQuelle(aOutRect), RectZiel(aOutRect); - // Nur der Mittelpunkt wird bewegt. Die Ecken werden von NbcMove bewegt. - // Fuer das Drehen wird von mir ein kartesisches Koordinatensystem verwendet in dem der Drehpunkt - // der Nullpunkt ist und die Y- Achse nach oben ansteigt, die X-Achse nach rechts. - // Dies muss bei den Y-Werten beachtet werden. (Auf dem Blatt zeigt die Y-Achse nach unten + // Only the center is moved. The corners are moved by NbcMove. For the + // rotation a cartesian coordinate system is used in which the pivot + // point is the origin, and the y-axis increases upward, the X-axis to + // the right. This must be especially noted for the Y-values. + // (When considering a flat piece of paper the Y-axis pointing downwards Center.X() = (UpperLeft.X() + dxOutRectHalf) - rRef.X(); Center.Y() = -((UpperLeft.Y() + dyOutRectHalf) - rRef.Y()); - // Ein paar Spezialfaelle zuerst abhandeln (n*90 Grad n ganzzahlig) + // A few special cases has to be dealt with first (n * 90 degrees n integer) if (sn==1.0 && cs==0.0) { // 90deg NewCenter.X() = -Center.Y(); NewCenter.Y() = -Center.X(); @@ -673,11 +575,12 @@ void E3dScene::RotateScene (const Point& rRef, long /*nWink*/, double sn, double NewCenter.X() = Center.Y(); NewCenter.Y() = -Center.X(); } - else // Hier wird um einen beliebigen Winkel in mathematisch positiver Richtung gedreht! - { // xneu = x * cos(alpha) - y * sin(alpha) - // yneu = x * sin(alpha) + y * cos(alpha) - // Unten Rechts wird nicht gedreht: die Seiten von RectQuelle muessen parallel - // zu den Koordinatenachsen bleiben. + else // Here it is rotated to any angle in the mathematically + // positive direction! + { // xnew = x * cos(alpha) - y * sin(alpha) + // ynew = x * sin(alpha) + y * cos(alpha) + // Bottom Right is not rotated: the pages of RectQuelle must + // remain parallel to the coordinate axes. NewCenter.X() = (long) (Center.X() * cs - Center.Y() * sn); NewCenter.Y() = (long) (Center.X() * sn + Center.Y() * cs); } @@ -685,16 +588,10 @@ void E3dScene::RotateScene (const Point& rRef, long /*nWink*/, double sn, double Size Differenz; Point DiffPoint = (NewCenter - Center); Differenz.Width() = DiffPoint.X(); - Differenz.Height() = -DiffPoint.Y(); // Man beachte dass die Y-Achse nach unten positiv gezaehlt wird. - NbcMove (Differenz); // fuehrt die eigentliche Koordinatentransformation durch. + Differenz.Height() = -DiffPoint.Y(); // Note that the Y-axis is counted ad positive downward. + NbcMove (Differenz); // Actually executes the coordinate transformation. } -/************************************************************************* -|* -|* Get the name of the object (singular) -|* -\************************************************************************/ - void E3dScene::TakeObjNameSingul(XubString& rName) const { rName=ImpGetResStr(STR_ObjNameSingulScene3d); @@ -709,24 +606,14 @@ void E3dScene::TakeObjNameSingul(XubString& rName) const } } -/************************************************************************* -|* -|* Get the name of the object (plural) -|* -\************************************************************************/ - void E3dScene::TakeObjNamePlural(XubString& rName) const { rName=ImpGetResStr(STR_ObjNamePluralScene3d); } -/************************************************************************* -|* -|* Die NbcRotate-Routine ueberlaedt die des SdrObject. Die Idee ist die Scene -|* drehen zu koennen und relativ zur Lage der Scene dann auch die Objekte -|* in der Scene -|* -\************************************************************************/ +// The NbcRotate routine overloads the one of the SdrObject. The idea is +// to be able to rotate the scene relative to the position of the scene +// and then the objects in the scene void E3dScene::NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix) { @@ -748,72 +635,60 @@ void E3dScene::SetTransform(const basegfx::B3DHomMatrix& rMatrix) void E3dScene::NbcRotate(const Point& rRef, long nWink, double sn, double cs) { - // Also derzeit sind die Klebepunkte relativ zum aOutRect der Szene definiert. Vor dem Drehen - // werden die Klebepunkte relativ zur Seite definiert. Sie nehmen an der Drehung der Szene noch nicht Teil - // dafuer gibt es den - SetGlueReallyAbsolute(sal_True); + // So currently the glue points are defined relative to the scene aOutRect. + // Before turning the glue points are defined relative to the page. They + // take no part in the rotation of the scene. To ensure this, there is the + // SetGlueReallyAbsolute(sal_True); - // So dass war die Szene, ab jetzt kommen die Objekte in der Szene - // 3D-Objekte gibt es nur ein einziges das kann zwar mehrere Flaechen haben aber die Flaechen - // muessen ja nicht zusammenhaengend sein - // es ermoeglicht den Zugriff auf Kindobjekte - // Ich gehe also die gesamte Liste durch und rotiere um die Z-Achse die durch den - // Mittelpunkt von aOutRect geht (Satz von Steiner), also RotateZ + // So that was the scene, now the objects used in the scene + // 3D objects, if there is only one it can still have multiple surfaces but + // the surfaces do not hve to be connected. This allows you to access child + // objects. So going through the entire list and rotate around the Z axis + // through the enter of aOutRect's (Steiner's theorem), so RotateZ - RotateScene (rRef, nWink, sn, cs); // Rotiert die Szene + RotateScene (rRef, nWink, sn, cs); // Rotates the scene double fWinkelInRad = nWink/100 * F_PI180; basegfx::B3DHomMatrix aRotation; aRotation.rotate(0.0, 0.0, fWinkelInRad); NbcSetTransform(aRotation * GetTransform()); - SetRectsDirty(); // Veranlasst eine Neuberechnung aller BoundRects - NbcRotateGluePoints(rRef,nWink,sn,cs); // Rotiert die Klebepunkte (die haben noch Koordinaten relativ - // zum Urpsung des Blattes - SetGlueReallyAbsolute(sal_False); // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert) + SetRectsDirty(); // This forces a recalculation of all BoundRects + NbcRotateGluePoints(rRef,nWink,sn,cs); // Rotate the glue points (who still + // have coordinates relative to the + // original page) + SetGlueReallyAbsolute(sal_False); // from now they are again relative to BoundRect (that is defined as aOutRect) SetRectsDirty(); } -/************************************************************************* -|* -|* SnapRect berechnen -|* -\************************************************************************/ - void E3dScene::RecalcSnapRect() { E3dScene* pScene = GetScene(); if(pScene == this) { - // Szene wird als 2D-Objekt benutzt, nimm SnapRect aus der - // 2D Bildschrimdarstellung + // The Scene is used as a 2D-Objekt, take the SnapRect from the + // 2D Display settings Camera3D& rCam = (Camera3D&)pScene->GetCamera(); maSnapRect = rCam.GetDeviceWindow(); } else { - // Szene ist selbst Mitglied einer anderen Szene, hole das - // SnapRect als zusammengesetztes Objekt + // The Scene itself is a member of another scene, get the SnapRect + // as a composite object E3dObject::RecalcSnapRect(); } } -/************************************************************************* -|* -|* Aufbrechen -|* -\************************************************************************/ - sal_Bool E3dScene::IsBreakObjPossible() { - // Szene ist aufzubrechen, wenn alle Mitglieder aufzubrechen sind + // Break scene, if all members are able to break SdrObjListIter a3DIterator(maSubList, IM_DEEPWITHGROUPS); while ( a3DIterator.IsMore() ) { E3dObject* pObj = (E3dObject*) a3DIterator.Next(); - DBG_ASSERT(pObj->ISA(E3dObject), "AW: In Szenen sind nur 3D-Objekte erlaubt!"); + DBG_ASSERT(pObj->ISA(E3dObject), "only 3D objects are allowed in scenes!"); if(!pObj->IsBreakObjPossible()) return sal_False; } @@ -840,7 +715,7 @@ basegfx::B2DPolyPolygon E3dScene::TakeCreatePoly(const SdrDragStat& /*rDrag*/) c return TakeXorPoly(); } -FASTBOOL E3dScene::BegCreate(SdrDragStat& rStat) +bool E3dScene::BegCreate(SdrDragStat& rStat) { rStat.SetOrtho4Possible(); Rectangle aRect1(rStat.GetStart(), rStat.GetNow()); @@ -850,7 +725,7 @@ FASTBOOL E3dScene::BegCreate(SdrDragStat& rStat) return sal_True; } -FASTBOOL E3dScene::MovCreate(SdrDragStat& rStat) +bool E3dScene::MovCreate(SdrDragStat& rStat) { Rectangle aRect1; rStat.TakeCreateRect(aRect1); @@ -862,7 +737,7 @@ FASTBOOL E3dScene::MovCreate(SdrDragStat& rStat) return sal_True; } -FASTBOOL E3dScene::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +bool E3dScene::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { Rectangle aRect1; rStat.TakeCreateRect(aRect1); @@ -872,7 +747,7 @@ FASTBOOL E3dScene::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointAnz()>=2); } -FASTBOOL E3dScene::BckCreate(SdrDragStat& /*rStat*/) +bool E3dScene::BckCreate(SdrDragStat& /*rStat*/) { return sal_False; } @@ -882,3 +757,5 @@ void E3dScene::BrkCreate(SdrDragStat& /*rStat*/) } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx index 2c1d4ea0480f..3b6ce894a9be 100644 --- a/svx/source/engine3d/sphere3d.cxx +++ b/svx/source/engine3d/sphere3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,7 +45,7 @@ #include <basegfx/polygon/b3dpolygon.hxx> ////////////////////////////////////////////////////////////////////////////// -// #110094# DrawContact section +// DrawContact section sdr::contact::ViewContact* E3dSphereObj::CreateObjectSpecificViewContact() { @@ -62,19 +63,15 @@ sdr::properties::BaseProperties* E3dSphereObj::CreateObjectSpecificProperties() TYPEINIT1(E3dSphereObj, E3dCompoundObject); -/************************************************************************* -|* -|* Kugel aus Polygonfacetten nach Laengen und Breitengrad aufbauen -|* -\************************************************************************/ + +// Build Sphere from polygon facets in latitude and longitude E3dSphereObj::E3dSphereObj(E3dDefaultAttributes& rDefault, const basegfx::B3DPoint& rCenter, const basegfx::B3DVector& r3DSize) : E3dCompoundObject(rDefault) { - // Defaults setzen + // Set defaults SetDefaultAttributes(rDefault); - // Uebergebene drueberbuegeln aCenter = rCenter; aSize = r3DSize; } @@ -82,63 +79,47 @@ E3dSphereObj::E3dSphereObj(E3dDefaultAttributes& rDefault, const basegfx::B3DPoi E3dSphereObj::E3dSphereObj() : E3dCompoundObject() { - // Defaults setzen + // Set defaults E3dDefaultAttributes aDefault; SetDefaultAttributes(aDefault); } -/************************************************************************* -|* -|* Kugel erzeugen ohne die Polygone darin zu erzeugen -|* -\************************************************************************/ - -// FG: Dieser Aufruf erfolgt von der 3D-Object Factory (objfac3d.cxx) und zwar ausschliesslich beim -// laden von Dokumenten. Hier braucht man keinen CreateSphere-Aufruf, denn die wirkliche -// Anzahl Segmente ist ja noch nicht bekannt. Dies war bis zum 10.2.97 ein (kleines) -// Speicherleck. -E3dSphereObj::E3dSphereObj(int /*dummy*/) // den Parameter braucht es um unterscheiden zu koennen, welcher -{ // der beiden Konstruktoren gemeint ist. Der obige halt per Default - // Defaults setzen + +// Create Sphere without creating the Polygons within + +// This call is from the 3D Object Factory (objfac3d.cxx) and only when loading +// of documents. Here you do not need CreateSphere call, since the real number +// of segments is not even known yet. This was until 10.02.1997 a (small) +// memory leak. + +E3dSphereObj::E3dSphereObj(int /*dummy*/) +// the parameters it needs to be able to distinguish which +// constructors of the two is meant. The above is the default. +{ + // Set defaults E3dDefaultAttributes aDefault; SetDefaultAttributes(aDefault); } void E3dSphereObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) { - // Defaults setzen + // Set defaults aCenter = rDefault.GetDefaultSphereCenter(); aSize = rDefault.GetDefaultSphereSize(); } -/************************************************************************* -|* -|* Identifier zurueckgeben -|* -\************************************************************************/ - sal_uInt16 E3dSphereObj::GetObjIdentifier() const { return E3D_SPHEREOBJ_ID; } -/************************************************************************* -|* -|* Wandle das Objekt in ein Gruppenobjekt bestehend aus n Polygonen -|* -\************************************************************************/ +// Convert the object into a group object consisting of n polygons SdrObject *E3dSphereObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const { return NULL; } -/************************************************************************* -|* -|* Leer-Konstruktor -|* -\************************************************************************/ - void E3dSphereObj::ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs) { if((nHSegs != GetHorizontalSegments() || nVSegs != GetVerticalSegments()) && (nHSegs != 0 || nVSegs != 0)) @@ -150,29 +131,12 @@ void E3dSphereObj::ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs) } } -/************************************************************************* -|* -|* Zuweisungsoperator -|* -\************************************************************************/ - -void E3dSphereObj::operator=(const SdrObject& rObj) +E3dSphereObj* E3dSphereObj::Clone() const { - // erstmal alle Childs kopieren - E3dCompoundObject::operator=(rObj); - - // weitere Parameter kopieren - const E3dSphereObj& r3DObj = (const E3dSphereObj&) rObj; - - aCenter = r3DObj.aCenter; - aSize = r3DObj.aSize; + return CloneHelper< E3dSphereObj >(); } -/************************************************************************* -|* -|* Lokale Parameter setzen mit Geometrieneuerzeugung -|* -\************************************************************************/ +// Set local parameters with geometry re-creating void E3dSphereObj::SetCenter(const basegfx::B3DPoint& rNew) { @@ -192,11 +156,7 @@ void E3dSphereObj::SetSize(const basegfx::B3DVector& rNew) } } -/************************************************************************* -|* -|* Get the name of the object (singular) -|* -\************************************************************************/ +// Get the name of the object (singular) void E3dSphereObj::TakeObjNameSingul(XubString& rName) const { @@ -212,11 +172,7 @@ void E3dSphereObj::TakeObjNameSingul(XubString& rName) const } } -/************************************************************************* -|* -|* Get the name of the object (plural) -|* -\************************************************************************/ +// Get the name of the object (plural) void E3dSphereObj::TakeObjNamePlural(XubString& rName) const { @@ -224,3 +180,5 @@ void E3dSphereObj::TakeObjNamePlural(XubString& rName) const } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/string3d.src b/svx/source/engine3d/string3d.src index 24b0592730ab..9d23adc147af 100644 --- a/svx/source/engine3d/string3d.src +++ b/svx/source/engine3d/string3d.src @@ -28,15 +28,13 @@ #include <svx/dialogs.hrc> // pragma ------------------------------------------------------------------- - // Strings fuer die Draw-Dialoge -------------------------------------------- + // Strings for the Draw Dialog -------------------------------------------- String RID_SVX_3D_CREATE_LATHE { Text [ en-US ] = "Create 3D rotation object" ; }; String RID_SVX_3D_UNDO_EXCHANGE_PASTE { - /* ### ACHTUNG: Neuer Text in Resource? Objekt(e) einfgen : Objekt(e) einfgen */ - /* ### ACHTUNG: Neuer Text in Resource? Objekt(e) einfgen : Objekt(e) einfgen */ Text [ en-US ] = "Insert object(s)" ; }; String RID_SVX_3D_UNDO_SEGMENTS @@ -65,14 +63,10 @@ String RID_SVX_3D_UNDO_EXTRUDE }; String RID_SVX_3D_UNDO_LATHE { - /* ### ACHTUNG: Neuer Text in Resource? Rotationskrper erstellen : Rotationskrper erstellen */ - /* ### ACHTUNG: Neuer Text in Resource? Rotationskrper erstellen : Rotationskrper erstellen */ Text [ en-US ] = "Create rotation object" ; }; String RID_SVX_3D_UNDO_BREAK_LATHE { - /* ### ACHTUNG: Neuer Text in Resource? Rotationskrper aufbrechen : Rotationskrper aufbrechen */ - /* ### ACHTUNG: Neuer Text in Resource? Rotationskrper aufbrechen : Rotationskrper aufbrechen */ Text [ en-US ] = "Split 3D object" ; }; String RID_SVX_3D_UNDO_ATTRIBUTES diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx index ef108bb902ae..78095748995a 100644 --- a/svx/source/engine3d/svx3ditems.cxx +++ b/svx/source/engine3d/svx3ditems.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -398,19 +399,19 @@ SfxPoolItem* Svx3DCloseBackItem::Create(SvStream& rIn, sal_uInt16 nItemVersion) ////////////////////////////////////////////////////////////////////////////// // Svx3DNormalsKindItem: use drawing::NormalsKind -sal_Bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::NormalsKind)GetValue(); - return sal_True; + return true; } -sal_Bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::NormalsKind eVar; if(!(rVal >>= eVar)) - return sal_False; + return false; SetValue((sal_Int16)eVar); - return sal_True; + return true; } SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* /*pPool*/) const @@ -419,19 +420,19 @@ SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DTextureProjectionXItem: use drawing::TextureProjectionMode -sal_Bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextureProjectionMode)GetValue(); - return sal_True; + return true; } -sal_Bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextureProjectionMode eVar; if(!(rVal >>= eVar)) - return sal_False; + return false; SetValue((sal_Int16)eVar); - return sal_True; + return true; } SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* /*pPool*/) const @@ -440,19 +441,19 @@ SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DTextureProjectionYItem: use drawing::TextureProjectionMode -sal_Bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextureProjectionMode)GetValue(); - return sal_True; + return true; } -sal_Bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextureProjectionMode eVar; if(!(rVal >>= eVar)) - return sal_False; + return false; SetValue((sal_Int16)eVar); - return sal_True; + return true; } SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* /*pPool*/) const @@ -461,19 +462,19 @@ SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DTextureKindItem: use drawing::TextureKind -sal_Bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextureKind)GetValue(); - return sal_True; + return true; } -sal_Bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextureKind eVar; if(!(rVal >>= eVar)) - return sal_False; + return false; SetValue((sal_Int16)eVar); - return sal_True; + return true; } SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* /*pPool*/) const @@ -482,19 +483,19 @@ SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DTextureModeItem: use drawing:TextureMode -sal_Bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextureMode)GetValue(); - return sal_True; + return true; } -sal_Bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextureMode eVar; if(!(rVal >>= eVar)) - return sal_False; + return false; SetValue((sal_Int16)eVar); - return sal_True; + return true; } SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* /*pPool*/) const @@ -503,19 +504,19 @@ SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DPerspectiveItem: use drawing::ProjectionMode -sal_Bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::ProjectionMode)GetValue(); - return sal_True; + return true; } -sal_Bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::ProjectionMode eVar; if(!(rVal >>= eVar)) - return sal_False; + return false; SetValue((sal_Int16)eVar); - return sal_True; + return true; } SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* /*pPool*/) const @@ -524,19 +525,19 @@ SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DShadeModeItem: use drawing::ShadeMode -sal_Bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::ShadeMode)GetValue(); - return sal_True; + return true; } -sal_Bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::ShadeMode eVar; if(!(rVal >>= eVar)) - return sal_False; + return false; SetValue((sal_Int16)eVar); - return sal_True; + return true; } SfxPoolItem* Svx3DShadeModeItem::Clone(SfxItemPool* /*pPool*/) const @@ -545,3 +546,5 @@ SfxPoolItem* Svx3DShadeModeItem::Clone(SfxItemPool* /*pPool*/) const } // EOF + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 9d54fe3882e3..08b2dc3ce4c0 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,7 +82,7 @@ TYPEINIT1(E3dView, SdrView); -//////////////////////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// // Migrate Marking class Impl3DMirrorConstructOverlay @@ -232,28 +233,18 @@ void Impl3DMirrorConstructOverlay::SetMirrorAxis(Point aMirrorAxisA, Point aMirr } } -/************************************************************************* -|* -|* Konstruktor 1 -|* -\************************************************************************/ - E3dView::E3dView(SdrModel* pModel, OutputDevice* pOut) : SdrView(pModel, pOut) { InitView (); } -/************************************************************************* -|* -|* DrawMarkedObj ueberladen, da eventuell nur einzelne 3D-Objekte -|* gezeichnet werden sollen -|* -\************************************************************************/ +// DrawMarkedObj overloaded, since possibly only a single 3D object is to be +// drawn void E3dView::DrawMarkedObj(OutputDevice& rOut) const { - // Existieren 3D-Objekte, deren Szenen nicht selektiert sind? + // Does 3D objects exist which scenes are not selected? sal_Bool bSpecialHandling = sal_False; E3dScene *pScene = NULL; @@ -263,12 +254,12 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const SdrObject *pObj = GetMarkedObjectByIndex(nObjs); if(pObj && pObj->ISA(E3dCompoundObject)) { - // zugehoerige Szene + // related scene pScene = ((E3dCompoundObject*)pObj)->GetScene(); if(pScene && !IsObjMarked(pScene)) bSpecialHandling = sal_True; } - // Alle SelectionFlags zuruecksetzen + // Reset all selection flags if(pObj && pObj->ISA(E3dObject)) { pScene = ((E3dObject*)pObj)->GetScene(); @@ -279,34 +270,30 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const if(bSpecialHandling) { - // SelectionFlag bei allen zu 3D Objekten gehoerigen - // Szenen und deren Objekten auf nicht selektiert setzen + // Set selection flag to "not selected" for scenes related to all 3D + // objects long nObjs; for(nObjs = 0;nObjs < nCnt;nObjs++) { SdrObject *pObj = GetMarkedObjectByIndex(nObjs); if(pObj && pObj->ISA(E3dCompoundObject)) { - // zugehoerige Szene + // relatated scene pScene = ((E3dCompoundObject*)pObj)->GetScene(); if(pScene) pScene->SetSelected(sal_False); } } - // bei allen direkt selektierten Objekten auf selektiert setzen - SdrMark* pM = NULL; - for(nObjs = 0;nObjs < nCnt;nObjs++) { SdrObject *pObj = GetMarkedObjectByIndex(nObjs); if(pObj && pObj->ISA(E3dObject)) { - // Objekt markieren + // Select object E3dObject* p3DObj = (E3dObject*)pObj; p3DObj->SetSelected(sal_True); pScene = p3DObj->GetScene(); - pM = GetSdrMarkByIndex(nObjs); } } @@ -316,17 +303,17 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const SortMarkedObjects(); pScene->SetDrawOnlySelected(sal_True); - pScene->SingleObjectPainter(rOut); // #110094#-17 + pScene->SingleObjectPainter(rOut); pScene->SetDrawOnlySelected(sal_False); } - // SelectionFlag zuruecksetzen + // Reset selection flag for(nObjs = 0;nObjs < nCnt;nObjs++) { SdrObject *pObj = GetMarkedObjectByIndex(nObjs); if(pObj && pObj->ISA(E3dCompoundObject)) { - // zugehoerige Szene + // releated scene pScene = ((E3dCompoundObject*)pObj)->GetScene(); if(pScene) pScene->SetSelected(sal_False); @@ -340,16 +327,12 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const } } -/************************************************************************* -|* -|* Model holen ueberladen, da bei einzelnen 3D Objekten noch eine Szene -|* untergeschoben werden muss -|* -\************************************************************************/ +// Get overloaded model, since in some 3D objects an additional scene +// must be pushed in SdrModel* E3dView::GetMarkedObjModel() const { - // Existieren 3D-Objekte, deren Szenen nicht selektiert sind? + // Does 3D objects exist which scenes are not selected? bool bSpecialHandling(false); const sal_uInt32 nCount(GetMarkedObjectCount()); sal_uInt32 nObjs(0); @@ -462,22 +445,17 @@ SdrModel* E3dView::GetMarkedObjModel() const // restore old selection rCurrentMarkList = aOldML; - // model zurueckgeben return pNewModel; } -/************************************************************************* -|* -|* Bei Paste muss - falls in eine Scene eingefuegt wird - die -|* Objekte der Szene eingefuegt werden, die Szene selbst aber nicht -|* -\************************************************************************/ +// When pasting objects have to integrated if a scene is inserted, but +// not the scene itself sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { sal_Bool bRetval = sal_False; - // Liste holen + // Get list Point aPos(rPos); SdrObjList* pDstList = pLst; ImpGetPasteObjList(aPos, pDstList); @@ -485,14 +463,14 @@ sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLs if(!pDstList) return sal_False; - // Owner der Liste holen + // Get owner of the list SdrObject* pOwner = pDstList->GetOwnerObj(); if(pOwner && pOwner->ISA(E3dScene)) { E3dScene* pDstScene = (E3dScene*)pOwner; BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_EXCHANGE_PASTE)); - // Alle Objekte aus E3dScenes kopieren und direkt einfuegen + // Copy all objects from E3dScenes and insert them directly for(sal_uInt16 nPg(0); nPg < rMod.GetPageCount(); nPg++) { const SdrPage* pSrcPg=rMod.GetPage(nPg); @@ -502,7 +480,7 @@ sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLs Rectangle aR = pSrcPg->GetAllObjBoundRect(); Point aDist(aPos - aR.Center()); - // Unterobjekte von Szenen einfuegen + // Insert sub-objects for scenes for(sal_uInt32 nOb(0); nOb < nObAnz; nOb++) { const SdrObject* pSrcOb = pSrcPg->GetObj(nOb); @@ -521,11 +499,10 @@ sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLs bRetval = SdrView::Paste(rMod, rPos, pLst, nOptions); } - // und Rueckgabewert liefern return bRetval; } -// #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...) +// Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...) sal_Bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point /*aOffset*/) { sal_Bool bRetval(sal_False); @@ -543,7 +520,6 @@ sal_Bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* if(pCompoundObj) { - // #116235# E3dCompoundObject* pNewCompoundObj = dynamic_cast< E3dCompoundObject* >(pCompoundObj->Clone()); if(pNewCompoundObj) @@ -625,7 +601,7 @@ sal_Bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene->Insert3DObj(pNewCompoundObj); bRetval = sal_True; - // Undo anlegen + // Create undo if( GetModel()->IsUndoEnabled() ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNewCompoundObj)); } @@ -636,12 +612,6 @@ sal_Bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* return bRetval; } -/************************************************************************* -|* -|* 3D-Konvertierung moeglich? -|* -\************************************************************************/ - sal_Bool E3dView::IsConvertTo3DObjPossible() const { sal_Bool bAny3D(sal_False); @@ -690,11 +660,6 @@ void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D, } } -/************************************************************************* -|* -|* 3D-Konvertierung zu Extrude ausfuehren -|* -\************************************************************************/ #include <editeng/eeitem.hxx> void E3dView::ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj) @@ -705,10 +670,10 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj) const SvxColorItem& rTextColorItem = (const SvxColorItem&)rSet.Get(EE_CHAR_COLOR); if(rTextColorItem.GetValue() == RGB_Color(COL_BLACK)) { - // Bei schwarzen Textobjekten wird die Farbe auf grau gesetzt + //For black text objects, the color set to gray if(pObj->GetPage()) { - // #84864# if black is only default attribute from + // if black is only default attribute from // pattern set it hard so that it is used in undo. pObj->SetMergedItem(SvxColorItem(RGB_Color(COL_BLACK), EE_CHAR_COLOR)); @@ -746,7 +711,7 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj) void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat) { - // Einzelnes PathObject, dieses umwanden + // Single PathObject, transform this SdrPathObj* pPath = PTR_CAST(SdrPathObj, pObj); if(pPath) @@ -757,35 +722,34 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal else aDefault.SetDefaultLatheCharacterMode(sal_True); - // ItemSet des Ursprungsobjektes holen + // Get Itemset of the original object SfxItemSet aSet(pObj->GetMergedItemSet()); XFillStyle eFillStyle = ITEMVALUE(aSet, XATTR_FILLSTYLE, XFillStyleItem); - // Linienstil ausschalten + // line style turned off aSet.Put(XLineStyleItem(XLINE_NONE)); - // Feststellen, ob ein FILL_Attribut gesetzt ist. + //Determining if FILL_Attribut is set. if(!pPath->IsClosed() || eFillStyle == XFILL_NONE) { - // Das SdrPathObj ist nicht gefuellt, lasse die - // vordere und hintere Flaeche weg. Ausserdem ist - // eine beidseitige Darstellung notwendig. + // This SdrPathObj is not filled, leave the front and rear face out. + // Moreover, a two-sided representation necessary. aDefault.SetDefaultExtrudeCloseFront(sal_False); aDefault.SetDefaultExtrudeCloseBack(sal_False); aSet.Put(Svx3DDoubleSidedItem(sal_True)); - // Fuellattribut setzen + // Set fill attribute aSet.Put(XFillStyleItem(XFILL_SOLID)); - // Fuellfarbe muss auf Linienfarbe, da das Objekt vorher - // nur eine Linie war + // Fill color must be the color line, because the object was + // previously just a line Color aColorLine = ((const XLineColorItem&)(aSet.Get(XATTR_LINECOLOR))).GetColorValue(); aSet.Put(XFillColorItem(String(), aColorLine)); } - // Neues Extrude-Objekt erzeugen + // Create a new extrude object E3dObject* p3DObj = NULL; if(bExtrude) { @@ -798,7 +762,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal p3DObj = new E3dLatheObj(aDefault, aPolyPoly2D); } - // Attribute setzen + // Set attribute if(p3DObj) { p3DObj->NbcSetLayer(pObj->GetLayer()); @@ -807,7 +771,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal p3DObj->NbcSetStyleSheet(pObj->GetStyleSheet(), sal_True); - // Neues 3D-Objekt einfuegen + // Insert a new extrude object pScene->Insert3DObj(p3DObj); } } @@ -866,45 +830,39 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExt else ImpCreateSingle3DObjectFlat(pScene, pNewObj2, bExtrude, fDepth, rLatheMat); - // delete zwi object + // delete object in between if(pNewObj2 != pObj && pNewObj2 != pNewObj1 && pNewObj2) SdrObject::Free( pNewObj2 ); } - // delete zwi object + // delete object in between if(pNewObj1 != pObj && pNewObj1) SdrObject::Free( pNewObj1 ); } } } -/************************************************************************* -|* -|* 3D-Konvertierung zu Extrude steuern -|* -\************************************************************************/ - void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, basegfx::B2DPoint aPnt2) { if(AreObjectsMarked()) { - // Undo anlegen + // Create undo if(bExtrude) BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_EXTRUDE)); else BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_LATHE)); - // Neue Szene fuer zu erzeugende 3D-Objekte anlegen + // Create a new scene for the created 3D object E3dScene* pScene = new E3dPolyScene(Get3DDefaultAttributes()); - // Rechteck bestimmen und evtl. korrigieren + // Determine rectangle and possibly correct it Rectangle aRect = GetAllMarkedRect(); if(aRect.GetWidth() <= 1) aRect.SetSize(Size(500, aRect.GetHeight())); if(aRect.GetHeight() <= 1) aRect.SetSize(Size(aRect.GetWidth(), 500)); - // Tiefe relativ zur Groesse der Selektion bestimmen + // Determine the depth relative to the size of the selection double fDepth = 0.0; double fRot3D = 0.0; basegfx::B2DHomMatrix aLatheMat; @@ -917,11 +875,11 @@ void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, b } if(!bExtrude) { - // Transformation fuer Polygone Rotationskoerper erstellen + // Create transformation for the polygons rotating body if(aPnt1 != aPnt2) { - // Rotation um Kontrollpunkt1 mit eigestelltem Winkel - // fuer 3D Koordinaten + // Rotation around control point #1 with set angle + // for 3D coordinates basegfx::B2DPoint aDiff(aPnt1 - aPnt2); fRot3D = atan2(aDiff.getY(), aDiff.getX()) - F_PI2; @@ -937,7 +895,7 @@ void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, b if(aPnt2.getX() != 0.0) { - // Translation auf Y=0 - Achse + // Translation to Y=0 - axis aLatheMat.translate(-aPnt2.getX(), 0.0); } else @@ -945,12 +903,11 @@ void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, b aLatheMat.translate((double)-aRect.Left(), 0.0); } - // Inverse Matrix bilden, um die Zielausdehnung zu bestimmen + // Form the inverse matrix to determine the target expansion basegfx::B2DHomMatrix aInvLatheMat(aLatheMat); aInvLatheMat.invert(); - // SnapRect Ausdehnung mittels Spiegelung an der Rotationsachse - // erweitern + // SnapRect extension enables mirroring in the axis of rotation for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++) { SdrMark* pMark = GetSdrMarkByIndex(a); @@ -989,8 +946,8 @@ void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, b } } - // Ueber die Selektion gehen und in 3D wandeln, komplett mit - // Umwandeln in SdrPathObject, auch Schriften + // Walk throguh the selection and convert it into 3D, complete with + // Convertion to SdrPathObject, also fonts for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++) { SdrMark* pMark = GetSdrMarkByIndex(a); @@ -1001,24 +958,24 @@ void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, b if(pScene->GetSubList() && pScene->GetSubList()->GetObjCount() != 0) { - // Alle angelegten Objekte Tiefenarrangieren + // Arrange all created objects by depth if(bExtrude) DoDepthArrange(pScene, fDepth); - // 3D-Objekte auf die Mitte des Gesamtrechtecks zentrieren + // Center 3D objects in the middle of the overall rectangle basegfx::B3DPoint aCenter(pScene->GetBoundVolume().getCenter()); basegfx::B3DHomMatrix aMatrix; aMatrix.translate(-aCenter.getX(), -aCenter.getY(), -aCenter.getZ()); - pScene->SetTransform(aMatrix * pScene->GetTransform()); // #112587# + pScene->SetTransform(aMatrix * pScene->GetTransform()); - // Szene initialisieren + // Initialize scene pScene->NbcSetSnapRect(aRect); basegfx::B3DRange aBoundVol = pScene->GetBoundVolume(); InitScene(pScene, (double)aRect.GetWidth(), (double)aRect.GetHeight(), aBoundVol.getDepth()); - // Szene anstelle des ersten selektierten Objektes einfuegen - // und alle alten Objekte weghauen + // Insert scene instead of the first selected object and throw away + // all the old objects SdrObject* pRepObj = GetMarkedObjectByIndex(0); SdrPageView* pPV = GetSdrPageViewOfMarkedByIndex(0); MarkObj(pRepObj, pPV, sal_True); @@ -1026,7 +983,7 @@ void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, b DeleteMarked(); MarkObj(pScene, pPV); - // Rotationskoerper um Rotationsachse drehen + // Rotate Rotation body around the axis of rotation basegfx::B3DHomMatrix aRotate; if(!bExtrude && fRot3D != 0.0) @@ -1034,7 +991,7 @@ void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, b aRotate.rotate(0.0, 0.0, fRot3D); } - // Default-Rotation setzen + // Set default rotation { double XRotateDefault = 20; aRotate.rotate(DEG2RAD(XRotateDefault), 0.0, 0.0); @@ -1045,25 +1002,20 @@ void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, b pScene->SetTransform(aRotate * pScene->GetTransform()); } - // SnapRects der Objekte ungueltig + // Invalid SnapRects of objects pScene->SetSnapRect(aRect); } else { - // Es wurden keine 3D Objekte erzeugt, schmeiss alles weg + // No 3D object was created, throw away everything delete pScene; } - // Undo abschliessen EndUndo(); } } -/************************************************************************* -|* -|* Alle enthaltenen Extrude-Objekte Tiefenarrangieren -|* -\************************************************************************/ +//Arrange all created extrude objects by depth struct E3dDepthNeighbour { @@ -1240,11 +1192,7 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth) } } -/************************************************************************* -|* -|* Drag beginnen, vorher ggf. Drag-Methode fuer 3D-Objekte erzeugen -|* -\************************************************************************/ +// Start drag, create for 3D objects before possibly drag method sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, @@ -1252,7 +1200,7 @@ sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, { if(Is3DRotationCreationActive() && GetMarkedObjectCount()) { - // bestimme alle selektierten Polygone und gebe die gespiegelte Hilfsfigur aus + // Determine all selected polygons and return rhe mirrored helper overlay mpMirrorOverlay->SetMirrorAxis(aRef1, aRef2); } else @@ -1323,7 +1271,7 @@ sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, default: break; } - // die nicht erlaubten Rotationen ausmaskieren + // do not mask the allowed rotations eConstraint = E3dDragConstraint(eConstraint& eDragConstraint); pForcedMeth = new E3dDragRotate(*this, GetMarkedObjectList(), eConstraint, IsSolidDragging()); } @@ -1338,7 +1286,7 @@ sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, } break; - // spaeter mal + // later on case SDRDRAG_MIRROR: case SDRDRAG_CROOK: case SDRDRAG_DISTORT: @@ -1355,23 +1303,11 @@ sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, return SdrView::BegDragObj(rPnt, pOut, pHdl, nMinMov, pForcedMeth); } -/************************************************************************* -|* -|* Pruefen, obj 3D-Szene markiert ist -|* -\************************************************************************/ - sal_Bool E3dView::HasMarkedScene() { return (GetMarkedScene() != NULL); } -/************************************************************************* -|* -|* Pruefen, obj 3D-Szene markiert ist -|* -\************************************************************************/ - E3dScene* E3dView::GetMarkedScene() { sal_uIntPtr nCnt = GetMarkedObjectCount(); @@ -1383,15 +1319,11 @@ E3dScene* E3dView::GetMarkedScene() return NULL; } -/************************************************************************* -|* -|* aktuelles 3D-Zeichenobjekt setzen, dafuer Szene erzeugen -|* -\************************************************************************/ +// Set current 3D drawing object, create the scene for this E3dScene* E3dView::SetCurrent3DObj(E3dObject* p3DObj) { - DBG_ASSERT(p3DObj != NULL, "Nana, wer steckt denn hier 'nen NULL-Zeiger rein?"); + DBG_ASSERT(p3DObj != NULL, "Who puts in a NULL-pointer here"); E3dScene* pScene = NULL; // get transformed BoundVolume of the object @@ -1412,12 +1344,6 @@ E3dScene* E3dView::SetCurrent3DObj(E3dObject* p3DObj) return pScene; } -/************************************************************************* -|* -|* neu erzeugte Szene initialisieren -|* -\************************************************************************/ - void E3dView::InitScene(E3dScene* pScene, double fW, double fH, double fCamZ) { Camera3D aCam(pScene->GetCamera()); @@ -1435,32 +1361,19 @@ void E3dView::InitScene(E3dScene* pScene, double fW, double fH, double fCamZ) pScene->SetCamera(aCam); } -/************************************************************************* -|* -|* startsequenz fuer die erstellung eines 3D-Rotationskoerpers -|* -\************************************************************************/ - void E3dView::Start3DCreation() { if (GetMarkedObjectCount()) { - // irgendwelche Markierungen ermitteln und ausschalten - //HMHBOOL bVis = IsMarkHdlShown(); - - //HMHif (bVis) HideMarkHdl(); - - // bestimme die koordinaten fuer JOEs Mirrorachse - // entgegen der normalen Achse wird diese an die linke Seite des Objektes - // positioniert + //positioned long nOutMin = 0; long nOutMax = 0; long nMinLen = 0; long nObjDst = 0; long nOutHgt = 0; - OutputDevice* pOut = GetFirstOutputDevice(); //GetWin(0); + OutputDevice* pOut = GetFirstOutputDevice(); - // erstmal Darstellungsgrenzen bestimmen + // first determine representation boundaries if (pOut != NULL) { nMinLen = pOut->PixelToLogic(Size(0,50)).Height(); @@ -1487,7 +1400,7 @@ void E3dView::Start3DCreation() if (nTemp > nMinLen) nMinLen = nTemp; } - // und dann die Markierungen oben und unten an das Objekt heften + // and then attach the marks at the top and bottom of the object basegfx::B2DRange aR; for(sal_uInt32 nMark(0L); nMark < GetMarkedObjectCount(); nMark++) { @@ -1520,32 +1433,25 @@ void E3dView::Start3DCreation() } } - aRef1.X() = basegfx::fround(aR.getMinX()); // Initial Achse um 2/100mm nach links + aRef1.X() = basegfx::fround(aR.getMinX()); // Initial move axis 2/100mm to the left aRef1.Y() = nY1; aRef2.X() = aRef1.X(); aRef2.Y() = nY2; - // Markierungen einschalten + // Turn on marks SetMarkHandles(); //HMHif (bVis) ShowMarkHdl(); if (AreObjectsMarked()) MarkListHasChanged(); - // SpiegelPolygone SOFORT zeigen + // Show mirror polygon IMMEDIATELY const SdrHdlList &aHdlList = GetHdlList(); mpMirrorOverlay = new Impl3DMirrorConstructOverlay(*this); mpMirrorOverlay->SetMirrorAxis(aHdlList.GetHdl(HDL_REF1)->GetPos(), aHdlList.GetHdl(HDL_REF2)->GetPos()); - //CreateMirrorPolygons (); - //ShowMirrorPolygons (aHdlList.GetHdl (HDL_REF1)->GetPos (), - // aHdlList.GetHdl (HDL_REF2)->GetPos ()); } } -/************************************************************************* -|* -|* was passiert bei einer Mausbewegung, wenn das Objekt erstellt wird ? -|* -\************************************************************************/ +// what happens with a mouse movement when the object is created? void E3dView::MovAction(const Point& rPnt) { @@ -1557,15 +1463,15 @@ void E3dView::MovAction(const Point& rPnt) { SdrHdlKind eHdlKind = pHdl->GetKind(); - // reagiere nur bei einer spiegelachse + // reacts only due to a mirror axis if ((eHdlKind == HDL_REF1) || (eHdlKind == HDL_REF2) || (eHdlKind == HDL_MIRX)) { const SdrHdlList &aHdlList = GetHdlList (); - // loesche das gespiegelte Polygon, spiegele das Original und zeichne es neu - //ShowMirrored (); + // delete the mirroed polygon, mirrors the original and draws + // it anew SdrView::MovAction (rPnt); mpMirrorOverlay->SetMirrorAxis( aHdlList.GetHdl (HDL_REF1)->GetPos(), @@ -1583,15 +1489,11 @@ void E3dView::MovAction(const Point& rPnt) } } -/************************************************************************* -|* -|* Schluss. Objekt und evtl. Unterobjekte ueber ImpCreate3DLathe erstellen -|* [FG] Mit dem Parameterwert sal_True (SDefault: sal_False) wird einfach ein -|* Rotationskoerper erzeugt, ohne den Benutzer die Lage der -|* Achse fetlegen zu lassen. Es reicht dieser Aufruf, falls -|* ein Objekt selektiert ist. (keine Initialisierung noetig) -|* -\************************************************************************/ +// The End. Create object and any child objects through ImpCreate3DLathe. +// With the parameter value sal_True (SDefault: sal_False) is simply a +// rotation body created, without letting the user set the position of the +// axis. It is sufficient with this call, if an object is selected. +// (No initialization necessary) void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes) { @@ -1614,8 +1516,9 @@ void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes) } else { - // Hilfsfigur ausschalten - // bestimme aus den Handlepositionen und den Versatz der Punkte + // Turn off helper overlay + // Determine from the handle positions and the displacement of + // the points const SdrHdlList &aHdlList = GetHdlList(); Point aMirrorRef1 = aHdlList.GetHdl(HDL_REF1)->GetPos(); Point aMirrorRef2 = aHdlList.GetHdl(HDL_REF2)->GetPos(); @@ -1628,22 +1531,10 @@ void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes) } } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - E3dView::~E3dView () { } -/************************************************************************* -|* -|* beende das erzeugen und loesche die polygone -|* -\************************************************************************/ - void E3dView::ResetCreationActive () { if(mpMirrorOverlay) @@ -1653,12 +1544,6 @@ void E3dView::ResetCreationActive () } } -/************************************************************************* -|* -|* Klasse initialisieren -|* -\************************************************************************/ - void E3dView::InitView () { eDragConstraint = E3DDRAG_CONSTR_XYZ; @@ -1679,12 +1564,6 @@ void E3dView::InitView () mpMirrorOverlay = 0L; } -/************************************************************************* -|* -|* Koennen die selektierten Objekte aufgebrochen werden? -|* -\************************************************************************/ - sal_Bool E3dView::IsBreak3DObjPossible() const { sal_uIntPtr nCount = GetMarkedObjectCount(); @@ -1718,17 +1597,11 @@ sal_Bool E3dView::IsBreak3DObjPossible() const return sal_True; } -/************************************************************************* -|* -|* Selektierte Lathe-Objekte aufbrechen -|* -\************************************************************************/ - void E3dView::Break3DObj() { if(IsBreak3DObjPossible()) { - // ALLE selektierten Objekte werden gewandelt + // ALL selected objects are changed sal_uInt32 nCount = GetMarkedObjectCount(); BegUndo(String(SVX_RESSTR(RID_SVX_3D_UNDO_BREAK_LATHE))); @@ -1767,12 +1640,6 @@ void E3dView::BreakSingle3DObj(E3dObject* pObj) } } -/************************************************************************* -|* -|* Szenen mischen -|* -\************************************************************************/ - void E3dView::MergeScenes () { sal_uIntPtr nCount = GetMarkedObjectCount(); @@ -1790,18 +1657,14 @@ void E3dView::MergeScenes () { if (pObj->ISA(E3dScene)) { - /********************************************************** - * Es ist eine 3D-Scene oder 3D-PolyScene - **********************************************************/ + // It is a 3D-Scene or 3D-PolyScene SdrObjList* pSubList = ((E3dObject*) pObj)->GetSubList(); SdrObjListIter aIter(*pSubList, IM_FLAT); while (aIter.IsMore()) { - /****************************************************** - * LatheObjekte suchen - ******************************************************/ + // Search for Lathe objects SdrObject* pSubObj = aIter.Next(); E3dObject *pNewObj = 0; @@ -1838,7 +1701,7 @@ void E3dView::MergeScenes () basegfx::B3DHomMatrix aMatrix; aMatrix.translate(aBoundRect.Left() - aCenter.getX(), aCenter.getY(), 0.0); - pNewObj->SetTransform(aMatrix * pNewObj->GetTransform()); // #112587# + pNewObj->SetTransform(aMatrix * pNewObj->GetTransform()); if (pNewObj) aBoundVol.expand(pNewObj->GetBoundVolume()); pScene->Insert3DObj (pNewObj); @@ -1875,27 +1738,22 @@ void E3dView::MergeScenes () aCamera.SetFocalLength(GetDefaultCamFocal()); pScene->SetCamera (aCamera); - // SnapRects der Objekte ungueltig + // Invalid SnapRects of Objects pScene->SetRectsDirty(); InsertObjectAtView(pScene, *(GetSdrPageViewOfMarkedByIndex(0))); - // SnapRects der Objekte ungueltig + // Invalid SnapRects of Objects pScene->SetRectsDirty(); } } -/************************************************************************* -|* -|* Possibilities, hauptsaechlich gruppieren/ungruppieren -|* -\************************************************************************/ void E3dView::CheckPossibilities() { // call parent SdrView::CheckPossibilities(); - // Weitere Flags bewerten + // Set other flags if(bGroupPossible || bUnGroupPossible || bGrpEnterPossible) { sal_Int32 nMarkCnt = GetMarkedObjectCount(); @@ -1910,9 +1768,8 @@ void E3dView::CheckPossibilities() b3DObject = sal_True; } - // Bisher: Es sind ZWEI oder mehr beliebiger Objekte selektiert. - // Nachsehen, ob CompoundObjects beteiligt sind. Falls ja, - // das Gruppieren verbieten. + // So far: there are two or more of any objects selected. See if + // compound objects are involved. If yes, ban grouping. if(bGroupPossible && bCoumpound) bGroupPossible = sal_False; @@ -1925,3 +1782,5 @@ void E3dView::CheckPossibilities() } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 6dd4dd816450..688c4a698684 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,12 +53,6 @@ #include <svx/svdogrp.hxx> #include <svx/e3dsceneupdater.hxx> -/************************************************************************* -|* -|* Konvertierung in Polygone -|* -\************************************************************************/ - void E3dView::ConvertMarkedToPolyObj(sal_Bool bLineToArea) { SdrObject* pNewObj = NULL; @@ -86,12 +81,6 @@ void E3dView::ConvertMarkedToPolyObj(sal_Bool bLineToArea) } } -/************************************************************************* -|* -|* Get3DAttributes -|* -\************************************************************************/ - void Imp_E3dView_InorderRun3DObjects(const SdrObject* pObj, sal_uInt32& rMask) { if(pObj->ISA(E3dLatheObj)) @@ -120,7 +109,7 @@ void Imp_E3dView_InorderRun3DObjects(const SdrObject* pObj, sal_uInt32& rMask) SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, sal_Bool /*bOnly3DAttr*/) const { - // ItemSet mit entspr. Bereich anlegen + // Creating itemset with corresponding field SfxItemSet aSet( pMod->GetItemPool(), SDRATTR_START, SDRATTR_END, @@ -150,42 +139,35 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, sal_Bool /*bOnly3DAttr*/ } } - // setze SID_ATTR_3D_INTERN auf den Status der selektierten Objekte + // Set SID_ATTR_3D_INTERN on the status of the selected objects aSet.Put(SfxUInt32Item(SID_ATTR_3D_INTERN, nSelectedItems)); - // DefaultValues pflegen + // maintain default values if(!nSelectedItems && !pInScene) { - // Defaults holen und hinzufuegen + // Get defaults and apply SfxItemSet aDefaultSet(pMod->GetItemPool(), SDRATTR_3D_FIRST, SDRATTR_3D_LAST); GetAttributes(aDefaultSet); aSet.Put(aDefaultSet); - // ... aber keine Linien fuer 3D + // ... but no lines for 3D aSet.Put(XLineStyleItem (XLINE_NONE)); - // #84061# new defaults for distance and focal length + // new defaults for distance and focal length aSet.Put(Svx3DDistanceItem(100)); aSet.Put(Svx3DFocalLengthItem(10000)); } - // ItemSet zurueckgeben + // return ItemSet return(aSet); } -/************************************************************************* -|* -|* Set3DAttributes: -|* -\************************************************************************/ - void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, sal_Bool bReplaceAll) { sal_uInt32 nSelectedItems(0L); if(pInScene) { - //pInScene->SetItemSetAndBroadcast(rAttr, bReplaceAll); pInScene->SetMergedItemSetAndBroadcast(rAttr, bReplaceAll); } else @@ -207,10 +189,10 @@ void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, sal_ } } - // DefaultValues pflegen + // Maintain default values if(!nSelectedItems && !pInScene) { - // Defaults setzen + // Set defaults SfxItemSet aDefaultSet(pMod->GetItemPool(), SDRATTR_3D_FIRST, SDRATTR_3D_LAST); aDefaultSet.Put(rAttr); SetAttributes(aDefaultSet); @@ -228,3 +210,4 @@ double E3dView::GetDefaultCamFocal() return (double)((const SfxUInt32Item&)pMod->GetItemPool().GetDefaultItem(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx index bbfe84fafbf2..76dba241fe92 100644 --- a/svx/source/engine3d/viewpt3d2.cxx +++ b/svx/source/engine3d/viewpt3d2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,12 +31,6 @@ #include <svx/viewpt3d.hxx> #include <svx/volume3d.hxx> -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - Viewport3D::Viewport3D() : aVRP(0, 0, 5), aVPN(0, 0, 1), @@ -56,11 +51,7 @@ Viewport3D::Viewport3D() : aViewWin.W = 2; aViewWin.H = 2; } -/************************************************************************* -|* -|* ViewWindow (in View-Koordinaten) setzen -|* -\************************************************************************/ +// Set ViewWindow (in View coordinates) void Viewport3D::SetViewWindow(double fX, double fY, double fW, double fH) { @@ -75,12 +66,6 @@ void Viewport3D::SetViewWindow(double fX, double fY, double fW, double fH) fHRatio = aDeviceRect.GetHeight() / aViewWin.H; } -/************************************************************************* -|* -|* ViewWindow zurueckgeben -|* -\************************************************************************/ - void Viewport3D::GetViewWindow(double& rX, double& rY, double& rW, double& rH) const { @@ -90,11 +75,7 @@ void Viewport3D::GetViewWindow(double& rX, double& rY, rH = aViewWin.H; } -/************************************************************************* -|* -|* Beobachterposition (PRP) in Weltkoordinaten zurueckgeben -|* -\************************************************************************/ +// Returns observer position (PRP) in world coordinates const basegfx::B3DPoint& Viewport3D::GetViewPoint() { @@ -103,11 +84,7 @@ const basegfx::B3DPoint& Viewport3D::GetViewPoint() return aViewPoint; } -/************************************************************************* -|* -|* Transformationsmatrix zurueckgeben -|* -\************************************************************************/ +// Returns transformations matrix const basegfx::B3DHomMatrix& Viewport3D::GetViewTransform() { @@ -116,17 +93,7 @@ const basegfx::B3DHomMatrix& Viewport3D::GetViewTransform() return aViewTf; } - - - - - - -/************************************************************************* -|* -|* View-Transformationsmatrix berechnen -|* -\************************************************************************/ +// Calculate View transformations matrix void Viewport3D::MakeTransform(void) { @@ -135,13 +102,13 @@ void Viewport3D::MakeTransform(void) double fV, fXupVp, fYupVp; aViewPoint = aVRP + aVPN * aPRP.getZ(); - // auf Einheitsmatrix zuruecksetzen + // Reset to Identity matrix aViewTf.identity(); - // in den Ursprung verschieben + // shift in the origin aViewTf.translate(-aVRP.getX(), -aVRP.getY(), -aVRP.getZ()); - // fV = Laenge der Projektion von aVPN auf die yz-Ebene: + // fV = Length of the projection of aVPN on the yz plane: fV = aVPN.getYZLength(); if ( fV != 0 ) @@ -167,8 +134,8 @@ void Viewport3D::MakeTransform(void) aViewTf *= aTemp; } - // X- und Y-Koordinaten des View Up Vektors in das (vorlaeufige) - // View-Koordinatensytem umrechnen + // Convert X- and Y- coordinates of the view up vector to the + // (preliminary) view coordinate system. fXupVp = aViewTf.get(0, 0) * aVUV.getX() + aViewTf.get(0, 1) * aVUV.getY() + aViewTf.get(0, 2) * aVUV.getZ(); fYupVp = aViewTf.get(1, 0) * aVUV.getX() + aViewTf.get(1, 1) * aVUV.getY() + aViewTf.get(1, 2) * aVUV.getZ(); fV = sqrt(fXupVp * fXupVp + fYupVp * fYupVp); @@ -189,12 +156,6 @@ void Viewport3D::MakeTransform(void) } } -/************************************************************************* -|* -|* DeviceWindow des Ausgabegeraetes setzen -|* -\************************************************************************/ - void Viewport3D::SetDeviceWindow(const Rectangle& rRect) { long nNewW = rRect.GetWidth(); @@ -206,11 +167,11 @@ void Viewport3D::SetDeviceWindow(const Rectangle& rRect) { double fRatio, fTmp; - // Mapping, ohne die reale Groesse der Objekte im Device-Window - // zu aendern + // Mapping, without changing the real size of the objects in the + // Device Window case AS_HOLD_SIZE: - // Wenn Device ungueltig (w, h = -1), zunaechst - // View mit AsHoldX anpassen + // When the Device is invalid (w, h = -1), adapt the View + // with AsHoldX if ( nOldW > 0 && nOldH > 0 ) { fRatio = (double) nNewW / nOldW; @@ -222,7 +183,7 @@ void Viewport3D::SetDeviceWindow(const Rectangle& rRect) break; } case AS_HOLD_X: - // View-Hoehe an -Breite anpassen + // Adapt view height to view width fRatio = (double) nNewH / nNewW; fTmp = aViewWin.H; aViewWin.H = aViewWin.W * fRatio; @@ -230,7 +191,7 @@ void Viewport3D::SetDeviceWindow(const Rectangle& rRect) break; case AS_HOLD_Y: - // View-Breite an -Hoehe anpassen + // Adapt view width to view height fRatio = (double) nNewW / nNewH; fTmp = aViewWin.W; aViewWin.W = aViewWin.H * fRatio; @@ -244,20 +205,7 @@ void Viewport3D::SetDeviceWindow(const Rectangle& rRect) aDeviceRect = rRect; } - - - - - - - - - -/************************************************************************* -|* -|* 3D-Punkt auf Viewplane projizieren -|* -\************************************************************************/ +// Project the 3D pointon the View plane basegfx::B3DPoint Viewport3D::DoProjection(const basegfx::B3DPoint& rVec) const { @@ -274,8 +222,8 @@ basegfx::B3DPoint Viewport3D::DoProjection(const basegfx::B3DPoint& rVec) const } else { - // Das ist die Version fuer beliebigen PRP, wird aber - // aus Performancegruenden nicht verwendet + // This is the version for any PRP, but not used due to + // performance reasons fPrDist /= aVec.getZ() - aPRP.getZ(); aVec.setX(aVec.getX() * fPrDist); aVec.setY(aVec.getY() * fPrDist); @@ -285,18 +233,13 @@ basegfx::B3DPoint Viewport3D::DoProjection(const basegfx::B3DPoint& rVec) const return aVec; } -/************************************************************************* -|* -|* 3D-Punkt auf Geraetekoordinaten mappen -|* -\************************************************************************/ +// Mapp 3D point to device coordinates basegfx::B3DPoint Viewport3D::MapToDevice(const basegfx::B3DPoint& rVec) const { basegfx::B3DPoint aRetval; - // Y-Koordinate subtrahieren, da die Device-Y-Achse von oben - // nach unten verlaeuft + // Subtract Y-coordinate, since the device Y-Axis runs from top to bottom aRetval.setX((double)aDeviceRect.Left() + ((rVec.getX() - aViewWin.X) * fWRatio)); aRetval.setY((double)aDeviceRect.Bottom() - ((rVec.getY() - aViewWin.Y) * fHRatio)); aRetval.setZ(rVec.getZ()); @@ -304,11 +247,7 @@ basegfx::B3DPoint Viewport3D::MapToDevice(const basegfx::B3DPoint& rVec) const return aRetval; } -/************************************************************************* -|* -|* View Reference Point setzen -|* -\************************************************************************/ +// Set View Reference Point void Viewport3D::SetVRP(const basegfx::B3DPoint& rNewVRP) { @@ -316,11 +255,7 @@ void Viewport3D::SetVRP(const basegfx::B3DPoint& rNewVRP) bTfValid = sal_False; } -/************************************************************************* -|* -|* View Plane Normal setzen -|* -\************************************************************************/ +// Set View Plane Normal void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN) { @@ -329,11 +264,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN) bTfValid = sal_False; } -/************************************************************************* -|* -|* View Up Vector setzen -|* -\************************************************************************/ +// Set View Up Vector void Viewport3D::SetVUV(const basegfx::B3DVector& rNewVUV) { @@ -341,11 +272,7 @@ void Viewport3D::SetVUV(const basegfx::B3DVector& rNewVUV) bTfValid = sal_False; } -/************************************************************************* -|* -|* Center Of Projection setzen -|* -\************************************************************************/ +// Set Center Of Projection void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP) { @@ -355,11 +282,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP) bTfValid = sal_False; } -/************************************************************************* -|* -|* View Plane Distance setzen -|* -\************************************************************************/ +// Set View Plane Distance void Viewport3D::SetVPD(double fNewVPD) { @@ -367,11 +290,7 @@ void Viewport3D::SetVPD(double fNewVPD) bTfValid = sal_False; } -/************************************************************************* -|* -|* Abstand der vorderen Clippingebene setzen -|* -\************************************************************************/ +// Set distance of the front Clipping plane void Viewport3D::SetNearClipDist(double fNewNCD) { @@ -379,11 +298,7 @@ void Viewport3D::SetNearClipDist(double fNewNCD) bTfValid = sal_False; } -/************************************************************************* -|* -|* Abstand der hinteren Clippingebene setzen -|* -\************************************************************************/ +// Set distance of the rear Clipping plane void Viewport3D::SetFarClipDist(double fNewFCD) { @@ -392,3 +307,5 @@ void Viewport3D::SetFarClipDist(double fNewFCD) } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 9b5b6eae07f4..6d6f100714ae 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,16 +34,12 @@ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include <comphelper/extract.hxx> #include <sot/formats.hxx> #include <sot/exchange.hxx> #include <comphelper/propertysetinfo.hxx> -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include <tools/urlobj.hxx> //........................................................................ @@ -126,7 +123,7 @@ namespace svx } catch(Exception&) { - OSL_ENSURE(sal_False, "OColumnTransferable::OColumnTransferable: could not collect essential data source attributes !"); + OSL_FAIL("OColumnTransferable::OColumnTransferable: could not collect essential data source attributes !"); } // If the data source is an SQL-statement and simple enough (means "select <field list> from <table> where ....") @@ -154,7 +151,7 @@ namespace svx } catch(Exception&) { - OSL_ENSURE(sal_False, "OColumnTransferable::OColumnTransferable: could not collect essential data source attributes (part two) !"); + OSL_FAIL("OColumnTransferable::OColumnTransferable: could not collect essential data source attributes (part two) !"); } } @@ -439,7 +436,7 @@ namespace svx } catch(Exception&) { - OSL_ENSURE(sal_False, "ODataAccessObjectTransferable::ODataAccessObjectTransferable: could not collect essential form attributes !"); + OSL_FAIL("ODataAccessObjectTransferable::ODataAccessObjectTransferable: could not collect essential form attributes !"); return; } @@ -453,7 +450,7 @@ namespace svx } catch(Exception&) { - OSL_ENSURE(sal_False, "ODataAccessObjectTransferable::ODataAccessObjectTransferable: could not collect essential form attributes (part two) !"); + OSL_FAIL("ODataAccessObjectTransferable::ODataAccessObjectTransferable: could not collect essential form attributes (part two) !"); return; } @@ -564,7 +561,7 @@ namespace svx return ODataAccessDescriptor(aDescriptorProps); } - OSL_ENSURE( sal_False, "OColumnTransferable::extractColumnDescriptor: unsupported formats only!" ); + OSL_FAIL( "OColumnTransferable::extractColumnDescriptor: unsupported formats only!" ); return ODataAccessDescriptor(); } @@ -730,3 +727,4 @@ namespace svx //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index a9c3cf05e1f2..7d5ee63782fa 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,16 +33,12 @@ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include <comphelper/extract.hxx> #include <sot/formats.hxx> #include <sot/exchange.hxx> #include <comphelper/propertysetinfo.hxx> -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif //........................................................................ namespace svx @@ -185,3 +182,4 @@ namespace svx //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index b974fe3ff5f3..2dc7a3671f8c 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -261,7 +262,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) sal_Bool bFieldDescriptor = OColumnTransferable::canExtractColumnDescriptor(aDroppedData.GetDataFlavorExVector(), CTF_FIELD_DESCRIPTOR); if (!bColumnDescriptor && !bFieldDescriptor) { - DBG_ERROR("FmGridHeader::ExecuteDrop: should never have reached this (no extractable format)!"); + OSL_FAIL("FmGridHeader::ExecuteDrop: should never have reached this (no extractable format)!"); return DND_ACTION_NONE; } @@ -291,7 +292,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) ) ) { - DBG_ERROR( "FmGridHeader::ExecuteDrop: somebody started a nonsense drag operation!!" ); + OSL_FAIL( "FmGridHeader::ExecuteDrop: somebody started a nonsense drag operation!!" ); return DND_ACTION_NONE; } @@ -310,12 +311,12 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) } catch(Exception&) { - DBG_ERROR("FmGridHeader::ExecuteDrop: could not retrieve the database access object !"); + OSL_FAIL("FmGridHeader::ExecuteDrop: could not retrieve the database access object !"); } if (!xConnection.is()) { - DBG_ERROR("FmGridHeader::ExecuteDrop: could not retrieve the database access object !"); + OSL_FAIL("FmGridHeader::ExecuteDrop: could not retrieve the database access object !"); return DND_ACTION_NONE; } } @@ -353,7 +354,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) // not interested in any results Reference< XPropertySet > xStatProps(xStatement,UNO_QUERY); - xStatProps->setPropertyValue(rtl::OUString::createFromAscii("MaxRows"), makeAny(sal_Int32(0))); + xStatProps->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxRows")), makeAny(sal_Int32(0))); xResultSet = xStatement->executeQuery(); Reference< XColumnsSupplier > xSupplyCols(xResultSet, UNO_QUERY); @@ -387,7 +388,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) } catch (Exception&) { - DBG_ERROR("FmGridHeader::ExecuteDrop: caught an exception while creatin' the column !"); + OSL_FAIL("FmGridHeader::ExecuteDrop: caught an exception while creatin' the column !"); ::comphelper::disposeComponent(xStatement); return sal_False; } @@ -448,7 +449,6 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) Reference< XIndexContainer > xCols(static_cast<FmGridControl*>(GetParent())->GetPeer()->getColumns()); Reference< XGridColumnFactory > xFactory(xCols, UNO_QUERY); - Point aPos = OutputToScreenPixel(m_pImpl->aDropPosPixel); sal_uInt16 nColId = GetItemId(m_pImpl->aDropPosPixel); // EinfuegePosition, immer vor der aktuellen Spalte sal_uInt16 nPos = GetModelColumnPos(nColId); @@ -506,14 +506,13 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) } catch(Exception&) { - DBG_ERROR("FmGridHeader::ExecuteDrop: Exception occured!"); + OSL_FAIL("FmGridHeader::ExecuteDrop: Exception occurred!"); } - sal_Int32 nPreferedType = -1; sal_Bool bDateNTimeCol = sal_False; if (aPossibleTypes.Count() != 0) { - nPreferedType = aPossibleTypes[0]; + sal_Int32 nPreferedType = aPossibleTypes[0]; if ((m_pImpl->nDropAction == DND_ACTION_LINK) && (aPossibleTypes.Count() > 1)) { ImageList aImageList( SVX_RES(RID_SVXIMGLIST_FMEXPL) ); @@ -646,7 +645,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) } catch (Exception&) { - DBG_ERROR("FmGridHeader::OnAsyncExecuteDrop: caught an exception while creatin' the column !"); + OSL_FAIL("FmGridHeader::OnAsyncExecuteDrop: caught an exception while creatin' the column !"); ::comphelper::disposeComponent(m_pImpl->xDroppedResultSet); ::comphelper::disposeComponent(m_pImpl->xDroppedStatement); return 0L; @@ -893,7 +892,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe if(pFact) { AbstractFmShowColsDialog* pDlg = pFact->CreateFmShowColsDialog(NULL); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); pDlg->SetColumns(xCols); pDlg->Execute(); delete pDlg; @@ -1099,7 +1098,7 @@ void FmGridControl::propertyChange(const ::com::sun::star::beans::PropertyChange if (eStatus != xRow->GetStatus()) { xRow->SetStatus(eStatus); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; RowModified(GetCurrentPos()); } } @@ -1172,7 +1171,7 @@ void FmGridControl::DeleteSelectedRows() // #100312# ------------ Reference< ::com::sun::star::util::XURLTransformer > xTransformer( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer")), UNO_QUERY); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY); if( xTransformer.is() ) xTransformer->parseStrict( aUrl ); @@ -1208,7 +1207,7 @@ void FmGridControl::DeleteSelectedRows() } catch(const Exception&) { - OSL_ENSURE(0,"Exception caught while deleting rows!"); + OSL_FAIL("Exception caught while deleting rows!"); } // An den DatenCursor anpassen AdjustDataSource(sal_True); @@ -1540,7 +1539,7 @@ void FmGridControl::RowHeightChanged() } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmGridControl::RowHeightChanged: caught an exception!" ); + OSL_FAIL( "FmGridControl::RowHeightChanged: caught an exception!" ); } } } @@ -1551,7 +1550,7 @@ void FmGridControl::ColumnResized(sal_uInt16 nId) DbGridControl::ColumnResized(nId); // Wert ans model uebergeben - DbGridColumn* pCol = DbGridControl::GetColumns().GetObject(GetModelColumnPos(nId)); + DbGridColumn* pCol = DbGridControl::GetColumns().at( GetModelColumnPos(nId) ); Reference< ::com::sun::star::beans::XPropertySet > xColModel(pCol->getModel()); if (xColModel.is()) { @@ -1597,7 +1596,7 @@ void FmGridControl::ColumnMoved(sal_uInt16 nId) { // suchen der Spalte und verschieben im Model // ColumnPos holen - DbGridColumn* pCol = DbGridControl::GetColumns().GetObject(GetModelColumnPos(nId)); + DbGridColumn* pCol = DbGridControl::GetColumns().at( GetModelColumnPos(nId) ); Reference< ::com::sun::star::beans::XPropertySet > xCol; // Einfuegen muß sich an den Column Positionen orientieren @@ -1660,7 +1659,7 @@ void FmGridControl::InitColumnsByModels(const Reference< ::com::sun::star::conta nWidth = LogicToPixel(Point(nWidth,0),MAP_10TH_MM).X(); AppendColumn(aName, (sal_uInt16)nWidth); - DbGridColumn* pCol = DbGridControl::GetColumns().GetObject(i); + DbGridColumn* pCol = DbGridControl::GetColumns().at( i ); pCol->setModel(xCol); } @@ -1738,12 +1737,6 @@ void FmGridControl::InitColumnByField( _pColumn->SetObject( (sal_Int16)nFieldPos ); return; } -/* - // handle readonly columns - sal_Bool bReadOnly = sal_True; - xField->getPropertyValue( FM_PROP_ISREADONLY ) >>= bReadOnly; - _pColumn->SetReadOnly( bReadOnly ); -*/ } // the control type is determined by the ColumnServiceName @@ -1773,7 +1766,7 @@ void FmGridControl::InitColumnsByFields(const Reference< ::com::sun::star::conta // Einfuegen muss sich an den Column Positionen orientieren for (sal_Int32 i = 0; i < xColumns->getCount(); i++) { - DbGridColumn* pCol = GetColumns().GetObject(i); + DbGridColumn* pCol = GetColumns().at( i ); OSL_ENSURE(pCol,"No grid column!"); if ( pCol ) { @@ -1794,7 +1787,7 @@ void FmGridControl::HideColumn(sal_uInt16 nId) if (nPos == (sal_uInt16)-1) return; - DbGridColumn* pColumn = GetColumns().GetObject(nPos); + DbGridColumn* pColumn = GetColumns().at( nPos ); if (pColumn->IsHidden()) GetPeer()->columnHidden(pColumn); @@ -1826,7 +1819,7 @@ void FmGridControl::ShowColumn(sal_uInt16 nId) if (nPos == (sal_uInt16)-1) return; - DbGridColumn* pColumn = GetColumns().GetObject(nPos); + DbGridColumn* pColumn = GetColumns().at( nPos ); if (!pColumn->IsHidden()) GetPeer()->columnVisible(pColumn); @@ -1838,12 +1831,12 @@ void FmGridControl::ShowColumn(sal_uInt16 nId) //------------------------------------------------------------------------------ sal_Bool FmGridControl::selectBookmarks(const Sequence< Any >& _rBookmarks) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // need to lock the SolarMutex so that no paint call disturbs us ... if ( !m_pSeekCursor ) { - DBG_ERROR( "FmGridControl::selectBookmarks: no seek cursor!" ); + OSL_FAIL( "FmGridControl::selectBookmarks: no seek cursor!" ); return sal_False; } @@ -1866,7 +1859,7 @@ sal_Bool FmGridControl::selectBookmarks(const Sequence< Any >& _rBookmarks) } catch(Exception&) { - DBG_ERROR("FmGridControl::selectBookmarks: could not move to one of the bookmarks!"); + OSL_FAIL("FmGridControl::selectBookmarks: could not move to one of the bookmarks!"); return sal_False; } @@ -1929,7 +1922,7 @@ Sequence< Any> FmGridControl::getSelectionBookmarks() } #ifdef DBG_UTIL else - DBG_ERROR("FmGridControl::DeleteSelectedRows : a bookmark could not be determined !"); + OSL_FAIL("FmGridControl::DeleteSelectedRows : a bookmark could not be determined !"); #endif } } @@ -2127,7 +2120,7 @@ void FmGridControl::KeyInput( const KeyEvent& rKEvt ) } catch(const Exception&) { - OSL_ENSURE(0,"exception occured while deleting a column"); + OSL_FAIL("exception occurred while deleting a column"); } } } @@ -2142,3 +2135,4 @@ void FmGridControl::KeyInput( const KeyEvent& rKEvt ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 0dce12e13cfb..c0b929bdf7c2 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,10 +61,12 @@ #include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> +#include <comphelper/servicehelper.hxx> #include <comphelper/types.hxx> #include <cppuhelper/typeprovider.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> +#include <sal/macros.h> using namespace ::svxform; using namespace ::com::sun::star::container; @@ -431,7 +434,7 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& Service //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL FmXGridControl::getImplementationName() throw() { - return ::rtl::OUString::createFromAscii("com.sun.star.form.FmXGridControl"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FmXGridControl")); } //------------------------------------------------------------------------------ @@ -439,14 +442,14 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& Service { Sequence< ::rtl::OUString > aServiceNames(2); aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL; - aServiceNames[1] = ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControl"); + aServiceNames[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControl")); return aServiceNames; } //------------------------------------------------------------------------------ void SAL_CALL FmXGridControl::dispose() throw( RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; EventObject aEvt; aEvt.Source = static_cast< ::cppu::OWeakObject* >(this); @@ -460,14 +463,14 @@ void SAL_CALL FmXGridControl::dispose() throw( RuntimeException ) //------------------------------------------------------------------------------ ::rtl::OUString FmXGridControl::GetComponentServiceName() { - ::rtl::OUString aName = ::rtl::OUString::createFromAscii("DBGrid"); + ::rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("DBGrid")); return aName; } //------------------------------------------------------------------------------ sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< ::com::sun::star::awt::XControlModel >& rModel) throw( RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (!UnoControl::setModel(rModel)) return sal_False; @@ -679,7 +682,7 @@ void FmXGridControl::addModifyListener(const Reference< ::com::sun::star::util:: //------------------------------------------------------------------------------ sal_Bool SAL_CALL FmXGridControl::select( const Any& _rSelection ) throw (IllegalArgumentException, RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< XSelectionSupplier > xPeer(getPeer(), UNO_QUERY); return xPeer->select(_rSelection); } @@ -687,7 +690,7 @@ sal_Bool SAL_CALL FmXGridControl::select( const Any& _rSelection ) throw (Illega //------------------------------------------------------------------------------ Any SAL_CALL FmXGridControl::getSelection( ) throw (RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< XSelectionSupplier > xPeer(getPeer(), UNO_QUERY); return xPeer->getSelection(); } @@ -754,7 +757,7 @@ void SAL_CALL FmXGridControl::removeModifyListener(const Reference< ::com::sun:: //------------------------------------------------------------------------------ void SAL_CALL FmXGridControl::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; m_bInDraw = sal_True; UnoControl::draw(x, y); m_bInDraw = sal_False; @@ -767,7 +770,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio // --- <mutex_lock> --- { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< XRowSetSupplier > xGrid(getPeer(), UNO_QUERY); @@ -802,7 +805,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio // prepare firing an event aModeChangeEvent.Source = *this; - aModeChangeEvent.NewMode = ::rtl::OUString::createFromAscii( mbDesignMode ? "design" : "alive" ); + aModeChangeEvent.NewMode = mbDesignMode ? ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "design" )) : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "alive" )); } // --- </mutex_lock> --- @@ -943,7 +946,7 @@ void SAL_CALL FmXGridControl::setCurrentColumnPosition(sal_Int16 nPos) throw( Ru Reference< XGridControl > xGrid( getPeer(), UNO_QUERY ); if ( xGrid.is() ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; xGrid->setCurrentColumnPosition( nPos ); } } @@ -1180,21 +1183,14 @@ FmXGridPeer::~FmXGridPeer() delete m_pGridListener; } -//------------------------------------------------------------------------------ +namespace +{ + class theFmXGridPeerImplementationId : public rtl::Static< UnoTunnelIdInit, theFmXGridPeerImplementationId > {}; +} + const Sequence< sal_Int8 >& FmXGridPeer::getUnoTunnelImplementationId() throw() { - static Sequence< sal_Int8 > * pSeq = 0; - if( !pSeq ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if( !pSeq ) - { - static Sequence< sal_Int8 > aSeq( 16 ); - rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); - pSeq = &aSeq; - } - } - return *pSeq; + return theFmXGridPeerImplementationId::get().getSeq(); } //------------------------------------------------------------------------------ @@ -1352,7 +1348,7 @@ Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType sal_uInt16 nModelPos = pGrid->GetModelColumnPos(pGrid->GetColumnIdFromViewPos((sal_uInt16)i)); DBG_ASSERT(nModelPos != (sal_uInt16)-1, "FmXGridPeer::queryFieldDataType : no model pos !"); - pCol = aColumns.GetObject(nModelPos); + pCol = aColumns[ nModelPos ]; const DbGridRowRef xRow = pGrid->GetSeekRow(); xFieldContent = (xRow.Is() && xRow->HasField(pCol->GetFieldPos())) ? xRow->GetField(pCol->GetFieldPos()).getColumn() : Reference< ::com::sun::star::sdb::XColumn > (); if (!xFieldContent.is()) @@ -1415,7 +1411,7 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type // don't use GetCurrentFieldValue to determine the field content as this isn't affected by the above SeekRow // FS - 30.09.99 - 68644 - pCol = aColumns.GetObject(nModelPos); + pCol = aColumns[ nModelPos ]; xFieldContent = xPaintRow->HasField( pCol->GetFieldPos() ) ? xPaintRow->GetField( pCol->GetFieldPos() ).getColumn() : Reference< XColumn > (); @@ -1435,7 +1431,7 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type // Strings werden direkt ueber das GetFieldText abgehandelt case TypeClass_STRING : { - String sText = aColumns.GetObject(nModelPos)->GetCellText( xPaintRow, pGrid->getNumberFormatter() ); + String sText = aColumns[ nModelPos ]->GetCellText( xPaintRow, pGrid->getNumberFormatter() ); pReturnArray[i] <<= ::rtl::OUString(sText); } break; @@ -1469,7 +1465,7 @@ void FmXGridPeer::CellModified() //------------------------------------------------------------------------------ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // want to do a lot of VCL stuff here ... // this should not be (deadlock) critical, as by definition, every component should release // any own mutexes before notifying @@ -1548,7 +1544,7 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeE // it design mode it doesn't matter if (!isDesignMode()) { - DbGridColumn* pCol = pGrid->GetColumns().GetObject(i); + DbGridColumn* pCol = pGrid->GetColumns().at( i ); pCol->SetAlignmentFromModel(-1); bInvalidateColumn = sal_True; @@ -1697,7 +1693,7 @@ void FmXGridPeer::addColumnListeners(const Reference< XPropertySet >& xCol) Reference< XPropertySetInfo > xInfo = xCol->getPropertySetInfo(); Property aPropDesc; const ::rtl::OUString* pProps = aPropsListenedTo; - const ::rtl::OUString* pPropsEnd = pProps + sizeof( aPropsListenedTo ) / sizeof( aPropsListenedTo[ 0 ] ); + const ::rtl::OUString* pPropsEnd = pProps + SAL_N_ELEMENTS( aPropsListenedTo ); for (; pProps != pPropsEnd; ++pProps) { if ( xInfo->hasPropertyByName( *pProps ) ) @@ -1720,7 +1716,7 @@ void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol) }; Reference< XPropertySetInfo > xInfo = xCol->getPropertySetInfo(); - for (sal_uInt16 i=0; i<sizeof(aPropsListenedTo)/sizeof(aPropsListenedTo[0]); ++i) + for (sal_uInt16 i=0; i < SAL_N_ELEMENTS(aPropsListenedTo); ++i) if (xInfo->hasPropertyByName(aPropsListenedTo[i])) xCol->removePropertyChangeListener(aPropsListenedTo[i], this); } @@ -1728,7 +1724,7 @@ void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol) //------------------------------------------------------------------------------ void FmXGridPeer::setColumns(const Reference< XIndexContainer >& Columns) throw( RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; FmGridControl* pGrid = static_cast< FmGridControl* >( GetWindow() ); @@ -1811,7 +1807,7 @@ sal_Bool FmXGridPeer::isDesignMode() throw( RuntimeException ) //------------------------------------------------------------------------------ void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; FmGridControl* pGrid = (FmGridControl*) GetWindow(); // Handle Column beruecksichtigen @@ -1832,7 +1828,7 @@ void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeExcep pGrid->AppendColumn(aName, (sal_uInt16)nWidth, (sal_Int16)::comphelper::getINT32(evt.Accessor)); // jetzt die Spalte setzen - DbGridColumn* pCol = pGrid->GetColumns().GetObject(::comphelper::getINT32(evt.Accessor)); + DbGridColumn* pCol = pGrid->GetColumns().at( ::comphelper::getINT32(evt.Accessor) ); pCol->setModel(xNewColumn); Any aHidden = xNewColumn->getPropertyValue(FM_PROP_HIDDEN); @@ -1845,7 +1841,7 @@ void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeExcep //------------------------------------------------------------------------------ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; FmGridControl* pGrid = (FmGridControl*) GetWindow(); @@ -1876,7 +1872,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep sal_uInt16 nNewPos = pGrid->GetModelColumnPos(nNewId); // set the model of the new column - DbGridColumn* pCol = pGrid->GetColumns().GetObject(nNewPos); + DbGridColumn* pCol = pGrid->GetColumns().at( nNewPos ); // for initializong this grid column, we need the fields of the grid's data source Reference< XColumnsSupplier > xSuppColumns; @@ -1901,7 +1897,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep //------------------------------------------------------------------------------ void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; FmGridControl* pGrid = (FmGridControl*) GetWindow(); @@ -1919,7 +1915,7 @@ void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeExcept //------------------------------------------------------------------------------ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& Value) throw( RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; FmGridControl* pGrid = (FmGridControl*) GetWindow(); @@ -1941,9 +1937,9 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V // need to forward this to the columns DbGridColumns& rColumns = const_cast<DbGridColumns&>(pGrid->GetColumns()); - DbGridColumn* pLoop = rColumns.First(); - while (pLoop) + for ( size_t i = 0, n = rColumns.size(); i < n; ++i ) { + DbGridColumn* pLoop = rColumns[ i ]; FmXGridCell* pXCell = pLoop->GetCell(); if (pXCell) { @@ -1952,8 +1948,6 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V else pXCell->SetTextLineColor(aTextLineColor); } - - pLoop = rColumns.Next(); } if (isDesignMode()) @@ -2192,7 +2186,6 @@ void FmXGridPeer::dispose() throw( RuntimeException ) VCLXWindow::dispose(); // release all interceptors - // discovered during #100312# - 2002-10-23 - fs@openoffice.org Reference< XDispatchProviderInterceptor > xInterceptor( m_xFirstDispatchInterceptor ); m_xFirstDispatchInterceptor.clear(); while ( xInterceptor.is() ) @@ -2353,7 +2346,7 @@ void FmXGridPeer::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeExcepti //------------------------------------------------------------------------------ void FmXGridPeer::selectionChanged(const EventObject& evt) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; FmGridControl* pGrid = (FmGridControl*) GetWindow(); if (pGrid) @@ -2443,8 +2436,7 @@ Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, // get the list position sal_uInt16 nPos = pGrid->GetModelColumnPos(nId); - DbGridColumn* pCol = pGrid->GetColumns().GetObject(nPos); -// DBG_ASSERT(pCol && pCol->GetCell(), "FmXGridPeer::getByIndex(): Invalid cell"); + DbGridColumn* pCol = pGrid->GetColumns().at( nPos ); Reference< ::com::sun::star::awt::XControl > xControl(pCol->GetCell()); aElement <<= xControl; @@ -2740,13 +2732,13 @@ void FmXGridPeer::resetted(const EventObject& rEvent) throw( RuntimeException ) FmGridControl* pGrid = (FmGridControl*)GetWindow(); if (!pGrid) return; - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pGrid->resetCurrentRow(); } // if the cursor fired a reset event we seem to be on the insert row else if (m_xCursor == rEvent.Source) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; FmGridControl* pGrid = (FmGridControl*) GetWindow(); if (pGrid && pGrid->IsOpen()) pGrid->positioned(rEvent); @@ -2767,7 +2759,7 @@ Sequence<sal_uInt16>& FmXGridPeer::getSupportedGridSlots() DbGridControl::NavigationBar::RECORD_NEW, SID_FM_RECORD_UNDO }; - aSupported.realloc(sizeof(nSupported)/sizeof(nSupported[0])); + aSupported.realloc(SAL_N_ELEMENTS(nSupported)); sal_uInt16* pSupported = aSupported.getArray(); for (sal_uInt16 i=0; i<aSupported.getLength(); ++i, ++pSupported) *pSupported = nSupported[i]; @@ -2789,7 +2781,7 @@ Sequence< ::com::sun::star::util::URL>& FmXGridPeer::getSupportedURLs() FMURL_RECORD_MOVETONEW, FMURL_RECORD_UNDO }; - aSupported.realloc(sizeof(sSupported)/sizeof(sSupported[0])); + aSupported.realloc(SAL_N_ELEMENTS(sSupported)); ::com::sun::star::util::URL* pSupported = aSupported.getArray(); sal_uInt16 i; @@ -2799,7 +2791,7 @@ Sequence< ::com::sun::star::util::URL>& FmXGridPeer::getSupportedURLs() // let an ::com::sun::star::util::URL-transformer normalize the URLs Reference< ::com::sun::star::util::XURLTransformer > xTransformer( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY); pSupported = aSupported.getArray(); if (xTransformer.is()) @@ -2966,3 +2958,4 @@ IMPL_LINK(FmXGridPeer, OnExecuteGridSlot, void*, pSlot) return 0; // not handled } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index b0ee4fe13a66..a713dc83a650 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" - +#include <sal/macros.h> #include "fmprop.hrc" #include "svx/fmresids.hrc" #include "svx/fmtools.hxx" @@ -58,6 +59,7 @@ #include <comphelper/extract.hxx> #include <comphelper/numbers.hxx> #include <comphelper/property.hxx> +#include <comphelper/servicehelper.hxx> #include <connectivity/formattedcolumnvalue.hxx> #include <cppuhelper/typeprovider.hxx> #include <i18npool/lang.h> @@ -124,13 +126,13 @@ namespace case awt::LineEndFormat::LINE_FEED: eFormat = LINEEND_LF; break; case awt::LineEndFormat::CARRIAGE_RETURN_LINE_FEED: eFormat = LINEEND_CRLF; break; default: - OSL_ENSURE( sal_False, "getModelLineEndSetting: what's this?" ); + OSL_FAIL( "getModelLineEndSetting: what's this?" ); } } } catch( const Exception& ) { - OSL_ENSURE( sal_False, "getModelLineEndSetting: caught an exception!" ); + OSL_FAIL( "getModelLineEndSetting: caught an exception!" ); } return eFormat; } @@ -206,7 +208,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< ::com::s case TYPE_TIMEFIELD: pCellControl = new DbTimeField(*this); break; case TYPE_FORMATTEDFIELD: pCellControl = new DbFormattedField(*this); break; default: - DBG_ERROR("DbGridColumn::CreateControl: Unknown Column"); + OSL_FAIL("DbGridColumn::CreateControl: Unknown Column"); return; } @@ -597,7 +599,7 @@ DbCellControl::DbCellControl( DbGridColumn& _rColumn, sal_Bool /*_bText*/ ) } catch( const Exception& ) { - DBG_ERROR( "DbCellControl::doPropertyListening: caught an exception!" ); + OSL_FAIL( "DbCellControl::doPropertyListening: caught an exception!" ); } } } @@ -621,7 +623,7 @@ void DbCellControl::implDoPropertyListening( const ::rtl::OUString& _rPropertyNa } catch( const Exception& ) { - DBG_ERROR( "DbCellControl::doPropertyListening: caught an exception!" ); + OSL_FAIL( "DbCellControl::doPropertyListening: caught an exception!" ); } } @@ -673,7 +675,7 @@ void DbCellControl::implAdjustGenericFieldSetting( const Reference< XPropertySet //------------------------------------------------------------------------------ void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< XPropertySet > xSourceProps( _rEvent.Source, UNO_QUERY ); @@ -735,7 +737,7 @@ void DbCellControl::ImplInitWindow( Window& rParent, const InitWindowFacet _eIni if ( ( _eInitWhat & InitWritingMode ) != 0 ) { - for ( size_t i=0; i < sizeof( pWindows ) / sizeof( pWindows[0] ); ++i ) + for ( size_t i=0; i < SAL_N_ELEMENTS( pWindows ); ++i ) { if ( pWindows[i] ) pWindows[i]->EnableRTL( rParent.IsRTLEnabled() ); @@ -744,7 +746,7 @@ void DbCellControl::ImplInitWindow( Window& rParent, const InitWindowFacet _eIni if ( ( _eInitWhat & InitFont ) != 0 ) { - for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i) + for (size_t i=0; i < SAL_N_ELEMENTS(pWindows); ++i) { if ( !pWindows[i] ) continue; @@ -776,7 +778,7 @@ void DbCellControl::ImplInitWindow( Window& rParent, const InitWindowFacet _eIni sal_Bool bTextLineColor = rParent.IsTextLineColor(); Color aTextLineColor( rParent.GetTextLineColor() ); - for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i) + for (size_t i=0; i < SAL_N_ELEMENTS(pWindows); ++i) { if ( pWindows[i] ) { @@ -797,7 +799,7 @@ void DbCellControl::ImplInitWindow( Window& rParent, const InitWindowFacet _eIni if (rParent.IsControlBackground()) { Color aColor( rParent.GetControlBackground()); - for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i) + for (size_t i=0; i < SAL_N_ELEMENTS(pWindows); ++i) { if ( pWindows[i] ) { @@ -905,7 +907,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor case MouseWheelBehavior::SCROLL_FOCUS_ONLY: nVclSetting = MOUSE_WHEEL_FOCUS_ONLY; break; case MouseWheelBehavior::SCROLL_ALWAYS: nVclSetting = MOUSE_WHEEL_ALWAYS; break; default: - OSL_ENSURE( false, "DbCellControl::Init: invalid MouseWheelBehavior!" ); + OSL_FAIL( "DbCellControl::Init: invalid MouseWheelBehavior!" ); break; } @@ -1131,7 +1133,7 @@ void DbTextField::Init( Window& rParent, const Reference< XRowSet >& xCursor) } catch( const Exception& ) { - OSL_ENSURE( sal_False, "DbTextField::Init: caught an exception while determining the multi-line capabilities!" ); + OSL_FAIL( "DbTextField::Init: caught an exception while determining the multi-line capabilities!" ); } m_bIsSimpleEdit = !bIsMultiLine; @@ -1480,7 +1482,7 @@ void DbFormattedField::Init( Window& rParent, const Reference< XRowSet >& xCurso } } default: - DBG_ERROR( "DbFormattedField::Init: unexpected value type!" ); + OSL_FAIL( "DbFormattedField::Init: unexpected value type!" ); break; } } @@ -2906,7 +2908,6 @@ void DbFilterField::Init( Window& rParent, const Reference< XRowSet >& xCursor ) DbCellControl::Init( rParent, xCursor ); // filter cells are never readonly - // 31.07.2002 - 101584 - fs@openoffice.org Edit* pAsEdit = dynamic_cast< Edit* >( m_pWindow ); if ( pAsEdit ) pAsEdit->SetReadOnly( sal_False ); @@ -2942,7 +2943,7 @@ void DbFilterField::updateFromModel( Reference< XPropertySet > _rxModel ) OSL_ENSURE( _rxModel.is() && m_pWindow, "DbFilterField::updateFromModel: invalid call!" ); (void)_rxModel; - OSL_ENSURE( sal_False, "DbListBox::updateFromModel: not implemented yet (how the hell did you reach this?)!" ); + OSL_FAIL( "DbListBox::updateFromModel: not implemented yet (how the hell did you reach this?)!" ); // TODO: implement this. // remember: updateFromModel should be some kind of opposite of commitControl } @@ -3189,7 +3190,7 @@ XubString DbFilterField::GetFormatText(const Reference< XColumn >& /*_rxField*/, //------------------------------------------------------------------ void DbFilterField::UpdateFromField(const Reference< XColumn >& /*_rxField*/, const Reference< XNumberFormatter >& /*xFormatter*/) { - DBG_ERROR( "DbFilterField::UpdateFromField: cannot update a filter control from a field!" ); + OSL_FAIL( "DbFilterField::UpdateFromField: cannot update a filter control from a field!" ); } //------------------------------------------------------------------ @@ -3364,7 +3365,7 @@ void FmXGridCell::setLock(sal_Bool _bLock) throw( RuntimeException ) //------------------------------------------------------------------ void SAL_CALL FmXGridCell::setPosSize( ::sal_Int32 _XX, ::sal_Int32 _Y, ::sal_Int32 _Width, ::sal_Int32 _Height, ::sal_Int16 _Flags ) throw (RuntimeException) { - OSL_ENSURE( false, "FmXGridCell::setPosSize: not implemented" ); + OSL_FAIL( "FmXGridCell::setPosSize: not implemented" ); (void)_XX; (void)_Y; (void)_Width; @@ -3376,14 +3377,14 @@ void SAL_CALL FmXGridCell::setPosSize( ::sal_Int32 _XX, ::sal_Int32 _Y, ::sal_In //------------------------------------------------------------------ awt::Rectangle SAL_CALL FmXGridCell::getPosSize( ) throw (RuntimeException) { - OSL_ENSURE( false, "FmXGridCell::getPosSize: not implemented" ); + OSL_FAIL( "FmXGridCell::getPosSize: not implemented" ); return awt::Rectangle(); } //------------------------------------------------------------------ void SAL_CALL FmXGridCell::setVisible( ::sal_Bool _Visible ) throw (RuntimeException) { - OSL_ENSURE( false, "FmXGridCell::setVisible: not implemented" ); + OSL_FAIL( "FmXGridCell::setVisible: not implemented" ); (void)_Visible; // not allowed to tamper with this for a grid cell } @@ -3391,7 +3392,7 @@ void SAL_CALL FmXGridCell::setVisible( ::sal_Bool _Visible ) throw (RuntimeExcep //------------------------------------------------------------------ void SAL_CALL FmXGridCell::setEnable( ::sal_Bool _Enable ) throw (RuntimeException) { - OSL_ENSURE( false, "FmXGridCell::setEnable: not implemented" ); + OSL_FAIL( "FmXGridCell::setEnable: not implemented" ); (void)_Enable; // not allowed to tamper with this for a grid cell } @@ -3399,7 +3400,7 @@ void SAL_CALL FmXGridCell::setEnable( ::sal_Bool _Enable ) throw (RuntimeExcepti //------------------------------------------------------------------ void SAL_CALL FmXGridCell::setFocus( ) throw (RuntimeException) { - OSL_ENSURE( false, "FmXGridCell::setFocus: not implemented" ); + OSL_FAIL( "FmXGridCell::setFocus: not implemented" ); // not allowed to tamper with this for a grid cell } @@ -3466,14 +3467,14 @@ void SAL_CALL FmXGridCell::removeMouseMotionListener( const Reference< awt::XMou //------------------------------------------------------------------ void SAL_CALL FmXGridCell::addPaintListener( const Reference< awt::XPaintListener >& _rxListener ) throw (RuntimeException) { - OSL_ENSURE( false, "FmXGridCell::addPaintListener: not implemented" ); + OSL_FAIL( "FmXGridCell::addPaintListener: not implemented" ); (void)_rxListener; } //------------------------------------------------------------------ void SAL_CALL FmXGridCell::removePaintListener( const Reference< awt::XPaintListener >& _rxListener ) throw (RuntimeException) { - OSL_ENSURE( false, "FmXGridCell::removePaintListener: not implemented" ); + OSL_FAIL( "FmXGridCell::removePaintListener: not implemented" ); (void)_rxListener; } @@ -4045,7 +4046,7 @@ void SAL_CALL FmXCheckBoxCell::removeActionListener( const Reference< awt::XActi //------------------------------------------------------------------ void SAL_CALL FmXCheckBoxCell::setLabel( const ::rtl::OUString& _Label ) throw (RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( m_pColumn ) { DbGridControl& rGrid( m_pColumn->GetParent() ); @@ -4691,21 +4692,14 @@ sal_Int64 SAL_CALL FmXFilterCell::getSomething( const Sequence< sal_Int8 >& _rId return nReturn; } -//------------------------------------------------------------------------------ +namespace +{ + class theFmXFilterCellUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theFmXFilterCellUnoTunnelId > {}; +} + const Sequence<sal_Int8>& FmXFilterCell::getUnoTunnelId() { - static Sequence< sal_Int8 > * pSeq = 0; - if( !pSeq ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if( !pSeq ) - { - static Sequence< sal_Int8 > aSeq( 16 ); - rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); - pSeq = &aSeq; - } - } - return *pSeq; + return theFmXFilterCellUnoTunnelId::get().getSeq(); } //------------------------------------------------------------------------------ @@ -4841,3 +4835,4 @@ IMPL_LINK( FmXFilterCell, OnCommit, void*, EMPTYARG ) return 1; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx index 969f1307a2ef..75a604822720 100644 --- a/svx/source/fmcomp/gridcols.cxx +++ b/svx/source/fmcomp/gridcols.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,14 +58,7 @@ const ::comphelper::StringSequence& getColumnTypes() //------------------------------------------------------------------ // Vergleichen von PropertyInfo -extern "C" int -#if defined( WNT ) - __cdecl -#endif -#if defined( ICC ) && defined( OS2 ) -_Optlink -#endif - NameCompare(const void* pFirst, const void* pSecond) +extern "C" int SAL_CALL NameCompare(const void* pFirst, const void* pSecond) { return ((::rtl::OUString*)pFirst)->compareTo(*(::rtl::OUString*)pSecond); } @@ -88,8 +82,8 @@ namespace //------------------------------------------------------------------------------ sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName) { - const ::rtl::OUString aModelPrefix = ::rtl::OUString::createFromAscii("com.sun.star.form.component."); - const ::rtl::OUString aCompatibleModelPrefix = ::rtl::OUString::createFromAscii("stardiv.one.form.component."); + const ::rtl::OUString aModelPrefix(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.")); + const ::rtl::OUString aCompatibleModelPrefix(RTL_CONSTASCII_USTRINGPARAM("stardiv.one.form.component.")); sal_Int32 nTypeId = -1; if (aModelName == FM_COMPONENT_EDIT) @@ -112,3 +106,4 @@ sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName) return nTypeId; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 26f36802a8f9..a8c1a8835f1d 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,18 +29,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef _SVX_FMHELP_HRC +#include <sal/macros.h> #include "fmhelp.hrc" -#endif #include <svx/gridctrl.hxx> #include "gridcell.hxx" #include "svx/dbtoolsclient.hxx" #include "svx/fmtools.hxx" #include <svtools/stringtransfer.hxx> -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include <svtools/stringtransfer.hxx> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> @@ -60,13 +58,9 @@ #include <vcl/sound.hxx> #include <vcl/menu.hxx> -#ifndef _SVX_FMRESIDS_HRC #include "svx/fmresids.hrc" -#endif -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <tools/shl.hxx> #include <svx/dialmgr.hxx> #include "fmservs.hxx" @@ -739,7 +733,6 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich) // event (ImplGenerateMouseMove) even if nothing happened. This may lead to some unwanted effects, so we // do this check. // For further explanation see Bug 69900. - // FS - 18.11.99 pWnd->Enable(bAvailable); } @@ -785,7 +778,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType ) case STATE_CHANGE_MIRRORING: { sal_Bool bIsRTLEnabled = IsRTLEnabled(); - for ( size_t i=0; i < sizeof( pWindows ) / sizeof( pWindows[0] ); ++i ) + for ( size_t i=0; i < SAL_N_ELEMENTS( pWindows ); ++i ) pWindows[i]->EnableRTL( bIsRTLEnabled ); } break; @@ -799,7 +792,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType ) if ( IsControlFont() ) aFont.Merge( GetControlFont() ); - for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i) + for (size_t i=0; i < SAL_N_ELEMENTS(pWindows); ++i) { pWindows[i]->SetZoom(aZoom); pWindows[i]->SetZoomedPointFont(aFont); @@ -828,7 +821,7 @@ DbGridRow::DbGridRow(CursorWrapper* pCur, sal_Bool bPaintCursor) Reference< XPropertySet > xColSet; ::cppu::extractInterface(xColSet, xColumns->getByIndex(i)); pColumn = new DataColumn(xColSet); - m_aVariants.Insert(pColumn, LIST_APPEND); + m_aVariants.push_back( pColumn ); } if (pCur->rowDeleted()) @@ -866,9 +859,9 @@ DbGridRow::DbGridRow(CursorWrapper* pCur, sal_Bool bPaintCursor) //------------------------------------------------------------------------------ DbGridRow::~DbGridRow() { - sal_uInt32 nCount = m_aVariants.Count(); - for (sal_uInt32 i = 0; i < nCount; i++) - delete m_aVariants.GetObject(i); + for ( size_t i = 0, n = m_aVariants.size(); i < n; ++i ) + delete m_aVariants[ i ]; + m_aVariants.clear(); } //------------------------------------------------------------------------------ @@ -1095,9 +1088,9 @@ void DbGridControl::Select() //------------------------------------------------------------------------------ void DbGridControl::ImplInitWindow( const InitWindowFacet _eInitWhat ) { - for ( sal_uInt32 i = 0; i < m_aColumns.Count(); ++i ) + for ( size_t i = 0; i < m_aColumns.size(); ++i ) { - DbGridColumn* pCol = m_aColumns.GetObject(i); + DbGridColumn* pCol = m_aColumns[ i ]; if (pCol) pCol->ImplInitWindow( GetDataWindow(), _eInitWhat ); } @@ -1169,8 +1162,8 @@ void DbGridControl::RemoveRows() // alle Columns deinitialisieren // existieren Spalten, dann alle Controller freigeben - for (sal_uInt32 i = 0; i < m_aColumns.Count(); i++) - m_aColumns.GetObject(i)->Clear(); + for (size_t i = 0; i < m_aColumns.size(); i++) + m_aColumns[ i ]->Clear(); DELETEZ(m_pSeekCursor); DELETEZ(m_pDataCursor); @@ -1494,7 +1487,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt // retrieve the datebase of the Numberformatter try { - xSupplier->getNumberFormatSettings()->getPropertyValue(rtl::OUString::createFromAscii("NullDate")) >>= m_aNullDate; + xSupplier->getNumberFormatSettings()->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= m_aNullDate; } catch(Exception&) { @@ -1673,9 +1666,9 @@ void DbGridControl::RemoveColumns() if ( IsEditing() ) DeactivateCell(); - for (sal_uInt32 i = 0; i < m_aColumns.Count(); i++) - delete m_aColumns.GetObject(i); - m_aColumns.Clear(); + for (size_t i = 0, n = m_aColumns.size(); i < n; i++) + delete m_aColumns[ i ]; + m_aColumns.clear(); DbGridControl_Base::RemoveColumns(); } @@ -1698,7 +1691,7 @@ sal_uInt16 DbGridControl::AppendColumn(const XubString& rName, sal_uInt16 nWidth sal_Int16 nViewPos = nModelPos; while (nModelPos--) { - if (m_aColumns.GetObject(nModelPos)->IsHidden()) + if ( m_aColumns[ nModelPos ]->IsHidden() ) --nViewPos; } // restore nModelPos, we need it later @@ -1708,16 +1701,20 @@ sal_uInt16 DbGridControl::AppendColumn(const XubString& rName, sal_uInt16 nWidth } // calculate the new id - for (nId=1; (GetModelColumnPos(nId) != GRID_COLUMN_NOT_FOUND) && (nId<=m_aColumns.Count()); ++nId) + for (nId=1; (GetModelColumnPos(nId) != GRID_COLUMN_NOT_FOUND) && (nId <= m_aColumns.size()); ++nId) ; DBG_ASSERT(GetViewColumnPos(nId) == (sal_uInt16)-1, "DbGridControl::AppendColumn : inconsistent internal state !"); // my column's models say "there is no column with id nId", but the view (the base class) says "there is a column ..." DbGridControl_Base::AppendColumn(rName, nWidth, nRealPos, nId); if (nModelPos == HEADERBAR_APPEND) - m_aColumns.Insert(CreateColumn(nId), LIST_APPEND); + m_aColumns.push_back( CreateColumn(nId) ); else - m_aColumns.Insert(CreateColumn(nId), nModelPos); + { + DbGridColumns::iterator it = m_aColumns.begin(); + ::std::advance( it, nModelPos ); + m_aColumns.insert( it, CreateColumn(nId) ); + } return nId; } @@ -1725,9 +1722,13 @@ sal_uInt16 DbGridControl::AppendColumn(const XubString& rName, sal_uInt16 nWidth //------------------------------------------------------------------------------ void DbGridControl::RemoveColumn(sal_uInt16 nId) { - sal_Int16 nIndex = GetModelColumnPos(nId); - DbGridControl_Base::RemoveColumn(nId); - delete m_aColumns.Remove(nIndex); + const sal_uInt16 nIndex = GetModelColumnPos(nId); + if(nIndex != GRID_COLUMN_NOT_FOUND) + { + DbGridControl_Base::RemoveColumn(nId); + delete m_aColumns[nIndex]; + m_aColumns.erase( m_aColumns.begin()+nIndex ); + } } //------------------------------------------------------------------------------ @@ -1736,9 +1737,9 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId) DbGridControl_Base::ColumnMoved(nId); // remove the col from the model - sal_Int16 nOldModelPos = GetModelColumnPos(nId); + sal_uInt16 nOldModelPos = GetModelColumnPos(nId); #ifdef DBG_UTIL - DbGridColumn* pCol = m_aColumns.GetObject((sal_uInt32)nOldModelPos); + DbGridColumn* pCol = m_aColumns[ (sal_uInt32)nOldModelPos ]; DBG_ASSERT(!pCol->IsHidden(), "DbGridControl::ColumnMoved : moved a hidden col ? how this ?"); #endif @@ -1750,9 +1751,9 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId) // from that we can compute the new model pos sal_uInt16 nNewModelPos; - for (nNewModelPos = 0; nNewModelPos < m_aColumns.Count(); ++nNewModelPos) + for (nNewModelPos = 0; nNewModelPos < m_aColumns.size(); ++nNewModelPos) { - if (!m_aColumns.GetObject(nNewModelPos)->IsHidden()) + if (!m_aColumns[ nNewModelPos ]->IsHidden()) { if (!nNewViewPos) break; @@ -1760,7 +1761,7 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId) --nNewViewPos; } } - DBG_ASSERT(nNewModelPos<m_aColumns.Count(), "DbGridControl::ColumnMoved : could not find the new model position !"); + DBG_ASSERT( nNewModelPos < m_aColumns.size(), "DbGridControl::ColumnMoved : could not find the new model position !"); // this will work. of course the model isn't fully consistent with our view right now, but let's // look at the situation : a column has been moved with in the VIEW from pos m to n, say m<n (in the @@ -1813,14 +1814,23 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId) // +---+---+---+---+---+---+ // // Now, all is consistent again. - // (except of the hidden column : The cycling of the cols occured on the model, not on the view. maybe + // (except of the hidden column : The cycling of the cols occurred on the model, not on the view. maybe // the user expected the latter but there really is no good argument against our method ;) ...) // // And no, this large explanation isn't just because I wanted to play a board game or something like // that. It's because it took me a while to see it myself, and the whole theme (hidden cols, model col // positions, view col positions) is really painful (at least for me) so the above pictures helped me a lot ;) - m_aColumns.Insert(m_aColumns.Remove((sal_uInt32)nOldModelPos), nNewModelPos); + + DbGridColumn* temp = m_aColumns[ nOldModelPos ]; + + DbGridColumns::iterator it = m_aColumns.begin(); + ::std::advance( it, nOldModelPos ); + m_aColumns.erase( it ); + + it = m_aColumns.begin(); + ::std::advance( it, nNewModelPos ); + m_aColumns.insert( it, temp ); } //------------------------------------------------------------------------------ @@ -2065,7 +2075,8 @@ void DbGridControl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uI if (!IsValid(m_xPaintRow)) return; - DbGridColumn* pColumn = m_aColumns.GetObject(GetModelColumnPos(nColumnId)); + size_t Location = GetModelColumnPos(nColumnId); + DbGridColumn* pColumn = (Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; if (pColumn) { Rectangle aArea(rRect); @@ -2170,7 +2181,7 @@ sal_Bool DbGridControl::SetCurrent(long nNewRow) } else { - DBG_ERROR("DbGridControl::SetCurrent : SeekRow failed !"); + OSL_FAIL("DbGridControl::SetCurrent : SeekRow failed !"); EndCursorAction(); return sal_False; } @@ -2257,9 +2268,9 @@ void DbGridControl::forceROController(sal_Bool bForce) m_bForceROController = bForce; // alle Columns durchgehen und denen Bescheid geben - for (sal_uInt16 i=0; i<m_aColumns.Count(); ++i) + for ( size_t i=0; i < m_aColumns.size(); ++i ) { - DbGridColumn* pColumn = m_aColumns.GetObject(i); + DbGridColumn* pColumn = m_aColumns[ i ]; if (!pColumn) continue; @@ -2290,7 +2301,7 @@ void DbGridControl::forceROController(sal_Bool bForce) void DbGridControl::AdjustDataSource(sal_Bool bFull) { TRACE_RANGE("DbGridControl::AdjustDataSource"); - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // wird die aktuelle Zeile gerade neu bestimmt, // wird kein abgleich vorgenommen @@ -2505,7 +2516,7 @@ sal_Bool DbGridControl::SeekCursor(long nRow, sal_Bool bAbsolute) } catch(Exception&) { - DBG_ERROR("DbGridControl::SeekCursor : failed ..."); + OSL_FAIL("DbGridControl::SeekCursor : failed ..."); } try @@ -2525,7 +2536,7 @@ sal_Bool DbGridControl::SeekCursor(long nRow, sal_Bool bAbsolute) } catch(Exception&) { - DBG_ERROR("DbGridControl::SeekCursor : failed ..."); + OSL_FAIL("DbGridControl::SeekCursor : failed ..."); m_nSeekPos = -1; // kein Datensatz mehr vorhanden } } @@ -2730,9 +2741,9 @@ void DbGridControl::SetFilterMode(sal_Bool bMode) m_xEmptyRow = new DbGridRow(); // setting the new filter controls - for (sal_uInt16 i = 0; i<m_aColumns.Count(); ++i) + for ( size_t i = 0; i < m_aColumns.size(); ++i ) { - DbGridColumn* pCurCol = m_aColumns.GetObject(i); + DbGridColumn* pCurCol = m_aColumns[ i ]; if (!pCurCol->IsHidden()) pCurCol->UpdateControl(); } @@ -2748,7 +2759,8 @@ void DbGridControl::SetFilterMode(sal_Bool bMode) // ----------------------------------------------------------------------------- String DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const { - DbGridColumn* pColumn = m_aColumns.GetObject( GetModelColumnPos( _nColId ) ); + size_t Location = GetModelColumnPos( _nColId ); + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; String sRet; if ( const_cast<DbGridControl*>(this)->SeekRow(_nRow) ) sRet = GetCurrentRowCellText(pColumn, m_xPaintRow); @@ -2769,7 +2781,8 @@ sal_uInt32 DbGridControl::GetTotalCellWidth(long nRow, sal_uInt16 nColId) { if (SeekRow(nRow)) { - DbGridColumn* pColumn = m_aColumns.GetObject(GetModelColumnPos(nColId)); + size_t Location = GetModelColumnPos( nColId ); + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; return GetDataWindow().GetTextWidth(GetCurrentRowCellText(pColumn,m_xPaintRow)); } else @@ -2822,7 +2835,7 @@ void DbGridControl::PostExecuteRowContextMenu(sal_uInt16 /*nRow*/, const PopupMe void DbGridControl::DataSourcePropertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException ) { TRACE_RANGE("DbGridControl::DataSourcePropertyChanged"); - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // prop "IsModified" changed ? // during update don't care about the modified state if (!IsUpdating() && evt.PropertyName.compareTo(FM_PROP_ISMODIFIED) == COMPARE_EQUAL) @@ -2884,7 +2897,8 @@ void DbGridControl::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel ) if (GetDataWindow().IsMouseCaptured()) GetDataWindow().ReleaseMouse(); - DbGridColumn* pColumn = m_aColumns.GetObject(GetModelColumnPos(nColId)); + size_t Location = GetModelColumnPos( nColId ); + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; OStringTransferable* pTransferable = new OStringTransferable(GetCurrentRowCellText(pColumn,m_xPaintRow)); Reference< XTransferable > xEnsureDelete(pTransferable); pTransferable->StartDrag(this, DND_ACTION_COPY); @@ -2904,7 +2918,7 @@ sal_Bool DbGridControl::canCopyCellText(sal_Int32 _nRow, sal_Int16 _nColId) void DbGridControl::copyCellText(sal_Int32 _nRow, sal_Int16 _nColId) { DBG_ASSERT(canCopyCellText(_nRow, _nColId), "DbGridControl::copyCellText: invalid call!"); - DbGridColumn* pColumn = m_aColumns.GetObject(GetModelColumnPos(_nColId)); + DbGridColumn* pColumn = m_aColumns[ GetModelColumnPos(_nColId) ]; SeekRow(_nRow); OStringTransfer::CopyString( GetCurrentRowCellText( pColumn,m_xPaintRow ), this ); } @@ -3056,7 +3070,8 @@ CellController* DbGridControl::GetController(long /*nRow*/, sal_uInt16 nColumnId if (!IsValid(m_xCurrentRow) || !IsEnabled()) return NULL; - DbGridColumn* pColumn = m_aColumns.GetObject(GetModelColumnPos(nColumnId)); + size_t Location = GetModelColumnPos(nColumnId); + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; if (!pColumn) return NULL; @@ -3095,7 +3110,8 @@ CellController* DbGridControl::GetController(long /*nRow*/, sal_uInt16 nColumnId //------------------------------------------------------------------------------ void DbGridControl::InitController(CellControllerRef& /*rController*/, long /*nRow*/, sal_uInt16 nColumnId) { - DbGridColumn* pColumn = m_aColumns.GetObject(GetModelColumnPos(nColumnId)); + size_t Location = GetModelColumnPos(nColumnId); + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; if (pColumn) pColumn->UpdateFromField(m_xCurrentRow, m_xFormatter); } @@ -3308,7 +3324,8 @@ sal_Bool DbGridControl::SaveModified() if (!DbGridControl_Base::IsModified()) return sal_True; - DbGridColumn* pColumn = m_aColumns.GetObject(GetModelColumnPos(GetCurColumnId())); + size_t Location = GetModelColumnPos( GetCurColumnId() ); + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; sal_Bool bOK = pColumn->Commit(); DBG_ASSERT( Controller().Is(), "DbGridControl::SaveModified: was modified, by have no controller?!" ); if ( !Controller().Is() ) @@ -3500,7 +3517,8 @@ void DbGridControl::KeyInput( const KeyEvent& rEvt ) sal_uInt16 nColId = GetCurColumnId(); if (nRow >= 0 && nRow < GetRowCount() && nColId < ColCount()) { - DbGridColumn* pColumn = m_aColumns.GetObject(GetModelColumnPos(nColId)); + size_t Location = GetModelColumnPos( nColId ); + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; OStringTransfer::CopyString( GetCurrentRowCellText( pColumn,m_xPaintRow ), this ); return; } @@ -3524,7 +3542,8 @@ void DbGridControl::HideColumn(sal_uInt16 nId) // don't use my own RemoveColumn, this would remove it from m_aColumns, too // update my model - DbGridColumn* pColumn = m_aColumns.GetObject(GetModelColumnPos(nId)); + size_t Location = GetModelColumnPos( nId ); + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; DBG_ASSERT(pColumn, "DbGridControl::HideColumn : somebody did hide a nonexistent column !"); if (pColumn) { @@ -3545,7 +3564,7 @@ void DbGridControl::ShowColumn(sal_uInt16 nId) if (nPos == (sal_uInt16)-1) return; - DbGridColumn* pColumn = m_aColumns.GetObject(nPos); + DbGridColumn* pColumn = m_aColumns[ nPos ]; if (!pColumn->IsHidden()) { DBG_ASSERT(GetViewColumnPos(nId) != (sal_uInt16)-1, "DbGridControl::ShowColumn : inconsistent internal state !"); @@ -3558,9 +3577,9 @@ void DbGridControl::ShowColumn(sal_uInt16 nId) // to determine the new view position we need an adjacent non-hidden column sal_uInt16 nNextNonHidden = (sal_uInt16)-1; // first search the cols to the right - for (sal_uInt16 i = nPos + 1; i<m_aColumns.Count(); ++i) + for ( size_t i = nPos + 1; i < m_aColumns.size(); ++i ) { - DbGridColumn* pCurCol = m_aColumns.GetObject(i); + DbGridColumn* pCurCol = m_aColumns[ i ]; if (!pCurCol->IsHidden()) { nNextNonHidden = i; @@ -3570,9 +3589,9 @@ void DbGridControl::ShowColumn(sal_uInt16 nId) if ((nNextNonHidden == (sal_uInt16)-1) && (nPos > 0)) { // then to the left - for (sal_uInt16 i = nPos; i>0; --i) + for ( size_t i = nPos; i > 0; --i ) { - DbGridColumn* pCurCol = m_aColumns.GetObject(i-1); + DbGridColumn* pCurCol = m_aColumns[ i-1 ]; if (!pCurCol->IsHidden()) { nNextNonHidden = i-1; @@ -3582,7 +3601,7 @@ void DbGridControl::ShowColumn(sal_uInt16 nId) } sal_uInt16 nNewViewPos = (nNextNonHidden == (sal_uInt16)-1) ? 1 // there is no visible column -> insert behinde the handle col - : GetViewColumnPos(m_aColumns.GetObject(nNextNonHidden)->GetId()) + 1; + : GetViewColumnPos( m_aColumns[ nNextNonHidden ]->GetId() ) + 1; // the first non-handle col has "view pos" 0, but the pos arg for InsertDataColumn expects // a position 1 for the first non-handle col -> +1 DBG_ASSERT(nNewViewPos != (sal_uInt16)-1, "DbGridControl::ShowColumn : inconsistent internal state !"); @@ -3606,13 +3625,13 @@ void DbGridControl::ShowColumn(sal_uInt16 nId) //------------------------------------------------------------------------------ sal_uInt16 DbGridControl::GetColumnIdFromModelPos( sal_uInt16 nPos ) const { - if (nPos >= m_aColumns.Count()) + if (nPos >= m_aColumns.size()) { - DBG_ERROR("DbGridControl::GetColumnIdFromModelPos : invalid argument !"); + OSL_FAIL("DbGridControl::GetColumnIdFromModelPos : invalid argument !"); return (sal_uInt16)-1; } - DbGridColumn* pCol = m_aColumns.GetObject(nPos); + DbGridColumn* pCol = m_aColumns[ nPos ]; #if (OSL_DEBUG_LEVEL > 0) || defined DBG_UTIL // in der Debug-Version rechnen wir die ModelPos in eine ViewPos um und vergleichen das mit dem Wert, // den wir zurueckliefern werden (nId an der entsprechenden Col in m_aColumns) @@ -3620,8 +3639,8 @@ sal_uInt16 DbGridControl::GetColumnIdFromModelPos( sal_uInt16 nPos ) const if (!pCol->IsHidden()) { // macht nur Sinn, wenn die Spalte sichtbar ist sal_uInt16 nViewPos = nPos; - for (sal_uInt16 i=0; i<m_aColumns.Count() && i<nPos; ++i) - if (m_aColumns.GetObject(i)->IsHidden()) + for ( size_t i = 0; i < m_aColumns.size() && i < nPos; ++i) + if ( m_aColumns[ i ]->IsHidden()) --nViewPos; DBG_ASSERT(pCol && GetColumnIdFromViewPos(nViewPos) == pCol->GetId(), @@ -3634,8 +3653,8 @@ sal_uInt16 DbGridControl::GetColumnIdFromModelPos( sal_uInt16 nPos ) const //------------------------------------------------------------------------------ sal_uInt16 DbGridControl::GetModelColumnPos( sal_uInt16 nId ) const { - for (sal_uInt16 i=0; i<m_aColumns.Count(); ++i) - if (m_aColumns.GetObject(i)->GetId() == nId) + for ( size_t i = 0; i < m_aColumns.size(); ++i ) + if ( m_aColumns[ i ]->GetId() == nId ) return i; return GRID_COLUMN_NOT_FOUND; @@ -3646,7 +3665,7 @@ void DbGridControl::implAdjustInSolarThread(sal_Bool _bRows) { TRACE_RANGE("DbGridControl::implAdjustInSolarThread"); ::osl::MutexGuard aGuard(m_aAdjustSafety); - if (::vos::OThread::getCurrentIdentifier() != Application::GetMainThreadIdentifier()) + if (::osl::Thread::getCurrentIdentifier() != Application::GetMainThreadIdentifier()) { m_nAsynAdjustEvent = PostUserEvent(LINK(this, DbGridControl, OnAsyncAdjust), reinterpret_cast< void* >( _bRows )); m_bPendingAdjustRows = _bRows; @@ -3744,9 +3763,9 @@ void DbGridControl::ConnectToFields() m_pFieldListeners = pListeners; } - for (sal_Int32 i=0; i<(sal_Int32)m_aColumns.Count(); ++i) + for ( size_t i = 0; i < m_aColumns.size(); ++i ) { - DbGridColumn* pCurrent = m_aColumns.GetObject(i); + DbGridColumn* pCurrent = m_aColumns[ i ]; sal_uInt16 nViewPos = pCurrent ? GetViewColumnPos(pCurrent->GetId()) : (sal_uInt16)-1; if ((sal_uInt16)-1 == nViewPos) continue; @@ -3791,7 +3810,8 @@ void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent // all other cases are handled elsewhere return; - DbGridColumn* pColumn = m_aColumns.GetObject(GetModelColumnPos(_nId)); + size_t Location = GetModelColumnPos( _nId ); + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; if (pColumn) { sal_Bool bAcquiredPaintSafety = sal_False; @@ -3809,7 +3829,7 @@ void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent return; } // here we got the solar mutex, transfer it to a guard for safety reasons - ::vos::OGuard aPaintSafety(Application::GetSolarMutex()); + SolarMutexGuard aPaintSafety; Application::GetSolarMutex().release(); // and finally do the update ... @@ -3824,14 +3844,14 @@ void DbGridControl::FieldListenerDisposing(sal_uInt16 _nId) ColumnFieldValueListeners* pListeners = (ColumnFieldValueListeners*)m_pFieldListeners; if (!pListeners) { - DBG_ERROR("DbGridControl::FieldListenerDisposing : invalid call (have no listener array) !"); + OSL_FAIL("DbGridControl::FieldListenerDisposing : invalid call (have no listener array) !"); return; } ColumnFieldValueListenersIterator aPos = pListeners->find(_nId); if (aPos == pListeners->end()) { - DBG_ERROR("DbGridControl::FieldListenerDisposing : invalid call (did not find the listener) !"); + OSL_FAIL("DbGridControl::FieldListenerDisposing : invalid call (did not find the listener) !"); return; } @@ -3875,7 +3895,8 @@ Reference<XAccessible > DbGridControl::CreateAccessibleControl( sal_Int32 _nInde Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) { sal_uInt16 nColumnId = GetColumnId( _nColumnPos ); - DbGridColumn* pColumn = m_aColumns.GetObject(GetModelColumnPos(nColumnId)); + size_t Location = GetModelColumnPos(nColumnId); + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; if ( pColumn ) { Reference< ::com::sun::star::awt::XControl> xInt(pColumn->GetCell()); @@ -3903,3 +3924,4 @@ Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, s // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src index 874f3ae4f0d9..e5a0c9ae2c54 100644 --- a/svx/source/fmcomp/gridctrl.src +++ b/svx/source/fmcomp/gridctrl.src @@ -27,7 +27,7 @@ #include "svx/fmresids.hrc" #include <svx/svxids.hrc> -#include "globlmn.hrc" +#include "globlmn_tmpl.hrc" #include "fmhelp.hrc" #include <svx/svxcommands.h> diff --git a/svx/source/fmcomp/trace.cxx b/svx/source/fmcomp/trace.cxx index a8ab835548ac..09979f1a1400 100644 --- a/svx/source/fmcomp/trace.cxx +++ b/svx/source/fmcomp/trace.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,62 +36,62 @@ //============================================================================== //------------------------------------------------------------------------------ -::vos::OMutex Tracer::s_aMapSafety; -::std::map< ::vos::OThread::TThreadIdentifier, sal_Int32, ::std::less< ::vos::OThread::TThreadIdentifier > > +::osl::Mutex Tracer::s_aMapSafety; +::std::map< ::oslThreadIdentifier, sal_Int32, ::std::less< oslThreadIdentifier > > Tracer::s_aThreadIndents; //------------------------------------------------------------------------------ Tracer::Tracer(const char* _pBlockDescription) :m_sBlockDescription(_pBlockDescription) { - ::vos::OGuard aGuard(s_aMapSafety); - sal_Int32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ]++; + ::osl::MutexGuard aGuard(s_aMapSafety); + sal_uInt32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]++; ByteString sIndent; while (nIndent--) sIndent += '\t'; - ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::vos::OThread::getCurrentIdentifier() ) ); + ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) ); sThread += '\t'; ByteString sMessage(sThread); sMessage += sIndent; sMessage += m_sBlockDescription; sMessage += " {"; - DBG_TRACE(sMessage.GetBuffer()); + OSL_TRACE(sMessage.GetBuffer()); } //------------------------------------------------------------------------------ Tracer::~Tracer() { - ::vos::OGuard aGuard(s_aMapSafety); - sal_Int32 nIndent = --s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ]; + ::osl::MutexGuard aGuard(s_aMapSafety); + sal_Int32 nIndent = --s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]; ByteString sIndent; while (nIndent--) sIndent += '\t'; - ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::vos::OThread::getCurrentIdentifier() ) ); + ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) ); sThread += '\t'; ByteString sMessage(sThread); sMessage += sIndent; sMessage += "} // "; sMessage += m_sBlockDescription; - DBG_TRACE(sMessage.GetBuffer()); + OSL_TRACE(sMessage.GetBuffer()); } //------------------------------------------------------------------------------ void Tracer::TraceString(const char* _pMessage) { - ::vos::OGuard aGuard(s_aMapSafety); - sal_Int32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ]; + ::osl::MutexGuard aGuard(s_aMapSafety); + sal_Int32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]; ByteString sIndent; while (nIndent--) sIndent += '\t'; - ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::vos::OThread::getCurrentIdentifier() ) ); + ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) ); sThread += '\t'; ByteString sMessage(sThread); @@ -98,20 +99,20 @@ void Tracer::TraceString(const char* _pMessage) sMessage += m_sBlockDescription; sMessage += ": "; sMessage += _pMessage; - DBG_TRACE(sMessage.GetBuffer()); + OSL_TRACE(sMessage.GetBuffer()); } //------------------------------------------------------------------------------ void Tracer::TraceString1StringParam(const char* _pMessage, const char* _pParam) { - ::vos::OGuard aGuard(s_aMapSafety); - sal_Int32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ]; + ::osl::MutexGuard aGuard(s_aMapSafety); + sal_Int32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]; ByteString sIndent; while (nIndent--) sIndent += '\t'; - ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::vos::OThread::getCurrentIdentifier() ) ); + ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) ); sThread += '\t'; ByteString sMessage(sThread); @@ -119,6 +120,8 @@ void Tracer::TraceString1StringParam(const char* _pMessage, const char* _pParam) sMessage += m_sBlockDescription; sMessage += ": "; sMessage += _pMessage; - DBG_TRACE1(sMessage.GetBuffer(), _pParam); + OSL_TRACE(sMessage.GetBuffer(), _pParam); } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index 1026356e08c2..3906972883fa 100644 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,4 @@ namespace svx //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index e1f069be96a6..d5b93d1bb212 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" +#include <sal/macros.h> #include "svx/ParseContext.hxx" #include "stringlistresource.hxx" #include "svx/fmresids.hrc" @@ -37,7 +39,7 @@ #include <unotools/syslocale.hxx> #include <vcl/svapp.hxx> #include <tools/debug.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> using namespace svxform; using namespace ::connectivity; @@ -49,7 +51,7 @@ DBG_NAME(OSystemParseContext) OSystemParseContext::OSystemParseContext() : IParseContext() { DBG_CTOR(OSystemParseContext,NULL); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; ::svx::StringListResource aKeywords( SVX_RES( RID_RSC_SQL_INTERNATIONAL ) ); aKeywords.get( m_aLocalizedKeywords ); @@ -71,7 +73,7 @@ OSystemParseContext::~OSystemParseContext() ::rtl::OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const { String aMsg; - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; switch (_eCode) { case ERROR_GENERAL: aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_ERROR); break; @@ -122,7 +124,7 @@ OSystemParseContext::~OSystemParseContext() case KEY_FUSION: nIndex = 22; break; case KEY_INTERSECTION: nIndex = 23; break; case KEY_NONE: - DBG_ERROR( "OSystemParseContext::getIntlKeywordAscii: illegal argument!" ); + OSL_FAIL( "OSystemParseContext::getIntlKeywordAscii: illegal argument!" ); break; } @@ -170,7 +172,7 @@ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const :: KEY_COLLECT, KEY_FUSION, KEY_INTERSECTION }; - sal_uInt32 nCount = sizeof Intl_TokenID / sizeof Intl_TokenID[0]; + sal_uInt32 nCount = SAL_N_ELEMENTS( Intl_TokenID ); for (sal_uInt32 i = 0; i < nCount; i++) { ::rtl::OString aKey = getIntlKeywordAscii(Intl_TokenID[i]); @@ -247,3 +249,4 @@ const OSystemParseContext* OParseContextClient::getParseContext() const +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index b2d67e9b66ea..f10546cf45c3 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,7 +51,6 @@ namespace svx #define CONST_CHAR( propname ) propname, sizeof(propname) - 1 -#ifndef SVX_LIGHT //==================================================================== //= ODADescriptorImpl //==================================================================== @@ -156,7 +156,7 @@ namespace svx xPropInfo = _rxValues->getPropertySetInfo(); if (!xPropInfo.is()) { - OSL_ENSURE(sal_False, "ODADescriptorImpl::buildFrom: invalid property set!"); + OSL_FAIL("ODADescriptorImpl::buildFrom: invalid property set!"); return sal_False; } @@ -324,67 +324,41 @@ namespace svx // don't need to rebuild next time m_bSetOutOfDate = sal_True; } -#endif //==================================================================== //= ODataAccessDescriptor //==================================================================== //-------------------------------------------------------------------- ODataAccessDescriptor::ODataAccessDescriptor() -#ifndef SVX_LIGHT :m_pImpl(new ODADescriptorImpl) -#else - :m_pImpl(NULL) -#endif { } //-------------------------------------------------------------------- ODataAccessDescriptor::ODataAccessDescriptor( const ODataAccessDescriptor& _rSource ) -#ifndef SVX_LIGHT :m_pImpl(new ODADescriptorImpl(*_rSource.m_pImpl)) -#else - :m_pImpl(NULL) -#endif { } //-------------------------------------------------------------------- const ODataAccessDescriptor& ODataAccessDescriptor::operator=(const ODataAccessDescriptor& _rSource) { -#ifndef SVX_LIGHT delete m_pImpl; m_pImpl = new ODADescriptorImpl(*_rSource.m_pImpl); -#else - OSL_ENSURE(sal_False, "ODataAccessDescriptor::operator=: not available in the SVX_LIGHT version!"); -#endif return *this; } //-------------------------------------------------------------------- ODataAccessDescriptor::ODataAccessDescriptor( const Reference< XPropertySet >& _rValues ) -#ifndef SVX_LIGHT :m_pImpl(new ODADescriptorImpl) -#else - :m_pImpl(NULL) -#endif { -#ifndef SVX_LIGHT m_pImpl->buildFrom(_rValues); -#else - OSL_ENSURE(sal_False, "ODataAccessDescriptor::ODataAccessDescriptor: not available in the SVX_LIGHT version!"); -#endif } //-------------------------------------------------------------------- ODataAccessDescriptor::ODataAccessDescriptor( const Any& _rValues ) -#ifndef SVX_LIGHT :m_pImpl(new ODADescriptorImpl) -#else - :m_pImpl(NULL) -#endif { -#ifndef SVX_LIGHT // check if we know the format in the Any Sequence< PropertyValue > aValues; Reference< XPropertySet > xValues; @@ -392,24 +366,13 @@ namespace svx m_pImpl->buildFrom( aValues ); else if ( _rValues >>= xValues ) m_pImpl->buildFrom( xValues ); -#else - OSL_ENSURE(sal_False, "ODataAccessDescriptor::ODataAccessDescriptor: not available in the SVX_LIGHT version!"); -#endif } //-------------------------------------------------------------------- ODataAccessDescriptor::ODataAccessDescriptor( const Sequence< PropertyValue >& _rValues ) -#ifndef SVX_LIGHT :m_pImpl(new ODADescriptorImpl) -#else - :m_pImpl(NULL) -#endif { -#ifndef SVX_LIGHT m_pImpl->buildFrom(_rValues); -#else - OSL_ENSURE(sal_False, "ODataAccessDescriptor::ODataAccessDescriptor: not available in the SVX_LIGHT version!"); -#endif } //-------------------------------------------------------------------- @@ -421,95 +384,68 @@ namespace svx //-------------------------------------------------------------------- void ODataAccessDescriptor::clear() { -#ifndef SVX_LIGHT m_pImpl->m_aValues.clear(); -#endif } //-------------------------------------------------------------------- void ODataAccessDescriptor::erase(DataAccessDescriptorProperty _eWhich) { -#ifndef SVX_LIGHT OSL_ENSURE(has(_eWhich), "ODataAccessDescriptor::erase: invalid call!"); if (has(_eWhich)) m_pImpl->m_aValues.erase(_eWhich); -#endif } //-------------------------------------------------------------------- sal_Bool ODataAccessDescriptor::has(DataAccessDescriptorProperty _eWhich) const { -#ifndef SVX_LIGHT return m_pImpl->m_aValues.find(_eWhich) != m_pImpl->m_aValues.end(); -#else - return sal_False; -#endif } //-------------------------------------------------------------------- const Any& ODataAccessDescriptor::operator [] ( DataAccessDescriptorProperty _eWhich ) const { -#ifndef SVX_LIGHT if (!has(_eWhich)) { - OSL_ENSURE(sal_False, "ODataAccessDescriptor::operator[]: invalid acessor!"); + OSL_FAIL("ODataAccessDescriptor::operator[]: invalid acessor!"); static const Any aDummy; return aDummy; } return m_pImpl->m_aValues[_eWhich]; -#else - static const Any aDummy; - return aDummy; -#endif } //-------------------------------------------------------------------- Any& ODataAccessDescriptor::operator[] ( DataAccessDescriptorProperty _eWhich ) { -#ifndef SVX_LIGHT m_pImpl->invalidateExternRepresentations(); return m_pImpl->m_aValues[_eWhich]; -#else - static const Any aDummy; - return aDummy; -#endif } //-------------------------------------------------------------------- void ODataAccessDescriptor::initializeFrom(const Reference< XPropertySet >& _rxValues, sal_Bool _bClear) { -#ifndef SVX_LIGHT if (_bClear) clear(); m_pImpl->buildFrom(_rxValues); -#endif } //-------------------------------------------------------------------- void ODataAccessDescriptor::initializeFrom(const Sequence< PropertyValue >& _rValues, sal_Bool _bClear) { -#ifndef SVX_LIGHT if (_bClear) clear(); m_pImpl->buildFrom(_rValues); -#endif } //-------------------------------------------------------------------- Sequence< PropertyValue > ODataAccessDescriptor::createPropertyValueSequence() { -#ifndef SVX_LIGHT m_pImpl->updateSequence(); return m_pImpl->m_aAsSequence; -#else - return Sequence< PropertyValue >(); -#endif } //-------------------------------------------------------------------- Sequence< Any > ODataAccessDescriptor::createAnySequence() { -#ifndef SVX_LIGHT m_pImpl->updateSequence(); Sequence< Any > aRet(m_pImpl->m_aAsSequence.getLength()); const PropertyValue* pBegin = m_pImpl->m_aAsSequence.getConstArray(); @@ -517,39 +453,27 @@ namespace svx for(sal_Int32 i=0;pBegin != pEnd;++pBegin,++i) aRet[i] <<= *pBegin; return aRet; -#else - return Sequence< createAnySequence >(); -#endif } //-------------------------------------------------------------------- Reference< XPropertySet > ODataAccessDescriptor::createPropertySet() { -#ifndef SVX_LIGHT m_pImpl->updateSet(); return m_pImpl->m_xAsSet; -#else - return Reference< XPropertySet >(); -#endif } //-------------------------------------------------------------------- ::rtl::OUString ODataAccessDescriptor::getDataSource() const { -#ifndef SVX_LIGHT ::rtl::OUString sDataSourceName; if ( has(daDataSource) ) (*this)[daDataSource] >>= sDataSourceName; else if ( has(daDatabaseLocation) ) (*this)[daDatabaseLocation] >>= sDataSourceName; return sDataSourceName; -#else - return ::rtl::OUString(); -#endif } //-------------------------------------------------------------------- void ODataAccessDescriptor::setDataSource(const ::rtl::OUString& _sDataSourceNameOrLocation) { -#ifndef SVX_LIGHT if ( _sDataSourceNameOrLocation.getLength() ) { INetURLObject aURL(_sDataSourceNameOrLocation); @@ -557,7 +481,6 @@ namespace svx } else (*this)[ daDataSource ] <<= ::rtl::OUString(); -#endif } //........................................................................ @@ -565,3 +488,4 @@ namespace svx //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index c6df77774c77..5b4e7f14af68 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -312,3 +313,5 @@ namespace svx //........................................................................ } // namespace svx //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/datalistener.cxx b/svx/source/form/datalistener.cxx index 244d9d2764e1..35f6b32cc1a7 100644 --- a/svx/source/form/datalistener.cxx +++ b/svx/source/form/datalistener.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,4 @@ namespace svxform } // namespace svxform //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index de429ca75c57..df4f2448342a 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" +#include <sal/macros.h> #include "datanavi.hxx" #include "fmservs.hxx" @@ -304,14 +306,12 @@ namespace svxform m_pNaviWin ( _pNaviWin ), m_bHasModel ( false ), m_eGroup ( _eGroup ), - m_TbxImageList ( SVX_RES( IL_TBX_BMPS ) ), - m_TbxHCImageList( SVX_RES( IL_TBX_BMPS_HC ) ) + m_TbxImageList ( SVX_RES( IL_TBX_BMPS ) ) { FreeResource(); - const ImageList& rImageList = - GetBackground().GetColor().IsDark() ? m_TbxHCImageList : m_TbxImageList; + const ImageList& rImageList = m_TbxImageList; m_aToolBox.SetItemImage( TBI_ITEM_ADD, rImageList.GetImage( IID_ITEM_ADD ) ); m_aToolBox.SetItemImage( TBI_ITEM_ADD_ELEMENT, rImageList.GetImage( IID_ITEM_ADD_ELEMENT ) ); m_aToolBox.SetItemImage( TBI_ITEM_ADD_ATTRIBUTE, rImageList.GetImage( IID_ITEM_ADD_ATTRIBUTE ) ); @@ -708,7 +708,7 @@ namespace svxform { try { - String sDelim( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + String sDelim( RTL_CONSTASCII_USTRINGPARAM( ": " ) ); ::rtl::OUString sTemp; pNode->m_xPropSet->getPropertyValue( PN_BINDING_ID ) >>= sTemp; sNewName += String( sTemp ); @@ -755,12 +755,12 @@ namespace svxform case MID_INSERT_CONTROL: { - OSL_ENSURE( false, "XFormsPage::DoToolboxAction: MID_INSERT_CONTROL not implemented, yet!" ); + OSL_FAIL( "XFormsPage::DoToolboxAction: MID_INSERT_CONTROL not implemented, yet!" ); } break; default: - OSL_ENSURE( false, "XFormsPage::DoToolboxAction: unknown ID!" ); + OSL_FAIL( "XFormsPage::DoToolboxAction: unknown ID!" ); break; } @@ -775,9 +775,7 @@ namespace svxform SvLBoxEntry* XFormsPage::AddEntry( ItemNode* _pNewNode, bool _bIsElement ) { SvLBoxEntry* pParent = m_aItemList.FirstSelected(); - const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode() - ? m_pNaviWin->GetItemHCImageList() - : m_pNaviWin->GetItemImageList(); + const ImageList& rImageList = m_pNaviWin->GetItemImageList(); sal_uInt16 nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE; Image aImage = rImageList.GetImage( nImageID ); ::rtl::OUString sName; @@ -812,10 +810,8 @@ namespace svxform { // create a resource manager, for the svx resource file // and the UI locale - ByteString aResourceFile( "svx" ); ResMgr* pResMgr = ResMgr::CreateResMgr( - aResourceFile.GetBuffer(), - Application::GetSettings().GetUILocale() ); + "svx", Application::GetSettings().GetUILocale() ); // load the resources for the AddSubmission modal dialog. // This will create our own resource context. @@ -985,9 +981,7 @@ namespace svxform SvLBoxEntry* XFormsPage::AddEntry( const Reference< XPropertySet >& _rEntry ) { SvLBoxEntry* pEntry = NULL; - const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode() - ? m_pNaviWin->GetItemHCImageList() - : m_pNaviWin->GetItemImageList(); + const ImageList& rImageList = m_pNaviWin->GetItemImageList(); Image aImage = rImageList.GetImage( IID_ELEMENT ); ItemNode* pNode = new ItemNode( _rEntry ); @@ -1035,7 +1029,7 @@ namespace svxform { try { - String sDelim( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + String sDelim( RTL_CONSTASCII_USTRINGPARAM( ": " ) ); ::rtl::OUString sName; _rEntry->getPropertyValue( PN_BINDING_ID ) >>= sTemp; sName += String( sTemp ); @@ -1241,9 +1235,7 @@ namespace svxform m_xUIHelper = Reference< css::xforms::XFormsUIHelper1 >( _xModel, UNO_QUERY ); String sRet; m_bHasModel = true; - const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode() - ? m_pNaviWin->GetItemHCImageList() - : m_pNaviWin->GetItemImageList(); + const ImageList& rImageList = m_pNaviWin->GetItemImageList(); switch ( m_eGroup ) { @@ -1256,13 +1248,13 @@ namespace svxform if ( xContainer.is() ) m_pNaviWin->AddContainerBroadcaster( xContainer ); - sal_uInt16 nIter = 0; Reference< XEnumerationAccess > xNumAccess( _xModel->getInstances(), UNO_QUERY ); if ( xNumAccess.is() ) { Reference < XEnumeration > xNum = xNumAccess->createEnumeration(); if ( xNum.is() && xNum->hasMoreElements() ) { + sal_uInt16 nIter = 0; while ( xNum->hasMoreElements() ) { if ( nIter == _nPagePos ) @@ -1342,7 +1334,7 @@ namespace svxform { Image aImage1 = rImageList.GetImage( IID_ELEMENT ); Image aImage2 = rImageList.GetImage( IID_ELEMENT ); - String sDelim( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + String sDelim( RTL_CONSTASCII_USTRINGPARAM( ": " ) ); while ( xNum->hasMoreElements() ) { Reference< XPropertySet > xPropSet; @@ -1372,7 +1364,7 @@ namespace svxform break; } default: - DBG_ERROR( "XFormsPage::SetModel: unknown group!" ); + OSL_FAIL( "XFormsPage::SetModel: unknown group!" ); break; } @@ -1559,7 +1551,6 @@ namespace svxform m_bIsNotifyDisabled ( false ), m_aItemImageList ( SVX_RES( IL_ITEM_BMPS ) ), - m_aItemHCImageList ( SVX_RES( IL_ITEM_BMPS_HC ) ), m_xDataListener ( new DataListener( this ) ) { @@ -1892,6 +1883,7 @@ namespace svxform m_aTabCtrl.SetPageText( nId, sNewName ); bIsDocModified = true; } + delete(pPage); } break; } @@ -2799,7 +2791,7 @@ namespace svxform m_eItemType = DITText; break; default: - DBG_ERROR( "AddDataItemDialog::InitFronNode: cannot handle this node type!" ); + OSL_FAIL( "AddDataItemDialog::InitFronNode: cannot handle this node type!" ); break; } @@ -2924,7 +2916,7 @@ namespace svxform &m_aCalculateBtn }; Window** pCurrent = pWinsForHide; - for ( ; i < sizeof( pWinsForHide ) / sizeof( pWinsForHide[ 0 ] ); ++i, ++pCurrent ) + for ( ; i < SAL_N_ELEMENTS( pWinsForHide ); ++i, ++pCurrent ) (*pCurrent)->Hide(); Window* pWinsForMove[] = @@ -2932,7 +2924,7 @@ namespace svxform &m_aButtonsFL, &m_aOKBtn, &m_aEscBtn, &m_aHelpBtn }; pCurrent = pWinsForMove; - for ( i = 0; i < sizeof( pWinsForMove ) / sizeof( pWinsForMove[ 0 ] ); ++i, ++pCurrent ) + for ( i = 0; i < SAL_N_ELEMENTS( pWinsForMove ); ++i, ++pCurrent ) { Point aNewPos = (*pCurrent)->GetPosPixel(); aNewPos.Y() -= nDelta; @@ -3534,7 +3526,7 @@ namespace svxform Reference < XEnumeration > xNum = xNumAccess->createEnumeration(); if ( xNum.is() && xNum->hasMoreElements() ) { - String sDelim( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + String sDelim( RTL_CONSTASCII_USTRINGPARAM( ": " ) ); while ( xNum->hasMoreElements() ) { Reference< XPropertySet > xPropSet; @@ -3730,3 +3722,4 @@ namespace svxform //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src index 3dac7faf3a90..f473ef411b60 100644 --- a/svx/source/form/datanavi.src +++ b/svx/source/form/datanavi.src @@ -106,12 +106,6 @@ IdCount = { 5 ; } ; MASKCOLOR IMG_LST }; - ImageList IL_TBX_BMPS_HC - { - Prefix = "tbh"; - MASKCOLOR - IMG_LST - }; #undef IMG_LST }; @@ -247,12 +241,6 @@ IdCount = { 6 ; } ; MASKCOLOR IMG_LST2 }; - ImageList IL_ITEM_BMPS_HC - { - Prefix = "dah"; - MASKCOLOR - IMG_LST2 - }; }; QueryBox RID_QRY_REMOVE_MODEL diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx index 5566493ca264..f77e95b49a5e 100644 --- a/svx/source/form/dbcharsethelper.cxx +++ b/svx/source/form/dbcharsethelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,4 @@ namespace svxform +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx index 6cc874112e94..cf36a7db03a6 100644 --- a/svx/source/form/dbtoolsclient.cxx +++ b/svx/source/form/dbtoolsclient.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,8 +111,8 @@ namespace svxform OSL_ENSURE(NULL == s_hDbtoolsModule, "ODbtoolsClient::registerClient: inconsistence: already have a module!"); OSL_ENSURE(NULL == s_pFactoryCreationFunc, "ODbtoolsClient::registerClient: inconsistence: already have a factory function!"); - const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii( - SVLIBRARY( "dbtools" ) + const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM( + SVLIBRARY( "dbtools" )) ); // load the dbtools library @@ -121,14 +122,14 @@ namespace svxform if (NULL != s_hDbtoolsModule) { // get the symbol for the method creating the factory - const ::rtl::OUString sFactoryCreationFunc = ::rtl::OUString::createFromAscii("createDataAccessToolsFactory"); + const ::rtl::OUString sFactoryCreationFunc( RTL_CONSTASCII_USTRINGPARAM("createDataAccessToolsFactory") ); // reinterpret_cast<createDataAccessToolsFactoryFunction> s_pFactoryCreationFunc = (createDataAccessToolsFactoryFunction)( osl_getFunctionSymbol(s_hDbtoolsModule, sFactoryCreationFunc.pData)); if (NULL == s_pFactoryCreationFunc) { // did not find the symbol - OSL_ENSURE(sal_False, "ODbtoolsClient::registerClient: could not find the symbol for creating the factory!"); + OSL_FAIL("ODbtoolsClient::registerClient: could not find the symbol for creating the factory!"); osl_unloadModule(s_hDbtoolsModule); s_hDbtoolsModule = NULL; } @@ -160,7 +161,7 @@ namespace svxform } //-------------------------------------------------------------------- - //add by BerryJia for fixing Bug97420 Time:2002-9-12-11:00(PRC time) + bool OStaticDataAccessTools::ensureLoaded() const { if ( !ODbtoolsClient::ensureLoaded() ) @@ -364,3 +365,4 @@ namespace svxform //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx index 630a81fd521e..182e64788aed 100644 --- a/svx/source/form/delayedevent.cxx +++ b/svx/source/form/delayedevent.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -66,3 +67,5 @@ namespace svxform //........................................................................ } // namespace svxform //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index d9f64d068cbb..1a9a2de3c636 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,12 +36,15 @@ #include "fmitems.hxx" #include "fmprop.hrc" #include "svx/fmresids.hrc" -#include "gridcell.hxx" /** === begin UNO includes === **/ +#include <com/sun/star/awt/XControlModel.hpp> +#include <com/sun/star/awt/XControl.hpp> +#include <com/sun/star/awt/XTextComponent.hpp> #include <com/sun/star/form/runtime/XFormController.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/util/XNumberFormatter.hpp> +#include <com/sun/star/beans/XFastPropertySet.hpp> /** === end UNO includes === **/ #include <comphelper/processfactory.hxx> @@ -62,6 +66,7 @@ #include <svx/svxids.hrc> #include <tools/shl.hxx> #include <vcl/wrkwin.hxx> +#include <tools/diagnose_ex.h> #include <functional> @@ -145,7 +150,7 @@ OLocalExchange* OFilterExchangeHelper::createExchange() const //======================================================================== TYPEINIT0(FmFilterData); -Image FmFilterData::GetImage( BmpColorMode /*_eMode*/ ) const +Image FmFilterData::GetImage() const { return Image(); } @@ -163,20 +168,16 @@ FmParentData::~FmParentData() //======================================================================== TYPEINIT1(FmFormItem, FmParentData); //------------------------------------------------------------------------ -Image FmFormItem::GetImage( BmpColorMode _eMode ) const +Image FmFormItem::GetImage() const { static Image aImage; - static Image aImage_HC; if (!aImage) { ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); - ImageList aNavigatorImages_HC( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) ); - aImage = aNavigatorImages.GetImage( RID_SVXIMG_FORM ); - aImage_HC = aNavigatorImages_HC.GetImage( RID_SVXIMG_FORM ); } - return ( BMP_COLOR_HIGHCONTRAST == _eMode ) ? aImage_HC : aImage; + return aImage; } //======================================================================== @@ -198,20 +199,16 @@ FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) co } //------------------------------------------------------------------------ -Image FmFilterItems::GetImage( BmpColorMode _eMode ) const +Image FmFilterItems::GetImage() const { static Image aImage; - static Image aImage_HC; if (!aImage) { ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); - ImageList aNavigatorImages_HC( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) ); - aImage = aNavigatorImages.GetImage( RID_SVXIMG_FILTER ); - aImage_HC = aNavigatorImages_HC.GetImage( RID_SVXIMG_FILTER ); } - return ( BMP_COLOR_HIGHCONTRAST == _eMode ) ? aImage_HC : aImage; + return aImage; } //======================================================================== @@ -229,20 +226,16 @@ FmFilterItem::FmFilterItem( const Reference< XMultiServiceFactory >& _rxFactory, } //------------------------------------------------------------------------ -Image FmFilterItem::GetImage( BmpColorMode _eMode ) const +Image FmFilterItem::GetImage() const { static Image aImage; - static Image aImage_HC; if (!aImage) { ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); - ImageList aNavigatorImages_HC( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) ); - aImage = aNavigatorImages.GetImage( RID_SVXIMG_FIELD ); - aImage_HC = aNavigatorImages_HC.GetImage( RID_SVXIMG_FIELD ); } - return ( BMP_COLOR_HIGHCONTRAST == _eMode ) ? aImage_HC : aImage; + return aImage; } //======================================================================== @@ -445,7 +438,7 @@ namespace //------------------------------------------------------------------------ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) throw( RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( !m_pModel ) return; @@ -495,7 +488,7 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) th //------------------------------------------------------------------------ void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& _Event ) throw (RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< XFormController > xController( _Event.Source, UNO_QUERY_THROW ); Reference< XFilterController > xFilterController( _Event.Source, UNO_QUERY_THROW ); @@ -530,7 +523,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& _Event //------------------------------------------------------------------------ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event ) throw (RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< XFormController > xController( _Event.Source, UNO_QUERY_THROW ); Reference< XFilterController > xFilterController( _Event.Source, UNO_QUERY_THROW ); @@ -545,7 +538,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event ) bool bValidIndex = ( nInsertPos >= 0 ) && ( (size_t)nInsertPos <= pFormItem->GetChildren().size() ); if ( !bValidIndex ) { - OSL_ENSURE( false, "FmFilterAdapter::disjunctiveTermAdded: invalid index!" ); + OSL_FAIL( "FmFilterAdapter::disjunctiveTermAdded: invalid index!" ); return; } @@ -952,7 +945,7 @@ void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const ::rtl::OUString& r m_pAdapter->setText(nParentPos, pItem, rText); - if (!rText) + if (rText.isEmpty()) Remove(pItem); else { @@ -1171,22 +1164,11 @@ FmFilterNavigator::FmFilterNavigator( Window* pParent ) SetHelpId( HID_FILTER_NAVIGATOR ); { - { - ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); - SetNodeBitmaps( - aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), - aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ), - BMP_COLOR_NORMAL - ); - } - { - ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) ); - SetNodeBitmaps( - aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), - aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ), - BMP_COLOR_HIGHCONTRAST - ); - } + ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); + SetNodeBitmaps( + aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), + aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ) + ); } m_pModel = new FmFilterModel(comphelper::getProcessServiceFactory()); @@ -1586,12 +1568,7 @@ void FmFilterNavigator::Insert(FmFilterData* pItem, sal_Int32 nPos) // insert the item SvLBoxEntry* pParentEntry = FindEntry( pParent ); - SvLBoxEntry* pNewEntry = InsertEntry(pItem->GetText(), pItem->GetImage(), pItem->GetImage(), pParentEntry, sal_False, nPos, pItem ); - if ( pNewEntry ) - { - SetExpandedEntryBmp( pNewEntry, pItem->GetImage( BMP_COLOR_HIGHCONTRAST ), BMP_COLOR_HIGHCONTRAST ); - SetCollapsedEntryBmp( pNewEntry, pItem->GetImage( BMP_COLOR_HIGHCONTRAST ), BMP_COLOR_HIGHCONTRAST ); - } + InsertEntry( pItem->GetText(), pItem->GetImage(), pItem->GetImage(), pParentEntry, sal_False, nPos, pItem ); if ( pParentEntry ) Expand( pParentEntry ); } @@ -2083,3 +2060,5 @@ FmFilterNavigatorWinMgr::FmFilterNavigatorWinMgr( Window *_pParent, sal_uInt16 _ //........................................................................ } // namespace svxform //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 6768acfbe1f2..1dca627aac7d 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" +#include <sal/macros.h> + #include "fmhelp.hrc" #include "fmprop.hrc" #include "fmPropBrw.hxx" @@ -228,20 +231,20 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding try { // create a frame wrapper for myself - m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Frame")), UNO_QUERY); + m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")) ), UNO_QUERY); if (m_xMeAsFrame.is()) { // create an intermediate window, which is to be the container window of the frame // Do *not* use |this| as container window for the frame, this would result in undefined // responsiblity for this window (as soon as we initialize a frame with a window, the frame // is responsible for it's life time, but |this| is controlled by the belonging SfxChildWindow) - // #i34249# - 2004-09-27 - fs@openoffice.org + // #i34249# Window* pContainerWindow = new Window( this ); pContainerWindow->Show(); m_xFrameContainerWindow = VCLUnoHelper::GetInterface ( pContainerWindow ); m_xMeAsFrame->initialize( m_xFrameContainerWindow ); - m_xMeAsFrame->setName(::rtl::OUString::createFromAscii("form property browser")); + m_xMeAsFrame->setName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("form property browser")) ); if ( _pBindings->GetDispatcher() ) { ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFramesSupplier > @@ -249,13 +252,13 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding // if ( xSupp.is() ) // xSupp->getFrames()->append( m_xMeAsFrame ); // Don't append frame to frame hierachy to prevent UI_DEACTIVATE messages - // #i31834# - 2004-07-27 - cd@openoffice.org + // #i31834# } } } catch (Exception&) { - DBG_ERROR("FmPropBrw::FmPropBrw: could not create/initialize my frame!"); + OSL_FAIL("FmPropBrw::FmPropBrw: could not create/initialize my frame!"); m_xMeAsFrame.clear(); } @@ -284,7 +287,7 @@ void FmPropBrw::Resize() } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmPropBrw::Resize: caught an exception!" ); + OSL_FAIL( "FmPropBrw::Resize: caught an exception!" ); } } } @@ -306,7 +309,7 @@ FmPropBrw::~FmPropBrw() , ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) ) , ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlContext" ) ) , ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlShapeAccess" ) ) }; - for ( size_t i = 0; i < sizeof(pProps)/sizeof(pProps[0]); ++i ) + for ( size_t i = 0; i < SAL_N_ELEMENTS(pProps); ++i ) xName->removeByName( pProps[i] ); } } @@ -333,7 +336,7 @@ FmPropBrw::~FmPropBrw() } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmPropBrw::getCurrentPage: caught an exception while retrieving the current page!" ); + OSL_FAIL( "FmPropBrw::getCurrentPage: caught an exception while retrieving the current page!" ); } return sCurrentPage; } @@ -353,12 +356,11 @@ void FmPropBrw::implDetachController() } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmPropBrw::implDetachController: caught an exception while resetting the component!" ); + OSL_FAIL( "FmPropBrw::implDetachController: caught an exception while resetting the component!" ); } } // we attached a frame to the controller manually, so we need to manually tell it that it's detached, too - // 96068 - 09.01.2002 - fs@openoffice.org if ( m_xBrowserController.is() ) m_xBrowserController->attachFrame( NULL ); @@ -381,7 +383,7 @@ sal_Bool FmPropBrw::Close() } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmPropBrw::Close: caught an exception while asking the controller!" ); + OSL_FAIL( "FmPropBrw::Close: caught an exception while asking the controller!" ); } } @@ -443,7 +445,7 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection ) } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmPropBrw::implSetNewSelection: caught an unexpected exception!" ); + OSL_FAIL( "FmPropBrw::implSetNewSelection: caught an unexpected exception!" ); return; } @@ -593,7 +595,7 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ) ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlShapeAccess" ) ), makeAny( xControlMap ) ) }; m_xInspectorContext.set( - ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), + ::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), xOwnContext ) ); bool bEnableHelpSection = lcl_shouldEnableHelpSection( m_xORB ); @@ -701,7 +703,7 @@ void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPool } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmPropBrw::StateChanged: caught an exception while setting the initial page!" ); + OSL_FAIL( "FmPropBrw::StateChanged: caught an exception while setting the initial page!" ); } } @@ -716,7 +718,9 @@ void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPool } catch (Exception&) { - DBG_ERROR("FmPropBrw::StateChanged: Exception occured!"); + OSL_FAIL("FmPropBrw::StateChanged: Exception occurred!"); } m_bInStateChange = false; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx index 28d016e1e146..bf9d0a45ac73 100644 --- a/svx/source/form/fmcontrolbordermanager.cxx +++ b/svx/source/form/fmcontrolbordermanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,13 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef SVX_SOURCE_FORM_FMCONTROLBORDERMANAGER_HXX #include "fmcontrolbordermanager.hxx" -#endif -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif /** === begin UNO includes === **/ #include <com/sun/star/form/validation/XValidatableFormComponent.hpp> @@ -183,7 +180,7 @@ namespace svxform if ( _nStatus & CONTROL_STATUS_MOUSE_HOVER ) return m_nMouseHoveColor; - OSL_ENSURE( sal_False, "ControlBorderManager::getControlColorByStatus: invalid status!" ); + OSL_FAIL( "ControlBorderManager::getControlColorByStatus: invalid status!" ); return 0x00000000; } @@ -259,7 +256,7 @@ namespace svxform } catch( const Exception& ) { - OSL_ENSURE( sal_False, "ControlBorderManager::controlStatusGained: caught an exception!" ); + OSL_FAIL( "ControlBorderManager::controlStatusGained: caught an exception!" ); } } @@ -283,7 +280,7 @@ namespace svxform } catch( const Exception& ) { - OSL_ENSURE( sal_False, "ControlBorderManager::controlStatusLost: caught an exception!" ); + OSL_FAIL( "ControlBorderManager::controlStatusLost: caught an exception!" ); } } @@ -315,7 +312,7 @@ namespace svxform m_nInvalidColor = _nColor; break; default: - OSL_ENSURE( sal_False, "ControlBorderManager::setStatusColor: invalid status!" ); + OSL_FAIL( "ControlBorderManager::setStatusColor: invalid status!" ); } } @@ -435,7 +432,7 @@ namespace svxform } catch( const Exception& ) { - OSL_ENSURE( sal_False, "ControlBorderManager::validityChanged: caught an exception!" ); + OSL_FAIL( "ControlBorderManager::validityChanged: caught an exception!" ); } } @@ -443,3 +440,4 @@ namespace svxform } // namespace svxform //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index 39454c27324e..358b4d3fb578 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -143,7 +144,8 @@ namespace svxform Reference< XPropertySetInfo > xStylePSI( xStyle->getPropertySetInfo(), UNO_SET_THROW ); // determine the script type associated with the system locale - const LocaleDataWrapper& rSysLocaleData = SvtSysLocale().GetLocaleData(); + const SvtSysLocale aSysLocale; + const LocaleDataWrapper& rSysLocaleData = aSysLocale.GetLocaleData(); const sal_Int16 eSysLocaleScriptType = MsLangId::getScriptType( MsLangId::convertLocaleToLanguage( rSysLocaleData.getLocale() ) ); // depending on this script type, use the right property from the document's style which controls the @@ -161,7 +163,7 @@ namespace svxform pCharLocalePropertyName = "CharLocaleComplex"; break; default: - OSL_ENSURE( false, "lcl_initializeControlFont: unexpected script type for system locale!" ); + OSL_FAIL( "lcl_initializeControlFont: unexpected script type for system locale!" ); break; } @@ -249,9 +251,9 @@ namespace svxform OSL_VERIFY( aVisualEffect >>= sVisualEffect ); sal_Int16 nVisualEffect = VisualEffect::NONE; - if ( sVisualEffect.equalsAscii( "flat" ) ) + if ( sVisualEffect.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "flat" ) ) ) nVisualEffect = VisualEffect::FLAT; - else if ( sVisualEffect.equalsAscii( "3D" ) ) + else if ( sVisualEffect.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "3D" ) ) ) nVisualEffect = VisualEffect::LOOK3D; if ( xPSI->hasPropertyByName( FM_PROP_BORDER ) ) @@ -286,7 +288,7 @@ namespace svxform } catch( const Exception& ) { - OSL_ENSURE( sal_False, "ControlLayouter::initializeControlLayout: caught an exception!" ); + OSL_FAIL( "ControlLayouter::initializeControlLayout: caught an exception!" ); } } @@ -326,3 +328,4 @@ namespace svxform } // namespace svxform //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index 199cc03b59b4..807919e60a2f 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,6 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" +#include <sal/macros.h> #include <svx/fmdmod.hxx> #include "fmservs.hxx" #include <fmobj.hxx> @@ -40,11 +42,11 @@ using namespace ::svxform; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstance(const ::rtl::OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRet; - if ( ServiceSpecifier.indexOf( ::rtl::OUString::createFromAscii("com.sun.star.form.component.") ) == 0 ) + if ( ServiceSpecifier.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.")) ) == 0 ) { xRet = ::comphelper::getProcessServiceFactory()->createInstance(ServiceSpecifier); } - else if ( ServiceSpecifier == ::rtl::OUString( ::rtl::OUString::createFromAscii("com.sun.star.drawing.ControlShape") ) ) + else if ( ServiceSpecifier == ::rtl::OUString( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")) ) ) { SdrObject* pObj = new FmFormObj(OBJ_FM_CONTROL); xRet = *new SvxShapeControl(pObj); @@ -86,7 +88,7 @@ using namespace ::svxform; FM_SUN_COMPONENT_IMAGECONTROL }; - static const sal_uInt16 nSvxComponentServiceNameListCount = sizeof(aSvxComponentServiceNameList) / sizeof ( aSvxComponentServiceNameList[0] ); + static const sal_uInt16 nSvxComponentServiceNameListCount = SAL_N_ELEMENTS(aSvxComponentServiceNameList); ::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq( nSvxComponentServiceNameListCount ); ::rtl::OUString* pStrings = aSeq.getArray(); @@ -105,19 +107,19 @@ using namespace ::svxform; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRet; sal_uInt16 nTokenCount = ServiceName.getTokenCount('.'); if (nTokenCount == 5 && - ServiceName.getToken( 0, '.' ) == ::rtl::OUString::createFromAscii("stardiv") && - ServiceName.getToken( 1, '.' ) == ::rtl::OUString::createFromAscii("one") && - ServiceName.getToken( 2, '.' ) == ::rtl::OUString::createFromAscii("form") && - ServiceName.getToken( 3, '.' ) == ::rtl::OUString::createFromAscii("component")) + ServiceName.getToken( 0, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv")) && + ServiceName.getToken( 1, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("one")) && + ServiceName.getToken( 2, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("form")) && + ServiceName.getToken( 3, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("component")) ) { xRet = ::comphelper::getProcessServiceFactory()->createInstance(ServiceName); } else if (nTokenCount == 4 && - ServiceName.getToken( 0, '.' ) == ::rtl::OUString::createFromAscii("stardiv") && - ServiceName.getToken( 1, '.' ) == ::rtl::OUString::createFromAscii("one") && - ServiceName.getToken( 2, '.' ) == ::rtl::OUString::createFromAscii("drawing") && - ServiceName.getToken( 3, '.' ) == ::rtl::OUString::createFromAscii("ControlShape")) + ServiceName.getToken( 0, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv")) && + ServiceName.getToken( 1, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("one")) && + ServiceName.getToken( 2, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("drawing")) && + ServiceName.getToken( 3, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlShape")) ) { SdrObject* pObj = new FmFormObj(); xRet = *new SvxShapeControl(pObj); @@ -129,3 +131,4 @@ using namespace ::svxform; */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx index d1ffbc7c0dbe..4bcb76f6f710 100644 --- a/svx/source/form/fmdocumentclassification.cxx +++ b/svx/source/form/fmdocumentclassification.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef SVX_SOURCE_FORM_FMDOCUMENTCLASSIFICATION_HXX #include "fmdocumentclassification.hxx" -#endif #include "svx/dbtoolsclient.hxx" /** === begin UNO includes === **/ @@ -152,7 +151,7 @@ namespace svxform } // last: uhm, there is no last resort - OSL_ENSURE( false, "DocumentClassification::classifyDocument: unknown document!" ); + OSL_FAIL( "DocumentClassification::classifyDocument: unknown document!" ); } catch( const Exception& ) { @@ -176,7 +175,7 @@ namespace svxform } catch( const Exception& ) { - OSL_ENSURE( sal_False, "DocumentClassification::classifyHostDocument: caught an exception!" ); + OSL_FAIL( "DocumentClassification::classifyHostDocument: caught an exception!" ); } return eType; @@ -212,3 +211,4 @@ namespace svxform } // namespace svxform //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index 2705afba891e..1581576f7657 100644 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,8 +96,8 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen { ::rtl::OUString aShapeType( xDescr->getShapeType() ); - if ( aShapeType.equalsAscii( "com.sun.star.drawing.ShapeControl" ) // compatibility - || aShapeType.equalsAscii( "com.sun.star.drawing.ControlShape" ) + if ( aShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.ShapeControl" ) ) // compatibility + || aShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.ControlShape" ) ) ) return new FmFormObj( OBJ_FM_CONTROL ); else @@ -144,3 +145,4 @@ sal_Bool SAL_CALL SvxFmDrawPage::hasForms(void) throw( ::com::sun::star::uno::Ru } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 1481a1846a36..da0868798af8 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ #include <sot/storage.hxx> #include <svl/itempool.hxx> -#ifndef _SVX_DBEXCH_HRC #include <svx/dbexch.hrc> -#endif #include <sot/formats.hxx> #include <svtools/svtreebx.hxx> #include <tools/diagnose_ex.h> @@ -164,7 +163,7 @@ namespace svxform } else { - DBG_ERROR( "OControlTransferData::OControlTransferData: invalid data for the control path format (2)!" ); + OSL_FAIL( "OControlTransferData::OControlTransferData: invalid data for the control path format (2)!" ); } } if ( OControlExchange::hasHiddenControlModelsFormat( aExchangedData.GetDataFlavorExVector() ) ) @@ -441,3 +440,4 @@ namespace svxform } //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index dc6a141e45e9..163e3cc45589 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,17 +29,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef _SVX_FMRESIDS_HRC #include "svx/fmresids.hrc" -#endif -#ifndef _SVX_FMEXPL_HRC #include "fmexpl.hrc" -#endif #include "fmexpl.hxx" -#ifndef _SVX_FMHELP_HRC #include "fmhelp.hrc" -#endif #include <svx/fmglob.hxx> #include "fmservs.hxx" #include <svx/fmmodel.hxx> @@ -46,13 +41,9 @@ #include "fmundo.hxx" #include "fmpgeimp.hxx" -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include <svx/dialmgr.hxx> #include "svx/svditer.hxx" #include <svx/svdouno.hxx> @@ -71,9 +62,7 @@ #include <sfx2/request.hxx> #include <tools/shl.hxx> -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif #include <vcl/sound.hxx> #include <svx/fmshell.hxx> #include "fmshimp.hxx" @@ -221,6 +210,43 @@ FmEntryDataList::~FmEntryDataList() DBG_DTOR(FmEntryDataList,NULL); } +//------------------------------------------------------------------------ +FmEntryData* FmEntryDataList::remove( FmEntryData* pItem ) +{ + for ( FmEntryDataBaseList::iterator it = maEntryDataList.begin(); + it < maEntryDataList.end(); + ++it + ) + { + if ( *it == pItem ) + { + maEntryDataList.erase( it ); + break; + } + } + return pItem; +} + +//------------------------------------------------------------------------ +void FmEntryDataList::insert( FmEntryData* pItem, size_t Index ) +{ + if ( Index < maEntryDataList.size() ) + { + FmEntryDataBaseList::iterator it = maEntryDataList.begin(); + ::std::advance( it, Index ); + maEntryDataList.insert( it, pItem ); + } + else + maEntryDataList.push_back( pItem ); +} + +//------------------------------------------------------------------------ +void FmEntryDataList::clear() +{ + for ( size_t i = 0, n = maEntryDataList.size(); i < n; ++i ) + delete maEntryDataList[ i ]; + maEntryDataList.clear(); +} //======================================================================== // class FmEntryData @@ -263,16 +289,15 @@ FmEntryData::FmEntryData( const FmEntryData& rEntryData ) pChildList = new FmEntryDataList(); aText = rEntryData.GetText(); m_aNormalImage = rEntryData.GetNormalImage(); - m_aHCImage = rEntryData.GetHCImage(); pParent = rEntryData.GetParent(); FmEntryData* pChildData; - sal_uInt32 nEntryCount = rEntryData.GetChildList()->Count(); - for( sal_uInt32 i=0; i<nEntryCount; i++ ) + size_t nEntryCount = rEntryData.GetChildList()->size(); + for( size_t i = 0; i < nEntryCount; i++ ) { - pChildData = rEntryData.GetChildList()->GetObject(i); + pChildData = rEntryData.GetChildList()->at( i ); FmEntryData* pNewChildData = pChildData->Clone(); - pChildList->Insert( pNewChildData, LIST_APPEND ); + pChildList->insert( pNewChildData, size_t(-1) ); } m_xNormalizedIFace = rEntryData.m_xNormalizedIFace; @@ -284,13 +309,7 @@ FmEntryData::FmEntryData( const FmEntryData& rEntryData ) void FmEntryData::Clear() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmEntryData::Clear" ); - for (;;) - { - FmEntryData* pEntryData = GetChildList()->Remove(sal_uLong(0)); - if (pEntryData == NULL) - break; - delete pEntryData; - } + GetChildList()->clear(); } //------------------------------------------------------------------------ @@ -328,16 +347,19 @@ sal_Bool FmEntryData::IsEqualWithoutChilds( FmEntryData* pEntryData ) TYPEINIT1( FmFormData, FmEntryData ); DBG_NAME(FmFormData); //------------------------------------------------------------------------ -FmFormData::FmFormData( const Reference< XForm >& _rxForm, const ImageList& _rNormalImages, const ImageList& _rHCImages, FmFormData* _pParent ) - :FmEntryData( _pParent, _rxForm ) - ,m_xForm( _rxForm ) +FmFormData::FmFormData( + const Reference< XForm >& _rxForm, + const ImageList& _rNormalImages, + FmFormData* _pParent +) +: FmEntryData( _pParent, _rxForm ), + m_xForm( _rxForm ) { DBG_CTOR(FmEntryData,NULL); ////////////////////////////////////////////////////////////////////// // Images setzen m_aNormalImage = _rNormalImages.GetImage( RID_SVXIMG_FORM ); - m_aHCImage = _rHCImages.GetImage( RID_SVXIMG_FORM ); ////////////////////////////////////////////////////////////////////// // Titel setzen @@ -395,16 +417,19 @@ sal_Bool FmFormData::IsEqualWithoutChilds( FmEntryData* pEntryData ) TYPEINIT1( FmControlData, FmEntryData ); DBG_NAME(FmControlData); //------------------------------------------------------------------------ -FmControlData::FmControlData( const Reference< XFormComponent >& _rxComponent, const ImageList& _rNormalImages, const ImageList& _rHCImages, FmFormData* _pParent ) - :FmEntryData( _pParent, _rxComponent ) - ,m_xFormComponent( _rxComponent ) +FmControlData::FmControlData( + const Reference< XFormComponent >& _rxComponent, + const ImageList& _rNormalImages, + FmFormData* _pParent +) +: FmEntryData( _pParent, _rxComponent ), + m_xFormComponent( _rxComponent ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmControlData::FmControlData" ); DBG_CTOR(FmControlData,NULL); ////////////////////////////////////////////////////////////////////// // Images setzen m_aNormalImage = GetImage( _rNormalImages ); - m_aHCImage = GetImage( _rHCImages ); ////////////////////////////////////////////////////////////////////// // Titel setzen @@ -565,7 +590,10 @@ sal_Bool FmControlData::IsEqualWithoutChilds( FmEntryData* pEntryData ) } //------------------------------------------------------------------------ -void FmControlData::ModelReplaced( const Reference< XFormComponent >& _rxNew, const ImageList& _rNormalImages, const ImageList& _rHCImages ) +void FmControlData::ModelReplaced( + const Reference< XFormComponent >& _rxNew, + const ImageList& _rNormalImages +) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmControlData::ModelReplaced" ); m_xFormComponent = _rxNew; @@ -573,7 +601,6 @@ void FmControlData::ModelReplaced( const Reference< XFormComponent >& _rxNew, co // Images neu setzen m_aNormalImage = GetImage( _rNormalImages ); - m_aHCImage = GetImage( _rHCImages ); } //............................................................................ @@ -705,3 +732,5 @@ namespace svxform //............................................................................ } // namespace svxform //............................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src index 8d6866f0ecdb..c6509d8cd1a1 100644 --- a/svx/source/form/fmexpl.src +++ b/svx/source/form/fmexpl.src @@ -28,7 +28,7 @@ #include <svx/svxids.hrc> #include "svx/fmresids.hrc" #include "fmexpl.hrc" -#include "globlmn.hrc" +#include "globlmn_tmpl.hrc" #include <svx/svxcommands.h> #include "fmhelp.hrc" @@ -298,13 +298,6 @@ ImageList RID_SVXIMGLIST_FMEXPL NAVIGATOR_IMAGEIDS; }; -ImageList RID_SVXIMGLIST_FMEXPL_HC -{ - Prefix = "sxh"; - MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; - NAVIGATOR_IMAGEIDS; -}; - ModalDialog RID_SVXDLG_SETFORM { HelpID = "svx:ModalDialog:RID_SVXDLG_SETFORM"; diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx index 14170f4c56fd..aca4c9b521e4 100644 --- a/svx/source/form/fmitems.cxx +++ b/svx/source/form/fmitems.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,17 +54,18 @@ SfxPoolItem* FmInterfaceItem::Clone( SfxItemPool* ) const //------------------------------------------------------------------------------ SvStream& FmInterfaceItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - DBG_ERROR( "FmInterfaceItem::Store: not implemented!" ); + OSL_FAIL( "FmInterfaceItem::Store: not implemented!" ); return rStrm; } //------------------------------------------------------------------------------ SfxPoolItem* FmInterfaceItem::Create( SvStream& /*rStrm*/, sal_uInt16 ) const { - DBG_ERROR( "FmInterfaceItem::Create: not implemented!" ); + OSL_FAIL( "FmInterfaceItem::Create: not implemented!" ); return new FmInterfaceItem( *this ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index 3c4c3debcc82..217e61f1df78 100644 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,11 +38,7 @@ #include <svx/svdobj.hxx> #include <tools/debug.hxx> -#ifndef SVX_LIGHT #include <sfx2/objsh.hxx> -#else -class SfxObjectShell; -#endif #include <boost/optional.hpp> @@ -80,11 +77,9 @@ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers) ,m_bOpenInDesignMode(sal_False) ,m_bAutoControlFocus(sal_False) { -#ifndef SVX_LIGHT m_pImpl = new FmFormModelImplData; m_pImpl->pUndoEnv = new FmXUndoEnvironment(*this); m_pImpl->pUndoEnv->acquire(); -#endif } /************************************************************************* @@ -99,11 +94,9 @@ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectSh ,m_bOpenInDesignMode(sal_False) ,m_bAutoControlFocus(sal_False) { -#ifndef SVX_LIGHT m_pImpl = new FmFormModelImplData; m_pImpl->pUndoEnv = new FmXUndoEnvironment(*this); m_pImpl->pUndoEnv->acquire(); -#endif } /************************************************************************* @@ -112,7 +105,7 @@ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectSh |* \************************************************************************/ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, - FASTBOOL bUseExtColorTable + bool bUseExtColorTable ) :SdrModel(pPool, pPers, bUseExtColorTable, LOADREFCOUNTS) ,m_pImpl(NULL) @@ -120,11 +113,9 @@ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, ,m_bOpenInDesignMode(sal_False) ,m_bAutoControlFocus(sal_False) { -#ifndef SVX_LIGHT m_pImpl = new FmFormModelImplData; m_pImpl->pUndoEnv = new FmXUndoEnvironment(*this); m_pImpl->pUndoEnv->acquire(); -#endif } /************************************************************************* @@ -133,18 +124,16 @@ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, |* \************************************************************************/ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, - FASTBOOL bUseExtColorTable) + bool bUseExtColorTable) :SdrModel(rPath, pPool, pPers, bUseExtColorTable, LOADREFCOUNTS) ,m_pImpl( NULL ) ,m_pObjShell(0) ,m_bOpenInDesignMode(sal_False) ,m_bAutoControlFocus(sal_False) { -#ifndef SVX_LIGHT m_pImpl = new FmFormModelImplData; m_pImpl->pUndoEnv = new FmXUndoEnvironment(*this); m_pImpl->pUndoEnv->acquire(); -#endif } /************************************************************************* @@ -154,7 +143,6 @@ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectSh \************************************************************************/ FmFormModel::~FmFormModel() { -#ifndef SVX_LIGHT if (m_pObjShell && m_pImpl->pUndoEnv->IsListening(*m_pObjShell)) SetObjectShell(NULL); @@ -165,7 +153,6 @@ FmFormModel::~FmFormModel() m_pImpl->pUndoEnv->release(); delete m_pImpl; -#endif } /************************************************************************* @@ -173,7 +160,7 @@ FmFormModel::~FmFormModel() |* Erzeugt eine neue Seite |* \************************************************************************/ -SdrPage* FmFormModel::AllocPage(FASTBOOL bMasterPage) +SdrPage* FmFormModel::AllocPage(bool bMasterPage) { return new FmFormPage(*this, NULL, bMasterPage); } @@ -185,11 +172,9 @@ SdrPage* FmFormModel::AllocPage(FASTBOOL bMasterPage) \************************************************************************/ void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos) { -#ifndef SVX_LIGHT // hack solange Methode intern if (m_pObjShell && !m_pImpl->pUndoEnv->IsListening( *m_pObjShell )) SetObjectShell(m_pObjShell); -#endif SdrModel::InsertPage( pPage, nPos ); } @@ -201,16 +186,12 @@ void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos) \************************************************************************/ void FmFormModel::MovePage( sal_uInt16 nPgNum, sal_uInt16 nNewPos ) { -#ifndef SVX_LIGHT m_pImpl->bMovingPage = sal_True; // see InsertPage for this -#endif SdrModel::MovePage( nPgNum, nNewPos ); -#ifndef SVX_LIGHT m_pImpl->bMovingPage = sal_False; -#endif } /************************************************************************* @@ -223,14 +204,12 @@ SdrPage* FmFormModel::RemovePage(sal_uInt16 nPgNum) FmFormPage* pToBeRemovedPage = dynamic_cast< FmFormPage* >( GetPage( nPgNum ) ); OSL_ENSURE( pToBeRemovedPage, "FmFormModel::RemovePage: *which page*?" ); -#ifndef SVX_LIGHT if ( pToBeRemovedPage ) { Reference< XNameContainer > xForms( pToBeRemovedPage->GetForms( false ) ); if ( xForms.is() ) m_pImpl->pUndoEnv->RemoveForms( xForms ); } -#endif FmFormPage* pRemovedPage = (FmFormPage*)SdrModel::RemovePage(nPgNum); OSL_ENSURE( pRemovedPage == pToBeRemovedPage, "FmFormModel::RemovePage: inconsistency!" ); @@ -244,11 +223,9 @@ SdrPage* FmFormModel::RemovePage(sal_uInt16 nPgNum) \************************************************************************/ void FmFormModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos) { -#ifndef SVX_LIGHT // hack solange Methode intern if (m_pObjShell && !m_pImpl->pUndoEnv->IsListening( *m_pObjShell )) SetObjectShell(m_pObjShell); -#endif SdrModel::InsertMasterPage(pPage, nPos); } @@ -262,14 +239,12 @@ SdrPage* FmFormModel::RemoveMasterPage(sal_uInt16 nPgNum) { FmFormPage* pPage = (FmFormPage*)SdrModel::RemoveMasterPage(nPgNum); -#ifndef SVX_LIGHT if ( pPage ) { Reference< XNameContainer > xForms( pPage->GetForms( false ) ); if ( xForms.is() ) m_pImpl->pUndoEnv->RemoveForms( xForms ); } -#endif return pPage; } @@ -297,18 +272,14 @@ void FmFormModel::implSetOpenInDesignMode( sal_Bool _bOpenDesignMode, sal_Bool _ //------------------------------------------------------------------------ void FmFormModel::SetOpenInDesignMode( sal_Bool bOpenDesignMode ) { -#ifndef SVX_LIGHT implSetOpenInDesignMode( bOpenDesignMode, sal_False ); -#endif } -#ifndef SVX_LIGHT //------------------------------------------------------------------------ sal_Bool FmFormModel::OpenInDesignModeIsDefaulted( ) { return m_pImpl->bOpenInDesignIsDefaulted; } -#endif //------------------------------------------------------------------------ sal_Bool FmFormModel::ControlsUseRefDevice() const @@ -326,19 +297,16 @@ sal_Bool FmFormModel::ControlsUseRefDevice() const //------------------------------------------------------------------------ void FmFormModel::SetAutoControlFocus( sal_Bool _bAutoControlFocus ) { -#ifndef SVX_LIGHT if( _bAutoControlFocus != m_bAutoControlFocus ) { m_bAutoControlFocus = _bAutoControlFocus; m_pObjShell->SetModified( sal_True ); } -#endif } //------------------------------------------------------------------------ void FmFormModel::SetObjectShell( SfxObjectShell* pShell ) { -#ifndef SVX_LIGHT if (pShell == m_pObjShell) return; @@ -359,7 +327,6 @@ void FmFormModel::SetObjectShell( SfxObjectShell* pShell ) m_pImpl->pUndoEnv->StartListening( *m_pObjShell ); } -#endif } //------------------------------------------------------------------------ @@ -367,3 +334,5 @@ FmXUndoEnvironment& FmFormModel::GetUndoEnv() { return *m_pImpl->pUndoEnv; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index a3a4038e4ab8..bcd6582c69a0 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -374,7 +375,7 @@ void FmFormObj::clonedFrom(const FmFormObj* _pSource) Reference< XInterface > xSourceContainer = xSourceAsChild->getParent(); m_xEnvironmentHistory = Reference< XIndexContainer >( - ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.form.Forms")), + ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.Forms")) ), UNO_QUERY); DBG_ASSERT(m_xEnvironmentHistory.is(), "FmFormObj::clonedFrom : could not create a forms collection !"); @@ -387,16 +388,14 @@ void FmFormObj::clonedFrom(const FmFormObj* _pSource) } //------------------------------------------------------------------ -SdrObject* FmFormObj::Clone() const +FmFormObj* FmFormObj::Clone() const { - SdrObject* pReturn = SdrUnoObj::Clone(); - - FmFormObj* pFormObject = PTR_CAST(FmFormObj, pReturn); + FmFormObj* pFormObject = CloneHelper< FmFormObj >(); DBG_ASSERT(pFormObject != NULL, "FmFormObj::Clone : invalid clone !"); if (pFormObject) pFormObject->clonedFrom(this); - return pReturn; + return pFormObject; } //------------------------------------------------------------------ @@ -407,30 +406,29 @@ void FmFormObj::NbcReformatText() } //------------------------------------------------------------------ -void FmFormObj::operator= (const SdrObject& rObj) +FmFormObj& FmFormObj::operator= (const FmFormObj& rObj) { + if( this == &rObj ) + return *this; SdrUnoObj::operator= (rObj); - FmFormObj* pFormObj = PTR_CAST(FmFormObj, &rObj); - if (pFormObj) + // liegt das UnoControlModel in einer Eventumgebung, + // dann koennen noch Events zugeordnet sein + Reference< XFormComponent > xContent(rObj.xUnoControlModel, UNO_QUERY); + if (xContent.is()) { - // liegt das UnoControlModel in einer Eventumgebung, - // dann koennen noch Events zugeordnet sein - Reference< XFormComponent > xContent(pFormObj->xUnoControlModel, UNO_QUERY); - if (xContent.is()) + Reference< XEventAttacherManager > xManager(xContent->getParent(), UNO_QUERY); + Reference< XIndexAccess > xManagerAsIndex(xManager, UNO_QUERY); + if (xManagerAsIndex.is()) { - Reference< XEventAttacherManager > xManager(xContent->getParent(), UNO_QUERY); - Reference< XIndexAccess > xManagerAsIndex(xManager, UNO_QUERY); - if (xManagerAsIndex.is()) - { - sal_Int32 nPos = getElementPos( xManagerAsIndex, xContent ); - if ( nPos >= 0 ) - aEvts = xManager->getScriptEvents( nPos ); - } + sal_Int32 nPos = getElementPos( xManagerAsIndex, xContent ); + if ( nPos >= 0 ) + aEvts = xManager->getScriptEvents( nPos ); } - else - aEvts = pFormObj->aEvts; } + else + aEvts = rObj.aEvts; + return *this; } //------------------------------------------------------------------ @@ -506,7 +504,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > } catch(Exception&) { - DBG_ERROR("FmFormObj::ensureModelEnv : could not retrieve a source DSS !"); + OSL_FAIL("FmFormObj::ensureModelEnv : could not retrieve a source DSS !"); } @@ -535,7 +533,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > } catch(Exception&) { - DBG_ERROR("FmFormObj::ensureModelEnv : exception while getting a sibling's DSS !"); + OSL_FAIL("FmFormObj::ensureModelEnv : exception while getting a sibling's DSS !"); } } @@ -566,7 +564,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > } catch(Exception&) { - DBG_ERROR("FmFormObj::ensureModelEnv : exception while getting a destination DSS !"); + OSL_FAIL("FmFormObj::ensureModelEnv : exception while getting a destination DSS !"); } } @@ -580,7 +578,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > { // create and insert (into the destination) a copy of the form xCurrentDestForm.set( - ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii( "com.sun.star.form.component.DataForm" ) ), + ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DataForm" )) ), UNO_QUERY_THROW ); ::comphelper::copyProperties( xCurrentSourceForm, xCurrentDestForm ); @@ -592,7 +590,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > } catch(Exception&) { - DBG_ERROR("FmFormObj::ensureModelEnv : something went seriously wrong while creating a new form !"); + OSL_FAIL("FmFormObj::ensureModelEnv : something went seriously wrong while creating a new form !"); // no more options anymore ... return Reference< XInterface > (); } @@ -658,7 +656,7 @@ void FmFormObj::SetUnoControlModel( const Reference< com::sun::star::awt::XContr } //------------------------------------------------------------------ -FASTBOOL FmFormObj::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) +bool FmFormObj::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) { bool bResult = SdrUnoObj::EndCreate(rStat, eCmd); if ( bResult && SDRCREATE_FORCEEND == eCmd && rStat.GetView() ) @@ -736,3 +734,5 @@ void FmFormObj::NbcSetLayer(SdrLayerID nLayer) } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 2b13f2a90bf0..8cfcf81983d0 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,32 +33,20 @@ #include "svx/fmtools.hxx" #include "fmservs.hxx" -#ifndef _FM_FMOBJFAC_HXX #include "svx/fmobjfac.hxx" -#endif -#ifndef _FM_FMGLOB_HXX #include <svx/fmglob.hxx> -#endif -#ifndef _FM_FMOBJ_HXX #include "fmobj.hxx" -#endif #include "fmshimp.hxx" -#ifndef _FM_FMSHELL_HXX #include <svx/fmshell.hxx> -#endif -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include "tbxform.hxx" #include <tools/resid.hxx> -#ifndef _SVX_FMRESIDS_HRC #include "svx/fmresids.hrc" -#endif #include <tools/shl.hxx> #include <svx/dialmgr.hxx> #include "fmservs.hxx" @@ -65,9 +54,7 @@ #include "fmexpl.hxx" #include "filtnav.hxx" -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include "fmPropBrw.hxx" #include "datanavi.hxx" @@ -143,7 +130,7 @@ namespace } catch( const Exception& ) { - DBG_ERROR( "lcl_initProperty: caught an exception!" ); + OSL_FAIL( "lcl_initProperty: caught an exception!" ); } } } @@ -276,3 +263,4 @@ IMPL_LINK(FmFormObjFactory, MakeObject, SdrObjFactory*, pObjFactory) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index bf86964d76de..75b27ed6033a 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,6 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" +#include <sal/macros.h> #define ENABLE_BYTESTRING_STREAM_OPERATORS #include <svx/fmpage.hxx> @@ -36,48 +38,26 @@ #include <svx/fmmodel.hxx> -#ifndef SVX_LIGHT -#ifndef _SVX_FMOBJ_HXX #include "fmobj.hxx" -#endif -#endif -#ifndef SVX_LIGHT -#ifndef _SVX_FMRESIDS_HRC -#include "svx/fmresids.hrc" -#endif -#endif +#include <svx/fmresids.hrc> #include <tools/shl.hxx> #include <svx/dialmgr.hxx> -#ifndef SVX_LIGHT -#ifndef _SVX_FMPGEIMP_HXX #include "fmpgeimp.hxx" -#endif -#endif -#ifndef SVX_LIGHT -#ifndef _SFX_OBJSH_HXX //autogen #include <sfx2/objsh.hxx> -#endif -#endif -#include "svx/svditer.hxx" +#include <svx/svditer.hxx> #include <svx/svdview.hxx> #include <tools/urlobj.hxx> #include <vcl/help.hxx> -#ifndef SVX_LIGHT -#ifndef _SVX_FMGLOB_HXX #include <svx/fmglob.hxx> -#endif -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include "fmundo.hxx" #include "svx/fmtools.hxx" using namespace ::svxform; -#endif #include <comphelper/property.hxx> #include <rtl/logfile.hxx> @@ -89,13 +69,9 @@ using com::sun::star::container::XNameContainer; TYPEINIT1(FmFormPage, SdrPage); //------------------------------------------------------------------ -FmFormPage::FmFormPage(FmFormModel& rModel, StarBASIC* _pBasic, FASTBOOL bMasterPage) +FmFormPage::FmFormPage(FmFormModel& rModel, StarBASIC* _pBasic, bool bMasterPage) :SdrPage(rModel, bMasterPage) -#ifndef SVX_LIGHT ,m_pImpl( new FmFormPageImpl( *this ) ) -#else - ,m_pImpl(NULL) -#endif ,m_pBasic(_pBasic) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::FmFormPage" ); @@ -104,16 +80,10 @@ FmFormPage::FmFormPage(FmFormModel& rModel, StarBASIC* _pBasic, FASTBOOL bMaster //------------------------------------------------------------------ FmFormPage::FmFormPage(const FmFormPage& rPage) :SdrPage(rPage) -#ifndef SVX_LIGHT ,m_pImpl(new FmFormPageImpl( *this ) ) -#else - ,m_pImpl(NULL) -#endif ,m_pBasic(0) { -#ifndef SVX_LIGHT m_pImpl->initFrom( rPage.GetImpl() ); -#endif RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::FmFormPage" ); m_sPageName = rPage.m_sPageName; } @@ -121,9 +91,7 @@ FmFormPage::FmFormPage(const FmFormPage& rPage) //------------------------------------------------------------------ FmFormPage::~FmFormPage() { -#ifndef SVX_LIGHT delete m_pImpl; -#endif } //------------------------------------------------------------------ @@ -158,9 +126,9 @@ void FmFormPage::SetModel(SdrModel* pNewModel) } } } - catch( ::com::sun::star::uno::Exception ex ) + catch( ::com::sun::star::uno::Exception const& ) { - OSL_ENSURE( sal_False, "UNO Exception caught resetting model for m_pImpl (FmFormPageImpl) in FmFormPage::SetModel" ); + OSL_FAIL( "UNO Exception caught resetting model for m_pImpl (FmFormPageImpl) in FmFormPage::SetModel" ); } } } @@ -179,17 +147,14 @@ void FmFormPage::InsertObject(SdrObject* pObj, sal_uLong nPos, { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::InsertObject" ); SdrPage::InsertObject( pObj, nPos, pReason ); -#ifndef SVX_LIGHT if (GetModel() && (!pReason || pReason->GetReason() != SDRREASON_STREAMING)) ((FmFormModel*)GetModel())->GetUndoEnv().Inserted(pObj); -#endif } //------------------------------------------------------------------ const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & FmFormPage::GetForms( bool _bForceCreate ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::GetForms" ); -#ifndef SVX_LIGHT const SdrPage& rMasterPage( *this ); const FmFormPage* pFormPage = dynamic_cast< const FmFormPage* >( &rMasterPage ); OSL_ENSURE( pFormPage, "FmFormPage::GetForms: referenced page is no FmFormPage - is this allowed?!" ); @@ -197,10 +162,6 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContai pFormPage = this; return pFormPage->m_pImpl->getForms( _bForceCreate ); -#else - static ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > aRef; - return aRef; -#endif } //------------------------------------------------------------------ @@ -208,7 +169,6 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView, const HelpEvent& rEvt ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::RequestHelp" ); -#ifndef SVX_LIGHT if( pView->IsAction() ) return sal_False; @@ -244,7 +204,7 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView, INET_PROT_HTTPS, INET_PROT_JAVASCRIPT, INET_PROT_IMAP, INET_PROT_POP3, INET_PROT_VIM, INET_PROT_LDAP }; - for (sal_uInt16 i=0; i<sizeof(s_aQuickHelpSupported)/sizeof(s_aQuickHelpSupported[0]); ++i) + for (sal_uInt16 i=0; i < SAL_N_ELEMENTS(s_aQuickHelpSupported); ++i) if (s_aQuickHelpSupported[i] == aProtocol) { aHelpText = INetURLObject::decode(aUrl.GetURLNoPass(), '%', INetURLObject::DECODE_UNAMBIGUOUS); @@ -268,7 +228,6 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView, else Help::ShowQuickHelp( pWindow, aItemRect, aHelpText ); } -#endif return sal_True; } @@ -277,9 +236,9 @@ SdrObject* FmFormPage::RemoveObject(sal_uLong nObjNum) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::RemoveObject" ); SdrObject* pObj = SdrPage::RemoveObject(nObjNum); -#ifndef SVX_LIGHT if (pObj && GetModel()) ((FmFormModel*)GetModel())->GetUndoEnv().Removed(pObj); -#endif return pObj; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index a0d2f5a3c47a..b46c074118ba 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -328,7 +329,7 @@ const Reference< XNameContainer >& FmFormPageImpl::getForms( bool _bForceCreate { m_bAttemptedFormCreation = true; - const ::rtl::OUString sFormsCollectionServiceName = ::rtl::OUString::createFromAscii("com.sun.star.form.Forms"); + const ::rtl::OUString sFormsCollectionServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.Forms") ); m_xForms = Reference< XNameContainer > ( ::comphelper::getProcessServiceFactory()->createInstance( sFormsCollectionServiceName ), UNO_QUERY @@ -621,7 +622,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( catch(const Exception& e) { (void)e; - OSL_ENSURE(sal_False, "FmFormPageImpl::findFormForDataSource: caught an exception!"); + OSL_FAIL("FmFormPageImpl::findFormForDataSource: caught an exception!"); } if (sLookupName == sFormDataSourceName) @@ -751,3 +752,5 @@ void FmFormPageImpl::formObjectRemoved( const FmFormObj& _object ) DBG_UNHANDLED_EXCEPTION(); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 3e8aa88a2612..50a6c888a6f6 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,6 +37,8 @@ #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/lang/EventObject.hpp> +#include <com/sun/star/awt/XControl.hpp> /** === end UNO includes === **/ #include <tools/diagnose_ex.h> @@ -44,7 +47,7 @@ #include <comphelper/componentcontext.hxx> #include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <sfx2/objsh.hxx> #include <sfx2/app.hxx> #include <basic/basmgr.hxx> @@ -74,6 +77,9 @@ namespace svxform using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::XInterface; + using ::com::sun::star::lang::EventObject; + using ::com::sun::star::awt::XControl; + using ::com::sun::star::beans::XPropertySet; /** === end UNO using === **/ class FormScriptingEnvironment; @@ -89,11 +95,11 @@ namespace svxform class FormScriptListener :public FormScriptListener_Base { private: - ::osl::Mutex m_aMutex; - ::rtl::Reference< FormScriptingEnvironment > m_pScriptExecutor; + ::osl::Mutex m_aMutex; + FormScriptingEnvironment *m_pScriptExecutor; public: - FormScriptListener( const ::rtl::Reference< FormScriptingEnvironment >& _pScriptExecutor ); + FormScriptListener( FormScriptingEnvironment * pScriptExecutor ); // XScriptListener virtual void SAL_CALL firing( const ScriptEvent& aEvent ) throw (RuntimeException); @@ -122,7 +128,7 @@ namespace svxform /** determines whether the instance is already disposed */ - bool impl_isDisposed_nothrow() const { return !m_pScriptExecutor.is(); } + bool impl_isDisposed_nothrow() const { return !m_pScriptExecutor; } /** fires the given script event in a thread-safe manner @@ -189,8 +195,8 @@ namespace svxform //= FormScriptListener //==================================================================== //-------------------------------------------------------------------- - FormScriptListener::FormScriptListener( const ::rtl::Reference< FormScriptingEnvironment >& _pScriptExecutor ) - :m_pScriptExecutor( _pScriptExecutor ) + FormScriptListener::FormScriptListener( FormScriptingEnvironment* pScriptExecutor ) + :m_pScriptExecutor( pScriptExecutor ) { } @@ -209,7 +215,7 @@ namespace svxform Reference< XHierarchicalNameAccess > xTypeDescriptions( aContext.getSingleton( "com.sun.star.reflection.theTypeDescriptionManager" ), UNO_QUERY_THROW ); ::rtl::OUString sMethodDescription( _rListenerType ); - sMethodDescription += ::rtl::OUString::createFromAscii( "::" ); + sMethodDescription += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "::" )); sMethodDescription += _rMethodName; Reference< XInterfaceMethodTypeDescription > xMethod( xTypeDescriptions->getByHierarchicalName( sMethodDescription ), UNO_QUERY_THROW ); @@ -225,19 +231,17 @@ namespace svxform //-------------------------------------------------------------------- void FormScriptListener::impl_doFireScriptEvent_nothrow( ::osl::ClearableMutexGuard& _rGuard, const ScriptEvent& _rEvent, Any* _pSyncronousResult ) { - OSL_PRECOND( m_pScriptExecutor.is(), "FormScriptListener::impl_doFireScriptEvent_nothrow: this will crash!" ); + OSL_PRECOND( m_pScriptExecutor, "FormScriptListener::impl_doFireScriptEvent_nothrow: this will crash!" ); - ::rtl::Reference< FormScriptingEnvironment > pExecutor( m_pScriptExecutor ); _rGuard.clear(); - pExecutor->doFireScriptEvent( _rEvent, _pSyncronousResult ); + m_pScriptExecutor->doFireScriptEvent( _rEvent, _pSyncronousResult ); } //-------------------------------------------------------------------- void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); - static const ::rtl::OUString vbaInterOp = - ::rtl::OUString::createFromAscii("VBAInterop"); + static const ::rtl::OUString vbaInterOp( RTL_CONSTASCII_USTRINGPARAM("VBAInterop") ); if ( _rEvent.ScriptType.equals(vbaInterOp) ) return; // not handled here @@ -416,15 +420,26 @@ namespace svxform { Sequence< sal_Int16 > aOutArgsIndex; Sequence< Any > aOutArgs; - - m_rObjectShell.CallXScript( m_sScriptCode, _rArguments, _rSynchronousResult, aOutArgsIndex, aOutArgs ); + EventObject aEvent; + Any aCaller; + if ( ( _rArguments.getLength() > 0 ) && ( _rArguments[ 0 ] >>= aEvent ) ) + { + try + { + Reference< XControl > xControl( aEvent.Source, UNO_QUERY_THROW ); + Reference< XPropertySet > xProps( xControl->getModel(), UNO_QUERY_THROW ); + aCaller = xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ); + } + catch( Exception& ) {} + } + m_rObjectShell.CallXScript( m_sScriptCode, _rArguments, _rSynchronousResult, aOutArgsIndex, aOutArgs, true, aCaller.hasValue() ? &aCaller : 0 ); } } //-------------------------------------------------------------------- void FormScriptingEnvironment::doFireScriptEvent( const ScriptEvent& _rEvent, Any* _pSyncronousResult ) { - ::vos::OClearableGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexClearableGuard aSolarGuard; ::osl::ClearableMutexGuard aGuard( m_aMutex ); if ( m_bDisposed ) @@ -438,7 +453,7 @@ namespace svxform // the script to execute PScript pScript; - if ( !_rEvent.ScriptType.equalsAscii( "StarBasic" ) ) + if ( !_rEvent.ScriptType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StarBasic" ) ) ) { pScript.reset( new NewStyleUNOScript( *xObjectShell, _rEvent.ScriptCode ) ); } @@ -497,7 +512,7 @@ namespace svxform { // object shells are not thread safe, so guard the destruction - ::vos::OGuard aSolarGuarsReset( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuarsReset; xObjectShell = NULL; } } @@ -520,3 +535,4 @@ namespace svxform } // namespace svxform //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx index 1018f0834337..45ceb61db6c1 100644 --- a/svx/source/form/fmservs.cxx +++ b/svx/source/form/fmservs.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,5 @@ namespace svxform }; } // namespace svxform + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 4dec747ca431..df6aa255cc62 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,18 +32,14 @@ #include <svx/fmshell.hxx> #include "svx/fmtools.hxx" #include "fmservs.hxx" -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include "fmpgeimp.hxx" #include "fmitems.hxx" #include "fmundo.hxx" #include <vcl/waitobj.hxx> #include <com/sun/star/form/XLoadable.hpp> #include <com/sun/star/container/XNamed.hpp> -#ifndef _COM_SUN_STAR_SDDB_PRIVILEGE_HPP_ #include <com/sun/star/sdbcx/Privilege.hpp> -#endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> @@ -67,13 +64,9 @@ #include "svx/svditer.hxx" #include "fmobj.hxx" -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif -#ifndef _SVX_FMRESIDS_HRC #include "svx/fmresids.hrc" -#endif #include "fmexch.hxx" #include <svx/fmglob.hxx> #include <svl/eitem.hxx> @@ -96,38 +89,15 @@ #include "fmdocumentclassification.hxx" #include "formtoolbars.hxx" -#include <svx/svxdlg.hxx> //CHINA001 -#include <svx/dialogs.hrc> //CHINA001 +#include <svx/svxdlg.hxx> +#include <svx/dialogs.hrc> #include "svx/sdrobjectfilter.hxx" -#define HANDLE_SQL_ERRORS( action, successflag, context, message ) \ - try \ - { \ - successflag = sal_False; \ - action; \ - successflag = sal_True; \ - } \ - catch(::com::sun::star::sdbc::SQLException& e) \ - { \ - ::com::sun::star::sdb::SQLContext eExtendedInfo = \ - GetImpl()->prependContextInfo(e, Reference< XInterface > (), context, ::rtl::OUString()); \ - displayException(eExtendedInfo); \ - } \ - catch(Exception&) \ - { \ - DBG_ERROR(message); \ - } \ - - -#define DO_SAFE_WITH_ERROR( action, message ) try { action; } catch(Exception&) { DBG_ERROR(message); } - #define FmFormShell #include "svxslots.hxx" -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include "tbxform.hxx" #include <comphelper/property.hxx> #include <com/sun/star/beans/PropertyValue.hpp> @@ -292,7 +262,6 @@ 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 - // 2002-11-12 #104702# - fs@openoffice.org return sal_True; sal_Bool bResult = sal_True; @@ -815,7 +784,7 @@ void FmFormShell::Execute(SfxRequest &rReq) } if ( nRecord != -1 ) - rController->execute( nSlot, ::rtl::OUString::createFromAscii( "Position" ), makeAny( (sal_Int32)nRecord ) ); + rController->execute( nSlot, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Position" )), makeAny( (sal_Int32)nRecord ) ); rReq.Done(); } break; @@ -1224,7 +1193,7 @@ void FmFormShell::GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich) } catch( const Exception& ) { - DBG_ERROR( "FmFormShell::GetFormState: caught an exception while determining the state!" ); + OSL_FAIL( "FmFormShell::GetFormState: caught an exception while determining the state!" ); } if (!bEnable) rSet.DisableItem(nWhich); @@ -1514,3 +1483,5 @@ void FmFormShell::SetDesignMode( sal_Bool _bDesignMode ) if ( pModel ) pModel->GetUndoEnv().UnLock(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 2ff40610fa77..43c9d6f89da4 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" +#include <sal/macros.h> #include "fmitems.hxx" #include "fmobj.hxx" #include "fmpgeimp.hxx" @@ -110,10 +112,11 @@ #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <algorithm> #include <functional> +#include <vector> // wird fuer Invalidate verwendet -> mitpflegen sal_uInt16 DatabaseSlotMap[] = @@ -388,8 +391,8 @@ namespace Sequence< Type> aModelListeners; Sequence< Type> aControlListeners; - Reference< XIntrospection> xModelIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.beans.Introspection")), UNO_QUERY); - Reference< XIntrospection> xControlIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.beans.Introspection")), UNO_QUERY); + Reference< XIntrospection> xModelIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection"))), UNO_QUERY); + Reference< XIntrospection> xControlIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection"))), UNO_QUERY); if (xModelIntrospection.is() && xModel.is()) { @@ -524,8 +527,8 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun { switch ( (TriState)xCheckBox->getState() ) { - case STATE_NOCHECK: *_pCurrentText = ::rtl::OUString::createFromAscii( "0" ); break; - case STATE_CHECK: *_pCurrentText = ::rtl::OUString::createFromAscii( "1" ); break; + case STATE_NOCHECK: *_pCurrentText = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "0" )); break; + case STATE_CHECK: *_pCurrentText = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "1" )); break; default: *_pCurrentText = ::rtl::OUString(); break; } } @@ -652,7 +655,7 @@ DBG_NAME(FmXFormShell); //------------------------------------------------------------------------ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) :FmXFormShell_BASE(m_aMutex) - ,FmXFormShell_CFGBASE(::rtl::OUString::createFromAscii("Office.Common/Misc"), CONFIG_MODE_DELAYED_UPDATE) + ,FmXFormShell_CFGBASE(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Misc")), CONFIG_MODE_DELAYED_UPDATE) ,m_eNavigate( NavigationBarMode_NONE ) ,m_nInvalidationEvent( 0 ) ,m_nActivationEvent( 0 ) @@ -690,7 +693,7 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) implAdjustConfigCache(); // and register for changes on this settings Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString::createFromAscii("FormControlPilotsEnabled"); + aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormControlPilotsEnabled")); EnableNotification(aNames); } @@ -733,7 +736,7 @@ bool FmXFormShell::impl_checkDisposed() const { if ( !m_pShell ) { - OSL_ENSURE( false, "FmXFormShell::impl_checkDisposed: already disposed!" ); + OSL_FAIL( "FmXFormShell::impl_checkDisposed: already disposed!" ); return true; } return false; @@ -751,7 +754,7 @@ bool FmXFormShell::impl_checkDisposed() const m_eDocumentType = DocumentClassification::classifyDocument( xModel ); else { - OSL_ENSURE( sal_False, "FmXFormShell::getDocumentType: can't determine the document type!" ); + OSL_FAIL( "FmXFormShell::getDocumentType: can't determine the document type!" ); m_eDocumentType = eTextDocument; // fallback, just to have a defined state } @@ -850,7 +853,7 @@ void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw // (Solche Paints passieren zum Beispiel, wenn man einfach nur eine andere Applikation ueber das Office legt und wieder // zurueckschaltet). // Deshalb die Benutzung des SolarMutex, der sichert das ab. - ::vos::IMutex& rSolarSafety = Application::GetSolarMutex(); + ::osl::SolarMutex& rSolarSafety = Application::GetSolarMutex(); if (rSolarSafety.tryToAcquire()) { m_pShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(SID_FM_RECORD_TOTAL , sal_True, sal_False); @@ -935,7 +938,6 @@ void FmXFormShell::disposing() // if we're here, then we expect that PrepareClose has been called, and thus the user // got a chance to commit or reject any changes. So in case we're here and there // are still uncommitted changes, the user explicitly wanted this. - // 2002-11-11 - 104702 - fs@openoffice.org m_pTextShell->dispose(); @@ -1009,7 +1011,7 @@ void FmXFormShell::UpdateSlot( sal_Int16 _nId ) if ( m_nLockSlotInvalidation ) { - OSL_ENSURE( sal_False, "FmXFormShell::UpdateSlot: cannot update if invalidation is currently locked!" ); + OSL_FAIL( "FmXFormShell::UpdateSlot: cannot update if invalidation is currently locked!" ); InvalidateSlot( _nId, sal_False ); } else @@ -1029,9 +1031,8 @@ void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId ) ::osl::MutexGuard aGuard(m_aInvalidationSafety); if (m_nLockSlotInvalidation) { - m_arrInvalidSlots.Insert(nId, m_arrInvalidSlots.Count()); sal_uInt8 nFlags = ( bWithId ? 0x01 : 0 ); - m_arrInvalidSlots_Flags.push_back(nFlags); + m_arrInvalidSlots.push_back( InvalidSlotInfo(nId, nFlags) ); } else if (nId) @@ -1068,21 +1069,14 @@ IMPL_LINK(FmXFormShell, OnInvalidateSlots, void*, EMPTYARG) ::osl::MutexGuard aGuard(m_aInvalidationSafety); m_nInvalidationEvent = 0; - DBG_ASSERT(m_arrInvalidSlots.Count() == m_arrInvalidSlots_Flags.size(), - "FmXFormShell::OnInvalidateSlots : inconsistent slot arrays !"); - sal_uInt8 nFlags; - for (sal_Int16 i=0; i<m_arrInvalidSlots.Count(); ++i) + for (std::vector<InvalidSlotInfo>::const_iterator i = m_arrInvalidSlots.begin(); i < m_arrInvalidSlots.end(); ++i) { - nFlags = m_arrInvalidSlots_Flags[i]; - - if (m_arrInvalidSlots[i]) - m_pShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(m_arrInvalidSlots[i], sal_True, (nFlags & 0x01)); + if (i->id) + m_pShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(i->id, sal_True, (i->flags & 0x01)); else m_pShell->GetViewShell()->GetViewFrame()->GetBindings().InvalidateShell(*m_pShell); } - - m_arrInvalidSlots.Remove(0, m_arrInvalidSlots.Count()); - m_arrInvalidSlots_Flags.clear(); + m_arrInvalidSlots.clear(); return 0L; } @@ -1110,13 +1104,11 @@ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation) //------------------------------------------------------------------------------ PopupMenu* FmXFormShell::GetConversionMenu() { - const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - sal_Bool bIsHiContrastMode = rSettings.GetHighContrastMode(); PopupMenu* pNewMenu = new PopupMenu(SVX_RES( RID_FMSHELL_CONVERSIONMENU )); - ImageList aImageList( SVX_RES( bIsHiContrastMode ? RID_SVXIMGLIST_FMEXPL_HC : RID_SVXIMGLIST_FMEXPL) ); - for ( size_t i = 0; i < sizeof( nConvertSlots ) / sizeof( nConvertSlots[0] ); ++i ) + ImageList aImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL) ); + for ( size_t i = 0; i < SAL_N_ELEMENTS( nConvertSlots ); ++i ) { // das entsprechende Image dran pNewMenu->SetItemImage(nConvertSlots[i], aImageList.GetImage(nCreateSlots[i])); @@ -1128,7 +1120,7 @@ PopupMenu* FmXFormShell::GetConversionMenu() //------------------------------------------------------------------------------ bool FmXFormShell::isControlConversionSlot( sal_uInt16 nSlotId ) { - for ( size_t i = 0; i < sizeof( nConvertSlots ) / sizeof( nConvertSlots[0] ); ++i ) + for ( size_t i = 0; i < SAL_N_ELEMENTS( nConvertSlots ); ++i ) if (nConvertSlots[i] == nSlotId) return true; return false; @@ -1164,7 +1156,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent OSL_ENSURE( isSolelySelected( _rxObject ), "FmXFormShell::executeControlConversionSlot: hmm ... shouldn't this parameter be redundant?" ); - for ( size_t lookupSlot = 0; lookupSlot < sizeof( nConvertSlots ) / sizeof( nConvertSlots[0] ); ++lookupSlot ) + for ( size_t lookupSlot = 0; lookupSlot < SAL_N_ELEMENTS( nConvertSlots ); ++lookupSlot ) { if (nConvertSlots[lookupSlot] == _nSlotId) { @@ -1221,7 +1213,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent } // replace the mdoel within the parent container - Reference< XIndexContainer> xIndexParent(xChild->getParent(), UNO_QUERY); //Modified by BerryJia for fixing Bug102516 Time(China):2002-9-5 16:00 + Reference< XIndexContainer> xIndexParent(xChild->getParent(), UNO_QUERY); if (xIndexParent.is()) { // the form container works with FormComponents @@ -1230,13 +1222,13 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent Any aNewModel(makeAny(xComponent)); try { - //Modified by BerryJia for fixing Bug102516 Time(China):2002-9-5 16:00 + sal_Int32 nIndex = getElementPos(xParent, xOldModel); if (nIndex>=0 && nIndex<xParent->getCount()) xIndexParent->replaceByIndex(nIndex, aNewModel); else { - DBG_ERROR("FmXFormShell::executeControlConversionSlot: could not replace the model !"); + OSL_FAIL("FmXFormShell::executeControlConversionSlot: could not replace the model !"); Reference< ::com::sun::star::lang::XComponent> xNewComponent(xNewModel, UNO_QUERY); if (xNewComponent.is()) xNewComponent->dispose(); @@ -1245,7 +1237,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent } catch(Exception&) { - DBG_ERROR("FmXFormShell::executeControlConversionSlot: could not replace the model !"); + OSL_FAIL("FmXFormShell::executeControlConversionSlot: could not replace the model !"); Reference< ::com::sun::star::lang::XComponent> xNewComponent(xNewModel, UNO_QUERY); if (xNewComponent.is()) xNewComponent->dispose(); @@ -1379,10 +1371,10 @@ bool FmXFormShell::canConvertCurrentSelectionToControl( sal_Int16 nConversionSlo ) return false; // those types cannot be converted - DBG_ASSERT(sizeof(nConvertSlots)/sizeof(nConvertSlots[0]) == sizeof(nObjectTypes)/sizeof(nObjectTypes[0]), + DBG_ASSERT(SAL_N_ELEMENTS(nConvertSlots) == SAL_N_ELEMENTS(nObjectTypes), "FmXFormShell::canConvertCurrentSelectionToControl: nConvertSlots & nObjectTypes must have the same size !"); - for ( size_t i = 0; i < sizeof( nConvertSlots ) / sizeof( nConvertSlots[0] ); ++i ) + for ( size_t i = 0; i < SAL_N_ELEMENTS( nConvertSlots ); ++i ) if (nConvertSlots[i] == nConversionSlot) return nObjectTypes[i] != nObjectType; @@ -1527,7 +1519,7 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel > } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmXFormShell::ExecuteTabOrderDialog: caught an exception!" ); + OSL_FAIL( "FmXFormShell::ExecuteTabOrderDialog: caught an exception!" ); } } @@ -1703,7 +1695,7 @@ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n) { try { - Any aVal( xSet->getPropertyValue(::rtl::OUString::createFromAscii("TwoDigitDateStart")) ); + Any aVal( xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TwoDigitDateStart"))) ); aVal >>= n; return sal_True; } @@ -1736,11 +1728,11 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) { Any aVal; aVal <<= n; - xSet->setPropertyValue(::rtl::OUString::createFromAscii("TwoDigitDateStart"), aVal); + xSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TwoDigitDateStart")), aVal); } catch(Exception&) { - DBG_ERROR("FmXFormShell::SetY2KState: Exception occured!"); + OSL_FAIL("FmXFormShell::SetY2KState: Exception occurred!"); } } @@ -1777,11 +1769,11 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) { Any aVal; aVal <<= n; - xSet->setPropertyValue(::rtl::OUString::createFromAscii("TwoDigitDateStart"), aVal); + xSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TwoDigitDateStart")), aVal); } catch(Exception&) { - DBG_ERROR("FmXFormShell::SetY2KState: Exception occured!"); + OSL_FAIL("FmXFormShell::SetY2KState: Exception occurred!"); } } @@ -2123,7 +2115,7 @@ bool FmXFormShell::setCurrentSelection( const InterfaceBag& _rSelection ) impl_updateCurrentForm( xNewCurrentForm ); // ensure some slots are updated - for ( size_t i = 0; i < sizeof( SelObjectSlotMap ) / sizeof( SelObjectSlotMap[0] ); ++i ) + for ( size_t i = 0; i < SAL_N_ELEMENTS( SelObjectSlotMap ); ++i ) InvalidateSlot( SelObjectSlotMap[i], sal_False); return true; @@ -2163,7 +2155,7 @@ void FmXFormShell::impl_updateCurrentForm( const Reference< XForm >& _rxNewCurFo pPage->GetImpl().setCurForm( m_xCurrentForm ); // ensure the UI which depends on the current form is up-to-date - for ( size_t i = 0; i < sizeof( DlgSlotMap ) / sizeof( DlgSlotMap[0] ); ++i ) + for ( size_t i = 0; i < SAL_N_ELEMENTS( DlgSlotMap ); ++i ) InvalidateSlot( DlgSlotMap[i], sal_False ); } @@ -2310,7 +2302,7 @@ IMPL_LINK(FmXFormShell, OnFoundData, FmFoundRecordInformation*, pfriWhere) } catch(const SQLException&) { - OSL_ENSURE(0,"Can position on bookmark!"); + OSL_FAIL("Can position on bookmark!"); } LoopGrids(GA_FORCE_SYNC); @@ -2342,7 +2334,7 @@ IMPL_LINK(FmXFormShell, OnFoundData, FmFoundRecordInformation*, pfriWhere) } // wenn das Feld sich in einem GridControl befindet, muss ich dort noch in die entsprechende Spalte gehen - sal_Int32 nGridColumn = m_arrRelativeGridColumn.GetObject(pfriWhere->nFieldPos); + sal_Int32 nGridColumn = m_arrRelativeGridColumn[pfriWhere->nFieldPos]; if (nGridColumn != -1) { // dummer weise muss ich mir das Control erst wieder besorgen Reference< XControl> xControl( impl_getControl( xControlModel, *pFormObject ) ); @@ -2393,7 +2385,7 @@ IMPL_LINK(FmXFormShell, OnCanceledNotFound, FmFoundRecordInformation*, pfriWhere } catch(const SQLException&) { - OSL_ENSURE(0,"Can position on bookmark!"); + OSL_FAIL("Can position on bookmark!"); } @@ -2418,7 +2410,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn // die Liste der zu involvierenden Felder zusammenstellen (sind die ControlSources aller Felder, die eine solche Eigenschaft habe) UniString strFieldList, sFieldDisplayNames; m_arrSearchedControls.Remove(0, m_arrSearchedControls.Count()); - m_arrRelativeGridColumn.Remove(0, m_arrRelativeGridColumn.Count()); + m_arrRelativeGridColumn.clear(); // folgendes kleines Problem : Ich brauche, um gefundene Felder zu markieren, SdrObjekte. Um hier festzustellen, welche Controls // ich in die Suche einbeziehen soll, brauche ich Controls (also XControl-Interfaces). Ich muss also ueber eines von beiden @@ -2527,7 +2519,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn // und das SdrObjekt zum Feld m_arrSearchedControls.C40_INSERT(SdrObject, pCurrent, m_arrSearchedControls.Count()); // die Nummer der Spalte - m_arrRelativeGridColumn.Insert(nViewPos, m_arrRelativeGridColumn.Count()); + m_arrRelativeGridColumn.push_back(nViewPos); } } } while (sal_False); @@ -2556,7 +2548,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn m_arrSearchedControls.C40_INSERT(SdrObject, pCurrent, m_arrSearchedControls.Count()); // die Nummer der Spalte (hier ein Dummy, nur fuer GridControls interesant) - m_arrRelativeGridColumn.Insert(-1, m_arrRelativeGridColumn.Count()); + m_arrRelativeGridColumn.push_back(-1); // und fuer die formatierte Suche ... pfmscContextInfo->arrFields.push_back(Reference< XInterface>(xControl, UNO_QUERY)); @@ -3138,7 +3130,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) } catch(Exception&) { - DBG_ERROR("FmXFormShell::stopFiltering : could not get the original filter !"); + OSL_FAIL("FmXFormShell::stopFiltering : could not get the original filter !"); // put dummies into the arrays so the they have the right size if (aOriginalFilters.size() == aOriginalApplyFlags.size()) @@ -3175,7 +3167,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) } catch(Exception&) { - DBG_ERROR("FmXFormShell::stopFiltering: Exception occured!"); + OSL_FAIL("FmXFormShell::stopFiltering: Exception occurred!"); } if (!isRowSetAlive(xFormSet)) @@ -3277,7 +3269,7 @@ void FmXFormShell::CreateExternalView() // the frame the external view is displayed in sal_Bool bAlreadyExistent = m_xExternalViewController.is(); Reference< ::com::sun::star::frame::XFrame> xExternalViewFrame; - ::rtl::OUString sFrameName = ::rtl::OUString::createFromAscii("_beamer"); + ::rtl::OUString sFrameName(RTL_CONSTASCII_USTRINGPARAM("_beamer")); sal_Int32 nSearchFlags = ::com::sun::star::frame::FrameSearchFlag::CHILDREN | ::com::sun::star::frame::FrameSearchFlag::CREATE; Reference< runtime::XFormController > xCurrentNavController( getNavController()); @@ -3361,7 +3353,7 @@ void FmXFormShell::CreateExternalView() URL aClearURL; aClearURL.Complete = FMURL_GRIDVIEW_CLEARVIEW; - Reference< ::com::sun::star::frame::XDispatch> xClear( xCommLink->queryDispatch(aClearURL, ::rtl::OUString::createFromAscii(""), 0)); + Reference< ::com::sun::star::frame::XDispatch> xClear( xCommLink->queryDispatch(aClearURL, ::rtl::OUString(), 0)); if (xClear.is()) xClear->dispatch(aClearURL, Sequence< PropertyValue>()); } @@ -3378,10 +3370,10 @@ void FmXFormShell::CreateExternalView() // collect the dispatchers we will need URL aAddColumnURL; aAddColumnURL.Complete = FMURL_GRIDVIEW_ADDCOLUMN; - Reference< ::com::sun::star::frame::XDispatch> xAddColumnDispatch( xCommLink->queryDispatch(aAddColumnURL, ::rtl::OUString::createFromAscii(""), 0)); + Reference< ::com::sun::star::frame::XDispatch> xAddColumnDispatch( xCommLink->queryDispatch(aAddColumnURL, ::rtl::OUString(), 0)); URL aAttachURL; aAttachURL.Complete = FMURL_GRIDVIEW_ATTACHTOFORM; - Reference< ::com::sun::star::frame::XDispatch> xAttachDispatch( xCommLink->queryDispatch(aAttachURL, ::rtl::OUString::createFromAscii(""), 0)); + Reference< ::com::sun::star::frame::XDispatch> xAttachDispatch( xCommLink->queryDispatch(aAttachURL, ::rtl::OUString(), 0)); if (xAddColumnDispatch.is() && xAttachDispatch.is()) { @@ -3547,7 +3539,7 @@ void FmXFormShell::CreateExternalView() aColumnProps.realloc(pColumnProps - aColumnProps.getArray()); // columns props are a dispatch argument - pDispatchArgs->Name = ::rtl::OUString::createFromAscii("ColumnProperties"); // TODO : fmurl.* + pDispatchArgs->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnProperties")); // TODO : fmurl.* pDispatchArgs->Value = makeAny(aColumnProps); ++pDispatchArgs; DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()), @@ -3634,7 +3626,7 @@ void FmXFormShell::CreateExternalView() ++pDispatchArgs; // the - pDispatchArgs->Name = ::rtl::OUString::createFromAscii("ColumnProperties"); // TODO : fmurl.* + pDispatchArgs->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnProperties")); // TODO : fmurl.* pDispatchArgs->Value = makeAny(aListBoxDescription); ++pDispatchArgs; DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()), @@ -3674,7 +3666,7 @@ void FmXFormShell::CreateExternalView() #ifdef DBG_UTIL else { - DBG_ERROR("FmXFormShell::CreateExternalView : could not create the external form view !"); + OSL_FAIL("FmXFormShell::CreateExternalView : could not create the external form view !"); } #endif InvalidateSlot( SID_FM_VIEW_AS_GRID, sal_False ); @@ -3685,7 +3677,7 @@ void FmXFormShell::implAdjustConfigCache() { // get (cache) the wizard usage flag Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString::createFromAscii("FormControlPilotsEnabled"); + aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormControlPilotsEnabled")); Sequence< Any > aFlags = GetProperties(aNames); if (1 == aFlags.getLength()) m_bUseWizards = ::cppu::any2bool(aFlags[0]); @@ -3717,7 +3709,7 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem) m_bUseWizards = _bUseThem; Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString::createFromAscii("FormControlPilotsEnabled"); + aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormControlPilotsEnabled")); Sequence< Any > aValues(1); aValues[0] = ::cppu::bool2any(m_bUseWizards); PutProperties(aNames, aValues); @@ -3734,7 +3726,6 @@ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeacti // if we have an async load operation pending for the 0-th page for this view, // we need to cancel this - // 103727 - 2002-09-26 - fs@openoffice.org FmFormPage* pPage = _rCurrentView.GetCurPage(); if ( pPage ) { @@ -3877,7 +3868,7 @@ void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels { if (!_rxModels.is()) { - DBG_ERROR("FmXFormShell::smartControlReset: invalid container!"); + OSL_FAIL("FmXFormShell::smartControlReset: invalid container!"); return; } @@ -4252,8 +4243,10 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState } else { - DBG_ERROR("ControlConversionMenuController::StateChanged : unknown id !"); + OSL_FAIL("ControlConversionMenuController::StateChanged : unknown id !"); } } //============================================================================== + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index dc396feec29f..2d286c00376b 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,9 +46,6 @@ namespace svxform // = struct FmSearchParams - Parameter einer Suche // ==================================================================== - //--------------------------------------------------------------------- - //--- 20.08.01 18:17:34 ----------------------------------------------- - FmSearchParams::FmSearchParams() :nTransliterationFlags( 0 ) ,nSearchForType ( 0 ) @@ -72,17 +70,11 @@ namespace svxform | TransliterationModules_IGNORE_CASE; } - //--------------------------------------------------------------------- - //--- 21.08.01 13:31:48 ----------------------------------------------- - sal_Bool FmSearchParams::isIgnoreWidthCJK( ) const { return 0 != (nTransliterationFlags & TransliterationModules_IGNORE_WIDTH); } - //--------------------------------------------------------------------- - //--- 21.08.01 13:32:03 ----------------------------------------------- - void FmSearchParams::setIgnoreWidthCJK( sal_Bool _bIgnore ) { if ( _bIgnore ) @@ -91,17 +83,11 @@ namespace svxform nTransliterationFlags &= ~TransliterationModules_IGNORE_WIDTH; } - //--------------------------------------------------------------------- - //--- 21.08.01 13:47:52 ----------------------------------------------- - sal_Bool FmSearchParams::isCaseSensitive( ) const { return 0 == (nTransliterationFlags & TransliterationModules_IGNORE_CASE); } - //--------------------------------------------------------------------- - //--- 21.08.01 13:48:00 ----------------------------------------------- - void FmSearchParams::setCaseSensitive( sal_Bool _bCase ) { if ( _bCase ) @@ -120,9 +106,6 @@ namespace svxform sal_Int16 nValue; }; - //--------------------------------------------------------------------- - //--- 20.08.01 18:28:38 ----------------------------------------------- - static const Ascii2Int16* lcl_getSearchForTypeValueMap() { static const Ascii2Int16 s_aSearchForTypeMap[] = @@ -135,9 +118,6 @@ namespace svxform return s_aSearchForTypeMap; } - //--------------------------------------------------------------------- - //--- 20.08.01 18:28:38 ----------------------------------------------- - static const Ascii2Int16* lcl_getSearchPositionValueMap() { static const Ascii2Int16 s_aSearchPositionMap[] = @@ -151,9 +131,6 @@ namespace svxform return s_aSearchPositionMap; } - //--------------------------------------------------------------------- - //--- 20.08.01 18:30:15 ----------------------------------------------- - static sal_Int16 lcl_implMapAsciiValue( const ::rtl::OUString& _rAsciiValue, const Ascii2Int16* _pMap ) { // search the map for the given ascii value @@ -166,7 +143,7 @@ namespace svxform ++pSearch; } - DBG_ERROR( + OSL_FAIL( ( ::rtl::OString( "lcl_implMapAsciiValue: could not convert the ascii value " ) += ::rtl::OString( _rAsciiValue.getStr(), _rAsciiValue.getLength(), RTL_TEXTENCODING_ASCII_US ) += ::rtl::OString( " !" ) @@ -175,9 +152,6 @@ namespace svxform return -1; } - //--------------------------------------------------------------------- - //--- 20.08.01 18:33:06 ----------------------------------------------- - static const sal_Char* lcl_implMapIntValue( const sal_Int16 _nValue, const Ascii2Int16* _pMap ) { // search the map for the given integer value @@ -190,7 +164,7 @@ namespace svxform ++pSearch; } - DBG_ERROR( + OSL_FAIL( ( ::rtl::OString( "lcl_implMapIntValue: could not convert the integer value " ) += ::rtl::OString::valueOf( (sal_Int32)_nValue ) += ::rtl::OString( " !" ) @@ -207,9 +181,6 @@ namespace svxform #define TA( c ) &c, getCppuType( &c ) - //--------------------------------------------------------------------- - //--- 20.08.01 18:19:59 ----------------------------------------------- - FmSearchConfigItem::FmSearchConfigItem() :OConfigurationValueContainer( ::comphelper::getProcessServiceFactory(), m_aMutex, "/org.openoffice.Office.DataAccess/FormSearchOptions", CVC_UPDATE_ACCESS | CVC_LAZY_UPDATE, 2 ) { @@ -255,17 +226,11 @@ namespace svxform read( ); } - //--------------------------------------------------------------------- - //--- 20.08.01 18:19:57 ----------------------------------------------- - FmSearchConfigItem::~FmSearchConfigItem() { commit( ); } - //--------------------------------------------------------------------- - //--- 20.08.01 18:20:48 ----------------------------------------------- - void FmSearchConfigItem::implTranslateFromConfig( ) { // the search-for string @@ -299,9 +264,6 @@ namespace svxform if ( m_bIsIgnoreMiddleDot ) nTransliterationFlags |= TransliterationModules_ignoreMiddleDot_ja_JP; } - //--------------------------------------------------------------------- - //--- 20.08.01 18:42:23 ----------------------------------------------- - void FmSearchConfigItem::implTranslateToConfig( ) { // the search-for string @@ -334,9 +296,6 @@ namespace svxform m_bIsIgnoreMiddleDot = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreMiddleDot_ja_JP ) ); } - //--------------------------------------------------------------------- - //--- 20.08.01 18:20:01 ----------------------------------------------- - const FmSearchParams& FmSearchConfigItem::getParams() const { // ensure that the properties which are not stored directly are up-to-date @@ -346,9 +305,6 @@ namespace svxform return *this; } - //--------------------------------------------------------------------- - //--- 20.08.01 18:41:57 ----------------------------------------------- - void FmSearchConfigItem::setParams( const FmSearchParams& _rParams ) { // copy the FmSearchParams part @@ -361,3 +317,5 @@ namespace svxform //........................................................................ } // namespace svxform //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 56957490150d..5b5ad1abd6ae 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef _SVX_FMRESIDS_HRC #include "svx/fmresids.hrc" -#endif #include "svx/fmtools.hxx" #include "svx/fmsrccfg.hxx" #include <tools/debug.hxx> @@ -50,18 +49,14 @@ #include <com/sun/star/i18n/TransliterationModules.hpp> #include <com/sun/star/i18n/CollatorOptions.hpp> -#ifndef _COM_SUN_STAR_SDDB_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#endif #include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormats.hpp> #include <comphelper/processfactory.hxx> -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include "fmservs.hxx" #include "svx/fmsrcimp.hxx" #include <svx/fmsearch.hxx> @@ -72,7 +67,6 @@ #define EQUAL_BOOKMARKS(a, b) a == b #define IFACECAST(c) ((const Reference< XInterface >&)c) - // SUN C52 has some ambiguities without this cast .... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; @@ -164,7 +158,7 @@ void FmRecordCountListener::NotifyCurrentCount() if (m_lnkWhoWantsToKnow.IsSet()) { DBG_ASSERT(m_xListening.is(), "FmRecordCountListener::NotifyCurrentCount : I have no propset ... !?"); - void* pTheCount = (void*)::comphelper::getINT32(m_xListening->getPropertyValue(FM_PROP_ROWCOUNT)); + void* pTheCount = (void*)(sal_IntPtr)::comphelper::getINT32(m_xListening->getPropertyValue(FM_PROP_ROWCOUNT)); m_lnkWhoWantsToKnow.Call(pTheCount); } } @@ -218,8 +212,8 @@ CheckBoxWrapper::CheckBoxWrapper(const Reference< ::com::sun::star::awt::XCheckB { switch ((TriState)m_xBox->getState()) { - case STATE_NOCHECK: return rtl::OUString::createFromAscii("0"); - case STATE_CHECK: return rtl::OUString::createFromAscii("1"); + case STATE_NOCHECK: return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")); + case STATE_CHECK: return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1")); default: break; } return rtl::OUString(); @@ -253,31 +247,31 @@ sal_Bool FmSearchEngine::MoveCursor() else m_xSearchCursor.previous(); } - catch(::com::sun::star::sdbc::SQLException e) + catch(::com::sun::star::sdbc::SQLException const& e) { #if OSL_DEBUG_LEVEL > 0 String sDebugMessage; sDebugMessage.AssignAscii("FmSearchEngine::MoveCursor : catched a DatabaseException ("); sDebugMessage += (const sal_Unicode*)e.SQLState; sDebugMessage.AppendAscii(") !"); - DBG_ERROR(ByteString(sDebugMessage, RTL_TEXTENCODING_ASCII_US).GetBuffer()); + OSL_FAIL(ByteString(sDebugMessage, RTL_TEXTENCODING_ASCII_US).GetBuffer()); #endif bSuccess = sal_False; } - catch(Exception e) + catch(Exception const& e) { #if OSL_DEBUG_LEVEL > 0 UniString sDebugMessage; sDebugMessage.AssignAscii("FmSearchEngine::MoveCursor : catched an Exception ("); sDebugMessage += (const sal_Unicode*)e.Message; sDebugMessage.AppendAscii(") !"); - DBG_ERROR(ByteString(sDebugMessage, RTL_TEXTENCODING_ASCII_US).GetBuffer()); + OSL_FAIL(ByteString(sDebugMessage, RTL_TEXTENCODING_ASCII_US).GetBuffer()); #endif bSuccess = sal_False; } catch(...) { - DBG_ERROR("FmSearchEngine::MoveCursor : catched an unknown Exception !"); + OSL_FAIL("FmSearchEngine::MoveCursor : catched an unknown Exception !"); bSuccess = sal_False; } @@ -427,7 +421,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchFor sal_Bool bMovedAround(sal_False); do { - if (m_eMode == SM_ALLOWSCHEDULE) //CHINA001 if (m_eMode == FmSearchDialog::SM_ALLOWSCHEDULE) + if (m_eMode == SM_ALLOWSCHEDULE) { Application::Reschedule(); Application::Reschedule(); @@ -494,7 +488,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const ::rtl::OUStri sal_Bool bMovedAround(sal_False); do { - if (m_eMode == SM_ALLOWSCHEDULE) //CHINA001 if (m_eMode == FmSearchDialog::SM_ALLOWSCHEDULE) + if (m_eMode == SM_ALLOWSCHEDULE) { Application::Reschedule(); Application::Reschedule(); @@ -596,7 +590,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const ::rtl::O sal_Bool bMovedAround(sal_False); do { - if (m_eMode == SM_ALLOWSCHEDULE) //CHINA001 if (m_eMode == FmSearchDialog::SM_ALLOWSCHEDULE) + if (m_eMode == SM_ALLOWSCHEDULE) { Application::Reschedule(); Application::Reschedule(); @@ -685,7 +679,8 @@ DBG_NAME(FmSearchEngine); //------------------------------------------------------------------------ FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB, const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields, - const Reference< XNumberFormatsSupplier > & xFormatSupplier, FMSEARCH_MODE eMode)//CHINA001 const Reference< XNumberFormatsSupplier > & xFormatSupplier, FmSearchDialog::SEARCH_MODE eMode) + const Reference< XNumberFormatsSupplier > & xFormatSupplier, FMSEARCH_MODE eMode) + :m_xSearchCursor(xCursor) ,m_xFormatSupplier(xFormatSupplier) ,m_aCharacterClassficator( _rxORB, SvtSysLocale().GetLocaleData().getLocale() ) @@ -723,7 +718,7 @@ FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB, //------------------------------------------------------------------------ FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB, const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields, - const InterfaceArray& arrFields, FMSEARCH_MODE eMode)//CHINA001 const InterfaceArray& arrFields, FmSearchDialog::SEARCH_MODE eMode) + const InterfaceArray& arrFields, FMSEARCH_MODE eMode) :m_xSearchCursor(xCursor) ,m_aCharacterClassficator( _rxORB, SvtSysLocale().GetLocaleData().getLocale() ) ,m_aStringCompare( _rxORB ) @@ -851,7 +846,7 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields) // - a control in the form is bound to "column" - not the different case // In such a scenario, the form and the field would work okay, but we here need to case for the different case // explicitly - // 2003-01-09 - #i8755# - fs@openoffice.org + // #i8755# // so first of all, check if the database handles identifiers case sensitive Reference< XConnection > xConn; @@ -912,7 +907,7 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields) } catch(Exception&) { - DBG_ERROR("Exception occured!"); + OSL_FAIL("Exception occurred!"); } } @@ -1010,19 +1005,19 @@ void FmSearchEngine::SearchNextImpl() switch (m_nPosition) { case MATCHING_ANYWHERE : - strSearchExpression = ::rtl::OUString::createFromAscii("*") + strSearchExpression - + ::rtl::OUString::createFromAscii("*"); + strSearchExpression = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) + strSearchExpression + + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")); break; case MATCHING_BEGINNING : - strSearchExpression = strSearchExpression + ::rtl::OUString::createFromAscii("*"); + strSearchExpression = strSearchExpression + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")); break; case MATCHING_END : - strSearchExpression = ::rtl::OUString::createFromAscii("*") + strSearchExpression; + strSearchExpression = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) + strSearchExpression; break; case MATCHING_WHOLETEXT : break; default : - DBG_ERROR("FmSearchEngine::SearchNextImpl() : die Methoden-Listbox duerfte nur 4 Eintraege enthalten ..."); + OSL_FAIL("FmSearchEngine::SearchNextImpl() : die Methoden-Listbox duerfte nur 4 Eintraege enthalten ..."); } } } @@ -1182,14 +1177,14 @@ void FmSearchEngine::ImplStartNextSearch() m_bCancelAsynchRequest = sal_False; m_bSearchingCurrently = sal_True; - if (m_eMode == SM_USETHREAD)//CHINA001 if (m_eMode == FmSearchDialog::SM_USETHREAD) + if (m_eMode == SM_USETHREAD) { FmSearchThread* pSearcher = new FmSearchThread(this); // der loescht sich nach Beendigung selber ... pSearcher->setTerminationHandler(LINK(this, FmSearchEngine, OnSearchTerminated)); pSearcher->createSuspended(); - pSearcher->setPriority(::vos::OThread::TPriority_Lowest); + pSearcher->setPriority(osl_Thread_PriorityLowest); pSearcher->resume(); } else @@ -1299,3 +1294,4 @@ void FmSearchEngine::RebuildUsedFields(sal_Int32 nFieldIndex, sal_Bool bForce) InvalidatePreviousLoc(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src index 91b5d28203a0..cdced89a1843 100644 --- a/svx/source/form/fmstring.src +++ b/svx/source/form/fmstring.src @@ -49,7 +49,6 @@ String RID_STR_NO_PROPERTIES }; String RID_STR_PROPERTIES_CONTROL { - /* ### ACHTUNG: Neuer Text in Resource? Eigenschaften: : Kontrollelement Eigenschaften */ Text [ en-US ] = "Properties: "; }; String RID_STR_PROPERTIES_FORM @@ -418,7 +417,6 @@ Resource RID_RSC_SQL_INTERNATIONAL String RID_STR_SVT_SQL_SYNTAX_ERROR { - /* ### ACHTUNG: Neuer Text in Resource? Syntaxfehler im SQL-Ausdruck : Fehlerhafte Syntax */ Text [ en-US ] = "Syntax error in SQL statement"; }; diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index 9be7d4881f61..7228db5b2840 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,20 +30,9 @@ #include "precompiled_svx.hxx" #include "fmtextcontroldialogs.hxx" #include <svx/dialmgr.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif - -#ifndef _SVX_CHARDLG_HXX -//#include "chardlg.hxx" -#endif -#ifndef _SVX_PARAGRPH_HXX -//#include "paragrph.hxx" -#endif + #include <editeng/eeitem.hxx> -#ifndef _SVX_TABSTPGE_HXX -//#include "tabstpge.hxx" -#endif #include "svx/flagsdef.hxx" #include <svl/intitem.hxx> @@ -129,3 +119,4 @@ namespace svx } // namespace svx //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx index ed5df54f117d..d73e80f17f08 100644 --- a/svx/source/form/fmtextcontrolfeature.cxx +++ b/svx/source/form/fmtextcontrolfeature.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,7 +66,7 @@ namespace svx } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmTextControlFeature::FmTextControlFeature: caught an exception!" ); + OSL_FAIL( "FmTextControlFeature::FmTextControlFeature: caught an exception!" ); } osl_decrementInterlockedCount( &m_refCount ); } @@ -91,7 +92,7 @@ namespace svx } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmTextControlFeature::dispatch: caught an exception!" ); + OSL_FAIL( "FmTextControlFeature::dispatch: caught an exception!" ); } } @@ -121,7 +122,7 @@ namespace svx } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmTextControlFeature::dispose: caught an exception!" ); + OSL_FAIL( "FmTextControlFeature::dispose: caught an exception!" ); } } @@ -129,3 +130,4 @@ namespace svx } // namespace svx //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index e2b959d013eb..e0ee408c3305 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,7 +74,7 @@ #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> #include <vcl/outdev.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <memory> @@ -342,7 +343,7 @@ namespace svx //-------------------------------------------------------------------- void SAL_CALL FmMouseListenerAdapter::mousePressed( const awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // is this a request for a context menu? if ( _rEvent.PopupTrigger ) { @@ -433,7 +434,7 @@ namespace svx } else { - DBG_ERROR( "lcl_translateUnoStateToItem: invalid state!" ); + OSL_FAIL( "lcl_translateUnoStateToItem: invalid state!" ); } } } @@ -477,7 +478,7 @@ namespace svx sMessage += "(slot id: "; sMessage += ::rtl::OString::valueOf( (sal_Int32)_nSlotId ); sMessage += ")"; - DBG_ERROR( sMessage ); + OSL_FAIL( sMessage.getStr() ); } #endif return sSlotUnoName; @@ -583,7 +584,7 @@ namespace svx { if ( m_bNeedClipboardInvalidation ) { - DBG_TRACE( "FmTextControlShell::ClipBoard: invalidating clipboard slots" ); + OSL_TRACE( "FmTextControlShell::ClipBoard: invalidating clipboard slots" ); m_rBindings.Invalidate( SID_CUT ); m_rBindings.Invalidate( SID_COPY ); m_rBindings.Invalidate( SID_PASTE ); @@ -647,7 +648,7 @@ namespace svx sMessage += sUnoSlotNameAscii; if ( !bFeatureIsEnabled ) sMessage += " (disabled)"; - DBG_TRACE( sMessage ); + OSL_TRACE( "%s", sMessage.getStr() ); #endif lcl_translateUnoStateToItem( nSlotId, aFeature->second->getFeatureState(), _rSet ); @@ -658,7 +659,7 @@ namespace svx ::rtl::OString sMessage( "FmTextControlShell::transferFeatureStatesToItemSet: found a feature state for " ); sMessage += sUnoSlotNameAscii; sMessage += ", but could not translate it into an item!"; - DBG_TRACE( sMessage ); + OSL_TRACE( "%s", sMessage.getStr() ); } #endif } @@ -764,7 +765,7 @@ namespace svx sError += ::rtl::OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US ); else sError += "unknown (no SfxSlot)"; - DBG_ERROR( sError.getStr() ); + OSL_FAIL( sError.getStr() ); } #endif } @@ -827,7 +828,7 @@ namespace svx } break; default: - OSL_ENSURE( sal_False, "FmTextControlShell::executeClipboardSlot: invalid slot!" ); + OSL_FAIL( "FmTextControlShell::executeClipboardSlot: invalid slot!" ); } return true; } @@ -992,7 +993,7 @@ namespace svx bNeedSelection = true; bNeedTextComponent = true; bNeedWriteableControl = true; - DBG_TRACE( "FmTextControlShell::ClipBoard: need to invalidate again" ); + OSL_TRACE( "FmTextControlShell::ClipBoard: need to invalidate again" ); m_bNeedClipboardInvalidation = true; break; @@ -1078,7 +1079,7 @@ namespace svx #if OSL_DEBUG_LEVEL > 0 ::rtl::OString sTrace( "FmTextControlShell::formActivated: 0x" ); sTrace += ::rtl::OString::valueOf( (sal_IntPtr)_rxController.get(), 16 ); - DBG_TRACE( sTrace ); + OSL_TRACE( "%s", sTrace.getStr() ); #endif DBG_ASSERT( _rxController.is(), "FmTextControlShell::formActivated: invalid controller!" ); @@ -1106,7 +1107,7 @@ namespace svx #if OSL_DEBUG_LEVEL > 0 ::rtl::OString sTrace( "FmTextControlShell::formDeactivated: 0x" ); sTrace += ::rtl::OString::valueOf( (sal_IntPtr)_rxController.get(), 16 ); - DBG_TRACE( sTrace ); + OSL_TRACE( "%s", sTrace.getStr() ); #endif (void)_rxController; @@ -1192,7 +1193,7 @@ namespace svx if ( m_xActiveTextComponent.is() ) { - DBG_TRACE( "FmTextControlShell::ClipBoard: stopping timer for clipboard invalidation" ); + OSL_TRACE( "FmTextControlShell::ClipBoard: stopping timer for clipboard invalidation" ); m_aClipboardInvalidation.Stop(); } // no more active control @@ -1257,7 +1258,7 @@ namespace svx if ( m_xActiveTextComponent.is() ) { - DBG_TRACE( "FmTextControlShell::ClipBoard: starting timer for clipboard invalidation" ); + OSL_TRACE( "FmTextControlShell::ClipBoard: starting timer for clipboard invalidation" ); m_aClipboardInvalidation.Start(); } @@ -1359,7 +1360,7 @@ namespace svx #if OSL_DEBUG_LEVEL > 0 ::rtl::OString sTrace( "FmTextControlShell::focusGained: 0x" ); sTrace += ::rtl::OString::valueOf( (sal_IntPtr)xControl.get(), 16 ); - DBG_TRACE( sTrace ); + OSL_TRACE( "%s", sTrace.getStr() ); #endif DBG_ASSERT( xControl.is(), "FmTextControlShell::focusGained: suspicious focus event!" ); @@ -1375,7 +1376,7 @@ namespace svx #if OSL_DEBUG_LEVEL > 0 ::rtl::OString sTrace( "FmTextControlShell::focusLost: 0x" ); sTrace += ::rtl::OString::valueOf( (sal_IntPtr)xControl.get(), 16 ); - DBG_TRACE( sTrace ); + OSL_TRACE( "%s", sTrace.getStr() ); #endif m_bActiveControl = false; @@ -1396,3 +1397,5 @@ namespace svx //........................................................................ } // namespace svx //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 460d2e1cd787..ba335ba09209 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -152,10 +153,10 @@ void displayException(const Any& _rExcept, Window* _pParent) Reference< XWindow > xParentWindow = VCLUnoHelper::GetInterface(pParentWindow); Sequence< Any > aArgs(2); - aArgs[0] <<= PropertyValue(::rtl::OUString::createFromAscii("SQLException"), 0, _rExcept, PropertyState_DIRECT_VALUE); - aArgs[1] <<= PropertyValue(::rtl::OUString::createFromAscii("ParentWindow"), 0, makeAny(xParentWindow), PropertyState_DIRECT_VALUE); + aArgs[0] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLException")), 0, _rExcept, PropertyState_DIRECT_VALUE); + aArgs[1] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")), 0, makeAny(xParentWindow), PropertyState_DIRECT_VALUE); - static ::rtl::OUString s_sDialogServiceName = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ErrorMessageDialog"); + static ::rtl::OUString s_sDialogServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ErrorMessageDialog") ); Reference< XExecutableDialog > xErrorDialog( ::comphelper::getProcessServiceFactory()->createInstanceWithArguments(s_sDialogServiceName, aArgs), UNO_QUERY); if (xErrorDialog.is()) @@ -165,7 +166,7 @@ void displayException(const Any& _rExcept, Window* _pParent) } catch(Exception&) { - OSL_ENSURE(sal_False, "displayException: could not display the error message!"); + OSL_FAIL("displayException: could not display the error message!"); } } @@ -219,7 +220,7 @@ sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAcce } catch(Exception&) { - DBG_ERROR( "getElementPos: caught an exception!" ); + OSL_FAIL( "getElementPos: caught an exception!" ); } } @@ -445,7 +446,7 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi return OBJ_FM_IMAGECONTROL; if (sPersistentServiceName.equals(FM_COMPONENT_FORMATTEDFIELD)) { - DBG_ERROR("::getControlTypeByObject : suspicious persistent service name (formatted field) !"); + OSL_FAIL("::getControlTypeByObject : suspicious persistent service name (formatted field) !"); // objects with that service name should exist as they aren't compatible with older versions return OBJ_FM_FORMATTEDFIELD; } @@ -456,7 +457,7 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi if (sPersistentServiceName.equals(FM_SUN_COMPONENT_NAVIGATIONBAR)) return OBJ_FM_NAVIGATIONBAR; - DBG_ERROR("::getControlTypeByObject : unknown object type !"); + OSL_FAIL("::getControlTypeByObject : unknown object type !"); return OBJ_FM_CONTROL; } @@ -474,7 +475,7 @@ void setConnection(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, } catch(Exception&) { - DBG_ERROR("::setConnection : could not set the connection !"); + OSL_FAIL("::setConnection : could not set the connection !"); } } @@ -494,3 +495,4 @@ sal_Bool isRowSetAlive(const Reference< XInterface >& _rxRowSet) return bIsAlive; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index ecbfc8afbe1a..c067eaee336c 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" +#include <sal/macros.h> #include "fmundo.hxx" #include "fmpgeimp.hxx" #include "svx/dbtoolsclient.hxx" @@ -62,7 +64,7 @@ #include <sfx2/sfx.hrc> #include <sfx2/event.hxx> #include <osl/mutex.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <comphelper/property.hxx> #include <comphelper/uno3.hxx> #include <comphelper/stl_types.hxx> @@ -572,8 +574,8 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) FM_PROP_TEXT, FM_PROP_STATE, FM_PROP_DATE, FM_PROP_TIME, FM_PROP_VALUE, FM_PROP_SELECT_SEQ, FM_PROP_EFFECTIVE_VALUE }; - sal_Int32 nDefaultValueProps = sizeof(pDefaultValueProperties)/sizeof(pDefaultValueProperties[0]); - OSL_ENSURE(sizeof(aValueProperties)/sizeof(aValueProperties[0]) == nDefaultValueProps, + sal_Int32 nDefaultValueProps = SAL_N_ELEMENTS(pDefaultValueProperties); + OSL_ENSURE(SAL_N_ELEMENTS(aValueProperties) == nDefaultValueProps, "FmXUndoEnvironment::propertyChange: inconsistence!"); for (sal_Int32 i=0; i<nDefaultValueProps; ++i) { @@ -585,7 +587,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) } catch(const Exception&) { - OSL_ENSURE(sal_False, "FmXUndoEnvironment::propertyChange: could not adjust the value property!"); + OSL_FAIL("FmXUndoEnvironment::propertyChange: could not adjust the value property!"); } } } @@ -729,7 +731,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) // TODO: this is a potential race condition: two threads here could in theory // add their undo actions out-of-order - ::vos::OClearableGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; rModel.AddUndo(new FmUndoPropertyAction(rModel, evt)); } } @@ -751,7 +753,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::elementInserted" ); - ::vos::OClearableGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); // neues Object zum lauschen @@ -777,7 +779,7 @@ void FmXUndoEnvironment::implSetModified() void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::elementReplaced" ); - ::vos::OClearableGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); Reference< XInterface > xIface; @@ -795,7 +797,7 @@ void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) thr void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::elementRemoved" ); - ::vos::OClearableGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); Reference< XInterface > xIface( evt.Element, UNO_QUERY ); @@ -914,7 +916,7 @@ void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _r } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmXUndoEnvironment::switchListening: caught an exception!" ); + OSL_FAIL( "FmXUndoEnvironment::switchListening: caught an exception!" ); } } @@ -949,7 +951,7 @@ void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObje } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmXUndoEnvironment::switchListening: caught an exception!" ); + OSL_FAIL( "FmXUndoEnvironment::switchListening: caught an exception!" ); } } @@ -987,7 +989,7 @@ void FmXUndoEnvironment::RemoveElement(const Reference< XInterface >& _rxElement if ( !::svxform::OStaticDataAccessTools().isEmbeddedInDatabase( _rxElement ) ) // (if there is a connection in the context of the component, setting // a new connection would be vetoed, anyway) - // #i34196# - 2004-09-21 - fs@openoffice.org + // #i34196# xFormProperties->setPropertyValue( FM_PROP_ACTIVE_CONNECTION, Any() ); } @@ -1028,7 +1030,7 @@ void FmUndoPropertyAction::Undo() } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmUndoPropertyAction::Undo: caught an exception!" ); + OSL_FAIL( "FmUndoPropertyAction::Undo: caught an exception!" ); } rEnv.UnLock(); } @@ -1049,7 +1051,7 @@ void FmUndoPropertyAction::Redo() } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmUndoPropertyAction::Redo: caught an exception!" ); + OSL_FAIL( "FmUndoPropertyAction::Redo: caught an exception!" ); } rEnv.UnLock(); } @@ -1211,7 +1213,7 @@ void FmUndoContainerAction::Undo() } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmUndoContainerAction::Undo: caught an exception!" ); + OSL_FAIL( "FmUndoContainerAction::Undo: caught an exception!" ); } rEnv.UnLock(); } @@ -1240,7 +1242,7 @@ void FmUndoContainerAction::Redo() } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FmUndoContainerAction::Redo: caught an exception!" ); + OSL_FAIL( "FmUndoContainerAction::Redo: caught an exception!" ); } rEnv.UnLock(); } @@ -1311,7 +1313,7 @@ void FmUndoModelReplaceAction::Undo() } catch(Exception&) { - DBG_ERROR("FmUndoModelReplaceAction::Undo : could not replace the model !"); + OSL_FAIL("FmUndoModelReplaceAction::Undo : could not replace the model !"); } } @@ -1321,3 +1323,5 @@ String FmUndoModelReplaceAction::GetComment() const RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoModelReplaceAction::GetComment" ); return SVX_RES(RID_STR_UNDO_MODEL_REPLACE); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 3ab15471e4fd..85cf87a4c406 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -124,8 +125,6 @@ void FmFormView::Init() // This means this is a newly created document. This means, we want to have it in design // mode by default (though a newly created model returns true for GetOpenInDesignMode). // We _want_ to have this because it makes a lot of hacks following the original fix - // for #94595# unnecessary - // #96399# - 2002-10-11 - fs@openoffice.org DBG_ASSERT( !bInitDesignMode, "FmFormView::Init: doesn't the model default to FALSE anymore?" ); // if this asserts, either the on-contruction default in the model has changed (then this here // may not be necessary anymore), or we're not dealing with a new document .... @@ -621,3 +620,4 @@ Reference< runtime::XFormController > FmFormView::GetFormController( const Refer return pImpl->getFormController( _rxForm, _rDevice ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index d2b6d6cbded4..8bbacd5b0a8e 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,7 +94,7 @@ #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> #include <vcl/stdtext.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/logfile.hxx> #include <algorithm> @@ -287,7 +288,7 @@ Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( Inde //------------------------------------------------------------------------ void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl >& _Control ) throw (RuntimeException) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; Reference< XWindow > xWindow( _Control, UNO_QUERY ); if ( xWindow.is() && m_pViewImpl->getView() && m_pWindow ) @@ -699,7 +700,7 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/) if ( !m_pView ) { - DBG_ERROR( "FmXFormView::OnActivate: well .... seems we have a timing problem (the view already died)!" ); + OSL_FAIL( "FmXFormView::OnActivate: well .... seems we have a timing problem (the view already died)!" ); return 0; } @@ -1153,7 +1154,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript ) ) { - DBG_ERROR( "FmXFormView::implCreateFieldControl: nonsense!" ); + OSL_FAIL( "FmXFormView::implCreateFieldControl: nonsense!" ); } Reference< XDataSource > xDataSource; @@ -1194,7 +1195,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript // need a data source and a connection here if (!xDataSource.is() || !xConnection.is()) { - DBG_ERROR("FmXFormView::implCreateFieldControl : could not retrieve the data source or the connection!"); + OSL_FAIL("FmXFormView::implCreateFieldControl : could not retrieve the data source or the connection!"); return NULL; } @@ -1479,7 +1480,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor } catch(const Exception&) { - DBG_ERROR("FmXFormView::implCreateXFormsControl: caught an exception while creating the control !"); + OSL_FAIL("FmXFormView::implCreateXFormsControl: caught an exception while creating the control !"); } @@ -1637,7 +1638,7 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& if ( xControlPropInfo->hasPropertyByName( FM_PROP_LABEL ) ) xControlSet->setPropertyValue( FM_PROP_LABEL, makeAny( sFieldName + _rFieldPostfix ) ); else - OSL_ENSURE( false, "FmXFormView::createControlLabelPair: can't set a label for the control!" ); + OSL_FAIL( "FmXFormView::createControlLabelPair: can't set a label for the control!" ); } } @@ -1728,7 +1729,7 @@ void FmXFormView::startMarkListWatching() } else { - DBG_ERROR( "FmXFormView::startMarkListWatching: already listening!" ); + OSL_FAIL( "FmXFormView::startMarkListWatching: already listening!" ); } } @@ -1774,7 +1775,7 @@ void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark ) } else { - DBG_ERROR( "FmXFormView::saveMarkList: invalid view!" ); + OSL_FAIL( "FmXFormView::saveMarkList: invalid view!" ); m_aMark = SdrMarkList(); } } @@ -1916,3 +1917,5 @@ DocumentType FmXFormView::impl_getDocumentType() const return GetFormShell()->GetImpl()->getDocumentType(); return eUnknownDocumentType; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 857bdc1b2647..8e41b884c8ff 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -231,7 +232,7 @@ namespace svxform } catch( const Exception& ) { - OSL_ENSURE( sal_False, "lcl_getDataSourceIndirectProperties: caught an exception!" ); + OSL_FAIL( "lcl_getDataSourceIndirectProperties: caught an exception!" ); } return aInfo; } @@ -545,7 +546,7 @@ namespace svxform const PropertyValue* pInfoEnd = pInfo + aInfo.getLength(); for ( ; pInfo != pInfoEnd; ++pInfo ) { - if ( pInfo->Name.equalsAscii( "PreferDosLikeLineEnds" ) ) + if ( pInfo->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PreferDosLikeLineEnds" ) ) ) { pInfo->Value >>= bDosLineEnds; break; @@ -625,7 +626,7 @@ namespace svxform aValue <<= (sal_Int32)nMinValue; else { - DBG_ERROR( "FormControlFactory::initializeFieldDependentProperties: unexpected property type (MinValue)!" ); + OSL_FAIL( "FormControlFactory::initializeFieldDependentProperties: unexpected property type (MinValue)!" ); } _rxControlModel->setPropertyValue( FM_PROP_VALUEMIN, aValue ); @@ -637,7 +638,7 @@ namespace svxform aValue <<= (sal_Int32)nMaxValue; else { - DBG_ERROR( "FormControlFactory::initializeFieldDependentProperties: unexpected property type (MaxValue)!" ); + OSL_FAIL( "FormControlFactory::initializeFieldDependentProperties: unexpected property type (MaxValue)!" ); } _rxControlModel->setPropertyValue( FM_PROP_VALUEMAX, aValue ); } @@ -731,3 +732,5 @@ namespace svxform //........................................................................ } // namespace svxform //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 6f6cdbf9c2a6..638072f1cd2b 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,11 +92,12 @@ #include <tools/shl.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/logfile.hxx> #include <algorithm> -#include <functional> + +#include <o3tl/compat_functional.hxx> using namespace ::com::sun::star; using namespace ::comphelper; @@ -484,7 +486,7 @@ public: { } - virtual ::rtl::OUString GetComponentServiceName() {return ::rtl::OUString::createFromAscii("Edit");} + virtual ::rtl::OUString GetComponentServiceName() {return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Edit"));} virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw( RuntimeException ); protected: @@ -527,7 +529,7 @@ struct UpdateAllListeners : public ::std::unary_function< Reference< XDispatch > bool operator()( const Reference< XDispatch >& _rxDispatcher ) const { static_cast< ::svx::OSingleFeatureDispatcher* >( _rxDispatcher.get() )->updateAllListeners(); - // the return is a dummy only so we can use this struct in a std::compose1 call + // the return is a dummy only so we can use this struct in a o3tl::compose1 call return true; } }; @@ -715,7 +717,7 @@ sal_Bool SAL_CALL FormController::supportsService(const ::rtl::OUString& Service //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL FormController::getImplementationName() throw( RuntimeException ) { - return ::rtl::OUString::createFromAscii( "org.openoffice.comp.svx.FormController" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svx.FormController")); } //------------------------------------------------------------------------------ @@ -753,7 +755,7 @@ Sequence< ::rtl::OUString> FormController::getSupportedServiceNames_Static(void) { aServices.realloc(2); aServices.getArray()[0] = FM_FORM_CONTROLLER; - aServices.getArray()[1] = ::rtl::OUString::createFromAscii("com.sun.star.awt.control.TabController"); + aServices.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.control.TabController")); } return aServices; } @@ -1238,7 +1240,7 @@ void FormController::disposing(void) // clean up our children for (FmFormControllers::const_iterator i = m_aChilds.begin(); - i != m_aChilds.end(); i++) + i != m_aChilds.end(); ++i) { // search the position of the model within the form Reference< XFormComponent > xForm((*i)->getModel(), UNO_QUERY); @@ -1714,7 +1716,7 @@ void FormController::focusGained(const FocusEvent& e) throw( RuntimeException ) ) { // check the old control if the content is ok -#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 Reference< XBoundControl > xLockingTest(m_xCurrentControl, UNO_QUERY); sal_Bool bControlIsLocked = xLockingTest.is() && xLockingTest->getLock(); OSL_ENSURE(!bControlIsLocked, "FormController::Gained: I'm modified and the current control is locked ? How this ?"); @@ -2670,9 +2672,9 @@ void FormController::updateAllDispatchers() const ::std::for_each( m_aFeatureDispatchers.begin(), m_aFeatureDispatchers.end(), - ::std::compose1( + ::o3tl::compose1( UpdateAllListeners(), - ::std::select2nd< DispatcherContainer::value_type >() + ::o3tl::select2nd< DispatcherContainer::value_type >() ) ); } @@ -3195,7 +3197,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) xQueryColumns->getByName(pRefValues[j].Name) >>= xSet; // get the RealName - xSet->getPropertyValue(::rtl::OUString::createFromAscii("RealName")) >>= aRealName; + xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RealName"))) >>= aRealName; // compare the condition field name and the RealName if (aCompare(aRealName, pRefValues[j].Name)) @@ -3208,7 +3210,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) for (sal_Int32 n = 0, nCount = xColumnsByIndex->getCount(); n < nCount; n++) { xColumnsByIndex->getByIndex(n) >>= xSet; - xSet->getPropertyValue(::rtl::OUString::createFromAscii("RealName")) >>= aRealName; + xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RealName"))) >>= aRealName; if (aCompare(aRealName, pRefValues[j].Name)) { // get the column by its alias @@ -3236,10 +3238,10 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) if (aRow.find((*iter).xText) != aRow.end()) { ::rtl::OUString aCompText = aRow[(*iter).xText]; - aCompText += ::rtl::OUString::createFromAscii(" "); + aCompText += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); ::rtl::OString aVal = m_xParser->getContext().getIntlKeywordAscii(OParseContext::KEY_AND); aCompText += ::rtl::OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US); - aCompText += ::rtl::OUString::createFromAscii(" "); + aCompText += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); aCompText += ::comphelper::getString(pRefValues[j].Value); aRow[(*iter).xText] = aCompText; } @@ -3291,7 +3293,6 @@ void FormController::startFiltering() Reference< XConnection > xConnection( aStaticTools.getRowSetConnection( Reference< XRowSet >( m_xModelAsIndex, UNO_QUERY ) ) ); if ( !xConnection.is() ) // nothing to do - can't filter a form which is not connected - // 98023 - 19.03.2002 - fs@openoffice.org return; // stop listening for controls @@ -3386,9 +3387,9 @@ void FormController::startFiltering() { // create a filter control Sequence< Any > aCreationArgs( 3 ); - aCreationArgs[ 0 ] <<= NamedValue( ::rtl::OUString::createFromAscii( "MessageParent" ), makeAny( VCLUnoHelper::GetInterface( getDialogParentWindow() ) ) ); - aCreationArgs[ 1 ] <<= NamedValue( ::rtl::OUString::createFromAscii( "NumberFormatter" ), makeAny( xFormatter ) ); - aCreationArgs[ 2 ] <<= NamedValue( ::rtl::OUString::createFromAscii( "ControlModel" ), makeAny( xModel ) ); + aCreationArgs[ 0 ] <<= NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MessageParent")), makeAny( VCLUnoHelper::GetInterface( getDialogParentWindow() ) ) ); + aCreationArgs[ 1 ] <<= NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormatter")), makeAny( xFormatter ) ); + aCreationArgs[ 2 ] <<= NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlModel")), makeAny( xModel ) ); Reference< XControl > xFilterControl( m_aContext.createComponentWithArguments( "com.sun.star.form.control.FilterControl", aCreationArgs ), UNO_QUERY @@ -3525,7 +3526,7 @@ void FormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportExcept m_aMode = Mode; - if ( Mode.equalsAscii( "FilterMode" ) ) + if ( Mode.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterMode" ) ) ) startFiltering(); else stopFiltering(); @@ -3658,7 +3659,7 @@ Reference< XControl > FormController::locateControl( const Reference< XControlMo return *pControls; } } - OSL_ENSURE( sal_False, "FormController::locateControl: did not find a control for this model!" ); + OSL_FAIL( "FormController::locateControl: did not find a control for this model!" ); } catch( const Exception& ) { @@ -3946,7 +3947,7 @@ void SAL_CALL FormController::removeParameterListener(const Reference< XDatabase //------------------------------------------------------------------------------ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& aEvent) throw( RuntimeException ) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3989,7 +3990,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& Sequence< PropertyValue > aFinalValues = pParamValues->getValues(); if (aFinalValues.getLength() != aRequest.Parameters->getCount()) { - DBG_ERROR("FormController::approveParameter: the InteractionHandler returned nonsense!"); + OSL_FAIL("FormController::approveParameter: the InteractionHandler returned nonsense!"); return sal_False; } const PropertyValue* pFinalValues = aFinalValues.getConstArray(); @@ -4007,7 +4008,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& try { xParam->setPropertyValue(FM_PROP_VALUE, pFinalValues->Value); } catch(Exception&) { - DBG_ERROR("FormController::approveParameter: setting one of the properties failed!"); + OSL_FAIL("FormController::approveParameter: setting one of the properties failed!"); } } } @@ -4126,7 +4127,7 @@ void SAL_CALL FormController::invalidateAllFeatures( ) throw (RuntimeException) m_aFeatureDispatchers.begin(), m_aFeatureDispatchers.end(), aInterceptedFeatures.getArray(), - ::std::select1st< DispatcherContainer::value_type >() + ::o3tl::select1st< DispatcherContainer::value_type >() ); aGuard.clear(); @@ -4144,7 +4145,7 @@ FormController::interceptedQueryDispatch( const URL& aURL, Reference< XDispatch > xReturn; // dispatches handled by ourself if ( ( aURL.Complete == FMURL_CONFIRM_DELETION ) - || ( ( aURL.Complete.equalsAscii( "private:/InteractionHandler" ) ) + || ( ( aURL.Complete.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:/InteractionHandler" ) ) ) && ensureInteractionHandler() ) ) @@ -4181,11 +4182,11 @@ void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< Proper { if ( _rArgs.getLength() != 1 ) { - DBG_ERROR( "FormController::dispatch: no arguments -> no dispatch!" ); + OSL_FAIL( "FormController::dispatch: no arguments -> no dispatch!" ); return; } - if ( _rURL.Complete.equalsAscii( "private:/InteractionHandler" ) ) + if ( _rURL.Complete.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:/InteractionHandler" ) ) ) { Reference< XInteractionRequest > xRequest; OSL_VERIFY( _rArgs[0].Value >>= xRequest ); @@ -4196,12 +4197,12 @@ void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< Proper if ( _rURL.Complete == FMURL_CONFIRM_DELETION ) { - DBG_ERROR( "FormController::dispatch: How do you expect me to return something via this call?" ); + OSL_FAIL( "FormController::dispatch: How do you expect me to return something via this call?" ); // confirmDelete has a return value - dispatch hasn't return; } - DBG_ERROR( "FormController::dispatch: unknown URL!" ); + OSL_FAIL( "FormController::dispatch: unknown URL!" ); } //------------------------------------------------------------------------------ @@ -4219,7 +4220,7 @@ void SAL_CALL FormController::addStatusListener( const Reference< XStatusListene } } else - OSL_ENSURE(sal_False, "FormController::addStatusListener: invalid (unsupported) URL!"); + OSL_FAIL("FormController::addStatusListener: invalid (unsupported) URL!"); } //------------------------------------------------------------------------------ @@ -4254,7 +4255,7 @@ Reference< XDispatchProviderInterceptor > FormController::createInterceptor(con ) { if ((*aIter)->getIntercepted() == _xInterception) - DBG_ERROR("FormController::createInterceptor : we already do intercept this objects dispatches !"); + OSL_FAIL("FormController::createInterceptor : we already do intercept this objects dispatches !"); } #endif @@ -4335,3 +4336,5 @@ void SAL_CALL FormController::columnChanged( const EventObject& /*_event*/ ) thr } } // namespace svxform + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index a1f2059f3dfb..197de8ccbee2 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" +#include <sal/macros.h> #include "formcontrolling.hxx" #include "fmurl.hxx" #include "svx/svxids.hrc" @@ -120,7 +122,7 @@ namespace svx { FMURL_FORM_APPLY_FILTER, SID_FM_FORM_FILTERED, FormFeature::ToggleApplyFilter }, { FMURL_FORM_REMOVE_FILTER, SID_FM_REMOVE_FILTER_SORT, FormFeature::RemoveFilterAndSort } }; - for ( size_t i=0; i<sizeof(aDescriptions)/sizeof(aDescriptions[0]); ++i ) + for ( size_t i=0; i < SAL_N_ELEMENTS(aDescriptions); ++i ) s_aFeatureDescriptions.push_back( aDescriptions[i] ); } }; @@ -461,13 +463,13 @@ namespace svx if ( bSuccess ) return true; - // display the error. Prefer the one reported in errorOccured over the one caught. + // display the error. Prefer the one reported in errorOccurred over the one caught. if ( m_aOperationError.hasValue() ) displayException( m_aOperationError ); else if ( aError.hasValue() ) displayException( aError ); else - OSL_ENSURE( false, "FormControllerHelper::impl_operateForm_nothrow: no success, but no error?" ); + OSL_FAIL( "FormControllerHelper::impl_operateForm_nothrow: no success, but no error?" ); return false; } @@ -533,7 +535,7 @@ namespace svx SID_FM_FILTER_START, SID_FM_VIEW_AS_GRID }; - sal_Int32 nFeatureCount = sizeof( pSupportedFeatures ) / sizeof( pSupportedFeatures[ 0 ] ); + sal_Int32 nFeatureCount = SAL_N_ELEMENTS( pSupportedFeatures ); aSupportedFeatures.resize( nFeatureCount ); ::std::copy( pSupportedFeatures, pSupportedFeatures + nFeatureCount, aSupportedFeatures.begin() ); @@ -543,7 +545,7 @@ namespace svx //-------------------------------------------------------------------- void SAL_CALL FormControllerHelper::errorOccured( const SQLErrorEvent& _Event ) throw (RuntimeException) { - OSL_ENSURE( !m_aOperationError.hasValue(), "FormControllerHelper::errorOccured: two errors during one operation?" ); + OSL_ENSURE( !m_aOperationError.hasValue(), "FormControllerHelper::errorOccurred: two errors during one operation?" ); m_aOperationError = _Event.Reason; } @@ -602,3 +604,5 @@ namespace svx //........................................................................ } // namespace svx //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx index f14a82d8c7ee..7eff1ac6bc8b 100644 --- a/svx/source/form/formdispatchinterceptor.cxx +++ b/svx/source/form/formdispatchinterceptor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -212,3 +213,5 @@ namespace svxform //........................................................................ } // namespace svxform //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx index 03db6dcb07bb..c401f41c0588 100644 --- a/svx/source/form/formfeaturedispatcher.cxx +++ b/svx/source/form/formfeaturedispatcher.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -124,7 +125,7 @@ namespace svx } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OSingleFeatureDispatcher::notifyStatus: caught an exception!" ); + OSL_FAIL( "OSingleFeatureDispatcher::notifyStatus: caught an exception!" ); } } else @@ -140,12 +141,12 @@ namespace svx } catch( const DisposedException& ) { - OSL_ENSURE( sal_False, "OSingleFeatureDispatcher::notifyStatus: caught a DisposedException - removing the listener!" ); + OSL_FAIL( "OSingleFeatureDispatcher::notifyStatus: caught a DisposedException - removing the listener!" ); aIter.remove( ); } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OSingleFeatureDispatcher::notifyStatus: caught a generic exception while notifying a single listener!" ); + OSL_FAIL( "OSingleFeatureDispatcher::notifyStatus: caught a generic exception while notifying a single listener!" ); } } } @@ -239,3 +240,5 @@ namespace svx //........................................................................ } // namespace svx //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src index 287f60a277a7..881d13fae6a3 100644 --- a/svx/source/form/formshell.src +++ b/svx/source/form/formshell.src @@ -29,7 +29,7 @@ #include <svx/svxids.hrc> #include <svx/dialogs.hrc> #include <sfx2/sfxsids.hrc> -#include "globlmn.hrc" +#include "globlmn_tmpl.hrc" #include "helpid.hrc" #include "fmhelp.hrc" diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx index 739e9788c64b..ef187ef0eea5 100644 --- a/svx/source/form/formtoolbars.cxx +++ b/svx/source/form/formtoolbars.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> /** === end UNO includes === **/ -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif //........................................................................ namespace svxform @@ -83,7 +82,7 @@ namespace svxform } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormToolboxes::toggleToolbox: caught an exception!" ); + OSL_FAIL( "FormToolboxes::toggleToolbox: caught an exception!" ); } } @@ -115,3 +114,4 @@ namespace svxform } // namespace svxform //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index 0908ae8af953..2224ce7caa2f 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -209,7 +210,7 @@ namespace svxform { Sequence< ::rtl::OUString > aServices(2); aServices.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.FormController" ) ); - aServices.getArray()[1] = ::rtl::OUString::createFromAscii("com.sun.star.awt.control.TabController"); + aServices.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.control.TabController") ); return aServices; } @@ -224,3 +225,4 @@ namespace svxform return ::svxform::LegacyFormController::Create( _rxORB ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/makefile.mk b/svx/source/form/makefile.mk new file mode 100755 index 000000000000..1088283c6184 --- /dev/null +++ b/svx/source/form/makefile.mk @@ -0,0 +1,117 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +PRJ=..$/.. + +PRJNAME=svx +TARGET=form +LIBTARGET=NO + +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +CDEFS+=-DENABLE_VBA + +SRS1NAME=form +SRC1FILES= \ + fmexpl.src \ + filtnav.src \ + fmstring.src \ + formshell.src \ + datanavi.src + +LIB1TARGET= $(SLB)$/$(TARGET)-core.lib +LIB1OBJFILES= \ + $(SLO)$/formtoolbars.obj \ + $(SLO)$/fmdocumentclassification.obj \ + $(SLO)$/fmcontrolbordermanager.obj \ + $(SLO)$/fmcontrollayout.obj \ + $(SLO)$/fmtextcontroldialogs.obj \ + $(SLO)$/fmtextcontrolfeature.obj \ + $(SLO)$/fmtextcontrolshell.obj \ + $(SLO)$/ParseContext.obj \ + $(SLO)$/typeconversionclient.obj \ + $(SLO)$/dbtoolsclient.obj \ + $(SLO)$/sqlparserclient.obj \ + $(SLO)$/dataaccessdescriptor.obj \ + $(SLO)$/fmpage.obj \ + $(SLO)$/fmundo.obj \ + $(SLO)$/fmmodel.obj \ + $(SLO)$/navigatortree.obj \ + $(SLO)$/navigatortreemodel.obj \ + $(SLO)$/fmexpl.obj \ + $(SLO)$/formcontroller.obj \ + $(SLO)$/fmpgeimp.obj \ + $(SLO)$/fmvwimp.obj \ + $(SLO)$/fmdpage.obj \ + $(SLO)$/fmitems.obj \ + $(SLO)$/fmobj.obj \ + $(SLO)$/fmdmod.obj \ + $(SLO)$/fmservs.obj \ + $(SLO)$/typemap.obj \ + $(SLO)$/fmexch.obj \ + $(SLO)$/fmtools.obj \ + $(SLO)$/fmshimp.obj \ + $(SLO)$/fmshell.obj \ + $(SLO)$/fmview.obj \ + $(SLO)$/sdbdatacolumn.obj \ + $(SLO)$/formcontrolling.obj \ + $(SLO)$/formfeaturedispatcher.obj \ + $(SLO)$/formdispatchinterceptor.obj \ + $(SLO)$/datanavi.obj \ + $(SLO)$/xfm_addcondition.obj \ + $(SLO)$/datalistener.obj \ + $(SLO)$/fmscriptingenv.obj \ + $(SLO)$/stringlistresource.obj \ + $(SLO)$/delayedevent.obj \ + $(SLO)$/formcontrolfactory.obj \ + $(SLO)$/legacyformcontroller.obj + +LIB2TARGET= $(SLB)$/$(TARGET).lib +LIB2OBJFILES= \ + $(SLO)$/dbcharsethelper.obj \ + $(SLO)$/fmPropBrw.obj \ + $(SLO)$/tbxform.obj \ + $(SLO)$/fmobjfac.obj \ + $(SLO)$/fmsrccfg.obj \ + $(SLO)$/tabwin.obj \ + $(SLO)$/filtnav.obj \ + $(SLO)$/fmsrcimp.obj \ + $(SLO)$/databaselocationinput.obj + +SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) + +# --- Targets ---------------------------------- + +.INCLUDE : target.mk + diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 362b4bba0faf..63fa854d291f 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,8 +60,8 @@ #include <com/sun/star/datatransfer/XTransferable.hpp> #include <svx/sdrpaintwindow.hxx> -#include <svx/svxdlg.hxx> //CHINA001 -#include <svx/dialogs.hrc> //CHINA001 +#include <svx/svxdlg.hxx> +#include <svx/dialogs.hrc> #include <rtl/logfile.hxx> //............................................................................ namespace svxform @@ -203,24 +204,17 @@ namespace svxform SetHelpId( HID_FORM_NAVIGATOR ); m_aNavigatorImages = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); - m_aNavigatorImagesHC = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) ); SetNodeBitmaps( m_aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), - m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ), - BMP_COLOR_NORMAL - ); - SetNodeBitmaps( - m_aNavigatorImagesHC.GetImage( RID_SVXIMG_COLLAPSEDNODE ), - m_aNavigatorImagesHC.GetImage( RID_SVXIMG_EXPANDEDNODE ), - BMP_COLOR_HIGHCONTRAST + m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ) ); SetDragDropMode(0xFFFF); EnableInplaceEditing( sal_True ); SetSelectionMode(MULTIPLE_SELECTION); - m_pNavModel = new NavigatorTreeModel( m_aNavigatorImages, m_aNavigatorImagesHC ); + m_pNavModel = new NavigatorTreeModel( m_aNavigatorImages ); Clear(); StartListening( *m_pNavModel ); @@ -461,7 +455,7 @@ namespace svxform aContextMenu.EnableItem( SID_FM_TAB_DIALOG, bSingleSelection && m_nFormsSelected ); // in XML forms, we don't allow for the properties of a form - // #i36484# / 2004-11-04 /- fs@openoffice.org + // #i36484# if ( pFormShell->GetImpl()->isEnhancedForm() && !m_nControlsSelected ) aContextMenu.RemoveItem( aContextMenu.GetItemPos( SID_FM_SHOW_PROPERTY_BROWSER ) ); @@ -667,11 +661,8 @@ namespace svxform SvLBoxEntry* pEntry = FindEntry( pData ); if (pEntry) { // das Image neu setzen - SetCollapsedEntryBmp( pEntry, pData->GetNormalImage(), BMP_COLOR_NORMAL ); - SetExpandedEntryBmp( pEntry, pData->GetNormalImage(), BMP_COLOR_NORMAL ); - - SetCollapsedEntryBmp( pEntry, pData->GetHCImage(), BMP_COLOR_HIGHCONTRAST ); - SetExpandedEntryBmp( pEntry, pData->GetHCImage(), BMP_COLOR_HIGHCONTRAST ); + SetCollapsedEntryBmp( pEntry, pData->GetNormalImage() ); + SetExpandedEntryBmp( pEntry, pData->GetNormalImage() ); } } @@ -691,13 +682,6 @@ namespace svxform Image aRootImage( m_aNavigatorImages.GetImage( RID_SVXIMG_FORMS ) ); m_pRootEntry = InsertEntry( SVX_RES(RID_STR_FORMS), aRootImage, aRootImage, NULL, sal_False, 0, NULL ); - - if ( m_pRootEntry ) - { - Image aHCRootImage( m_aNavigatorImagesHC.GetImage( RID_SVXIMG_FORMS ) ); - SetExpandedEntryBmp( m_pRootEntry, aHCRootImage, BMP_COLOR_HIGHCONTRAST ); - SetCollapsedEntryBmp( m_pRootEntry, aHCRootImage, BMP_COLOR_HIGHCONTRAST ); - } } else if (!m_bMarkingObjects && rHint.ISA(FmNavRequestSelectHint)) { // wenn m_bMarkingObjects sal_True ist, markiere ich gerade selber Objekte, und da der ganze Mechanismus dahinter synchron ist, @@ -732,12 +716,6 @@ namespace svxform pEntryData->GetNormalImage(), pEntryData->GetNormalImage(), pParentEntry, sal_False, nRelPos, pEntryData ); - if ( pNewEntry ) - { - SetExpandedEntryBmp( pNewEntry, pEntryData->GetHCImage(), BMP_COLOR_HIGHCONTRAST ); - SetCollapsedEntryBmp( pNewEntry, pEntryData->GetHCImage(), BMP_COLOR_HIGHCONTRAST ); - } - ////////////////////////////////////////////////////////////////////// // Wenn Root-Eintrag Root expandieren if( !pParentEntry ) @@ -746,11 +724,11 @@ namespace svxform ////////////////////////////////////////////////////////////////////// // Childs einfuegen FmEntryDataList* pChildList = pEntryData->GetChildList(); - sal_uInt32 nChildCount = pChildList->Count(); + size_t nChildCount = pChildList->size(); FmEntryData* pChildData; - for( sal_uInt32 i=0; i<nChildCount; i++ ) + for( size_t i = 0; i < nChildCount; i++ ) { - pChildData = pChildList->GetObject(i); + pChildData = pChildList->at( i ); Insert( pChildData, LIST_APPEND ); } @@ -1103,13 +1081,13 @@ namespace svxform // und die Properties des alten in das neue kopieren Reference< XPropertySet > xCurrent(pControls[i], UNO_QUERY); -#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL +#if (OSL_DEBUG_LEVEL > 1) // nur mal eben sehen, ob das Ding tatsaechlich ein hidden control ist sal_Int16 nClassId = ::comphelper::getINT16(xCurrent->getPropertyValue(FM_PROP_CLASSID)); OSL_ENSURE(nClassId == FormComponentType::HIDDENCONTROL, "NavigatorTree::implExecuteDataTransfer: invalid control in drop list !"); // wenn das SVX_FM_HIDDEN_CONTROLS-Format vorhanden ist, dann sollten wirklich nur hidden controls in der Sequenz // stecken -#endif // (OSL_DEBUG_LEVEL > 1) || DBG_UTIL +#endif // (OSL_DEBUG_LEVEL > 1) Reference< XPropertySetInfo > xPropInfo( xCurrent->getPropertySetInfo()); Sequence< Property> seqAllCurrentProps = xPropInfo->getProperties(); Property* pAllCurrentProps = seqAllCurrentProps.getArray(); @@ -1193,9 +1171,9 @@ namespace svxform // beim Vater austragen if (pCurrentParentUserData) - pCurrentParentUserData->GetChildList()->Remove(pCurrentUserData); + pCurrentParentUserData->GetChildList()->remove( pCurrentUserData ); else - GetNavModel()->GetRootList()->Remove(pCurrentUserData); + GetNavModel()->GetRootList()->remove( pCurrentUserData ); // aus dem Container entfernen sal_Int32 nIndex = getElementPos(Reference< XIndexAccess > (xContainer, UNO_QUERY), xCurrentChild); @@ -1265,9 +1243,9 @@ namespace svxform // dann dem Parent das neue Child if (pTargetData) - pTargetData->GetChildList()->Insert(pCurrentUserData, nIndex); + pTargetData->GetChildList()->insert( pCurrentUserData, nIndex ); else - GetNavModel()->GetRootList()->Insert(pCurrentUserData, nIndex); + GetNavModel()->GetRootList()->insert( pCurrentUserData, nIndex ); // dann bei mir selber bekanntgeben und neu selektieren SvLBoxEntry* pNew = Insert( pCurrentUserData, nIndex ); @@ -1341,7 +1319,7 @@ namespace svxform } catch( const Exception& ) { - DBG_ERROR( "NavigatorTree::doPaste: caught an exception!" ); + OSL_FAIL( "NavigatorTree::doPaste: caught an exception!" ); } } @@ -1463,7 +1441,7 @@ namespace svxform if (!xNewForm.is()) return; - FmFormData* pNewFormData = new FmFormData( xNewForm, m_aNavigatorImages, m_aNavigatorImagesHC, pParentFormData ); + FmFormData* pNewFormData = new FmFormData( xNewForm, m_aNavigatorImages, pParentFormData ); ////////////////////////////////////////////////////////////////////// // Namen setzen @@ -1481,7 +1459,7 @@ namespace svxform } catch ( const Exception& ) { - DBG_ERROR("NavigatorTree::NewForm : could not set esssential properties !"); + OSL_FAIL("NavigatorTree::NewForm : could not set esssential properties !"); } @@ -1528,7 +1506,7 @@ namespace svxform if (!xNewComponent.is()) return NULL; - FmControlData* pNewFormControlData = new FmControlData( xNewComponent, m_aNavigatorImages, m_aNavigatorImagesHC, pParentFormData ); + FmControlData* pNewFormControlData = new FmControlData( xNewComponent, m_aNavigatorImages, pParentFormData ); ////////////////////////////////////////////////////////////////////// // Namen setzen @@ -1582,7 +1560,7 @@ namespace svxform aNewName = aBaseName; if( i>0 ) { - aNewName += ::rtl::OUString::createFromAscii(" "); + aNewName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); aNewName += ::rtl::OUString::valueOf(i).getStr(); } @@ -1887,7 +1865,7 @@ namespace svxform // start UNDO at this point. Unfortunately, this results in 2 UNDO actions, since DeleteMarked is // creating an own one. However, if we'd move it before DeleteMarked, Writer does not really like // this ... :( - // 2004-07-05 - #i31038# - fs@openoffice.org + // #i31038# { // --------------- // initialize UNDO @@ -1917,7 +1895,7 @@ namespace svxform // if the entry still has children, we skipped deletion of one of those children. // This may for instance be because the shape is in a hidden layer, where we're unable // to remove it - if ( pCurrent->GetChildList()->Count() ) + if ( pCurrent->GetChildList()->size() ) continue; // noch ein kleines Problem, bevor ich das ganz loesche : wenn es eine Form ist und die Shell diese als CurrentObject @@ -2246,9 +2224,9 @@ namespace svxform FmEntryDataList* pChildList = pFormData->GetChildList(); FmEntryData* pEntryData; FmControlData* pControlData; - for( sal_uInt32 i=0; i < pChildList->Count(); ++i ) + for( size_t i = 0; i < pChildList->size(); ++i ) { - pEntryData = pChildList->GetObject(i); + pEntryData = pChildList->at( i ); if( pEntryData->ISA(FmControlData) ) { pControlData = (FmControlData*)pEntryData; @@ -2320,3 +2298,4 @@ namespace svxform //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index bd788b731280..ff0bfc07044d 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -176,7 +177,7 @@ namespace svxform } else if (pEntryData->ISA(FmFormData)) { - DBG_ERROR("replacing forms not implemented yet !"); + OSL_FAIL("replacing forms not implemented yet !"); } } @@ -215,12 +216,11 @@ namespace svxform //======================================================================== //------------------------------------------------------------------------ - NavigatorTreeModel::NavigatorTreeModel( const ImageList& _rNormalImages, const ImageList& _rHCImages ) + NavigatorTreeModel::NavigatorTreeModel( const ImageList& _rNormalImages ) :m_pFormShell(NULL) ,m_pFormPage(NULL) ,m_pFormModel(NULL) ,m_aNormalImages( _rNormalImages ) - ,m_aHCImages( _rHCImages ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::NavigatorTreeModel" ); m_pPropChangeList = new OFormComponentObserver(this); @@ -271,15 +271,7 @@ namespace svxform ////////////////////////////////////////////////////////////////////// // RootList loeschen - FmEntryData* pChildData; - FmEntryDataList* pRootList = GetRootList(); - - for( sal_uInt32 i=pRootList->Count(); i>0; i-- ) - { - pChildData = pRootList->GetObject(i-1); - pRootList->Remove( pChildData ); - delete pChildData; - } + GetRootList()->clear(); ////////////////////////////////////////////////////////////////////// // UI benachrichtigen @@ -360,7 +352,7 @@ namespace svxform } else { - DBG_ERROR("NavigatorTreeModel::Insert : the parent container needs an elementtype I don't know !"); + OSL_FAIL("NavigatorTreeModel::Insert : the parent container needs an elementtype I don't know !"); } if( bUndo ) @@ -383,9 +375,9 @@ namespace svxform } if (pFolder) - pFolder->GetChildList()->Insert( pEntry, nRelPos ); + pFolder->GetChildList()->insert( pEntry, nRelPos ); else - GetRootList()->Insert( pEntry, nRelPos ); + GetRootList()->insert( pEntry, nRelPos ); ////////////////////////////////////////////////////////////////////// // UI benachrichtigen @@ -466,13 +458,13 @@ namespace svxform // beim Vater austragen if (pFolder) - pFolder->GetChildList()->Remove(pEntry); + pFolder->GetChildList()->remove( pEntry ); else { - GetRootList()->Remove(pEntry); + GetRootList()->remove( pEntry ); ////////////////////////////////////////////////////////////////////// // Wenn keine Form mehr in der Root, an der Shell CurForm zuruecksetzen - if (!GetRootList()->Count()) + if ( !GetRootList()->size() ) m_pFormShell->GetImpl()->forgetCurrentForm(); } @@ -498,10 +490,9 @@ namespace svxform return; FmEntryDataList* pChildList = pFormData->GetChildList(); - sal_uInt32 nCount = pChildList->Count(); - for (sal_uInt32 i = nCount; i > 0; i--) + for ( size_t i = pChildList->size(); i > 0; ) { - FmEntryData* pEntryData = pChildList->GetObject(i - 1); + FmEntryData* pEntryData = pChildList->at( --i ); ////////////////////////////////////////////////////////////////////// // Child ist Form -> rekursiver Aufruf @@ -545,15 +536,14 @@ namespace svxform ////////////////////////////////////////////////////////////////////// // Alle Eintraege dieses Zweiges loeschen FmEntryDataList* pChildList = pParentData->GetChildList(); - FmEntryData* pChildData; - for( sal_uInt32 i=pChildList->Count(); i>0; i-- ) + for( size_t i = pChildList->size(); i > 0; ) { - pChildData = pChildList->GetObject(i-1); + FmEntryData* pChildData = pChildList->at( --i ); if( pChildData->ISA(FmFormData) ) ClearBranch( (FmFormData*)pChildData ); - pChildList->Remove( pChildData ); + pChildList->remove( pChildData ); } } @@ -577,7 +567,7 @@ namespace svxform "NavigatorTreeModel::FillBranch : the root container should supply only elements of type XForm"); xForms->getByIndex(i) >>= xSubForm; - pSubFormData = new FmFormData( xSubForm, m_aNormalImages, m_aHCImages, pFormData ); + pSubFormData = new FmFormData( xSubForm, m_aNormalImages, pFormData ); Insert( pSubFormData, LIST_APPEND ); ////////////////////////////////////////////////////////////// @@ -607,7 +597,7 @@ namespace svxform if (xSubForm.is()) { // die aktuelle Component ist eine Form - pSubFormData = new FmFormData(xSubForm, m_aNormalImages, m_aHCImages, pFormData); + pSubFormData = new FmFormData(xSubForm, m_aNormalImages, pFormData); Insert(pSubFormData, LIST_APPEND); ////////////////////////////////////////////////////////////// @@ -616,7 +606,7 @@ namespace svxform } else { - pNewControlData = new FmControlData(xCurrentComponent, m_aNormalImages, m_aHCImages, pFormData); + pNewControlData = new FmControlData(xCurrentComponent, m_aNormalImages, pFormData); Insert(pNewControlData, LIST_APPEND); } } @@ -639,7 +629,7 @@ namespace svxform if (xParentForm.is()) pParentData = (FmFormData*)FindData( xParentForm, GetRootList() ); - pFormData = new FmFormData( xForm, m_aNormalImages, m_aHCImages, pParentData ); + pFormData = new FmFormData( xForm, m_aNormalImages, pParentData ); Insert( pFormData, nRelPos ); } @@ -657,7 +647,7 @@ namespace svxform FmFormData* pParentData = (FmFormData*)FindData( xForm, GetRootList() ); if( !pParentData ) { - pParentData = new FmFormData( xForm, m_aNormalImages, m_aHCImages, NULL ); + pParentData = new FmFormData( xForm, m_aNormalImages, NULL ); Insert( pParentData, LIST_APPEND ); } @@ -665,7 +655,7 @@ namespace svxform { ////////////////////////////////////////////////////////// // Neue EntryData setzen - FmEntryData* pNewEntryData = new FmControlData( xComp, m_aNormalImages, m_aHCImages, pParentData ); + FmEntryData* pNewEntryData = new FmControlData( xComp, m_aNormalImages, pParentData ); ////////////////////////////////////////////////////////// // Neue EntryData einfuegen @@ -674,12 +664,15 @@ namespace svxform } //------------------------------------------------------------------------ - void NavigatorTreeModel::ReplaceFormComponent(const Reference< XFormComponent > & xOld, const Reference< XFormComponent > & xNew) + void NavigatorTreeModel::ReplaceFormComponent( + const Reference< XFormComponent > & xOld, + const Reference< XFormComponent > & xNew + ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::ReplaceFormComponent" ); FmEntryData* pData = FindData(xOld, GetRootList(), sal_True); DBG_ASSERT(pData && pData->ISA(FmControlData), "NavigatorTreeModel::ReplaceFormComponent : invalid argument !"); - ((FmControlData*)pData)->ModelReplaced( xNew, m_aNormalImages, m_aHCImages ); + ((FmControlData*)pData)->ModelReplaced( xNew, m_aNormalImages ); FmNavModelReplacedHint aReplacedHint( pData ); Broadcast( aReplacedHint ); @@ -692,9 +685,9 @@ namespace svxform // normalize Reference< XInterface > xIFace( xElement, UNO_QUERY ); - for (sal_uInt16 i=0; i < pDataList->Count(); i++) + for ( size_t i = 0; i < pDataList->size(); i++ ) { - FmEntryData* pEntryData = pDataList->GetObject(i); + FmEntryData* pEntryData = pDataList->at( i ); if ( pEntryData->GetElement().get() == xIFace.get() ) return pEntryData; else if (bRecurs) @@ -721,9 +714,9 @@ namespace svxform FmEntryData* pEntryData; FmEntryData* pChildData; - for( sal_uInt16 i=0; i<pDataList->Count(); i++ ) + for( size_t i = 0; i < pDataList->size(); i++ ) { - pEntryData = pDataList->GetObject(i); + pEntryData = pDataList->at( i ); aEntryText = pEntryData->GetText(); if (rText == aEntryText) @@ -988,9 +981,9 @@ namespace svxform ::rtl::OUString aChildText; FmEntryData* pChildData; - for( sal_uInt16 i=0; i<pChildList->Count(); i++ ) + for( size_t i = 0; i < pChildList->size(); i++ ) { - pChildData = pChildList->GetObject(i); + pChildData = pChildList->at( i ); aChildText = pChildData->GetText(); ////////////////////////////////////////////////////////////////////// @@ -1124,3 +1117,4 @@ namespace svxform //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx index a3fa90d9e0c5..120c8f8bb41d 100644 --- a/svx/source/form/sdbdatacolumn.cxx +++ b/svx/source/form/sdbdatacolumn.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -285,3 +286,5 @@ namespace svxform //.............................................................................. } // namespace svxform //.............................................................................. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx index a63db6e96d62..1b5962792d25 100644 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ namespace svxform //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx index 06f8814a9721..a2e4e7b67470 100644 --- a/svx/source/form/stringlistresource.cxx +++ b/svx/source/form/stringlistresource.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,5 @@ namespace svx //........................................................................ } // namespace svx //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index d8bff05bf599..eb758f3552a2 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,25 +45,17 @@ #include <comphelper/processfactory.hxx> #include <comphelper/stl_types.hxx> -#ifndef _SVX_FMHELP_HRC #include "fmhelp.hrc" -#endif #include <svx/fmshell.hxx> #include "fmshimp.hxx" #include "svx/dbtoolsclient.hxx" #include <svx/fmpage.hxx> -#ifndef _SVX_FMPGEIMP_HXX #include "fmpgeimp.hxx" -#endif -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif -#ifndef _SVX_FMRESIDS_HRC #include "svx/fmresids.hrc" -#endif #include <svx/dialmgr.hxx> #include <tools/shl.hxx> #include <svx/svdpagv.hxx> @@ -430,7 +423,7 @@ void FmFieldWin::UpdateContent(const ::com::sun::star::uno::Reference< ::com::su } catch( const Exception& ) { - DBG_ERROR( "FmTabWin::UpdateContent: caught an exception!" ); + OSL_FAIL( "FmTabWin::UpdateContent: caught an exception!" ); } } @@ -474,3 +467,4 @@ FmFieldWinMgr::FmFieldWinMgr(Window* _pParent, sal_uInt16 _nId, } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 0bad14631355..836f2c265fb0 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <tools/ref.hxx> #include <tools/shl.hxx> #include <svl/intitem.hxx> @@ -42,19 +43,13 @@ #include <vcl/sound.hxx> #include <svx/dialmgr.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include "svx/tbxctl.hxx" #include "svx/tbxdraw.hxx" #include "tbxform.hxx" -#ifndef _SVX_FMRESIDS_HRC #include "svx/fmresids.hrc" -#endif #include "fmitems.hxx" -#ifndef _SVX_FMHELP_HRC #include "fmhelp.hrc" -#endif #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/imagemgr.hxx> @@ -213,11 +208,7 @@ void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const { // set a new image, matching to this slot rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlot )); - Image aImage = GetImage( m_xFrame, - aSlotURL, - hasBigImages(), - GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() ); - + Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() ); GetToolBox().SetItemImage( GetId(), aImage ); nLastSlot = nSlot; } @@ -414,7 +405,7 @@ SvxFmTbxCtlRecTotal::~SvxFmTbxCtlRecTotal() Window* SvxFmTbxCtlRecTotal::CreateItemWindow( Window* pParent ) { pFixedText = new FixedText( pParent ); - String aSample( "123456", sizeof( "123456" ) - 1 ); + String aSample(RTL_CONSTASCII_USTRINGPARAM("123456")); Size aSize( pFixedText->GetTextWidth( aSample ), pFixedText->GetTextHeight( ) ); aSize.Width() += 12; pFixedText->SetSizePixel( aSize ); @@ -475,3 +466,4 @@ SvxFmTbxPrevRec::SvxFmTbxPrevRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& r } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/typeconversionclient.cxx b/svx/source/form/typeconversionclient.cxx index 9c76a8005e68..fd9427c1aa1a 100644 --- a/svx/source/form/typeconversionclient.cxx +++ b/svx/source/form/typeconversionclient.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ namespace svxform //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx index c12bb313f862..e1eaeca03bca 100644 --- a/svx/source/form/typemap.cxx +++ b/svx/source/form/typemap.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,9 +38,7 @@ #include <editeng/cntritem.hxx> #include <editeng/shdditem.hxx> #include <editeng/postitem.hxx> -#ifndef _SVX_CLIPBOARDCTL_HXX_ #include "svx/clipfmtitem.hxx" -#endif #include <editeng/fhgtitem.hxx> #include "editeng/fontitem.hxx" #include <editeng/charreliefitem.hxx> @@ -55,11 +54,10 @@ #include <editeng/kernitem.hxx> #include <editeng/tstpitem.hxx> #include <editeng/adjitem.hxx> -#ifndef _SVX_EMPHITEM_HXX #include <editeng/emphitem.hxx> -#endif #include <editeng/memberids.hrc> #define SFX_TYPEMAP #include "svxslots.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index 078e555cfe25..aff2199bd49d 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef SVX_SOURCE_FORM_XFM_ADDCONDITION_HXX #include "xfm_addcondition.hxx" -#endif /** === begin UNO includes === **/ /** === end UNO includes === **/ @@ -73,7 +72,7 @@ namespace svxform //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL OAddConditionDialog_GetImplementationName() { - return ::rtl::OUString::createFromAscii( "org.openoffice.comp.svx.OAddConditionDialog" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svx.OAddConditionDialog")); } //==================================================================== @@ -191,3 +190,4 @@ namespace svxform } // namespace svxformv //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx index 3306e7896c5d..c8ffb25446fa 100644 --- a/svx/source/gallery2/codec.cxx +++ b/svx/source/gallery2/codec.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -171,3 +172,5 @@ void GalleryCodec::Read( SvStream& rStmToRead ) } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/codec.hxx b/svx/source/gallery2/codec.hxx index ca7ee5d3adbf..cf10f48870c2 100644 --- a/svx/source/gallery2/codec.hxx +++ b/svx/source/gallery2/codec.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: static sal_Bool IsCoded( SvStream& rStm, sal_uInt32& rVersion ); }; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx index 5d4e4297f0a4..ba95d07ba8cf 100644 --- a/svx/source/gallery2/galbrws.cxx +++ b/svx/source/gallery2/galbrws.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -283,3 +284,5 @@ IMPL_LINK( GalleryBrowser, SplitHdl, void*, EMPTYARG ) return 0L; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 3704262833ed..df79fd48e0cf 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,8 +45,7 @@ #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> -#include <svx/svxdlg.hxx> //CHINA001 -//CHINA001 #include <svx/dialogs.hrc> //CHINA001 +#include <svx/svxdlg.hxx> // -------------- // - Namespaces - @@ -240,7 +240,7 @@ void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeDa util::DateTime aDateTimeModified; DateTime aDateTime; - aCnt.getPropertyValue( OUString::createFromAscii( "DateModified" ) ) >>= aDateTimeModified; + aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "DateModified" )) ) >>= aDateTimeModified; ::utl::typeConvert( aDateTimeModified, aDateTime ); rData.aThemeChangeDate = aDateTime; rData.aThemeChangeTime = aDateTime; @@ -410,17 +410,17 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId ) case( MN_ACTUALIZE ): { GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this ); - //CHINA001 ActualizeProgress aActualizeProgress( this, pTheme ); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { VclAbstractRefreshableDialog* aActualizeProgress = pFact->CreateActualizeProgressDialog( this, pTheme ); - DBG_ASSERT(aActualizeProgress, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(aActualizeProgress, "Dialogdiet fail!"); - aActualizeProgress->Update(); //CHINA001 aActualizeProgress.Update(); - aActualizeProgress->Execute(); //CHINA001 aActualizeProgress.Execute(); + aActualizeProgress->Update(); + aActualizeProgress->Execute(); mpGallery->ReleaseTheme( pTheme, *this ); - delete aActualizeProgress; //add CHINA001 + delete aActualizeProgress; } } break; @@ -436,15 +436,15 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId ) { GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this ); const String aOldName( pTheme->GetName() ); - //CHINA001 TitleDialog aDlg( this, aOldName ); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractTitleDialog* aDlg = pFact->CreateTitleDialog( this, aOldName ); - DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(aDlg, "Dialogdiet fail!"); - if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK ) + if( aDlg->Execute() == RET_OK ) { - const String aNewName( aDlg->GetTitle() ); //CHINA001 aDlg.GetTitle() ); + const String aNewName( aDlg->GetTitle() ); if( aNewName.Len() && ( aNewName != aOldName ) ) { @@ -462,7 +462,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId ) } } mpGallery->ReleaseTheme( pTheme, *this ); - delete aDlg; //add CHINA001 + delete aDlg; } break; @@ -472,16 +472,16 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId ) if( pTheme && !pTheme->IsReadOnly() && !pTheme->IsImported() ) { - //CHINA001 GalleryIdDialog aDlg( this, pTheme ); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { AbstractGalleryIdDialog* aDlg = pFact->CreateGalleryIdDialog( this, pTheme ); - DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(aDlg, "Dialogdiet fail!"); - if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK ) - pTheme->SetId( aDlg->GetId(), sal_True ); //CHINA001 pTheme->SetId( aDlg.GetId(), sal_True ); - delete aDlg; //add CHINA001 + if( aDlg->Execute() == RET_OK ) + pTheme->SetId( aDlg->GetId(), sal_True ); + delete aDlg; } } @@ -716,3 +716,4 @@ IMPL_LINK( GalleryBrowser1, ClickNewThemeHdl, void*, EMPTYARG ) return 0L; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index d05187d4c856..10b7606de2cc 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,3 +134,5 @@ public: void ShowContextMenu(); sal_Bool KeyInput( const KeyEvent& rKEvt, Window* pWindow ); }; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 2fff76ba0c76..6b1a265dd9aa 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,17 +122,16 @@ void GalleryBackgroundPopup::StateChanged( sal_uInt16 nSID, SfxItemState eState, if( ( pStrLstItem = PTR_CAST( SfxStringListItem, pItem ) ) != NULL ) { - List* pList = pStrLstItem->GetList(); + const std::vector<String> &aList = pStrLstItem->GetList(); - if( pList ) - for ( sal_uIntPtr i = 0, nCount = pList->Count(); i < nCount; i++ ) - InsertItem( (sal_uInt16) i + 1, *(String*) pList->GetObject( i ) ); + for ( sal_uIntPtr i = 0, nCount = aList.size(); i < nCount; i++ ) + InsertItem( (sal_uInt16) i + 1, aList[i]); } else if( ( pStrItem = PTR_CAST( SfxStringItem, pItem ) ) != NULL ) InsertItem( 1, pStrItem->GetValue() ); else { - DBG_ERROR( "SgaBGPopup::StateChanged(...): Wrong item type!" ); + OSL_FAIL( "SgaBGPopup::StateChanged(...): Wrong item type!" ); } } } @@ -1030,15 +1030,15 @@ void GalleryBrowser2::ImplExecute( sal_uInt16 nId ) if( pObj ) { const String aOldTitle( GetItemText( *mpCurTheme, *pObj, GALLERY_ITEM_TITLE ) ); - //CHINA001 TitleDialog aDlg( this, aOldTitle ); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { AbstractTitleDialog* aDlg = pFact->CreateTitleDialog( this, aOldTitle ); - DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 - if( aDlg->Execute() == RET_OK )//CHINA001 if( aDlg.Execute() == RET_OK ) + DBG_ASSERT(aDlg, "Dialogdiet fail!"); + if( aDlg->Execute() == RET_OK ) { - String aNewTitle( aDlg->GetTitle() );//CHINA001 String aNewTitle( aDlg.GetTitle() ); + String aNewTitle( aDlg->GetTitle() ); if( ( !aNewTitle.Len() && pObj->GetTitle().Len() ) || ( aNewTitle != aOldTitle ) ) { @@ -1051,7 +1051,7 @@ void GalleryBrowser2::ImplExecute( sal_uInt16 nId ) } mpCurTheme->ReleaseObject( pObj ); - delete aDlg; //add CHINA001 + delete aDlg; } } } @@ -1171,12 +1171,12 @@ String GalleryBrowser2::GetFilterName() const if( ( SGA_OBJ_BMP == eObjKind ) || ( SGA_OBJ_ANIM == eObjKind ) ) { - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); + GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); INetURLObject aURL; mpCurTheme->GetURL( mnCurActionPos, aURL ); - sal_uInt16 nFilter = pFilter->GetImportFormatNumberForShortName( aURL.GetExtension() ); + sal_uInt16 nFilter = rFilter.GetImportFormatNumberForShortName( aURL.GetExtension() ); if( GRFILTER_FORMAT_DONTKNOW != nFilter ) - aFilterName = pFilter->GetImportFormatName( nFilter ); + aFilterName = rFilter.GetImportFormatName( nFilter ); } } @@ -1248,12 +1248,10 @@ IMPL_LINK( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox ) IMPL_LINK( GalleryBrowser2, MiscHdl, void*, EMPTYARG ) { - const sal_Bool bHC = maViewBox.GetSettings().GetStyleSettings().GetHighContrastMode(); - maViewBox.SetOutStyle( maMiscOptions.GetToolboxStyle() ); - BitmapEx aIconBmpEx = BitmapEx( Image( GAL_RESID( bHC? RID_SVXIMG_GALLERY_VIEW_ICON_HC : RID_SVXIMG_GALLERY_VIEW_ICON ) ).GetBitmapEx() ); - BitmapEx aListBmpEx = BitmapEx( Image( GAL_RESID( bHC? RID_SVXIMG_GALLERY_VIEW_LIST_HC : RID_SVXIMG_GALLERY_VIEW_LIST ) ).GetBitmapEx() ); + BitmapEx aIconBmpEx = BitmapEx( Image( GAL_RESID( RID_SVXIMG_GALLERY_VIEW_ICON ) ).GetBitmapEx() ); + BitmapEx aListBmpEx = BitmapEx( Image( GAL_RESID( RID_SVXIMG_GALLERY_VIEW_LIST ) ).GetBitmapEx() ); if( maMiscOptions.AreCurrentSymbolsLarge() ) { @@ -1271,3 +1269,5 @@ IMPL_LINK( GalleryBrowser2, MiscHdl, void*, EMPTYARG ) return 0L; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 6dca7b050e01..667cc36574b8 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,9 +95,9 @@ bool GalleryPreview::SetGraphic( const INetURLObject& _aURL ) } else { - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); - GalleryProgress aProgress( pFilter ); - if( pFilter->ImportGraphic( aGraphic, _aURL, GRFILTER_FORMAT_DONTKNOW ) ) + GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); + GalleryProgress aProgress( &rFilter ); + if( rFilter.ImportGraphic( aGraphic, _aURL, GRFILTER_FORMAT_DONTKNOW ) ) bRet = false; } @@ -693,13 +694,8 @@ sal_Int8 GalleryListView::AcceptDrop( const BrowserAcceptDropEvent& ) { sal_Int8 nRet = DND_ACTION_NONE; - if( mpTheme && !mpTheme->IsReadOnly() && !mpTheme ->IsImported() ) - { - if( !mpTheme->IsDragging() ) - nRet = DND_ACTION_COPY; - else - nRet = DND_ACTION_COPY; - } + if( mpTheme && !mpTheme->IsReadOnly() && !mpTheme ->IsImported() ) + nRet = DND_ACTION_COPY; return nRet; } @@ -721,3 +717,5 @@ void GalleryListView::StartDrag( sal_Int8, const Point& rPosPixel ) { ( (GalleryBrowser2*) GetParent() )->StartDrag( this, &rPosPixel ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index 84f62fc795e7..a813ffe8a15b 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,7 +109,7 @@ sal_Bool GalleryExplorer::IsLinkage() const // ------------------------------------------------------------------------ -sal_Bool GalleryExplorer::FillThemeList( List& rThemeList ) +bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList ) { Gallery* pGal = ImplGetGallery(); @@ -119,16 +120,16 @@ sal_Bool GalleryExplorer::FillThemeList( List& rThemeList ) const GalleryThemeEntry* pEntry = pGal->GetThemeInfo( i ); if( pEntry && !pEntry->IsReadOnly() && !pEntry->IsHidden() ) - rThemeList.Insert( new String( pEntry->GetThemeName() ), LIST_APPEND ); + rThemeList.push_back(pEntry->GetThemeName()); } } - return( rThemeList.Count() > 0 ); + return !rThemeList.empty(); } // ------------------------------------------------------------------------ -sal_Bool GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList ) +sal_Bool GalleryExplorer::FillObjList( const String& rThemeName, std::vector<String> &rObjList ) { Gallery* pGal = ImplGetGallery(); @@ -139,22 +140,26 @@ sal_Bool GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList if( pTheme ) { - for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ ) - rObjList.Insert( new String( pTheme->GetObjectURL( i ).GetMainURL( INetURLObject::NO_DECODE ) ), LIST_APPEND ); + for( sal_uInt32 i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ ) + rObjList.push_back( pTheme->GetObjectURL( i ).GetMainURL( INetURLObject::NO_DECODE ) ); pGal->ReleaseTheme( pTheme, aListener ); } } - return( rObjList.Count() > 0 ); + return !rObjList.empty(); } // ------------------------------------------------------------------------ -sal_Bool GalleryExplorer::FillObjList( sal_uIntPtr nThemeId, List& rObjList ) +sal_Bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<String> &rObjList ) { Gallery* pGal = ImplGetGallery(); - return( pGal ? FillObjList( pGal->GetThemeName( nThemeId ), rObjList ) : sal_False ); + + if (!pGal) + return false; + + return FillObjList( pGal->GetThemeName( nThemeId ), rObjList ); } // ------------------------------------------------------------------------ @@ -182,7 +187,7 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect pGal->ReleaseTheme( pTheme, aListener ); } } - return( rList.size() > 0 ); + return !rList.empty(); } // ------------------------------------------------------------------------ @@ -513,3 +518,5 @@ sal_Bool GalleryExplorer::DrawCentered( OutputDevice* pOut, const FmFormModel& r { return SgaObjectSvDraw::DrawCentered( pOut, rModel ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src index 8179367cd53d..b801b1d3fa50 100644 --- a/svx/source/gallery2/gallery.src +++ b/svx/source/gallery2/gallery.src @@ -257,19 +257,6 @@ Image RID_SVXIMG_GALLERY_VIEW_LIST MASKCOLOR }; -Image RID_SVXIMG_GALLERY_VIEW_ICON_HC -{ - ImageBitmap = Bitmap { File = "galicon_h.bmp"; }; - MASKCOLOR -}; - -Image RID_SVXIMG_GALLERY_VIEW_LIST_HC -{ - ImageBitmap = Bitmap { File = "gallist_h.bmp"; }; - MASKCOLOR -}; - - /******************************************************************************/ Menu RID_SVXMN_GALLERY1 diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index eee9f46953c4..0eba3f66d248 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,25 +94,17 @@ INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL { INetURLObject aURL( rURL ); String aFileName; - sal_Bool bExists = sal_False; // check original file name - if( FileExists( aURL ) ) - bExists = sal_True; - else + if( !FileExists( aURL ) ) { // check upper case file name aURL.setName( aURL.getName().toAsciiUpperCase() ); - if( FileExists( aURL ) ) - bExists = sal_True; - else + if(!FileExists( aURL ) ) { // check lower case file name aURL.setName( aURL.getName().toAsciiLowerCase() ); - - if( FileExists( aURL ) ) - bExists = sal_True; } } @@ -209,12 +202,14 @@ Gallery::Gallery( const String& rMultiPath ) Gallery::~Gallery() { // Themen-Liste loeschen - for( GalleryThemeEntry* pThemeEntry = aThemeList.First(); pThemeEntry; pThemeEntry = aThemeList.Next() ) - delete pThemeEntry; + for ( size_t i = 0, n = aThemeList.size(); i < n; ++i ) + delete aThemeList[ i ]; + aThemeList.clear(); // Import-Liste loeschen - for( GalleryImportThemeEntry* pImportEntry = aImportList.First(); pImportEntry; pImportEntry = aImportList.Next() ) - delete pImportEntry; + for ( size_t i = 0, n = aImportList.size(); i < n; ++i ) + delete aImportList[ i ]; + aImportList.clear(); } // ------------------------------------------------------------------------ @@ -285,7 +280,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR ::ucbhelper::Content aCnt( rBaseURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv ); uno::Sequence< OUString > aProps( 1 ); - aProps.getArray()[ 0 ] = OUString::createFromAscii( "Url" ); + aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Url")); uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) ); @@ -333,10 +328,10 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR if(aThmURL.GetExtension().equalsIgnoreAsciiCaseAscii("thm")) { - INetURLObject aSdgURL( aThmURL); aSdgURL.SetExtension( OUString::createFromAscii( "sdg" ) ); - INetURLObject aSdvURL( aThmURL ); aSdvURL.SetExtension( OUString::createFromAscii( "sdv" ) ); - const OUString aTitleProp( OUString::createFromAscii( "Title" ) ); - const OUString aReadOnlyProp( OUString::createFromAscii( "IsReadOnly" ) ); + INetURLObject aSdgURL( aThmURL); aSdgURL.SetExtension( OUString(RTL_CONSTASCII_USTRINGPARAM("sdg")) ); + INetURLObject aSdvURL( aThmURL ); aSdvURL.SetExtension( OUString(RTL_CONSTASCII_USTRINGPARAM("sdv")) ); + const OUString aTitleProp( RTL_CONSTASCII_USTRINGPARAM("Title") ); + const OUString aReadOnlyProp( RTL_CONSTASCII_USTRINGPARAM("IsReadOnly") ); OUString aTitle; sal_Bool bReadOnly = sal_False; @@ -432,7 +427,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR { const sal_uIntPtr nFileNumber = (sal_uIntPtr) String(aThmURL.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32(); - aThemeList.Insert( pEntry, LIST_APPEND ); + aThemeList.push_back( pEntry ); if( nFileNumber > nLastFileNumber ) nLastFileNumber = nFileNumber; @@ -487,10 +482,10 @@ void Gallery::ImplLoadImports() sal_uInt16 i; sal_uInt16 nTempCharSet; - for( pImportEntry = aImportList.First(); pImportEntry; pImportEntry = aImportList.Next() ) - delete pImportEntry; + for ( size_t j = 0, n = aImportList.size(); j < n; ++j ) + delete aImportList[ j ]; + aImportList.clear(); - aImportList.Clear(); *pIStm >> nInventor; if( nInventor == COMPAT_FORMAT( 'S', 'G', 'A', '3' ) ) @@ -502,14 +497,14 @@ void Gallery::ImplLoadImports() pImportEntry = new GalleryImportThemeEntry; *pIStm >> *pImportEntry; - aImportList.Insert( pImportEntry, LIST_APPEND ); + aImportList.push_back( pImportEntry ); aFile = INetURLObject( pImportEntry->aURL ); pThemeEntry = new GalleryThemeEntry( aFile, pImportEntry->aUIName, String(aFile.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32(), sal_True, sal_True, sal_False, 0, sal_False ); - aThemeList.Insert( pThemeEntry, LIST_APPEND ); + aThemeList.push_back( pThemeEntry ); } } @@ -531,10 +526,10 @@ void Gallery::ImplWriteImportList() const sal_uInt32 nInventor = (sal_uInt32) COMPAT_FORMAT( 'S', 'G', 'A', '3' ); const sal_uInt16 nId = 0x0004; - *pOStm << nInventor << nId << (sal_uInt32) aImportList.Count() << (sal_uInt16) gsl_getSystemTextEncoding(); + *pOStm << nInventor << nId << (sal_uInt32) aImportList.size() << (sal_uInt16) gsl_getSystemTextEncoding(); - for( GalleryImportThemeEntry* pImportEntry = aImportList.First(); pImportEntry; pImportEntry = aImportList.Next() ) - *pOStm << *pImportEntry; + for ( size_t i = 0, n = aImportList.size(); i < n; ++i ) + *pOStm << *aImportList[ i ]; if( pOStm->GetError() ) ErrorHandler::HandleError( ERRCODE_IO_GENERAL ); @@ -550,9 +545,9 @@ GalleryThemeEntry* Gallery::ImplGetThemeEntry( const String& rThemeName ) GalleryThemeEntry* pFound = NULL; if( rThemeName.Len() ) - for( GalleryThemeEntry* pEntry = aThemeList.First(); pEntry && !pFound; pEntry = aThemeList.Next() ) - if( rThemeName == pEntry->GetThemeName() ) - pFound = pEntry; + for ( size_t i = 0, n = aThemeList.size(); i < n && !pFound; ++i ) + if( rThemeName == aThemeList[ i ]->GetThemeName() ) + pFound = aThemeList[ i ]; return pFound; } @@ -561,13 +556,10 @@ GalleryThemeEntry* Gallery::ImplGetThemeEntry( const String& rThemeName ) GalleryImportThemeEntry* Gallery::ImplGetImportThemeEntry( const String& rImportName ) { - GalleryImportThemeEntry* pFound = NULL; - - for( GalleryImportThemeEntry* pImportEntry = aImportList.First(); pImportEntry && !pFound; pImportEntry = aImportList.Next() ) - if ( rImportName == pImportEntry->aUIName ) - pFound = pImportEntry; - - return pFound; + for ( size_t i = 0, n = aImportList.size(); i < n; ++i ) + if ( rImportName == aImportList[ i ]->aUIName ) + return aImportList[ i ]; + return NULL; } // ------------------------------------------------------------------------ @@ -576,10 +568,9 @@ String Gallery::GetThemeName( sal_uIntPtr nThemeId ) const { GalleryThemeEntry* pFound = NULL; - for( sal_uIntPtr n = 0, nCount = aThemeList.Count(); n < nCount; n++ ) + for ( size_t i = 0, n = aThemeList.size(); i < n && !pFound; ++i ) { - GalleryThemeEntry* pEntry = aThemeList.GetObject( n ); - + GalleryThemeEntry* pEntry = aThemeList[ i ]; if( nThemeId == pEntry->GetId() ) pFound = pEntry; } @@ -631,7 +622,7 @@ sal_Bool Gallery::CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom ) nLastFileNumber, sal_False, sal_False, sal_True, 0, sal_False ); - aThemeList.Insert( pNewEntry, LIST_APPEND ); + aThemeList.push_back( pNewEntry ); delete( new GalleryTheme( this, pNewEntry ) ); Broadcast( GalleryHint( GALLERY_HINT_THEME_CREATED, rThemeName ) ); bRet = sal_True; @@ -695,14 +686,14 @@ sal_Bool Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rI } pImportTheme->SetImportName( aNewName ); - aThemeList.Insert( pThemeEntry, LIST_APPEND ); + aThemeList.push_back( pThemeEntry ); // Thema in Import-Liste eintragen und Import-Liste speichern GalleryImportThemeEntry* pImportEntry = new GalleryImportThemeEntry; pImportEntry->aThemeName = pImportEntry->aUIName = aNewName; pImportEntry->aURL = rURL; pImportEntry->aImportName = rImportName; - aImportList.Insert( pImportEntry, LIST_APPEND ); + aImportList.push_back( pImportEntry ); ImplWriteImportList(); bRet = sal_True; } @@ -776,8 +767,15 @@ sal_Bool Gallery::RemoveTheme( const String& rThemeName ) if( pImportEntry ) { - delete aImportList.Remove( pImportEntry ); - ImplWriteImportList(); + for ( GalleryImportThemeList::iterator it = aImportList.begin(); it < aImportList.end(); ++it ) + { + if ( *it == pImportEntry ) + { + delete pImportEntry; + aImportList.erase( it ); + break; + } + } } } else @@ -799,7 +797,15 @@ sal_Bool Gallery::RemoveTheme( const String& rThemeName ) } } - delete aThemeList.Remove( pThemeEntry ); + for ( GalleryThemeList::iterator it = aThemeList.begin(); it < aThemeList.end(); ++it ) + { + if ( pThemeEntry == *it ) { + delete pThemeEntry; + aThemeList.erase( it ); + break; + } + } + Broadcast( GalleryHint( GALLERY_HINT_THEME_REMOVED, rThemeName ) ); bRet = sal_True; @@ -832,11 +838,14 @@ GalleryTheme* Gallery::ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry if( pThemeEntry ) { - GalleryThemeCacheEntry* pEntry; - - for( pEntry = (GalleryThemeCacheEntry*) aThemeCache.First(); pEntry && !pTheme; pEntry = (GalleryThemeCacheEntry*) aThemeCache.Next() ) - if( pThemeEntry == pEntry->GetThemeEntry() ) - pTheme = pEntry->GetTheme(); + for (GalleryCacheThemeList::const_iterator it = aThemeCache.begin(); it != aThemeCache.end(); ++it) + { + if (pThemeEntry == (*it)->GetThemeEntry()) + { + pTheme = (*it)->GetTheme(); + break; + } + } if( !pTheme ) { @@ -868,7 +877,7 @@ GalleryTheme* Gallery::ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry } if( pTheme ) - aThemeCache.Insert( new GalleryThemeCacheEntry( pThemeEntry, pTheme ), LIST_APPEND ); + aThemeCache.push_back( new GalleryThemeCacheEntry( pThemeEntry, pTheme )); } } @@ -879,15 +888,13 @@ GalleryTheme* Gallery::ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry void Gallery::ImplDeleteCachedTheme( GalleryTheme* pTheme ) { - GalleryThemeCacheEntry* pEntry; - sal_Bool bDone = sal_False; - - for( pEntry = (GalleryThemeCacheEntry*) aThemeCache.First(); pEntry && !bDone; pEntry = (GalleryThemeCacheEntry*) aThemeCache.Next() ) + for (GalleryCacheThemeList::iterator it = aThemeCache.begin(); it != aThemeCache.end(); ++it) { - if( pTheme == pEntry->GetTheme() ) + if (pTheme == (*it)->GetTheme()) { - delete (GalleryThemeCacheEntry*) aThemeCache.Remove( pEntry ); - bDone = sal_True; + delete *it; + aThemeCache.erase(it); + break; } } } @@ -921,3 +928,4 @@ void Gallery::ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener ) sal_Bool GalleryThemeEntry::IsDefault() const { return( ( nId > 0 ) && ( nId != ( RID_GALLERYSTR_THEME_MYTHEME - RID_GALLERYSTR_THEME_START ) ) ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/gallerydrawmodel.hxx b/svx/source/gallery2/gallerydrawmodel.hxx index 7221565dffc5..61531579218b 100644 --- a/svx/source/gallery2/gallerydrawmodel.hxx +++ b/svx/source/gallery2/gallerydrawmodel.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,4 @@ private: FmFormModel* mpFormModel; }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index da5375423b56..be92ac7ebba9 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,9 +76,8 @@ ResMgr* GetGalleryResMgr() if( !pGalleryResMgr ) { - ByteString aResMgrName( "gal" ); pGalleryResMgr = ResMgr::CreateResMgr( - aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() ); + "gal", Application::GetSettings().GetUILocale() ); } return pGalleryResMgr; @@ -126,13 +126,13 @@ sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, if( pIStm ) { - GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); - GalleryProgress* pProgress = bShowProgress ? new GalleryProgress( pGraphicFilter ) : NULL; + GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); + GalleryProgress* pProgress = bShowProgress ? new GalleryProgress( &rGraphicFilter ) : NULL; sal_uInt16 nFormat; - if( !pGraphicFilter->ImportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ), *pIStm, GRFILTER_FORMAT_DONTKNOW, &nFormat ) ) + if( !rGraphicFilter.ImportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ), *pIStm, GRFILTER_FORMAT_DONTKNOW, &nFormat ) ) { - rFilterName = pGraphicFilter->GetImportFormatName( nFormat ); + rFilterName = rGraphicFilter.GetImportFormatName( nFormat ); nRet = SGA_IMPORT_FILE; } @@ -161,7 +161,7 @@ sal_Bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel ) if( 1 == nVersion ) { - DBG_ERROR( "staroffice binary file formats are no longer supported inside the gallery!" ); + OSL_FAIL( "staroffice binary file formats are no longer supported inside the gallery!" ); bRet = false; } else if( 2 == nVersion ) @@ -284,7 +284,7 @@ sal_Bool FileExists( const INetURLObject& rURL ) ::ucbhelper::Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() ); OUString aTitle; - aCnt.getPropertyValue( OUString::createFromAscii( "Title" ) ) >>= aTitle; + aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ) >>= aTitle; bRet = ( aTitle.getLength() > 0 ); } catch( const ucb::ContentCreationException& ) @@ -318,11 +318,11 @@ sal_Bool CreateDir( const INetURLObject& rURL ) uno::Sequence< OUString > aProps( 1 ); uno::Sequence< uno::Any > aValues( 1 ); - aProps.getArray()[ 0 ] = OUString::createFromAscii( "Title" ); + aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); aValues.getArray()[ 0 ] = uno::makeAny( OUString( aNewFolderURL.GetName() ) ); ::ucbhelper::Content aContent( aNewFolderURL.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv ); - bRet = aParent.insertNewContent( OUString::createFromAscii( "application/vnd.sun.staroffice.fsys-folder" ), aProps, aValues, aContent ); + bRet = aParent.insertNewContent( OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.staroffice.fsys-folder")), aProps, aValues, aContent ); } catch( const ucb::ContentCreationException& ) { @@ -348,7 +348,7 @@ sal_Bool CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL ) { ::ucbhelper::Content aDestPath( rDstURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() ); - aDestPath.executeCommand( OUString::createFromAscii( "transfer" ), + aDestPath.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")), uno::makeAny( ucb::TransferInfo( sal_False, rSrcURL.GetMainURL( INetURLObject::NO_DECODE ), rDstURL.GetName(), ucb::NameClash::OVERWRITE ) ) ); bRet = sal_True; @@ -377,7 +377,7 @@ sal_Bool KillFile( const INetURLObject& rURL ) try { ::ucbhelper::Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() ); - aCnt.executeCommand( OUString::createFromAscii( "delete" ), uno::makeAny( sal_Bool( sal_True ) ) ); + aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ucb::ContentCreationException& ) { @@ -408,7 +408,7 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) : if( xMgr.is() ) { uno::Reference< awt::XProgressMonitor > xMonitor( xMgr->createInstance( - ::rtl::OUString::createFromAscii( "com.sun.star.awt.XProgressMonitor" ) ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.XProgressMonitor")) ), uno::UNO_QUERY ); if ( xMonitor.is() ) @@ -529,7 +529,7 @@ void GalleryTransferable::InitData( bool bLazy ) break; default: - DBG_ERROR( "GalleryTransferable::GalleryTransferable: invalid object type" ); + OSL_FAIL( "GalleryTransferable::GalleryTransferable: invalid object type" ); break; } } @@ -667,3 +667,5 @@ void GalleryTransferable::StartDrag( Window* pWindow, sal_Int8 nDragSourceAction TransferableHelper::StartDrag( pWindow, nDragSourceActions, nDragPointer, nDragImage ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 9ba9cff068a3..d86553ace8c8 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -605,3 +606,5 @@ void SgaObjectSvDraw::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) rIn >> aTmpStr; aTitle = String( aTmpStr.GetBuffer(), RTL_TEXTENCODING_UTF8 ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 71f2252fc731..e239fbd659e3 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,12 +94,14 @@ GalleryTheme::~GalleryTheme() { ImplWrite(); - for( GalleryObject* pEntry = aObjectList.First(); pEntry; pEntry = aObjectList.Next() ) + for ( size_t i = 0, n = aObjectList.size(); i < n; ++i ) { + GalleryObject* pEntry = aObjectList[ i ]; Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); delete pEntry; Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); } + aObjectList.clear(); } // ------------------------------------------------------------------------ @@ -118,7 +121,7 @@ void GalleryTheme::ImplCreateSvDrawStorage() // ------------------------------------------------------------------------ -sal_Bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, sal_uIntPtr nPos, GalleryObject* pExistentEntry ) +sal_Bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry ) { SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE ); sal_Bool bRet = sal_False; @@ -136,7 +139,14 @@ sal_Bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, sal_uIntPtr nP if( !pExistentEntry ) { pEntry = new GalleryObject; - aObjectList.Insert( pEntry, nPos ); + if ( nPos < aObjectList.size() ) + { + GalleryObjectList::iterator it = aObjectList.begin(); + ::std::advance( it, nPos ); + aObjectList.insert( it, pEntry ); + } + else + aObjectList.push_back( pEntry ); } else pEntry = pExistentEntry; @@ -250,14 +260,10 @@ void GalleryTheme::ImplWrite() const GalleryObject* GalleryTheme::ImplGetGalleryObject( const INetURLObject& rURL ) { - GalleryObject* pEntry = aObjectList.First(); - GalleryObject* pFoundEntry = NULL; - - for( ; pEntry && !pFoundEntry; pEntry = aObjectList.Next() ) - if( pEntry->aURL == rURL ) - pFoundEntry = pEntry; - - return pFoundEntry; + for ( size_t i = 0, n = aObjectList.size(); i < n; ++i ) + if ( aObjectList[ i ]->aURL == rURL ) + return aObjectList[ i ]; + return NULL; } // ------------------------------------------------------------------------ @@ -344,9 +350,12 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPt bExists = sal_False; - for( GalleryObject* pEntry = aObjectList.First(); pEntry && !bExists; pEntry = aObjectList.Next() ) - if( pEntry->aURL == aNewURL ) + for ( size_t i = 0, n = aObjectList.size(); i < n; ++i ) + if ( aObjectList[ i ]->aURL == aNewURL ) + { bExists = sal_True; + break; + } } else { @@ -417,18 +426,22 @@ void GalleryTheme::UnlockBroadcaster( sal_uIntPtr nUpdatePos ) // ------------------------------------------------------------------------ -sal_Bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos ) +bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos ) { sal_Bool bRet = sal_False; if( rObj.IsValid() ) { - GalleryObject* pEntry = aObjectList.First(); GalleryObject* pFoundEntry = NULL; - - for( ; pEntry && !pFoundEntry; pEntry = aObjectList.Next() ) - if( pEntry->aURL == rObj.GetURL() ) - pFoundEntry = pEntry; + size_t iFoundPos = 0; + for ( size_t n = aObjectList.size(); iFoundPos < n; ++iFoundPos ) + { + if ( aObjectList[ iFoundPos ]->aURL == rObj.GetURL() ) + { + pFoundEntry = aObjectList[ iFoundPos ]; + break; + } + } if( pFoundEntry ) { @@ -455,7 +468,7 @@ sal_Bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertP ImplWriteSgaObject( rObj, nInsertPos, NULL ); ImplSetModified( bRet = sal_True ); - ImplBroadcast( pFoundEntry ? aObjectList.GetPos( pFoundEntry ) : nInsertPos ); + ImplBroadcast( pFoundEntry ? iFoundPos : nInsertPos ); } return bRet; @@ -463,9 +476,9 @@ sal_Bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertP // ------------------------------------------------------------------------ -SgaObject* GalleryTheme::AcquireObject( sal_uIntPtr nPos ) +SgaObject* GalleryTheme::AcquireObject( size_t nPos ) { - return ImplReadSgaObject( aObjectList.GetObject( nPos ) ); + return ImplReadSgaObject( aObjectList[ nPos ] ); } // ------------------------------------------------------------------------ @@ -477,11 +490,18 @@ void GalleryTheme::ReleaseObject( SgaObject* pObject ) // ------------------------------------------------------------------------ -sal_Bool GalleryTheme::RemoveObject( sal_uIntPtr nPos ) +bool GalleryTheme::RemoveObject( size_t nPos ) { - GalleryObject* pEntry = aObjectList.Remove( nPos ); + GalleryObject* pEntry = NULL; + if ( nPos < aObjectList.size() ) + { + GalleryObjectList::iterator it = aObjectList.begin(); + ::std::advance( it, nPos ); + pEntry = *it; + aObjectList.erase( it ); + } - if( !aObjectList.Count() ) + if( aObjectList.empty() ) KillFile( GetSdgURL() ); if( pEntry ) @@ -502,25 +522,28 @@ sal_Bool GalleryTheme::RemoveObject( sal_uIntPtr nPos ) // ------------------------------------------------------------------------ -sal_Bool GalleryTheme::ChangeObjectPos( sal_uIntPtr nOldPos, sal_uIntPtr nNewPos ) +bool GalleryTheme::ChangeObjectPos( size_t nOldPos, size_t nNewPos ) { sal_Bool bRet = sal_False; - if( nOldPos != nNewPos ) + if( nOldPos != nNewPos + && nOldPos < aObjectList.size() + ) { - GalleryObject* pEntry = aObjectList.GetObject( nOldPos ); + GalleryObject* pEntry = aObjectList[ nOldPos ]; - if( pEntry ) - { - aObjectList.Insert( pEntry, nNewPos ); + GalleryObjectList::iterator it = aObjectList.begin(); + ::std::advance( it, nNewPos ); + aObjectList.insert( it, pEntry ); - if( nNewPos < nOldPos ) - nOldPos++; + if( nNewPos < nOldPos ) nOldPos++; - aObjectList.Remove( nOldPos ); - ImplSetModified( bRet = sal_True ); - ImplBroadcast( ( nNewPos < nOldPos ) ? nNewPos : ( nNewPos - 1 ) ); - } + it = aObjectList.begin(); + ::std::advance( it, nOldPos ); + aObjectList.erase( it ); + + ImplSetModified( bRet = sal_True ); + ImplBroadcast( ( nNewPos < nOldPos ) ? nNewPos : ( nNewPos - 1 ) ); } return bRet; @@ -535,22 +558,21 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg Graphic aGraphic; String aFormat; GalleryObject* pEntry; - const sal_uIntPtr nCount = aObjectList.Count(); - sal_uIntPtr i; + const size_t nCount = aObjectList.size(); LockBroadcaster(); bAbortActualize = sal_False; // LoeschFlag zuruecksetzen - for ( i = 0; i < nCount; i++ ) - aObjectList.GetObject( i )->bDummy = sal_False; + for (size_t i = 0; i < nCount; i++) + aObjectList[ i ]->bDummy = sal_False; - for( i = 0; ( i < nCount ) && !bAbortActualize; i++ ) + for(size_t i = 0; ( i < nCount ) && !bAbortActualize; i++) { if( pProgress ) pProgress->Update( i, nCount - 1 ); - pEntry = aObjectList.GetObject( i ); + pEntry = aObjectList[ i ]; const INetURLObject aURL( pEntry->aURL ); @@ -615,19 +637,19 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg } // remove all entries with set flag - pEntry = aObjectList.First(); - while( pEntry ) + for ( size_t i = 0; i < aObjectList.size(); ) { + pEntry = aObjectList[ i ]; if( pEntry->bDummy ) { Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); - delete aObjectList.Remove( pEntry ); - Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); - - pEntry = aObjectList.GetCurObject(); + GalleryObjectList::iterator it = aObjectList.begin(); + ::std::advance( it, i ); + aObjectList.erase( it ); + delete pEntry; + Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uLong >( pEntry ) ) ); } - else - pEntry = aObjectList.Next(); + else ++i; } // update theme @@ -643,19 +665,18 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg if( pIStm && pTmpStm ) { - pEntry = aObjectList.First(); - - while( pEntry ) + for ( size_t i = 0, n = aObjectList.size(); i < n; ++i ) { + pEntry = aObjectList[ i ]; SgaObject* pObj; switch( pEntry->eObjKind ) { - case( SGA_OBJ_BMP ): pObj = new SgaObjectBmp(); break; - case( SGA_OBJ_ANIM ): pObj = new SgaObjectAnim(); break; - case( SGA_OBJ_INET ): pObj = new SgaObjectINet(); break; - case( SGA_OBJ_SVDRAW ): pObj = new SgaObjectSvDraw(); break; - case (SGA_OBJ_SOUND): pObj = new SgaObjectSound(); break; + case( SGA_OBJ_BMP ): pObj = new SgaObjectBmp(); break; + case( SGA_OBJ_ANIM ): pObj = new SgaObjectAnim(); break; + case( SGA_OBJ_INET ): pObj = new SgaObjectINet(); break; + case( SGA_OBJ_SVDRAW ): pObj = new SgaObjectSvDraw(); break; + case (SGA_OBJ_SOUND): pObj = new SgaObjectSound(); break; default: pObj = NULL; @@ -670,13 +691,11 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg *pTmpStm << *pObj; delete pObj; } - - pEntry = aObjectList.Next(); } } else { - DBG_ERROR( "File(s) could not be opened" ); + OSL_FAIL( "File(s) could not be opened" ); } delete pIStm; @@ -722,7 +741,6 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sa if( pIStm ) { String aThemeName; - sal_uInt32 nThemeId = 0; sal_uInt16 nVersion; sal_Bool bThemeNameFromResource = sal_False; @@ -730,6 +748,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sa if( nVersion <= 0x00ff ) { + sal_uInt32 nThemeId = 0; ByteString aTmpStr; *pIStm >> aTmpStr; aThemeName = String( aTmpStr.GetBuffer(), RTL_TEXTENCODING_UTF8 ); @@ -1181,12 +1200,12 @@ sal_Bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, s ::ucbhelper::Content aCnt( rFileOrDirURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() ); sal_Bool bFolder = false; - aCnt.getPropertyValue( OUString::createFromAscii( "IsFolder" ) ) >>= bFolder; + aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")) ) >>= bFolder; if( bFolder ) { uno::Sequence< OUString > aProps( 1 ); - aProps.getArray()[ 0 ] = OUString::createFromAscii( "Url" ); + aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Url")); uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) ); if( xResultSet.is() ) @@ -1456,14 +1475,14 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) sal_uInt32 nId1, nId2; sal_Bool bRel; - for( pObj = aObjectList.First(); pObj; pObj = aObjectList.Next() ) + for( size_t i = 0, n = aObjectList.size(); i < n; ++i ) { + pObj = aObjectList[ i ]; Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pObj ) ) ); delete pObj; Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pObj ) ) ); } - - aObjectList.Clear(); + aObjectList.clear(); for( sal_uInt32 i = 0; i < nCount; i++ ) { @@ -1527,7 +1546,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) } } - aObjectList.Insert( pObj, LIST_APPEND ); + aObjectList.push_back( pObj ); } rIStm >> nId1 >> nId2; @@ -1598,3 +1617,4 @@ void GalleryTheme::InsertAllThemes( ListBox& rListBox ) rListBox.InsertEntry( String( GAL_RESID( i ) ) ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src index bfb1f65d0340..2db8a1e39643 100644 --- a/svx/source/gallery2/galtheme.src +++ b/svx/source/gallery2/galtheme.src @@ -300,42 +300,732 @@ String RID_GALLERYSTR_THEME_DUMMY5 Text = "Dummy 5"; }; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_SHAPES_POLYGONS +{ +Text [ en-US ] = "Shapes - polygons"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_SHAPES_1 +{ +Text [ en-US ] = "Shapes 1"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_SHAPES_2 +{ +Text [ en-US ] = "Shapes 2"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_ANIMALS +{ +Text [ en-US ] = "Animals"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_CARS +{ +Text [ en-US ] = "Cars"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_BUGS +{ +Text [ en-US ] = "Bugs"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_CISCO_OTHER +{ +Text [ en-US ] = "Cisco - Other"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_CISCO_MEDIA +{ +Text [ en-US ] = "Cisco - Media"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_CISCO_PRODUCTS +{ +Text [ en-US ] = "Cisco - Products"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_CISCO_WAN_LAN +{ +Text [ en-US ] = "Cisco - WAN - LAN"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_DOMINO_USUAL +{ +Text [ en-US ] = "Domino - usual"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_DOMINO_NUMBERED +{ +Text [ en-US ] = "Domino - numbered"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_1 +{ +Text [ en-US ] = "Electronics - parts 1"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_2 +{ +Text [ en-US ] = "Electronics - parts 2"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_3 +{ +Text [ en-US ] = "Electronics - parts 3"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_4 +{ +Text [ en-US ] = "Electronics - parts 4"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_ELECTRONICS_CIRCUIT +{ +Text [ en-US ] = "Electronics - circuit"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_ELECTRONICS_SIGNS +{ +Text [ en-US ] = "Electronics - signs"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_ELECTRONICS_GAUGES +{ +Text [ en-US ] = "Electronics - gauges"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_PEOPLE_1 +{ +Text [ en-US ] = "People"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_ARCHITECTURE_OVERLAY +{ +Text [ en-US ] = "Architecture - overlay"; +}; +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_ARCHITECTURE_FURNITURES +{ +Text [ en-US ] = "Architecture - furnitures"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_ARCHITECTURE_BUILDINGS +{ +Text [ en-US ] = "Architecture - buildings"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_ARCHITECTURE_BATHROOM_KITCHEN +{ +Text [ en-US ] = "Architecture - bathroom, kitchen"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_ARCHITECTURE_KITCHEN +{ +Text [ en-US ] = "Architecture - kitchen"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_ARCHITECTURE_WINDOWS_DOORS +{ +Text [ en-US ] = "Architecture - windows, doors"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_FLOWCHARTS_1 +{ +Text [ en-US ] = "Flowcharts"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_FLOWCHARTS_2 +{ +Text [ en-US ] = "Flowcharts 2"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_FORALSTUDIOA +{ +Text [ en-US ] = "Foral-StudioA"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_PHOTOS_FAUNA +{ +Text [ en-US ] = "Photos - Fauna"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_PHOTOS_BUILDINGS +{ +Text [ en-US ] = "Photos - Buildings"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_PHOTOS_PLANTS +{ +Text [ en-US ] = "Photos - Plants"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_PHOTOS_STATUES +{ +Text [ en-US ] = "Photos - Statues"; +}; +// --------------------------------------------------------------------------- +String RID_GALLERYSTR_THEME_PHOTOS_LANDSCAPES +{ +Text [ en-US ] = "Photos - Landscapes"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_PHOTOS_CITIES +{ +Text [ en-US ] = "Photos - Cities"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_PHOTOS_FLOWERS +{ +Text [ en-US ] = "Photos - Flowers"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_THERAPEUTICS_GENERAL +{ +Text [ en-US ] = "Therapeutics - general"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_WEATHER +{ +Text [ en-US ] = "Weather"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_VECHILES +{ +Text [ en-US ] = "Vehicles"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_SIGNS +{ +Text [ en-US ] = "Signs"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_BLUE_MAN +{ +Text [ en-US ] = "Blue Man"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_CHEMISTRY_AMINO_ACIDS +{ +Text [ en-US ] = "Chemistry - Amino acids"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_LOGICAL_SIGNS +{ +Text [ en-US ] = "Logical signs"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_LOGICAL_GATES +{ +Text [ en-US ] = "Logical gates"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_LOGOS +{ +Text [ en-US ] = "Logos"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_SMILES +{ +Text [ en-US ] = "Smilies"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_ARROWS_1 +{ +Text [ en-US ] = "Arrows"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_CLOCK_01_CLOCK +{ +Text [ en-US ] = "Clock - 01 clock"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_CLOCK_02_CLOCK +{ +Text [ en-US ] = "Clock - 02 clock"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_CLOCK_03_CLOCK +{ +Text [ en-US ] = "Clock - 03 clock"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_CLOCK_04_CLOCK +{ +Text [ en-US ] = "Clock - 04 clock"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_CLOCK_05_CLOCK +{ +Text [ en-US ] = "Clock - 05 clock"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_CLOCK_06_CLOCK +{ +Text [ en-US ] = "Clock - 06 clock"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_CLOCK_07_CLOCK +{ +Text [ en-US ] = "Clock - 07 clock"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_CLOCK_08_CLOCK +{ +Text [ en-US ] = "Clock - 08 clock"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_CLOCK_09_CLOCK +{ +Text [ en-US ] = "Clock - 09 clock"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_CLOCK_10_CLOCK +{ +Text [ en-US ] = "Clock - 10 clock"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_CLOCK_11_CLOCK +{ +Text [ en-US ] = "Clock - 11 clock"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_CLOCK_12_CLOCK +{ +Text [ en-US ] = "Clock - 12 clock"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_PNEUMATIC_PARTS +{ +Text [ en-US ] = "Pneumatic - parts"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_COMPUTER_GENERAL +{ +Text [ en-US ] = "Computer - general"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_COMPUTER_NETWORK +{ +Text [ en-US ] = "Computer - network"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_COMPUTER_NETWORK_DEVICES +{ +Text [ en-US ] = "Computer - network devices"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_COMPUTER_WIFI +{ +Text [ en-US ] = "Computer - WIFI"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_NUMBERS +{ +Text [ en-US ] = "Numbers"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_SIGNS_DANGER +{ +Text [ en-US ] = "Signs - danger"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_OBJECTS +{ +Text [ en-US ] = "Objects"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_AFRICA +{ +Text [ en-US ] = "Maps - Africa"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_UNITED_STATES_OF_AMERICA +{ +Text [ en-US ] = "Maps - United States of America"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_AUSTRALIA +{ +Text [ en-US ] = "Maps - Australia"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_ASIA +{ +Text [ en-US ] = "Maps - Asia"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_SOUTH_AMERICA +{ +Text [ en-US ] = "Maps - South America"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_EUROPE +{ +Text [ en-US ] = "Maps - Europe"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_EUROPE_1 +{ +Text [ en-US ] = "Maps - Europe 1"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_FRANCE +{ +Text [ en-US ] = "Maps - France"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_FRANCE_COUNTRIES +{ +Text [ en-US ] = "Maps - France - countries"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_SIGNS +{ +Text [ en-US ] = "Maps - signs"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_CANADA +{ +Text [ en-US ] = "Maps - Canada"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_CONTINENTS +{ +Text [ en-US ] = "Maps - Continents"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_MIDDLE_EAST +{ +Text [ en-US ] = "Maps - Middle East"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_MIDDLE_AMERICA +{ +Text [ en-US ] = "Maps - Middle America"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_MIDDLE_AGES +{ +Text [ en-US ] = "Maps - Middle ages"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_MEXICO +{ +Text [ en-US ] = "Maps - Mexico"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_ANCIENT_TIMES +{ +Text [ en-US ] = "Maps - Ancient times"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_SYMBOLS +{ +Text [ en-US ] = "Maps - symbols"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_HISTORY_1900 +{ +Text [ en-US ] = "Maps - history - 1900"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MAPS_WORLD +{ +Text [ en-US ] = "Maps - World"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_CROPS +{ +Text [ en-US ] = "Crops"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_FRACTIONS +{ +Text [ en-US ] = "Fractions"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_FLAGS_1 +{ +Text [ en-US ] = "Flags"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MUSIC_INSTRUMENTS +{ +Text [ en-US ] = "Music - instruments"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_MUSIC_SHEET_MUSIC +{ +Text [ en-US ] = "Music - sheet music"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_SPECIAL_PICTOGRAMM +{ +Text [ en-US ] = "Special Pictogramms"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_PHOTOS_CELEBRATION +{ +Text [ en-US ] = "Photos - Celebration"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_PHOTOS_FOODSANDDRINKS +{ +Text [ en-US ] = "Photos - Foods and Drinks"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_PHOTOS_HUMANS +{ +Text [ en-US ] = "Photos - Humans"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_PHOTOS_OBJECTS +{ +Text [ en-US ] = "Photos - Objects"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_PHOTOS_SPACE +{ +Text [ en-US ] = "Photos - Space"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_PHOTOS_TRAVEL +{ +Text [ en-US ] = "Photos - Travel"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_OPENOFFICEORG_LOGOS +{ +Text [ en-US ] = "OpenOffice.org logos"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_RELIGION +{ +Text [ en-US ] = "Religion"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_BUILDINGS +{ +Text [ en-US ] = "Buildings"; +}; + +// ---------------------------------------------------------------------------+ + +String RID_GALLERYSTR_THEME_HOMEPAGE2 +{ +Text [ en-US ] = "Homepage 2"; +}; + +// --------------------------------------------------------------------------- + +String RID_GALLERYSTR_THEME_ELEMENTSBULLETS2 +{ +Text [ en-US ] = "Bullets 2"; +}; +// --------------------------------------------------------------------------- diff --git a/svx/AllLangResTarget_about.mk b/svx/source/gallery2/makefile.mk index 0d08c0075665..7f1a3bb7a7d3 100644..100755 --- a/svx/AllLangResTarget_about.mk +++ b/svx/source/gallery2/makefile.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,21 +25,41 @@ # #************************************************************************* -$(eval $(call gb_AllLangResTarget_AllLangResTarget,about)) +PRJ=..$/.. +PRJNAME=svx +TARGET=gal -$(eval $(call gb_AllLangResTarget_set_reslocation,about,svx)) +# --- Settings ----------------------------------------------------- -$(eval $(call gb_AllLangResTarget_add_srs,about,svx/about)) +.INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/makefile.pmk -$(eval $(call gb_SrsTarget_SrsTarget,svx/about)) +# --- Files -------------------------------------------------------- -$(eval $(call gb_SrsTarget_set_include,svx/about,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc \ - -I$(SRCDIR)/svx/inc/ \ -)) +SRS1NAME=$(TARGET) +SRC1FILES = \ + gallery.src \ + galtheme.src -$(eval $(call gb_SrsTarget_add_files,svx/about,\ - svx/source/intro/about_ooo.src \ -)) +SLOFILES = \ + $(EXCEPTIONSFILES) \ + $(SLO)$/codec.obj +EXCEPTIONSFILES = \ + $(SLO)$/galbrws.obj \ + $(SLO)$/galbrws1.obj \ + $(SLO)$/galbrws2.obj \ + $(SLO)$/galctrl.obj \ + $(SLO)$/galexpl.obj \ + $(SLO)$/gallery1.obj \ + $(SLO)$/galmisc.obj \ + $(SLO)$/galobj.obj \ + $(SLO)$/galtheme.obj + +RESLIB1NAME = $(TARGET) +RESLIB1IMAGES = $(PRJ)$/res +RESLIB1SRSFILES = $(SRS)$/$(TARGET).srs + +# --- Targets -------------------------------------------------------------- + +.INCLUDE : target.mk diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx new file mode 100644 index 000000000000..f8be9c56146e --- /dev/null +++ b/svx/source/gengal/gengal.cxx @@ -0,0 +1,321 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_svx.hxx" + +#include <stdio.h> +#include <unistd.h> +#include <memory> +#include <list> + +#include <unotools/streamwrap.hxx> +#include <unotools/ucbstreamhelper.hxx> + +#include <comphelper/processfactory.hxx> +#include <comphelper/regpathhelper.hxx> +#include <cppuhelper/servicefactory.hxx> +#include <cppuhelper/bootstrap.hxx> +#include <com/sun/star/uno/Reference.h> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/registry/XSimpleRegistry.hpp> + +#include <ucbhelper/contentbroker.hxx> +#include <ucbhelper/configurationkeys.hxx> + +#include <tools/urlobj.hxx> +#include <tools/fsys.hxx> +#include <svtools/filedlg.hxx> + +#include <vcl/window.hxx> +#include <vcl/svapp.hxx> +#include <vcl/font.hxx> +#include <vcl/sound.hxx> +#include <vcl/print.hxx> +#include <vcl/toolbox.hxx> +#include <vcl/help.hxx> +#include <vcl/scrbar.hxx> +#include <vcl/wrkwin.hxx> +#include <vcl/msgbox.hxx> + +#include <osl/file.hxx> +#include <osl/process.h> +#include <rtl/bootstrap.hxx> + +#include <galtheme.hxx> +#include <svx/gallery1.hxx> + +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::registry; +using namespace ::com::sun::star::lang; + +typedef ::std::list<rtl::OUString> FileNameList; + +class GalApp : public Application +{ +public: + virtual int Main(); + +protected: + Reference<XMultiServiceFactory> xMSF; + void Init(); + void InitUCB(); +}; + +Gallery* createGallery( const rtl::OUString& aGalleryURL ) +{ + return new Gallery( aGalleryURL ); +} + +void disposeGallery( Gallery* pGallery ) +{ + delete pGallery; +} + +static void createTheme( rtl::OUString aThemeName, + rtl::OUString aGalleryURL, + rtl::OUString aDestDir, + UINT32 nNumFrom, + FileNameList &rFiles ) +{ + Gallery * pGallery( createGallery( aGalleryURL ) ); + + if (!pGallery ) { + fprintf( stderr, "Could't acquire '%s'\n", + rtl::OUStringToOString(aGalleryURL, RTL_TEXTENCODING_UTF8).getStr() ); + exit( 1 ); + } + fprintf( stderr, "Work on gallery '%s'\n", + rtl::OUStringToOString(aGalleryURL, RTL_TEXTENCODING_UTF8).getStr() ); + + fprintf( stderr, "Existing themes: %lu\n", + sal::static_int_cast< unsigned long >( + pGallery->GetThemeCount() ) ); + + if( !pGallery->HasTheme( aThemeName) ) { + if( !pGallery->CreateTheme( aThemeName, nNumFrom ) ) { + fprintf( stderr, "Failed to create theme\n" ); + disposeGallery( pGallery ); + exit( 1 ); + } + } + + fprintf( stderr, "Existing themes: %lu\n", + sal::static_int_cast< unsigned long >( + pGallery->GetThemeCount() ) ); + + SfxListener aListener; + + GalleryTheme *pGalTheme = pGallery->AcquireTheme( aThemeName, aListener ); + if ( pGalTheme == NULL ) { + fprintf( stderr, "Failed to acquire theme\n" ); + disposeGallery( pGallery ); + exit( 1 ); + } + + fprintf( stderr, "Using DestDir: %s\n", + rtl::OUStringToOString(aDestDir, RTL_TEXTENCODING_UTF8).getStr() ); + pGalTheme->SetDestDir(String(aDestDir)); + + FileNameList::const_iterator aIter; + + for( aIter = rFiles.begin(); aIter != rFiles.end(); aIter++ ) + { +// Should/could use: +// if ( ! pGalTheme->InsertFileOrDirURL( aURL ) ) { +// Requires a load more components ... + + Graphic aGraphic; + String aFormat; + +#if 1 + if ( ! pGalTheme->InsertURL( *aIter ) ) + fprintf( stderr, "Failed to import '%s'\n", + rtl::OUStringToOString(*aIter, RTL_TEXTENCODING_UTF8).getStr() ); + else + fprintf( stderr, "Imported file '%s' (%lu)\n", + rtl::OUStringToOString(*aIter, RTL_TEXTENCODING_UTF8).getStr(), + sal::static_int_cast< unsigned long >( + pGalTheme->GetObjectCount() ) ); + +#else // only loads BMPs + SvStream *pStream = ::utl::UcbStreamHelper::CreateStream( *aIter, STREAM_READ ); + if (!pStream) { + fprintf( stderr, "Can't find image to import\n" ); + disposeGallery( pGallery ); + exit (1); + } + *pStream >> aGraphic; + delete pStream; + if( aGraphic.GetType() == GRAPHIC_NONE ) + { + fprintf( stderr, "Failed to load '%s'\n", + (const sal_Char *) rtl::OUStringToOString( *aIter, RTL_TEXTENCODING_UTF8 ) ); + continue; + } + + SgaObjectBmp aObject( aGraphic, *aIter, aFormat ); + if ( ! aObject.IsValid() ) { + fprintf( stderr, "Failed to create thumbnail for image\n" ); + continue; + } + + if ( ! pGalTheme->InsertObject( aObject ) ) { + fprintf( stderr, "Failed to insert file or URL\n" ); + continue; + } +#endif + } + + pGallery->ReleaseTheme( pGalTheme, aListener ); + disposeGallery( pGallery ); +} + +static void PrintHelp() +{ + fprintf( stdout, "Utility to generate OO.o gallery files\n\n" ); + + fprintf( stdout, "using: gengal --name <name> --path <dir> [ --destdir <path> ]\n"); + fprintf( stdout, " [ --number-from <num> ] [ files ... ]\n\n" ); + + fprintf( stdout, "options:\n"); + fprintf( stdout, " --name <theme>\t\tdefines a name of the created or updated theme.\n"); + fprintf( stdout, " --path <dir>\t\tdefines directory where the gallery files are created\n"); + fprintf( stdout, "\t\t\tor updated.\n"); + fprintf( stdout, " --destdir <dir>\tdefines a path prefix to be removed from the paths\n"); + fprintf( stdout, "\t\t\tstored in the gallery files. It is useful to create\n"); + fprintf( stdout, "\t\t\tRPM packages using the BuildRoot feature.\n"); + fprintf( stdout, " --number-from <num>\tdefines minimal number for the newly created gallery\n"); + fprintf( stdout, "\t\t\ttheme files.\n"); + fprintf( stdout, " files\t\t\tlists files to be added to the gallery. Absolute paths\n"); + fprintf( stdout, "\t\t\tare required.\n"); +} + +static rtl::OUString Smartify( const rtl::OUString &rPath ) +{ + INetURLObject aURL; + aURL.SetSmartURL( rPath ); + return aURL.GetMainURL( INetURLObject::NO_DECODE ); +} + +#define OUSTRING_CSTR( str ) \ + rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ).getStr() + +void GalApp::Init() +{ + if( getenv( "OOO_INSTALL_PREFIX" ) == NULL ) { + rtl::OUString fileName = GetAppFileName(); + int lastSlash = fileName.lastIndexOf( '/' ); +#ifdef WNT + // Don't know which directory separators GetAppFileName() returns on Windows. + // Be safe and take into consideration they might be backslashes. + if( fileName.lastIndexOf( '\\' ) > lastSlash ) + lastSlash = fileName.lastIndexOf( '\\' ); +#endif + rtl::OUString baseBinDir = fileName.copy( 0, lastSlash ); + rtl::OUString installPrefix = baseBinDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/../..")); + + rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("OOO_INSTALL_PREFIX")); + osl_setEnvironment(envVar.pData, installPrefix.pData); + } + OSL_TRACE( "OOO_INSTALL_PREFIX=%s", getenv( "OOO_INSTALL_PREFIX" ) ); + + Reference<XComponentContext> xComponentContext + = ::cppu::defaultBootstrap_InitialComponentContext(); + xMSF = Reference<XMultiServiceFactory> + ( xComponentContext->getServiceManager(), UNO_QUERY ); + if( !xMSF.is() ) + fprintf( stderr, "Failed to bootstrap\n" ); + ::comphelper::setProcessServiceFactory( xMSF ); + + InitUCB(); +} + +void GalApp::InitUCB() +{ + rtl::OUString aEmpty; + Sequence< Any > aArgs(6); + aArgs[0] + <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY1_LOCAL)); + aArgs[1] + <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY2_OFFICE)); + aArgs[2] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PIPE")); + aArgs[3] <<= aEmpty; + aArgs[4] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PORTAL")); + aArgs[5] <<= aEmpty; + + if (! ::ucbhelper::ContentBroker::initialize( xMSF, aArgs ) ) + fprintf( stderr, "Failed to init content broker\n" ); +} + +int GalApp::Main() +{ + bool bHelp = false; + rtl::OUString aPath, aDestDir; + rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("Default name")); + UINT32 nNumFrom = 0; + FileNameList aFiles; + + for( USHORT i = 0; i < GetCommandLineParamCount(); i++ ) + { + rtl::OUString aParam = GetCommandLineParam( i ); + + if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--help" ) ) || + aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-h" ) ) ) + bHelp = true; + + else if ( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--name" ) ) ) + aName = GetCommandLineParam( ++i ); + + else if ( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--path" ) ) ) + aPath = Smartify( GetCommandLineParam( ++i ) ); + + else if ( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--destdir" ) ) ) + aDestDir = GetCommandLineParam( ++i ); + + else if ( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--number-from" ) ) ) + nNumFrom = GetCommandLineParam( ++i ).ToInt32(); + + else + aFiles.push_back( Smartify( aParam ) ); + } + + if( bHelp ) + { + PrintHelp(); + return EXIT_SUCCESS; + } + + createTheme( aName, aPath, aDestDir, nNumFrom, aFiles ); + return EXIT_SUCCESS; +} + +GalApp aGalApp; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/workben/makefile.mk b/svx/source/gengal/makefile.mk index 4aa0a098f00a..82e482283f58 100644..100755 --- a/svx/workben/makefile.mk +++ b/svx/source/gengal/makefile.mk @@ -25,48 +25,56 @@ # #************************************************************************* -PRJ=.. +PRJ=..$/.. -PRJNAME=SVX -TARGET=edittest +PRJNAME=svx + +TARGET=gengal TARGETTYPE=GUI LIBTARGET=NO - ENABLE_EXCEPTIONS=TRUE - # --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk +.INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- -OBJFILES= $(OBJ)$/edittest.obj +SCRIPTFILES = $(BIN)$/gengal +OBJFILES= $(OBJ)$/gengal.obj + +.IF "$(GUI)"=="WNT" APP1TARGET= $(TARGET) -APP1OBJS= $(OBJFILES) -APP1LIBS= $(LB)$/svx.lib +.ELSE # .IF "$(GUI)"=="WNT" +APP1TARGET= $(TARGET).bin +.ENDIF # .IF "$(GUI)"=="WNT" + +APP1OBJS= $(OBJFILES) + APP1STDLIBS=$(TOOLSLIB) \ - $(VOSLIB) \ $(SO2LIB) \ - $(SVTOOLLIB) \ $(SVLLIB) \ $(COMPHELPERLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(SALLIB) \ - $(SFXLIB) \ - $(SOTLIB) \ - $(VCLLIB) + $(VCLLIB) \ + $(UCBHELPERLIB) \ + $(SVXCORELIB) +# --- Targets ------------------------------------------------------ -#.IF "$(COM)"=="GCC" -#ADDOPTFILES=$(OBJ)$/edittest.obj -#add_cflagscxx="-frtti -fexceptions" -#.ENDIF +.INCLUDE : target.mk +ALLTAR : \ + $(SCRIPTFILES)\ + $(BIN)/gengalrc -# --- Targets ------------------------------------------------------ +$(SCRIPTFILES) : $$(@:f:+".sh") + @tr -d "\015" < $(@:f:+".sh") > $@ -.INCLUDE : target.mk +$(BIN)/%: %.in + cp $< $@ diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index 745cd7c627ba..09aeeff7eddd 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -147,3 +148,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/DGColorNameLookUp.hxx b/svx/source/inc/DGColorNameLookUp.hxx index 1b8c6ac8abe1..9c766d0f9043 100644 --- a/svx/source/inc/DGColorNameLookUp.hxx +++ b/svx/source/inc/DGColorNameLookUp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,7 +30,7 @@ #define _SVX_ACCESSIBILITY_DG_COLOR_NAME_LOOK_UP_HXX #include <rtl/ustrbuf.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace accessibility { @@ -70,7 +71,7 @@ public: private: /// Define hash map type to convert numerical color values to names. - typedef std::hash_map<long int, ::rtl::OUString> + typedef boost::unordered_map<long int, ::rtl::OUString> tColorValueToNameMap; /// This ma translates from numerical color values to names. @@ -97,3 +98,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index 1d29cba30c8c..e52e4865997f 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,17 +30,13 @@ #ifndef _SVXGRAPHACCESSIBLECONTEXT_HXX #define _SVXGRAPHACCESSIBLECONTEXT_HXX -#ifndef _CPPUHELPER_IMPLBASE7_HXX_ #include <cppuhelper/compbase7.hxx> -#endif #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleComponent.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_IllegalAccessibleComponentStateException_HPP_ #include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp> -#endif #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <cppuhelper/weak.hxx> @@ -47,7 +44,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <comphelper/broadcasthelper.hxx> #include <svl/lstner.hxx> @@ -279,3 +276,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index 5bd5714b8039..0d47f4a149bd 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,14 +26,10 @@ * ************************************************************************/ -#include <vos/mutex.hxx> -#include <tools/list.hxx> +#include <osl/mutex.hxx> #include <tools/color.hxx> #include <tools/string.hxx> -#ifndef _IMAGE_HXX #include <vcl/image.hxx> -#endif -#include <rtl/uuid.h> #include <comphelper/accessibleselectionhelper.hxx> #include <com/sun/star/accessibility/XAccessibleTable.hpp> @@ -276,3 +273,4 @@ namespace svx } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/clonelist.hxx b/svx/source/inc/clonelist.hxx index 424c592805ba..3ed91566257b 100644 --- a/svx/source/inc/clonelist.hxx +++ b/svx/source/inc/clonelist.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,8 +28,9 @@ #ifndef _CLONELIST_HXX_ #define _CLONELIST_HXX_ +#include <vector> + #include <sal/types.h> -#include <tools/list.hxx> // predeclarations class SdrObject; @@ -38,12 +40,10 @@ class SdrObject; // re-creating the connections for contained connectors class CloneList { - List maOriginalList; - List maCloneList; + std::vector<const SdrObject*> maOriginalList; + std::vector<SdrObject*> maCloneList; public: - CloneList(); - ~CloneList(); void AddPair(const SdrObject* pOriginal, SdrObject* pClone); sal_uInt32 Count() const; @@ -55,3 +55,5 @@ public: }; #endif // _CLONELIST_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/datalistener.hxx b/svx/source/inc/datalistener.hxx index 1807aeb0a730..5dc98e3abf56 100644 --- a/svx/source/inc/datalistener.hxx +++ b/svx/source/inc/datalistener.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,4 @@ namespace svxform #endif // #ifndef _SVX_DATALISTENER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc index a77485db399a..ee75a3753ee2 100644..100755 --- a/svx/source/inc/datanavi.hrc +++ b/svx/source/inc/datanavi.hrc @@ -38,17 +38,20 @@ // Controls #define TB_ITEMS 10 #define LB_ITEMS 11 + // Menu items #define MID_INSERT_CONTROL 100 + // ToolBox items #define TBI_ITEM_ADD 10 #define TBI_ITEM_ADD_ELEMENT 11 #define TBI_ITEM_ADD_ATTRIBUTE 12 #define TBI_ITEM_EDIT 13 #define TBI_ITEM_REMOVE 14 + // ImageLists #define IL_TBX_BMPS 20 -#define IL_TBX_BMPS_HC 21 + // ImageIndexes #define IID_ITEM_ADD 1 #define IID_ITEM_ADD_ELEMENT 2 @@ -62,6 +65,7 @@ #define MB_MODELS 11 #define TC_ITEMS 12 #define MB_INSTANCES 13 + // MenuItems #define MID_MODELS_ADD 10 #define MID_MODELS_EDIT 11 @@ -70,13 +74,15 @@ #define MID_INSTANCES_EDIT 21 #define MID_INSTANCES_REMOVE 22 #define MID_SHOW_DETAILS 30 + // TabPage Ids #define TID_SUBMISSION 10 #define TID_BINDINGS 11 #define TID_INSTANCE 12 + // ImageLists #define IL_ITEM_BMPS 30 -#define IL_ITEM_BMPS_HC 31 + // ImageIndexes #define IID_GROUP_CLOSED 1 #define IID_GROUP_OPEN 2 diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index a8bfad89090b..a119b4500e90 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -151,7 +152,6 @@ namespace svxform bool m_bHasModel; DataGroupType m_eGroup; ImageList m_TbxImageList; - ImageList m_TbxHCImageList; // these strings are not valid on the Submission and Binding Page // mb: furthermore these are properties of an instance, thus // it would be much better to get/set them through the UIHelper @@ -233,7 +233,6 @@ namespace svxform Size m_a2Size; Size m_a3Size; ImageList m_aItemImageList; - ImageList m_aItemHCImageList; PageList m_aPageList; ContainerList m_aContainerList; EventTargetList m_aEventTargetList; @@ -273,7 +272,6 @@ namespace svxform void RemoveBroadcaster(); inline const ImageList& GetItemImageList() const { return m_aItemImageList; } - inline const ImageList& GetItemHCImageList() const { return m_aItemHCImageList; } inline bool IsShowDetails() const { return m_bShowDetails; } inline void DisableNotify( bool _bDisable ) { m_bIsNotifyDisabled = _bDisable; } }; @@ -599,3 +597,4 @@ namespace svxform #endif // _SVX_DATANAVI_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx index 5dd531de8090..a1742c3fdc64 100644 --- a/svx/source/inc/delayedevent.hxx +++ b/svx/source/inc/delayedevent.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -85,3 +86,5 @@ namespace svxform //........................................................................ #endif // SVX_DELAYEDLINK_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index ebe104058509..b9ff1f927847 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,13 +30,9 @@ #define _SVX_DOCRECOVERY_HXX #include <vcl/tabpage.hxx> -#ifndef _SV_TABDIALOG_HXX #include <vcl/tabdlg.hxx> -#endif #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <svtools/svmedit2.hxx> #include <svtools/svtreebx.hxx> @@ -51,47 +48,47 @@ //=============================================== // const -#define RECOVERY_CMDPART_PROTOCOL ::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:") - -#define RECOVERY_CMDPART_DO_PREPARE_EMERGENCY_SAVE ::rtl::OUString::createFromAscii("/doPrepareEmergencySave" ) -#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE ::rtl::OUString::createFromAscii("/doEmergencySave" ) -#define RECOVERY_CMDPART_DO_RECOVERY ::rtl::OUString::createFromAscii("/doAutoRecovery" ) -#define RECOVERY_CMDPART_DO_CRASHREPORT ::rtl::OUString::createFromAscii("/doCrashReport" ) -#define RECOVERY_CMDPART_DO_ENTRY_BACKUP ::rtl::OUString::createFromAscii("/doEntryBackup" ) -#define RECOVERY_CMDPART_DO_ENTRY_CLEANUP ::rtl::OUString::createFromAscii("/doEntryCleanUp" ) - -#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE ::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doPrepareEmergencySave") -#define RECOVERY_CMD_DO_EMERGENCY_SAVE ::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doEmergencySave" ) -#define RECOVERY_CMD_DO_RECOVERY ::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doAutoRecovery" ) -#define RECOVERY_CMD_DO_CRASHREPORT ::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doCrashReport" ) -#define RECOVERY_CMD_DO_ENTRY_BACKUP ::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doEntryBackup" ) -#define RECOVERY_CMD_DO_ENTRY_CLEANUP ::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doEntryCleanUp" ) - -#define SERVICENAME_PROGRESSFACTORY ::rtl::OUString::createFromAscii("com.sun.star.task.StatusIndicatorFactory") -#define SERVICENAME_URLTRANSFORMER ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" ) -#define SERVICENAME_RECOVERYCORE ::rtl::OUString::createFromAscii("com.sun.star.frame.AutoRecovery" ) -#define SERVICENAME_FOLDERPICKER ::rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.FolderPicker" ) -#define SERVICENAME_DESKTOP ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop" ) - -#define PROP_PARENTWINDOW ::rtl::OUString::createFromAscii("Window" ) -#define PROP_STATUSINDICATOR ::rtl::OUString::createFromAscii("StatusIndicator" ) -#define PROP_DISPATCHASYNCHRON ::rtl::OUString::createFromAscii("DispatchAsynchron") -#define PROP_SAVEPATH ::rtl::OUString::createFromAscii("SavePath" ) -#define PROP_ENTRYID ::rtl::OUString::createFromAscii("EntryID" ) -#define PROP_ALLOWPARENTSHOW ::rtl::OUString::createFromAscii("AllowParentShow" ) - -#define STATEPROP_ID ::rtl::OUString::createFromAscii("ID" ) -#define STATEPROP_STATE ::rtl::OUString::createFromAscii("DocumentState") -#define STATEPROP_ORGURL ::rtl::OUString::createFromAscii("OriginalURL" ) -#define STATEPROP_TEMPURL ::rtl::OUString::createFromAscii("TempURL" ) -#define STATEPROP_FACTORYURL ::rtl::OUString::createFromAscii("FactoryURL" ) -#define STATEPROP_TEMPLATEURL ::rtl::OUString::createFromAscii("TemplateURL" ) -#define STATEPROP_TITLE ::rtl::OUString::createFromAscii("Title" ) -#define STATEPROP_MODULE ::rtl::OUString::createFromAscii("Module" ) - -#define RECOVERY_OPERATIONSTATE_START ::rtl::OUString::createFromAscii("start" ) -#define RECOVERY_OPERATIONSTATE_STOP ::rtl::OUString::createFromAscii("stop" ) -#define RECOVERY_OPERATIONSTATE_UPDATE ::rtl::OUString::createFromAscii("update") +#define RECOVERY_CMDPART_PROTOCOL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:")) + +#define RECOVERY_CMDPART_DO_PREPARE_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doPrepareEmergencySave" )) +#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doEmergencySave" )) +#define RECOVERY_CMDPART_DO_RECOVERY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doAutoRecovery" )) +#define RECOVERY_CMDPART_DO_CRASHREPORT rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doCrashReport" )) +#define RECOVERY_CMDPART_DO_ENTRY_BACKUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doEntryBackup" )) +#define RECOVERY_CMDPART_DO_ENTRY_CLEANUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doEntryCleanUp" )) + +#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doPrepareEmergencySave")) +#define RECOVERY_CMD_DO_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEmergencySave" )) +#define RECOVERY_CMD_DO_RECOVERY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doAutoRecovery" )) +#define RECOVERY_CMD_DO_CRASHREPORT rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doCrashReport" )) +#define RECOVERY_CMD_DO_ENTRY_BACKUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEntryBackup" )) +#define RECOVERY_CMD_DO_ENTRY_CLEANUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEntryCleanUp" )) + +#define SERVICENAME_PROGRESSFACTORY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.StatusIndicatorFactory")) +#define SERVICENAME_URLTRANSFORMER rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" )) +#define SERVICENAME_RECOVERYCORE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.AutoRecovery" )) +#define SERVICENAME_FOLDERPICKER rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FolderPicker" )) +#define SERVICENAME_DESKTOP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) + +#define PROP_PARENTWINDOW rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Window" )) +#define PROP_STATUSINDICATOR rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "StatusIndicator" )) +#define PROP_DISPATCHASYNCHRON rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DispatchAsynchron")) +#define PROP_SAVEPATH rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SavePath" )) +#define PROP_ENTRYID rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "EntryID" )) +#define PROP_ALLOWPARENTSHOW rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AllowParentShow" )) + +#define STATEPROP_ID rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ID" )) +#define STATEPROP_STATE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DocumentState")) +#define STATEPROP_ORGURL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OriginalURL" )) +#define STATEPROP_TEMPURL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TempURL" )) +#define STATEPROP_FACTORYURL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FactoryURL" )) +#define STATEPROP_TEMPLATEURL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TemplateURL" )) +#define STATEPROP_TITLE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" )) +#define STATEPROP_MODULE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Module" )) + +#define RECOVERY_OPERATIONSTATE_START rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "start" )) +#define RECOVERY_OPERATIONSTATE_STOP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stop" )) +#define RECOVERY_OPERATIONSTATE_UPDATE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "update")) #define DLG_RET_UNKNOWN -1 #define DLG_RET_OK 1 @@ -184,9 +181,6 @@ struct TURLInfo /// standard icon Image StandardImage; - /// high contrast icon - Image HCImage; - public: TURLInfo() @@ -612,9 +606,6 @@ class RecovDocList : public SvxSimpleTable Image m_aGreenCheckImg; Image m_aYellowCheckImg; Image m_aRedCrossImg; - Image m_aGreenCheckImgHC; - Image m_aYellowCheckImgHC; - Image m_aRedCrossImgHC; String m_aSuccessRecovStr; String m_aOrigDocRecovStr; @@ -971,3 +962,5 @@ class BrokenRecoveryDialog : public ModalDialog #undef css #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index df4e2b8559a6..920e79482b82 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,7 +86,7 @@ public: ::rtl::OUString GetText() const { return m_aText; } FmParentData* GetParent() const {return m_pParent;} - virtual Image GetImage( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const; + virtual Image GetImage() const; }; //======================================================================== @@ -129,7 +130,7 @@ public: inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterController >& GetFilterController() { return m_xFilterController; } - virtual Image GetImage( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const; + virtual Image GetImage() const; }; //======================================================================== @@ -141,7 +142,7 @@ public: FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmFormItem* pParent, const ::rtl::OUString& rText ):FmParentData(_rxFactory,pParent, rText){} FmFilterItem* Find( const ::sal_Int32 _nFilterComponentIndex ) const; - virtual Image GetImage( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const; + virtual Image GetImage() const; }; //======================================================================== @@ -163,7 +164,7 @@ public: const ::rtl::OUString& GetFieldName() const {return m_aFieldName;} sal_Int32 GetComponentIndex() const { return m_nComponentIndex; } - virtual Image GetImage( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const; + virtual Image GetImage() const; }; //======================================================================== @@ -370,3 +371,4 @@ public: #endif // _SVX_FILTNAV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx index 963a5beb0dff..84687ac861c5 100644 --- a/svx/source/inc/fmPropBrw.hxx +++ b/svx/source/inc/fmPropBrw.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -122,3 +123,5 @@ private: void impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ); }; #endif //SVX_FMPROPBRW_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index 2c8a62e56a89..5733e2ed7f75 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -266,3 +267,5 @@ namespace svxform //........................................................................ #endif // SVX_SOURCE_INC_FMCONTROLBORDERMANAGER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx index 0cff5f6282cd..0f05024709b8 100644 --- a/svx/source/inc/fmcontrollayout.hxx +++ b/svx/source/inc/fmcontrollayout.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> /** === end UNO includes === **/ -#ifndef SVX_SOURCE_FORM_FMDOCUMENTCLASSIFICATION_HXX #include "fmdocumentclassification.hxx" -#endif #include <unotools/confignode.hxx> //........................................................................ @@ -91,3 +90,4 @@ namespace svxform #endif // SVX_SOURCE_INC_FMCONTROLLAYOUT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmdocumentclassification.hxx b/svx/source/inc/fmdocumentclassification.hxx index d3e766338a16..0076bbb62f24 100644 --- a/svx/source/inc/fmdocumentclassification.hxx +++ b/svx/source/inc/fmdocumentclassification.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,3 +86,4 @@ namespace svxform #endif // SVX_SOURCE_INC_FMDOCUMENTCLASSIFICATION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index b805ebf452d1..43d8a43c3bcf 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -281,3 +282,4 @@ namespace svxform #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmexpl.hrc b/svx/source/inc/fmexpl.hrc index be8db7b71e49..be8db7b71e49 100644..100755 --- a/svx/source/inc/fmexpl.hrc +++ b/svx/source/inc/fmexpl.hrc diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 598e9d61196a..9e8d9a731301 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,6 +60,7 @@ #include <svx/fmview.hxx> #include "fmexch.hxx" +#include <vector> class SdrObjListIter; class FmFormShell; @@ -156,7 +158,6 @@ private: protected: Image m_aNormalImage; - Image m_aHCImage; ::rtl::OUString aText; FmEntryDataList* pChildList; @@ -177,7 +178,6 @@ public: void SetParent( FmEntryData* pParentData ){ pParent = pParentData; } const Image& GetNormalImage() const { return m_aNormalImage; } - const Image& GetHCImage() const { return m_aHCImage; } ::rtl::OUString GetText() const { return aText; } FmEntryData* GetParent() const { return pParent; } @@ -205,13 +205,24 @@ public: }; //======================================================================== -DECLARE_LIST( FmEntryDataBaseList, FmEntryData* ) +typedef ::std::vector< FmEntryData* > FmEntryDataBaseList; -class FmEntryDataList : public FmEntryDataBaseList +class FmEntryDataList { +private: + FmEntryDataBaseList maEntryDataList; + public: FmEntryDataList(); virtual ~FmEntryDataList(); + + FmEntryData* at( size_t Index ) + { return ( Index < maEntryDataList.size() ) ? maEntryDataList[ Index ] : NULL; } + + size_t size() const { return maEntryDataList.size(); } + FmEntryData* remove( FmEntryData* pItem ); + void insert( FmEntryData* pItem, size_t Index ); + void clear(); }; //======================================================================== @@ -248,7 +259,6 @@ public: FmFormData( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const ImageList& _rNormalImages, - const ImageList& _rHCImages, FmFormData* _pParent = NULL ); @@ -283,7 +293,6 @@ public: FmControlData( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxComponent, const ImageList& _rNormalImages, - const ImageList& _rHCImages, FmFormData* _pParent ); FmControlData( const FmControlData& rControlData ); @@ -295,8 +304,7 @@ public: void ModelReplaced( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxNew, - const ImageList& _rNormalImages, - const ImageList& _rHCImages + const ImageList& _rNormalImages ); }; @@ -361,7 +369,6 @@ namespace svxform OFormComponentObserver* m_pPropChangeList; ImageList m_aNormalImages; - ImageList m_aHCImages; void UpdateContent( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xForms ); FmControlData* CreateControlData( ::com::sun::star::form::XFormComponent* pFormComponent ); @@ -383,7 +390,7 @@ namespace svxform // Rueckgabe sal_True, wenn das Objekt eine FormComponent ist (oder rekursiv nur aus solchen besteht) public: - NavigatorTreeModel( const ImageList& _rNormalImages, const ImageList& _rHCImages ); + NavigatorTreeModel( const ImageList& _rNormalImages ); virtual ~NavigatorTreeModel(); void FillBranch( FmFormData* pParentData ); @@ -431,7 +438,6 @@ namespace svxform ListBoxEntrySet m_aCutEntries; // die Images, die ich brauche (und an FormDatas und EntryDatas weiterreiche) ImageList m_aNavigatorImages; - ImageList m_aNavigatorImagesHC; ::svxform::OControlExchangeHelper m_aControlExchange; @@ -610,3 +616,4 @@ namespace svxform #endif // _SVX_FMEXPL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmgroup.hxx b/svx/source/inc/fmgroup.hxx index 5cad571dee7b..800cafbb1f0a 100644 --- a/svx/source/inc/fmgroup.hxx +++ b/svx/source/inc/fmgroup.hxx @@ -35,8 +35,6 @@ #include <dbform.hxx> #endif -DECLARE_LIST( FmCtrlModelList, XInterface* ); - struct FmXGroupModel_Impl; //================================================================== diff --git a/svx/source/inc/fmhlpids.hrc b/svx/source/inc/fmhlpids.hrc index 7df02cdfec7d..7df02cdfec7d 100644..100755 --- a/svx/source/inc/fmhlpids.hrc +++ b/svx/source/inc/fmhlpids.hrc diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx index 1031163b3765..304426d4d74d 100644 --- a/svx/source/inc/fmitems.hxx +++ b/svx/source/inc/fmitems.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,4 @@ inline FmInterfaceItem& FmInterfaceItem::operator=( const FmInterfaceItem &rCpy #endif // _SVX_FMITEMS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index fae15aeb18df..35297c2ad013 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,9 +86,9 @@ public: virtual sal_uInt16 GetObjIdentifier() const; virtual void NbcReformatText(); - virtual SdrObject* Clone() const; + virtual FmFormObj* Clone() const; // #116235# virtual SdrObject* Clone(SdrPage* pPage, SdrModel* pModel) const; - virtual void operator= (const SdrObject& rObj); + FmFormObj& operator= (const FmFormObj& rObj); virtual void SetModel(SdrModel* pNewModel); @@ -111,7 +112,7 @@ public: virtual void SetUnoControlModel( const ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >& _rxModel ); protected: - virtual FASTBOOL EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ); + virtual bool EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ); virtual void BrkCreate( SdrDragStat& rStat ); // #i70852# overload Layer interface to force to FormColtrol layer @@ -132,3 +133,4 @@ private: #endif // _FM_FMOBJ_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 9eb91c809d66..a62225d898cc 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,7 +37,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XMap.hpp> -#include <tools/list.hxx> #include <tools/link.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/weakref.hxx> @@ -170,3 +170,4 @@ private: #endif // _SVX_FMUNOPGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmprop.hrc b/svx/source/inc/fmprop.hrc index a0592c80b90b..a0592c80b90b 100644..100755 --- a/svx/source/inc/fmprop.hrc +++ b/svx/source/inc/fmprop.hrc diff --git a/svx/source/inc/fmscriptingenv.hxx b/svx/source/inc/fmscriptingenv.hxx index 5834c43713ff..98451af39b1c 100644 --- a/svx/source/inc/fmscriptingenv.hxx +++ b/svx/source/inc/fmscriptingenv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,4 @@ namespace svxform #endif // SVX_FMSCRIPTINGENV_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx index d90774cea4ee..5eafffc5d02e 100644 --- a/svx/source/inc/fmservs.hxx +++ b/svx/source/inc/fmservs.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,4 @@ namespace svxform #endif // _SVX_FMSERVS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 73fe666c3528..7e1b75c0d183 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,15 +52,10 @@ #include <sfx2/app.hxx> #include <svx/svdmark.hxx> #include <svx/fmsearch.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svl/svarray.hxx> #include <svl/lstner.hxx> -#define _SVSTDARR_BOOLS -#define _SVSTDARR_BYTES -#define _SVSTDARR_LONGS #define _SVSTDARR_ULONGS #define _SVSTDARR_USHORTS #include <svl/svstdarr.hxx> @@ -67,7 +63,6 @@ #include "svx/fmtools.hxx" #include "svx/fmsrccfg.hxx" #include <osl/mutex.hxx> -#include <vos/thread.hxx> #include <tools/debug.hxx> #include <cppuhelper/component.hxx> #include <comphelper/stl_types.hxx> @@ -88,7 +83,7 @@ SV_DECL_PTRARR(SdrObjArray, SdrObject*, 32, 16) DECLARE_STL_VECTOR( ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > ,FmFormArray); // catch databse exceptions if occur -#define DO_SAFE(statement) try { statement; } catch( const Exception& ) { DBG_ERROR("unhandled exception (I tried to move a cursor (or something like that).)"); } +#define DO_SAFE(statement) try { statement; } catch( const Exception& ) { OSL_FAIL("unhandled exception (I tried to move a cursor (or something like that).)"); } #define GA_DISABLE_SYNC 1 #define GA_FORCE_SYNC 2 @@ -182,8 +177,12 @@ class SAL_DLLPRIVATE FmXFormShell :public FmXFormShell_BASE // We enable a permanent cursor for the grid we found a searched text, it's disabled in the next "found" event. FmFormArray m_aSearchForms; - SvUShorts m_arrInvalidSlots; - SvBytes m_arrInvalidSlots_Flags; + struct InvalidSlotInfo { + sal_uInt16 id; + sal_uInt8 flags; + inline InvalidSlotInfo(sal_uInt16 slotId, sal_uInt8 flgs) : id(slotId), flags(flgs) {}; + }; + std::vector<InvalidSlotInfo> m_arrInvalidSlots; // we explicitly switch off the propbrw before leaving the design mode // this flag tells us if we have to switch it on again when reentering @@ -197,7 +196,7 @@ class SAL_DLLPRIVATE FmXFormShell :public FmXFormShell_BASE // da ich beim Suchen fuer die Behandlung des "gefunden" ein SdrObject markieren will, besorge ich mir vor dem // Hochreissen des Suchen-Dialoges alle relevanten Objekte // (das Array ist damit auch nur waehrend des Suchvorganges gueltig) - SvLongs m_arrRelativeGridColumn; + std::vector<long> m_arrRelativeGridColumn; ::osl::Mutex m_aMutex; sal_uLong m_nInvalidationEvent; @@ -606,3 +605,5 @@ public: }; #endif // _SVX_FMSHIMP_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmslotinvalidator.hxx b/svx/source/inc/fmslotinvalidator.hxx index d37099f40cf4..b92201939953 100644 --- a/svx/source/inc/fmslotinvalidator.hxx +++ b/svx/source/inc/fmslotinvalidator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,4 @@ namespace svx #endif // SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx index 2b6ccb09d89d..9c54c12574a3 100644 --- a/svx/source/inc/fmtextcontroldialogs.hxx +++ b/svx/source/inc/fmtextcontroldialogs.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,4 @@ namespace svx #endif // SVX_SOURCE_FORM_FMTEXTCONTROLDIALOGS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx index 6b557d4b9840..c2214661b69d 100644 --- a/svx/source/inc/fmtextcontrolfeature.hxx +++ b/svx/source/inc/fmtextcontrolfeature.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,4 @@ namespace svx #endif // SVX_SOURCE_INC_FMTEXTCONTROLFEATURE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx index 0eb0d3020ce3..3a0198758cbc 100644 --- a/svx/source/inc/fmtextcontrolshell.hxx +++ b/svx/source/inc/fmtextcontrolshell.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -222,3 +223,4 @@ namespace svx #endif // SVX_SOURCE_INC_FMTEXTCONTROLSHELL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index fb82f02ca4b8..76cf870e2242 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -228,3 +229,4 @@ public: #endif //_SVX_FMUNDO_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx index 4bbfe25dfe91..d1b39c6edd6f 100644 --- a/svx/source/inc/fmurl.hxx +++ b/svx/source/inc/fmurl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ #define FMARG_ADDCOL_COLUMNPOS rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnPosition" ) ) #endif // _SVX_FMURL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 9641db8c8a19..341d9534e018 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -314,3 +315,4 @@ private: #endif // _SVX_FMVWIMP_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx index e2b32acc0ca2..94668deba402 100644 --- a/svx/source/inc/formcontrolfactory.hxx +++ b/svx/source/inc/formcontrolfactory.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -117,3 +118,5 @@ namespace svxform //........................................................................ #endif // SVX_FORMCONTROLMANAGER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index b0f42a0e97ea..f362d59802fe 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -591,3 +592,4 @@ namespace svxform #endif // _SVX_FMCTRLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index 571e0a6a80f0..b69c26e1e870 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -306,3 +307,5 @@ namespace svx //........................................................................ #endif // SVX_FORMCONTROLLING_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx index e542d4a1090a..f6987e6ce252 100644 --- a/svx/source/inc/formdispatchinterceptor.hxx +++ b/svx/source/inc/formdispatchinterceptor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -117,3 +118,5 @@ namespace svxform //........................................................................ #endif // SVX_FORMDISPATCHINTERCEPTOR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx index 4b75a95d2bc9..777b573faf54 100644 --- a/svx/source/inc/formfeaturedispatcher.hxx +++ b/svx/source/inc/formfeaturedispatcher.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -155,3 +156,5 @@ namespace svx //........................................................................ #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx index db21979ab756..4ce05cf1fd1b 100644 --- a/svx/source/inc/formtoolbars.hxx +++ b/svx/source/inc/formtoolbars.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,4 @@ namespace svxform #endif // SVX_SOURCE_INC_FORMTOOLBARS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/frmsel.hrc b/svx/source/inc/frmsel.hrc index b0b7bc01fceb..b0b7bc01fceb 100644..100755 --- a/svx/source/inc/frmsel.hrc +++ b/svx/source/inc/frmsel.hrc diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index 77554da2587e..fd36b53be86f 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,10 +57,12 @@ public: inline bool IsSelected() const { return mbSelected; } inline void Select( bool bSelect ) { mbSelected = bSelect; } - const SvxBorderLine& GetCoreStyle() const { return maCoreStyle; } - void SetCoreStyle( const SvxBorderLine* pStyle ); + const editeng::SvxBorderLine& GetCoreStyle() const { return maCoreStyle; } + void SetCoreStyle( const editeng::SvxBorderLine* pStyle ); - inline void SetUIColor( const Color& rColor ) {maUIStyle.SetColor( rColor ); } + inline void SetUIColorPrim( const Color& rColor ) {maUIStyle.SetColorPrim( rColor ); } + inline void SetUIColorSecn( const Color& rColor ) {maUIStyle.SetColorSecn( rColor ); } + inline void SetUIColorGap( bool bUseIt, const Color& rColor ) {maUIStyle.SetColorGap(bUseIt, rColor);} inline const frame::Style& GetUIStyle() const { return maUIStyle; } inline void ClearFocusArea() { maFocusArea.Clear(); } @@ -80,7 +83,7 @@ public: private: const FrameBorderType meType; /// Frame border type (position in control). FrameBorderState meState; /// Frame border state (on/off/don't care). - SvxBorderLine maCoreStyle; /// Core style from application. + editeng::SvxBorderLine maCoreStyle; /// Core style from application. frame::Style maUIStyle; /// Internal style to draw lines. FrameBorderType meKeyLeft; /// Left neighbor for keyboard control. FrameBorderType meKeyRight; /// Right neighbor for keyboard control. @@ -121,7 +124,7 @@ struct FrameSelectorImpl : public Resource FrameBorder maVer; /// All data of inner vertical frame border. FrameBorder maTLBR; /// All data of top-left to bottom-right frame border. FrameBorder maBLTR; /// All data of bottom-left to top-right frame border. - SvxBorderLine maCurrStyle; /// Current style and color for new borders. + editeng::SvxBorderLine maCurrStyle; /// Current style and color for new borders. frame::Array maArray; /// Frame link array to draw an array of frame borders. FrameSelFlags mnFlags; /// Flags for enabled frame borders. @@ -213,7 +216,7 @@ struct FrameSelectorImpl : public Resource /** Sets the state of the specified frame border. */ void SetBorderState( FrameBorder& rBorder, FrameBorderState eState ); /** Sets the core style of the specified frame border, or hides the frame border, if pStyle is 0. */ - void SetBorderCoreStyle( FrameBorder& rBorder, const SvxBorderLine* pStyle ); + void SetBorderCoreStyle( FrameBorder& rBorder, const editeng::SvxBorderLine* pStyle ); /** Sets the color of the specified frame border. */ void SetBorderColor( FrameBorder& rBorder, const Color& rColor ); @@ -303,3 +306,4 @@ typedef FrameBorderIterBase< FrameBorderPtrVec, FrameBorderPtrVec::iterator, Fra #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index cde1533eca46..5cd19569344b 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1154,3 +1155,4 @@ protected: #endif // _SVX_GRIDCELL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/gridcols.hxx b/svx/source/inc/gridcols.hxx index 29390d64a59a..fb50b42191cd 100644 --- a/svx/source/inc/gridcols.hxx +++ b/svx/source/inc/gridcols.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName); #endif // _SVX_GRIDCOLS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/linectrl.hrc b/svx/source/inc/linectrl.hrc index 59c224f4240c..59c224f4240c 100644..100755 --- a/svx/source/inc/linectrl.hrc +++ b/svx/source/inc/linectrl.hrc diff --git a/svx/source/inc/recoveryui.hxx b/svx/source/inc/recoveryui.hxx index f0af19699afb..c35c32333578 100644 --- a/svx/source/inc/recoveryui.hxx +++ b/svx/source/inc/recoveryui.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -153,3 +154,5 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo } // namespace svx #endif // _RECOVERYUI_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index cb108cb2c08c..71013212a8e3 100644 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -138,3 +139,5 @@ namespace svxform //.............................................................................. } // namespace svxform //.............................................................................. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx index 01e175d51e4e..d97ee70b53e0 100644 --- a/svx/source/inc/sqlparserclient.hxx +++ b/svx/source/inc/sqlparserclient.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,7 +45,7 @@ namespace svxform ,public ::svxform::OParseContextClient { private: - //add by BerryJia for fixing Bug97420 Time:2002-9-12-11:00(PRC time) + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; protected: @@ -77,3 +78,4 @@ namespace svxform #endif // SVX_SQLPARSERCLIENT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx index 5fdcfb320443..617bdba5f7dc 100644 --- a/svx/source/inc/stringlistresource.hxx +++ b/svx/source/inc/stringlistresource.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ namespace svx //........................................................................ #endif // SVX_STRINGLISTRESOURCE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/svdoimp.hxx b/svx/source/inc/svdoimp.hxx index 91add6aaa48e..4f4187d7f272 100644 --- a/svx/source/inc/svdoimp.hxx +++ b/svx/source/inc/svdoimp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,17 +31,8 @@ #include <vcl/mapmod.hxx> -//#include <svl/lstner.hxx> -//#include <vcl/timer.hxx> -//#include <svx/svdsob.hxx> -//#include <svx/svdtypes.hxx> // fuer SdrLayerID -//#include <svx/svdglue.hxx> // Klebepunkte -//#include <svx/xdash.hxx> -//#include <svx/xpoly.hxx> -//#include <svx/xenum.hxx> -//#include <basegfx/vector/b2dvector.hxx> #include <svx/rectenum.hxx> -//#include <basegfx/polygon/b2dpolypolygon.hxx> + class Bitmap; @@ -109,3 +101,5 @@ void ImpCalcBmpFillSizes( Size& rStartOffset, #endif // _SVX_SVDOIMP_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/svdoutlinercache.hxx b/svx/source/inc/svdoutlinercache.hxx index 356011d41cfa..35c004260e17 100644 --- a/svx/source/inc/svdoutlinercache.hxx +++ b/svx/source/inc/svdoutlinercache.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index be1265cb0c98..ae5982f16644 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,12 +45,9 @@ #include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/DisposedException.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/compbase6.hxx> -//#ifndef _CPPUHELPER_COMPBASE7_HXX_ -//#include <cppuhelper/compbase7.hxx> -//#endif #include <comphelper/broadcasthelper.hxx> #include <cppuhelper/implbase6.hxx> #include <comphelper/servicehelper.hxx> @@ -564,3 +562,5 @@ inline sal_Bool SvxRectCtlChildAccessibleContext::IsNotAlive( void ) const #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index bbb5cb261b46..2b5bc1b8099b 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -139,3 +140,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx index 774e786b80f7..3000418b5574 100644 --- a/svx/source/inc/tbxform.hxx +++ b/svx/source/inc/tbxform.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ #include <vcl/field.hxx> #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif //======================================================================== class SvxFmAbsRecWin : public NumericField @@ -164,3 +163,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/trace.hxx b/svx/source/inc/trace.hxx index 8de8af5f7cf1..aecfab7c52a3 100644 --- a/svx/source/inc/trace.hxx +++ b/svx/source/inc/trace.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,8 +31,8 @@ #if defined(DBG_UTIL) #include <tools/string.hxx> -#include <vos/thread.hxx> -#include <vos/mutex.hxx> +#include <osl/thread.hxx> +#include <osl/mutex.hxx> #include <comphelper/stl_types.hxx> @@ -39,10 +40,10 @@ class Tracer { ByteString m_sBlockDescription; - DECLARE_STL_STDKEY_MAP( ::vos::OThread::TThreadIdentifier, sal_Int32, MapThreadId2Int ); + DECLARE_STL_STDKEY_MAP( ::oslThreadIdentifier, sal_Int32, MapThreadId2Int ); static MapThreadId2Int s_aThreadIndents; - static ::vos::OMutex s_aMapSafety; + static ::osl::Mutex s_aMapSafety; public: Tracer(const char* _pBlockDescription); @@ -66,3 +67,5 @@ public: #endif #endif // _TRACE_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/treevisitor.hxx b/svx/source/inc/treevisitor.hxx index b089c524789b..93dc0081ae31 100644 --- a/svx/source/inc/treevisitor.hxx +++ b/svx/source/inc/treevisitor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -107,3 +108,5 @@ bool TreeVisitor< ELEMENT, NODEINFO, PROCESSOR >::do_step() } #endif // SVX_TREE_VISITOR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/typeconversionclient.hxx b/svx/source/inc/typeconversionclient.hxx index 9ff7e12fe4d0..525e2d891c07 100644 --- a/svx/source/inc/typeconversionclient.hxx +++ b/svx/source/inc/typeconversionclient.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,4 @@ namespace svxform #endif // SVX_TYPECONVERSION_CLIENT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/unogalthemeprovider.hxx b/svx/source/inc/unogalthemeprovider.hxx index e5d1e7dd1bf5..d23957022390 100644 --- a/svx/source/inc/unogalthemeprovider.hxx +++ b/svx/source/inc/unogalthemeprovider.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,5 @@ private: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/unopolyhelper.hxx b/svx/source/inc/unopolyhelper.hxx index feb501a52d82..cc55cfae1f0a 100644 --- a/svx/source/inc/unopolyhelper.hxx +++ b/svx/source/inc/unopolyhelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,4 @@ SVX_DLLPUBLIC void SvxConvertB2DPolyPolygonToPolyPolygonBezier( const basegfx::B #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index 81387b78fe0c..48d2eb41945d 100644 --- a/svx/source/inc/xfm_addcondition.hxx +++ b/svx/source/inc/xfm_addcondition.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,4 @@ namespace svxform #endif // SVX_SOURCE_INC_XFM_ADDCONDITION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx index fcb72b691b00..703454d235cf 100644 --- a/svx/source/inc/xmlxtexp.hxx +++ b/svx/source/inc/xmlxtexp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx index 85fddbeef005..d57680f2db0a 100644 --- a/svx/source/inc/xmlxtimp.hxx +++ b/svx/source/inc/xmlxtimp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,3 +63,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/intro/about_ooo.hrc b/svx/source/intro/about_ooo.hrc deleted file mode 100644 index 2d81fff3b454..000000000000 --- a/svx/source/intro/about_ooo.hrc +++ /dev/null @@ -1,1083 +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. - * - ************************************************************************/ - -#define OOO_CONTRIBUTOR_LIST \ -ItemList = \ -{ \ - < "" ; > ; \ - < "Esben Aaberg" ; > ; \ - < "Craig A. Adams" ; > ; \ - < "Agenda d.o.o." ; > ; \ - < "Claus Agerskov" ; > ; \ - < "Tesfamicael Adhanom" ; > ; \ - < "Agile Interactions, Inc." ; > ; \ - < "Volker Ahrendt" ; > ; \ - < "Christian Ahrenkiel" ; > ; \ - < "Kai Ahrens" ; > ; \ - < "Ralph Aichinger" ; > ; \ - < "Takamichi Akiyama" ; > ; \ - < "Rail Aliev" ; > ; \ - < "Florence Allizon-Juillet" ; > ; \ - < "Benoit Altenbourger" ; > ; \ - < "Ahmet Altin" ; > ; \ - < "Jesus Bravo Alvarez" ; > ; \ - < "Michal Ambroz" ; > ; \ - < "Aryan Ameri" ; > ; \ - < "Brian M. Ames" ; > ; \ - < "Jost Ammon" ; > ; \ - < "Paolo Amodio" ; > ; \ - < "Abdullah Anar" ; > ; \ - < "Gene Anaya" ; > ; \ - < "Christian Andersen" ; > ; \ - < "Frank J. Andersen" ; > ; \ - < "Jan Moller Andersen" ; > ; \ - < "Jorn Skifter Andersen" ; > ; \ - < "Susanne Anderson" ; > ; \ - < "Joost Andrae" ; > ; \ - < "Timar Andras" ; > ; \ - < "Michael Arbon" ; > ; \ - < "Magosanhi Ardho" ; > ; \ - < "Sakari Aro" ; > ; \ - < "Magosanyi Arpad" ; > ; \ - < "Peter Arnold" ; > ; \ - < "Takashi Asari" ; > ; \ - < "Travis Athougies " ; > ; \ - < "Kosa Attila" ; > ; \ - < "Ativiras Kodas Lietuvai (Open Source for Lithuania)" ; > ; \ - < "Peter Babco" ; > ; \ - < "Natalia Babkina" ; > ; \ - < "Eric Bachard" ; > ; \ - < "Jeffrey G. Backes" ; > ; \ - < "Monica Badia" ; > ; \ - < "Sanlig Badral" ; > ; \ - < "Michele Baldessari" ; > ; \ - < "Dwayne Bailey" ; > ; \ - < "Ilyas Bakirov " ; > ; \ - < "Omer Bar-or" ; > ; \ - < "Danial Ferreira Balieiro" ; > ; \ - < "Athur Barret" ; > ; \ - < "Rodrigo Pedroso Barbosa" ; > ; \ - < "Gildecio E. Barboza" ; > ; \ - < "Joerg Barfurth" ; > ; \ - < "Yvan Barthelemy " ; > ; \ - < "David Bartlett" ; > ; \ - < "Sascha Ballach" ; > ; \ - < "Stefan Baltzer" ; > ; \ - < "Jayant Balraj Madavi" ; > ; \ - < "Claudio Bandaloukas" ; > ; \ - < "Omar Bar-or" ; > ; \ - < "Hrega Basu" ; > ; \ - < "Mathias Bauer" ; > ; \ - < "Martin Baulig" ; > ; \ - < "Martin Bayer" ; > ; \ - < "Gwenole Beauchesne" ; > ; \ - < "Youssef Beghi" ; > ; \ - < "Juraj Bednar" ; > ; \ - < "Brian Behlendorf" ; > ; \ - < "Thorsten Behrens" ; > ; \ - < "Lars Behrmann" ; > ; \ - < "Kyle Begol" ; > ; \ - < "Beijing Co-Create Open Source Software Co. Ltd." ; > ; \ - < "Beijing Redflag Chinese 2000 Software Co. Ltd." ; > ; \ - < "Andero Belov" ; > ; \ - < "Michael Bemmer" ; > ; \ - < "Boldizsar Bencsath" ; > ; \ - < "Thomas Benisch" ; > ; \ - < "Stephan Bergmann" ; > ; \ - < "Josh Berkus" ; > ; \ - < "Armin Besirovic" ; > ; \ - < "beunited.org Littleton, USA" ; > ; \ - < "Zaheda Bhorat" ; > ; \ - < "Andreas Bille" ; > ; \ - < "Oliver Bietzer" ; > ; \ - < "Eric Bischoff" ; > ; \ - < "Marissa Bishop" ; > ; \ - < "Torkil Bladt" ; > ; \ - < "Martin Blapp" ; > ; \ - < "Nick Blievers" ; > ; \ - < "Peter Bodnar" ; > ; \ - < "Daniel Boelzle" ; > ; \ - < "Marco Boerries" ; > ; \ - < "Michael Bohn" ; > ; \ - < "Myrzaliyer Bolat" ; > ; \ - < "Oliver Bolte" ; > ; \ - < "Berit Bonde" ; > ; \ - < "Alexander Bootman" ; > ; \ - < "Csaba Borbola" ; > ; \ - < "Gregor Bornemann" ; > ; \ - < "Thorsten Bosbach" ; > ; \ - < "Eric Bosdonnat" ; > ; \ - < "Daniel Boss" ; > ; \ - < "David Boswell" ; > ; \ - < "Freddy Boswell" ; > ; \ - < "J.David Boyd" ; > ; \ - < "Oisin Boydell" ; > ; \ - < "Rafaella Braconi" ; > ; \ - < "Cristovad Braga" ; > ; \ - < "Tanovic Branko" ; > ; \ - < "Michael Brauer" ; > ; \ - < "Oliver Braun" ; > ; \ - < "Andreas Bregas" ; > ; \ - < "Matthias Breuer" ; > ; \ - < "Marek Brezina" ; > ; \ - < "Henning Brinkmann" ; > ; \ - < "Simon Brouwer" ; > ; \ - < "Andrew Brown" ; > ; \ - < "Joerg Brunsmann" ; > ; \ - < "Joerg Budischewski" ; > ; \ - < "Nicolae Buculei" ; > ; \ - < "Ronny Buelund" ; > ; \ - < "Michael Buettner" ; > ; \ - < "Edwin Burdak" ; > ; \ - < "Hans-Peter Burow" ; > ; \ - < "Aidan Butler" ; > ; \ - < "Richard Bywater" ; > ; \ - < "Josef Cacek" ; > ; \ - < "Guy Capra" ; > ; \ - < "Gabriele Carcassi" ; > ; \ - < "Anders Carlsson" ; > ; \ - < "Brian Cameron" ; > ; \ - < "Scott Carr" ; > ; \ - < "Christina L. Carr" ; > ; \ - < "Mauro Catarzi" ; > ; \ - < "Daniel Carrera" ; > ; \ - < "Giuseppe Castagno" ; > ; \ - < "Centre for Development of Advanced Computing" ; > ; \ - < "Ales Cernosek" ; > ; \ - < "Goerkem Cetin" ; > ; \ - < "Peter Chabada" ; > ; \ - < "David Chan" ; > ; \ - < "Tak-Shing Chan of Aleph One Limited" ; > ; \ - < "Colin Charles" ; > ; \ - < "Kimmy Chen" ; > ; \ - < "Robert Chen" ; > ; \ - < "Yu Aaron Cheng" ; > ; \ - < "Jian Hong Cheng" ; > ; \ - < "Xiuzhi Cheng" ; > ; \ - < "Allan B. Christensen" ; > ; \ - < "Steen Christensen" ; > ; \ - < "Marco Ciampa" ; > ; \ - < "Henrik R. Clausen" ; > ; \ - < "James Cleere" ; > ; \ - < "Justin Clift" ; > ; \ - < "David Cobb" ; > ; \ - < "Oliver Craemer" ; > ; \ - < "Vicky Chan" ; > ; \ - < "Michael J. Cole" ; > ; \ - < "Urska Colner" ; > ; \ - < "Alexandro Colorado" ; > ; \ - < "Compaq Computer Corperation" ; > ; \ - < "Karen Conatser" ; > ; \ - < "Confucian Pro. Technology" ; > ; \ - < "Danese Cooper" ; > ; \ - < "Lee Corbin" ; > ; \ - < "Dietmar Cordes" ; > ; \ - < "Berend Cornelius" ; > ; \ - < "Clayton Cornell" ; > ; \ - < "Jesus Corrius" ; > ; \ - < "Martin Coxall" ; > ; \ - < "Joszef Csongradi" ; > ; \ - < "Alessandro Cumin" ; > ; \ - < "Johannes Czerwinski" ; > ; \ - < "Michael Cziebalski" ; > ; \ - < "Valentina Dagiene" ; > ; \ - < "Richard Daley" ; > ; \ - < "Viktoras Dagys" ; > ; \ - < "Dimitrios Dalossis" ; > ; \ - < "Martin Damboldt" ; > ; \ - < "Johan Dahlin" ; > ; \ - < "Goto Daichi" ; > ; \ - < "Robert Dargaud" ; > ; \ - < "Yuri Dario" ; > ; \ - < "Akshay Dayal" ; > ; \ - < "Simon Dean" ; > ; \ - < "Denice C. Deatrich" ; > ; \ - < "Blaise Drayer" ; > ; \ - < "Francois Dechelle" ; > ; \ - < "Andrea Decorte" ; > ; \ - < "Martijn Dekkers" ; > ; \ - < "Andrew Dent" ; > ; \ - < "Westley Alan Dent" ; > ; \ - < "Luiz Augusto Von Dentz" ; > ; \ - < "Helge Delfs" ; > ; \ - < "Naren Devaiah" ; > ; \ - < "Frederic Juan Diaz" ; > ; \ - < "Scott Dietrich" ; > ; \ - < "Frederik Dietz" ; > ; \ - < "Marcel Diki-Kidiri" ; > ; \ - < "Marian Diklic" ; > ; \ - < "Sebastian Docktor" ; > ; \ - < "Vitor Domingos" ; > ; \ - < "Jean-Francois Donikian" ; > ; \ - < "Simford Dong" ; > ; \ - < "Nitri Dongre" ; > ; \ - < "Thomas Doru" ; > ; \ - < "Willem van Dorp" ; > ; \ - < "Radek Doulik" ; > ; \ - < "Davide Dozza" ; > ; \ - < "Derek Dreger" ; > ; \ - < "Carsten Driesner" ; > ; \ - < "Cristian Driga" ; > ; \ - < "Petr Dudacek" ; > ; \ - < "Herbert Duerr" ; > ; \ - < "Marc Durdin" ; > ; \ - < "Damien Duportal" ; > ; \ - < "Dolores Eccles" ; > ; \ - < "Craig Eddy" ; > ; \ - < "Florian Effenberger" ; > ; \ - < "Aleksander Ehrlich" ; > ; \ - < "Bernd Eilers" ; > ; \ - < "Terry Ellison" ; > ; \ - < "Rene Engelhard" ; > ; \ - < "Mina Erickson" ; > ; \ - < "Peter Eriksen" ; > ; \ - < "Per Eriksson" ; > ; \ - < "Alberto Escudero-Pascual" ; > ; \ - < "Fabalabs Software GmbH" ; > ; \ - < "Charles Anthony Fannan" ; > ; \ - < "Jean-Baptiste Faure" ; > ; \ - < "Ralf-Michael Fehr" ; > ; \ - < "Vladimir Fedak" ; > ; \ - < "Zoltan Fekete" ; > ; \ - < "Olaf Felka" ; > ; \ - < "Carlos Fernando" ; > ; \ - < "Ramon Garcia Fernandez" ; > ; \ - < "Claudio Ferreira" ; > ; \ - < "Raquel Fares Ferreira" ; > ; \ - < "Marco Fiemozzi" ; > ; \ - < "Claudio F Filho" ; > ; \ - < "Pierre de Filippis" ; > ; \ - < "Jan Firich" ; > ; \ - < "Andre Fischer" ; > ; \ - < "Helga Fischer" ; > ; \ - < "Uwe Fischer" ; > ; \ - < "Darin Fisher" ; > ; \ - < "Nicole M. Follet-Dunn" ; > ; \ - < "Kenneth Foskey" ; > ; \ - < "Duncan Foster" ; > ; \ - < "Tim Foster" ; > ; \ - < "David Franser" ; > ; \ - < "Peter Frandsen" ; > ; \ - < "Gary Frederick" ; > ; \ - < "Nils Fuhrmann" ; > ; \ - < "Jan Funken" ; > ; \ - < "Bruno Gallart" ; > ; \ - < "Roberto Galoppini" ; > ; \ - < "Tom Garland" ; > ; \ - < "Wolfram Garten" ; > ; \ - < "Martin Gallwey" ; > ; \ - < "Pierre-Andre Galmes" ; > ; \ - < "Roberto Galoppini" ; > ; \ - < "Tony Galmiche" ; > ; \ - < "Sunil Gandhi" ; > ; \ - < "Zemin Gao" ; > ; \ - < "Sophie Gautier" ; > ; \ - < "Kathy Gavin" ; > ; \ - < "Alexander Gelfenbain" ; > ; \ - < "Genicorp" ; > ; \ - < "Radim Gelner" ; > ; \ - < "R.R. Gerbrands" ; > ; \ - < "Vytautas Germanavicius" ; > ; \ - < "Berthold Gerdes" ; > ; \ - < "Gorken Getin" ; > ; \ - < "Adriana Geurts" ; > ; \ - < "Marco Giorgetti" ; > ; \ - < "Thomas Girard" ; > ; \ - < "Serkan Girgin" ; > ; \ - < "Vladimir Glazounov" ; > ; \ - < "Laurent Godard" ; > ; \ - < "M. Godec" ; > ; \ - < "Angelika Goeszler" ; > ; \ - < "Xabier Arrieta Goiri" ; > ; \ - < "Adam Golebiowski" ; > ; \ - < "Good Day, Inc. - Seiya Maeda, CEO" ; > ; \ - < "Ajey Y. Gore" ; > ; \ - < "Adam Gould" ; > ; \ - < "Brigitte Le Grand" ; > ; \ - < "GravityZoo" ; > ; \ - < "Paul Gress" ; > ; \ - < "Gintautas Grigas" ; > ; \ - < "Dirk Grobler" ; > ; \ - < "Steffen Grund" ; > ; \ - < "Christian Guenther" ; > ; \ - < "Marko Gronroos" ; > ; \ - < "Wojciech Gryc" ; > ; \ - < "Stefano Guidetti" ; > ; \ - < "Wilson Guo" ; > ; \ - < "Brant Langer Gurganus" ; > ; \ - < "Richard Guziewicz" ; > ; \ - < "Szabo Gyoergi" ; > ; \ - < "Bettina Haberer" ; > ; \ - < "Thomas Hackert" ; > ; \ - < "David Hackler" ; > ; \ - < "Fredrik Haegg" ; > ; \ - < "Ingrid Halama" ; > ; \ - < "William Neil Hall" ; > ; \ - < "Chris Halls" ; > ; \ - < "Arne Christian Harseth" ; > ; \ - < "Syamsul Anuar Abdul Hamid" ; > ; \ - < "Bo Han" ; > ; \ - < "Ove Hanebring" ; > ; \ - < "Jens K. Hansen" ; > ; \ - < "Martin Willemoes Hansen" ; > ; \ - < "Rune Piil Hansen" ; > ; \ - < "Jeff Hanson" ; > ; \ - < "Paul Eugene Hanson" ; > ; \ - < "Christian Hardy" ; > ; \ - < "Alexey Harlamenkov" ; > ; \ - < "Taska Harnischfeger" ; > ; \ - < "Gregor Hartmann" ; > ; \ - < "Peter Hartmann" ; > ; \ - < "Andreas Hausmann" ; > ; \ - < "Bustamam Harun" ; > ; \ - < "Soren Hauberg" ; > ; \ - < "Andreas Hausmann" ; > ; \ - < "Mike Hayes" ; > ; \ - < "John Heard" ; > ; \ - < "Florian Heckl" ; > ; \ - < "Will Heid" ; > ; \ - < "Reimar Heider" ; > ; \ - < "Joerg Heilig" ; > ; \ - < "Lars Jorgen Helbo" ; > ; \ - < "Bill Heiser" ; > ; \ - < "Frank Heitbrock" ; > ; \ - < "Brian Hemstedt" ; > ; \ - < "Kevin B. Hendricks" ; > ; \ - < "C.P. Hennessy" ; > ; \ - < "Gregor Herrman" ; > ; \ - < "Chris Herrnberger" ; > ; \ - < "Sven Herzberg" ; > ; \ - < "Uwe Heth" ; > ; \ - < "Ariya Hidayat" ; > ; \ - < "Bernd Hilgenberg" ; > ; \ - < "Michelle Hills" ; > ; \ - < "Kazunari Hirano" ; > ; \ - < "Samual W. Hiser" ; > ; \ - < "Ivo Hinkelmann" ; > ; \ - < "Theresa Hinkelman" ; > ; \ - < "Eric Hoch" ; > ; \ - < "Lutz Hoeger" ; > ; \ - < "Michael Hoennig" ; > ; \ - < "Ilko Hoepping" ; > ; \ - < "Axel Hoernke" ; > ; \ - < "Ralf Hofmann" ; > ; \ - < "Jakob Hojgaard" ; > ; \ - < "Janos Holanyi" ; > ; \ - < "Jan Holesovsky" ; > ; \ - < "Martin Hollmichel" ; > ; \ - < "Richard Holt" ; > ; \ - < "Sei Honda" ; > ; \ - < "Karl Hong" ; > ; \ - < "Alan Horkan" ; > ; \ - < "Alexandre Horst" ; > ; \ - < "Horst" ; > ; \ - < "Thomas Hosemann" ; > ; \ - < "Chris Hoypoy" ; > ; \ - < "Radovan Hrabak" ; > ; \ - < "Hristo Simeonov Hristov" ; > ; \ - < "Stanislav Huba" ; > ; \ - < "Bert Hubert" ; > ; \ - < "Ralf Hueskes" ; > ; \ - < "Matthias Huetsch" ; > ; \ - < "Marco Huggenberger" ; > ; \ - < "Humboldt-Universitaet zu Berlin" ; > ; \ - < "James R Hunt" ; > ; \ - < "Jason Hunter" ; > ; \ - < "Isabelle Hurbain" ; > ; \ - < "Gabriel Hurley" ; > ; \ - < "Emin Huseynov" ; > ; \ - < "Scott Hutinger" ; > ; \ - < "Hungarian Linux Users, Association of" ; > ; \ - < "Thomas Hygum" ; > ; \ - < "Andreas Hyballa" ; > ; \ - < "Hasan Ilter" ; > ; \ - < "Intel Corp." ; > ; \ - < "International Business Machines" ; > ; \ - < "Intersol SRL" ; > ; \ - < "Michael Irion" ; > ; \ - < "Naoyuki Ishimura" ; > ; \ - < "Baurzhan Ismagulov" ; > ; \ - < "Fumihiko Iwabuchi" ; > ; \ - < "Issendis Alain Curt" ; > ; \ - < "Pavel Janik" ; > ; \ - < "Sunil Amitkumar Janki" ; > ; \ - < "Sven Jacobi" ; > ; \ - < "Yvonne Jacoby" ; > ; \ - < "Denis Jacquerye" ; > ; \ - < "Egle Jasutiene" ; > ; \ - < "Joerg Jahnke" ; > ; \ - < "Christian Jansen" ; > ; \ - < "Ocke Janssen" ; > ; \ - < "Amer Javaid" ; > ; \ - < "Andrew T. Jensen" ; > ; \ - < "Byrial Ole Jensen" ; > ; \ - < "Ricky Hugh Jensen" ; > ; \ - < "Tatjiana Jevsikova" ; > ; \ - < "Berry Jia" ; > ; \ - < "Mingfei Jia" ; > ; \ - < "Chuang Jiang" ; > ; \ - < "Jiao Jianhua" ; > ; \ - < "Gary Johnston" ; > ; \ - < "Dewi Jones" ; > ; \ - < "Henrik Jordt" ; > ; \ - < "Anders Colding Jorgesen" ; > ; \ - < "Peter Junge" ; > ; \ - < "Christian Junker" ; > ; \ - < "Pascal Junck" ; > ; \ - < "Henrik Just" ; > ; \ - < "Christian Kaas" ; > ; \ - < "Yukata Kachi" ; > ; \ - < "Natsu Kadoya" ; > ; \ - < "Szalai Kalman" ; > ; \ - < "masahisa kamataki" ; > ; \ - < "Tim Kampa" ; > ; \ - < "Petr Kania" ; > ; \ - < "Mick Kappenburg" ; > ; \ - < "Etsushi Kato" ; > ; \ - < "Yosuke Kato" ; > ; \ - < "Hirano Kazunari" ; > ; \ - < "Mihaela Kedikova" ; > ; \ - < "Juergen Keil" ; > ; \ - < "Lina Kemmel" ; > ; \ - < "Darren Kenny" ; > ; \ - < "Dhanajay Keskar" ; > ; \ - < "Ilja Ketris" ; > ; \ - < "Philipp Kewisch Ketris" ; > ; \ - < "Ossama Khayat" ; > ; \ - < "Volodymyr Khrystynych" ; > ; \ - < "Ilja Ketris" ; > ; \ - < "Hermann Kienlein" ; > ; \ - < "Artem Khvat" ; > ; \ - < "Aijin Kim" ; > ; \ - < "Jeongkyu Kim" ; > ; \ - < "Jung-uk Kim" ; > ; \ - < "Bevis Robert Wearing King" ; > ; \ - < "Bo Kiersgaard" ; > ; \ - < "Robert Kinsella" ; > ; \ - < "Lazsio Kishalmi" ; > ; \ - < "Andre Kitzing" ; > ; \ - < "Thomas Klarhoefer" ; > ; \ - < "Sven Klawitter" ; > ; \ - < "Branislav Klocok" ; > ; \ - < "Matthias Klose" ; > ; \ - < "Halfdan Holger Knudsen" ; > ; \ - < "Rune Tendal Kock" ; > ; \ - < "Magdy Samuel Abdel Koddous" ; > ; \ - < "Charles Peter Koerner" ; > ; \ - < "Kay Koll" ; > ; \ - < "Masataka Kondo" ; > ; \ - < "Soren Kongstad" ; > ; \ - < "Dimitris Korbetis" ; > ; \ - < "Uros Kositer" ; > ; \ - < "Peter Kosmalla" ; > ; \ - < "Nobuhiro Koura" ; > ; \ - < "Lazlo Kovacs" ; > ; \ - < "Martin Kretzchmar" ; > ; \ - < "Ramesh Krishnamagaru" ; > ; \ - < "Jayamohan Krishnasamy" ; > ; \ - < "Erik Kristiansen" ; > ; \ - < "Jesper Krogh" ; > ; \ - < "Oliver Krapp" ; > ; \ - < "Andrey Krutak" ; > ; \ - < "Andreas Krause" ; > ; \ - < "Tobias Krause" ; > ; \ - < "Nigel Kukard" ; > ; \ - < "Andre Kuemmel" ; > ; \ - < "Jorma Kuha" ; > ; \ - < "Mashrab Kuvatov" ; > ; \ - < "Thorsten Koerner" ; > ; \ - < "Ralf Kuhnert" ; > ; \ - < "Gaute Hvoslef Kvalnes" ; > ; \ - < "Kabrianis & Sia O.E." ; > ; \ - < "William Rikard Lachance" ; > ; \ - < "Dominic Lachoucz" ; > ; \ - < "Sandra Lain" ; > ; \ - < "Alexandre Lahiniriko" ; > ; \ - < "Denis Lakcovic" ; > ; \ - < "Dr. Swapnil Vishnu Lale" ; > ; \ - < "Antti Lampinen/Kongo Group" ; > ; \ - < "Massimo Lanfranconi" ; > ; \ - < "Marcus Lange" ; > ; \ - < "Peter Lange" ; > ; \ - < "Thomas Lange" ; > ; \ - < "Lars Langhans" ; > ; \ - < "Vance Lankhaar" ; > ; \ - < "Sébastien Lanteigne" ; > ; \ - < "Finn Gruwier Larsen" ; > ; \ - < "Rune S. Larsen" ; > ; \ - < "Pavel Lastovicka" ; > ; \ - < "Rimgaudus Laucius" ; > ; \ - < "Jesper Laugesen" ; > ; \ - < "David Laurent" ; > ; \ - < "Thorsten Laux" ; > ; \ - < "Nemeth Laszlo" ; > ; \ - < "Hans-Joachim Lankenau (Ause)" ; > ; \ - < "Athanasios Lefteris" ; > ; \ - < "Ely Levy" ; > ; \ - < "Learning and Teaching Scotland" ; > ; \ - < "Yoann Le Bars" ; > ; \ - < "Armin Le Grand" ; > ; \ - < "Brigitte Le Grand" ; > ; \ - < "Jakob Lechner" ; > ; \ - < "Michael Leibowitz" ; > ; \ - < "Serge Le Louarne" ; > ; \ - < "Dong Lee" ; > ; \ - < "Kenneth Lee" ; > ; \ - < "Gregory Leffler" ; > ; \ - < "Hercule Li" ; > ; \ - < "Hui Li" ; > ; \ - < "Jian Li" ; > ; \ - < "Tommy C. Li" ; > ; \ - < "Wind Li" ; > ; \ - < "Xing Li" ; > ; \ - < "Ping Liao" ; > ; \ - < "Xin Liao" ; > ; \ - < "Weike Liang" ; > ; \ - < "Rony Liemmukda" ; > ; \ - < "Tor Lillqvist" ; > ; \ - < "Patranun Limudomporn" ; > ; \ - < "Archie Lin" ; > ; \ - < "Fong Lin" ; > ; \ - < "Martha J. Lindeman" ; > ; \ - < "Joachim Lingner" ; > ; \ - < "Christian Lippka" ; > ; \ - < "Chen Liu" ; > ; \ - < "Jianli Liu" ; > ; \ - < "Mindy Liu" ; > ; \ - < "Tao Liu" ; > ; \ - < "YiSong Liu" ; > ; \ - < "Yu Liu" ; > ; \ - < "Yuhua Liu" ; > ; \ - < "ALT Linux Russia" ; > ; \ - < "Jonathan S. Lister" ; > ; \ - < "Vedran Ljubovic" ; > ; \ - < "Frank Loehmann" ; > ; \ - < "Dieter Loeschky" ; > ; \ - < "Philipp Lohmann" ; > ; \ - < "Christian Lohmaier" ; > ; \ - < "Michel Loiseleur" ; > ; \ - < "Anthony Long" ; > ; \ - < "Roberto Loprieno" ; > ; \ - < "Riccardo Losselli" ; > ; \ - < "Jackson Low" ; > ; \ - < "Patrick Luby" ; > ; \ - < "Christoph Lukasiak" ; > ; \ - < "Robert Ludvik" ; > ; \ - < "Uwe Luebbers" ; > ; \ - < "Edgardo Lugaresi" ; > ; \ - < "Gavin Lu" ; > ; \ - < "Morton Lund" ; > ; \ - < "Jingrong Luo" ; > ; \ - < "Zaoliang Luo" ; > ; \ - < "Ian Lynch" ; > ; \ - < "Jun Ma" ; > ; \ - < "Thomas J.L. MacDermott" ; > ; \ - < "Marcio A. Macendo" ; > ; \ - < "George Machitidze" ; > ; \ - < "Diane Mackay" ; > ; \ - < "Prasad Madhav" ; > ; \ - < "Jorgen Madsen" ; > ; \ - < "Ove Madsen" ; > ; \ - < "Martin Maher" ; > ; \ - < "Babak Mahbod" ; > ; \ - < "Nakata Maho " ; > ; \ - < "Wad Mahsckoff" ; > ; \ - < "Milena Majorosova" ; > ; \ - < "Yonggang Mao" ; > ; \ - < "Libor Maly" ; > ; \ - < "Mandrake Soft S.A." ; > ; \ - < "Libor Maly" ; > ; \ - < "Mohammed Mamdouh" ; > ; \ - < "Andreas Mantke" ; > ; \ - < "Paolo Mantovani" ; > ; \ - < "Chris Manuh" ; > ; \ - < "Luisa Della Marina" ; > ; \ - < "Christian Markgraf" ; > ; \ - < "John Marmion" ; > ; \ - < "Adam Marks" ; > ; \ - < "Dirk Marquardt" ; > ; \ - < "Tam Marshall" ; > ; \ - < "Andreas Martens" ; > ; \ - < "Thorsten Martens" ; > ; \ - < "Bartosz Maruszewski" ; > ; \ - < "Jordi Mas" ; > ; \ - < "Nishida Masanori" ; > ; \ - < "Yoshiyuki Masutomi" ; > ; \ - < "Ivan Masar" ; > ; \ - < "Nishida Masanori" ; > ; \ - < "Shane M. Mathews" ; > ; \ - < "Yoshiyuki Masutomi" ; > ; \ - < "Akira Matsumiya" ; > ; \ - < "Yoshihiso Matsutani" ; > ; \ - < "Shinobu Matsuzuka" ; > ; \ - < "Elizabeth Matthis" ; > ; \ - < "Michael Maurier, Publishing Power, Inc." ; > ; \ - < "Frank Mau" ; > ; \ - < "Izumi Mazur" ; > ; \ - < "John McCreesh" ; > ; \ - < "Shaun McDonald" ; > ; \ - < "Ian McDonnell" ; > ; \ - < "Caolan McNamara" ; > ; \ - < "Jacqueline McNally" ; > ; \ - < "Aaron R. Meck" ; > ; \ - < "Nirav Mehta" ; > ; \ - < "Michael Meeks" ; > ; \ - < "Frederico Mena-Quintero" ; > ; \ - < "James Meng" ; > ; \ - < "Frank Meies" ; > ; \ - < "Antonius Tjipke Meinen" ; > ; \ - < "Ismael Merzaq" ; > ; \ - < "Andreas Meyer" ; > ; \ - < "Markus Meyer" ; > ; \ - < "Rolf Meyer" ; > ; \ - < "Djapparova Meruert" ; > ; \ - < "Ismael Merzaq" ; > ; \ - < "Michael Mi" ; > ; \ - < "Bjoern Michaelsen" ; > ; \ - < "Boris Michelsz" ; > ; \ - < "Bjoern Milcke" ; > ; \ - < "Marcin Milkowski" ; > ; \ - < "Michelle Milledge" ; > ; \ - < "Aleksander Mikhailov-Erlich" ; > ; \ - < "Paul A. Miller" ; > ; \ - < "Arkadiusz Miskiewicz" ; > ; \ - < "Petr Mladek" ; > ; \ - < "Erica Modena" ; > ; \ - < "Filip Molcan" ; > ; \ - < "Tadeusz Mollun" ; > ; \ - < "Carl De Monbrun" ; > ; \ - < "Volker Moneke" ; > ; \ - < "Takayuki Morisawa" ; > ; \ - < "Jan Morgils" ; > ; \ - < "Tim Morley" ; > ; \ - < "Tomas Mraz" ; > ; \ - < "Cyrille Moureaux" ; > ; \ - < "S. Muguntharaj" ; > ; \ - < "Matthias Mueller-Prove" ; > ; \ - < "Inaki Larranaga Murgoitio" ; > ; \ - < "Mark Murnane" ; > ; \ - < "Jack Murphy" ; > ; \ - < "Steven Michael Murphy" ; > ; \ - < "Kris Nackaerts" ; > ; \ - < "Hiroyuki Nakaji" ; > ; \ - < "Takashi Nakamoto" ; > ; \ - < "Maho Nakata" ; > ; \ - < "National Centre for Software Technology, India" ; > ; \ - < "Takamichi Nara" ; > ; \ - < "Peter Naulls" ; > ; \ - < "Jan Navratil" ; > ; \ - < "Niklas Nebel" ; > ; \ - < "Ales Nehyba" ; > ; \ - < "Christoph Neumann" ; > ; \ - < "Frank Neumann" ; > ; \ - < "Marc Neumann" ; > ; \ - < "Net Integration Technologies, Inc." ; > ; \ - < "Scott Ng" ; > ; \ - < "Nam T. Nguyen" ; > ; \ - < "Jan Normann Nielsen" ; > ; \ - < "Ko-haw Nieh" ; > ; \ - < "Peter Van Nieuwenhoven" ; > ; \ - < "Jan Nieuwenhuizen" ; > ; \ - < "Dhiraj Nilange" ; > ; \ - < "Sofia Nilsson" ; > ; \ - < "Kazutoshi Nimura" ; > ; \ - < "Jes Drost Nissen" ; > ; \ - < "Sofia Nilsson" ; > ; \ - < "Christoph Noack" ; > ; \ - < "Bertram Nolte" ; > ; \ - < "Niels Nordmann" ; > ; \ - < "Michael Novati" ; > ; \ - < "Novell, Inc.," ; > ; \ - < "Rodrigo Parra Novo" ; > ; \ - < "Peter Novodvorsky" ; > ; \ - < "O3Spaces (C.B Hoeflake)" ; > ; \ - < "Tomas O'Connor" ; > ; \ - < "Munzir Taha Obeid" ; > ; \ - < "Eivind Odegard" ; > ; \ - < "Maximilian Odendahl" ; > ; \ - < "Kaoru Oguru" ; > ; \ - < "Dan Ohnesorg" ; > ; \ - < "Akira Ohsone" ; > ; \ - < "Takashi Ono" ; > ; \ - < "Lars Oppermann" ; > ; \ - < "Michael Opsahl" ; > ; \ - < "Anmar Oueja" ; > ; \ - < "Dana Oliver" ; > ; \ - < "Shane Owenby" ; > ; \ - < "Marcin Orowski" ; > ; \ - < "Takeshi Otsuki" ; > ; \ - < "Jan-Hendrick Palic" ; > ; \ - < "Assis Paniago" ; > ; \ - < "Carlos F.A. Paniago" ; > ; \ - < "Subiaco Paola" ; > ; \ - < "Kannada Ganaka Parishat" ; > ; \ - < "Anna Parovel" ; > ; \ - < "Pierre Pasteau" ; > ; \ - < "Shripad Patki" ; > ; \ - < "Andreas Pauley" ; > ; \ - < "Viktorija Paulikaite" ; > ; \ - < "Soren Thing Pedersen" ; > ; \ - < "Pablo F. Pena IV" ; > ; \ - < "Mattia Penati" ; > ; \ - < "Pentaho - James Dixon - " ; > ; \ - < "Damien Persohn" ; > ; \ - < "Andrea Pescetti" ; > ; \ - < "Edward Peterlin" ; > ; \ - < "Allan Juhl Peterson" ; > ; \ - < "Frank Peters" ; > ; \ - < "Bryan Petty" ; > ; \ - < "John Pfersich" ; > ; \ - < "Wilhelm Pfluger" ; > ; \ - < "Thomas Pfohe" ; > ; \ - < "Yashwant Phatak" ; > ; \ - < "Nusorn Photpipat" ; > ; \ - < "Dao-Duy Pierre" ; > ; \ - < "Juergen Pingel" ; > ; \ - < "Christof Pintaske" ; > ; \ - < "Guido Pinkernell" ; > ; \ - < "Pedro Pinto" ; > ; \ - < "Saso Pirnat" ; > ; \ - < "Sebastien Plisson" ; > ; \ - < "Aurelien Pocheville" ; > ; \ - < "Pvabhas Pokhavel" ; > ; \ - < "Ravi Poluri" ; > ; \ - < "Rastislav Poruban" ; > ; \ - < "Noel Power" ; > ; \ - < "Ashwanth Premchandran" ; > ; \ - < "Marco Pratesi" ; > ; \ - < "Nikolai Pretzell" ; > ; \ - < "Nicola Previati" ; > ; \ - < "Rhoslyn Prys" ; > ; \ - < "Jaroslaw Jan Pyszny" ; > ; \ - < "Jonathan Pryor" ; > ; \ - < "Zhang Qingbin" ; > ; \ - < "Canghua Qu" ; > ; \ - < "Volker Quetschke" ; > ; \ - < "Tino Rachui" ; > ; \ - < "Radostin Radnev" ; > ; \ - < "Pramod Raghavendra" ; > ; \ - < "Adam Rambousek" ; > ; \ - < "Jacqueline Rahemipour" ; > ; \ - < "Goran Rakic" ; > ; \ - < "Adam Rambousek" ; > ; \ - < "Kay Ramme" ; > ; \ - < "Klaus Ramstock" ; > ; \ - < "Scott Rankin" ; > ; \ - < "Samphan Raruenrom" ; > ; \ - < "Michael Rasch" ; > ; \ - < "Ejnar Zacho Rath" ; > ; \ - < "Eike Rathke" ; > ; \ - < "Michael Rauch" ; > ; \ - < "Jens-Heiner Rechtien" ; > ; \ - < "Red Hat, Inc." ; > ; \ - < "Itzchack Rehberg" ; > ; \ - < "Frank Rehberger" ; > ; \ - < "Michael Reichow" ; > ; \ - < "Manfred Reiter" ; > ; \ - < "Eric Renaud" ; > ; \ - < "Peyronnet Remi" ; > ; \ - < "Daniel Rentz" ; > ; \ - < "Florian Reuter" ; > ; \ - < "Kjell Arne Rekaa" ; > ; \ - < "Frco. Javier Rial" ; > ; \ - < "Nicholas Richards" ; > ; \ - < "Georg Richter" ; > ; \ - < "Jozef Riha" ; > ; \ - < "Michael Lee Rilee" ; > ; \ - < "Modestas Rimkus" ; > ; \ - < "Jose Ariel Rios" ; > ; \ - < "Jorge Rivas" ; > ; \ - < "William Robinson" ; > ; \ - < "Donald Evan Rogers" ; > ; \ - < "Willy Sudiarto Rohorjo" ; > ; \ - < "Hennes Rohling" ; > ; \ - < "Richard Rolston" ; > ; \ - < "Christian Romanini" ; > ; \ - < "Lin Rongheng" ; > ; \ - < "Dimitri Roschowski" ; > ; \ - < "Eddie Roosenmaallen" ; > ; \ - < "Dimitri Roschkowski" ; > ; \ - < "Bernard Rosenkraenzer" ; > ; \ - < "Cark Rosschou" ; > ; \ - < "Thomas Roswall" ; > ; \ - < "Werner Roth" ; > ; \ - < "Christian Roy" ; > ; \ - < "Doug Royer" ; > ; \ - < "Bill Roth" ; > ; \ - < "rPath, Inc. (Erik W. Troan)" ; > ; \ - < "Saverio Rubini" ; > ; \ - < "Klaus Ruehl" ; > ; \ - < "Verena Ruff" ; > ; \ - < "Michael Ruess" ; > ; \ - < "Peeter Russak" ; > ; \ - < "Stasys Rutkauskas" ; > ; \ - < "Frederick K. Saalbach" ; > ; \ - < "Tobias Sager" ; > ; \ - < "Enn Saar" ; > ; \ - < "Reshat Sabiq" ; > ; \ - < "Amit Kumar Saha" ; > ; \ - < "Bibek Sahu" ; > ; \ - < "Reiko Saito" ; > ; \ - < "Bruno Sant'Anna" ; > ; \ - < "Roberto Figueiredo Salomon" ; > ; \ - < "Shkumbim Saneja" ; > ; \ - < "Janus Sandsgaard" ; > ; \ - < "Pablo Sarataga" ; > ; \ - < "Juraj Sarinay" ; > ; \ - < "Nobuyuki Sasaki" ; > ; \ - < "Eric Savary" ; > ; \ - < "Stephan Schaefer" ; > ; \ - < "Kathryn L. Schenk" ; > ; \ - < "Harald Schilly" ; > ; \ - < "Tom Schindl" ; > ; \ - < "Andreas Schluens" ; > ; \ - < "Ingo Schmidt-Rosbiegal" ; > ; \ - < "Juergen Schmidt" ; > ; \ - < "Andre Schnabel" ; > ; \ - < "Frank Schoenheit" ; > ; \ - < "Timon Schroeter" ; > ; \ - < "Maik Schroeder" ; > ; \ - < "Sabine Schroeder" ; > ; \ - < "Admar Schoonen" ; > ; \ - < "Svante Schubert" ; > ; \ - < "Friedemann Schuetz" ; > ; \ - < "Dietrich Schulten" ; > ; \ - < "Charles Henri Schulz" ; > ; \ - < "Christoph Schultz" ; > ; \ - < "Thorsten Schulz" ; > ; \ - < "Stella Schulze" ; > ; \ - < "Martin Seelhofer" ; > ; \ - < "Daniel Seibert" ; > ; \ - < "Marcella Semboli" ; > ; \ - < "Julian Seward" ; > ; \ - < "Shanmugam Senthil" ; > ; \ - < "Giovanni Sgnaolin" ; > ; \ - < "Charles Sharp" ; > ; \ - < "Syed Ahmad Shazali" ; > ; \ - < "Darragh Sherwin" ; > ; \ - < "Gia Shervashidze" ; > ; \ - < "Wei Guo Shi" ; > ; \ - < "Norikatsu Shigemura" ; > ; \ - < "Bernhard Siaud" ; > ; \ - < "Joerg Sievers" ; > ; \ - < "Silicon Graphic, Inc." ; > ; \ - < "Maria Augusta Marques da Silva" ; > ; \ - < "Keld Jorn Simonsen" ; > ; \ - < "Michael Sicotte" ; > ; \ - < "Clytie Ann Siddall" ; > ; \ - < "Raul Siddahartha" ; > ; \ - < "SIL International (Freddy Boswell)" ; > ; \ - < "Mukund Sivaraman" ; > ; \ - < "Manoranjan Kr. Singh" ; > ; \ - < "G. Roderick Singleton" ; > ; \ - < "Joerg Skottke" ; > ; \ - < "Sarah Smith" ; > ; \ - < "Timothy P. Smith" ; > ; \ - < "Colm Smyth" ; > ; \ - < "Javier Sola" ; > ; \ - < "Inga Solyte" ; > ; \ - < "Peter Somlo" ; > ; \ - < "Kai Sommerfeld" ; > ; \ - < "Young Joo Song" ; > ; \ - < "Claus Soerensen" ; > ; \ - < "Sbarnea Sorin" ; > ; \ - < "Anousak Souphavank" ; > ; \ - < "Caio Tiago Oliveira de Sousa" ; > ; \ - < "Oliver Specht" ; > ; \ - < "Laure Spilker-Four" ; > ; \ - < "Michael Stahl" ; > ; \ - < "Irina Stamatoiu" ; > ; \ - < "Joseph James John Stanford" ; > ; \ - < "Frank Stecher" ; > ; \ - < "Boris Steiner" ; > ; \ - < "Jason Stewart" ; > ; \ - < "Konrad Stobiecki" ; > ; \ - < "Arthit Suriyawongkul" ; > ; \ - < "Lili Sun" ; > ; \ - < "Erik William Strack" ; > ; \ - < "Daniel Strome" ; > ; \ - < "Fridrich Strba" ; > ; \ - < "Keith Stribley" ; > ; \ - < "Ulf Stroehler" ; > ; \ - < "Daniel Strome" ; > ; \ - < "Louis Suarez-Potts" ; > ; \ - < "Muthu Subramanian" ; > ; \ - < "Matthias Suess" ; > ; \ - < "Tae Hoon Suk of Intellikorea Ca., Ltd." ; > ; \ - < "Arthit Suriyawongkul" ; > ; \ - < "SuSE CR, s.r.o" ; > ; \ - < "Steve Swales" ; > ; \ - < "Ethan Baggett Swint" ; > ; \ - < "Kaupo Suviste" ; > ; \ - < "TK Open Systems Ltd." ; > ; \ - < "TTC Telecom" ; > ; \ - < "E. A. Tacao" ; > ; \ - < "Munzir Taha" ; > ; \ - < "Hidetoshi Tajima" ; > ; \ - < "Kazuhiro Hatake Takabatake " ; > ; \ - < "Taigo Takeda" ; > ; \ - < "Christina Taliaferro" ; > ; \ - < "Makoto Takizawa" ; > ; \ - < "Masaki Tamakoshi" ; > ; \ - < "Quanfa Tang" ; > ; \ - < "Alberto Di Taranto" ; > ; \ - < "David Tardon" ; > ; \ - < "Uday K. Tashildar" ; > ; \ - < "Stefan Taxhet" ; > ; \ - < "William Terry" ; > ; \ - < "Michal Touzin" ; > ; \ - < "Techmaprojekt Sp. z.o.o." ; > ; \ - < "Erwin Tenhumberg" ; > ; \ - < "William Terry" ; > ; \ - < "Pietro Emilio Teofilatto" ; > ; \ - < "Falko Tesch" ; > ; \ - < "Armin Theissen" ; > ; \ - < "Christophe Thibierge" ; > ; \ - < "Michael Thiessne" ; > ; \ - < "James M. Thompson" ; > ; \ - < "Holger Thon" ; > ; \ - < "Alexander Thurgood" ; > ; \ - < "Caio Tiago Oliveira" ; > ; \ - < "Lukas Tinkl" ; > ; \ - < "Gerhard Tonn" ; > ; \ - < "Istvan Torda" ; > ; \ - < "Robert J. Townley" ; > ; \ - < "Christian Treldal" ; > ; \ - < "Trees for Life, Inc." ; > ; \ - < "Christian Treldal" ; > ; \ - < "James Treleaven" ; > ; \ - < "Tim Tretyak" ; > ; \ - < "Andreas Treumann" ; > ; \ - < "Claus Dieter Thoele" ; > ; \ - < "Filippo Trianni" ; > ; \ - < "Joshua A. Triplett" ; > ; \ - < "John Trowbridge" ; > ; \ - < "Dang Minh Tuan" ; > ; \ - < "Gianluca Turconi" ; > ; \ - < "Gunnar Timm" ; > ; \ - < "Ruediger Timm" ; > ; \ - < "Malte Timmermann" ; > ; \ - < "Ralf Unger" ; > ; \ - < "Manu Unni" ; > ; \ - < "Iulian Ursache" ; > ; \ - < "UITE Open Source Armenia" ; > ; \ - < "John Vandenberg" ; > ; \ - < "Ain Vagula" ; > ; \ - < "Mura Valter" ; > ; \ - < "Elanjelian Venugopal" ; > ; \ - < "Sven Vermeulen" ; > ; \ - < "Tom Verbeek" ; > ; \ - < "Sven Vermeulen" ; > ; \ - < "Tomas Vesely" ; > ; \ - < "Kim Viktoriya" ; > ; \ - < "Sander Vesik" ; > ; \ - < "Aridane Vilardaga-Viera" ; > ; \ - < "Adriano Del Vigna" ; > ; \ - < "Dirk Voelzke" ; > ; \ - < "Robert Vojta" ; > ; \ - < "Daniel Vogelheim" ; > ; \ - < "Mikhail Voitenko" ; > ; \ - < "Vladimir Vuksan" ; > ; \ - < "Erno Vuori" ; > ; \ - < "Radek Vybiral" ; > ; \ - < "Robert Don Wadley" ; > ; \ - < "Robert Wagy" ; > ; \ - < "Martina Waller" ; > ; \ - < "William Wan" ; > ; \ - < "Funda Wang" ; > ; \ - < "Polly Wang" ; > ; \ - < "Xu Ming Wang" ; > ; \ - < "Yi Wang" ; > ; \ - < "Sangay Wangchuk" ; > ; \ - < "Matthew Wardrop" ; > ; \ - < "Catherine Waterman" ; > ; \ - < "Jim Watson" ; > ; \ - < "Joerg Wartenberg" ; > ; \ - < "Jean Hollis Weber" ; > ; \ - < "Martin Webermann" ; > ; \ - < "Donata Wegener" ; > ; \ - < "Law Yee Wei" ; > ; \ - < "Zhao Wei" ; > ; \ - < "Michel Weimerskirch" ; > ; \ - < "Prof. Dr. Eduard Werner" ; > ; \ - < "Michael Wever" ; > ; \ - < "Brendan Whelan" ; > ; \ - < "Martin Whitaker" ; > ; \ - < "Arnulf Wiedemann" ; > ; \ - < "Franz Wieser" ; > ; \ - < "Dan Williams" ; > ; \ - < "Deirdre Williams" ; > ; \ - < "Michelle C. Williams" ; > ; \ - < "Miljenko Williams" ; > ; \ - < "David Noel Wilson" ; > ; \ - < "Jennifer Winger" ; > ; \ - < "Oliver-Rainer Wittmann" ; > ; \ - < "Hans Witvliet" ; > ; \ - < "Goetz Wohlberg" ; > ; \ - < "Luciano Miguel Wolf" ; > ; \ - < "Eugene T.S. Wong" ; > ; \ - < "Pui Lam Wong" ; > ; \ - < "Minna Wu" ; > ; \ - < "Yan Wu" ; > ; \ - < "Stephan Wunderlich" ; > ; \ - < "Simos Xenitellis" ; > ; \ - < "Shun Min Serena Xiao" ; > ; \ - < "Nat Friedman for Ximian" ; > ; \ - < "Antonio Xu" ; > ; \ - < "Dehua Xu" ; > ; \ - < "Gary Yang" ; > ; \ - < "Yukiharu Yabuki" ; > ; \ - < "Kliment Pavlov Yanev" ; > ; \ - < "Taniguchi Yasuaki" ; > ; \ - < "Oleg Yegorov" ; > ; \ - < "Steve Yin" ; > ; \ - < "Kunihiko Yokota" ; > ; \ - < "Kim Il Yong" ; > ; \ - < "Kohei Yoshida" ; > ; \ - < "Deltasoft Yu" ; > ; \ - < "Guoqiang Yu" ; > ; \ - < "Xiaoyang Yu" ; > ; \ - < "Gary Yuen" ; > ; \ - < "Christian Zagrodnick" ; > ; \ - < "George Zahopulos" ; > ; \ - < "Aidas Zandaris" ; > ; \ - < "Ernedin Zajko" ; > ; \ - < "Kurt Zenker" ; > ; \ - < "Fuxin Zhang" ; > ; \ - < "Joy Zhang" ; > ; \ - < "Lei Phill Zhang" ; > ; \ - < "Xiaofei Zhang" ; > ; \ - < "Jianwei Zhao" ; > ; \ - < "May Zhang" ; > ; \ - < "Jeremy Zheng" ; > ; \ - < "Thorsten Ziehm" ; > ; \ - < "Stefan Ziel" ; > ; \ - < "Jan Zitniak" ; > ; \ - < "Stefan Zimmermann" ; > ; \ - < "Mattia Zuliani" ; > ; \ -}; - diff --git a/svx/source/intro/about_ooo.src b/svx/source/intro/about_ooo.src deleted file mode 100644 index 4523ffd739ce..000000000000 --- a/svx/source/intro/about_ooo.src +++ /dev/null @@ -1,40 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <svtools/svtools.hrc> -#include "about_ooo.hrc" - -String ABOUT_STR_COPYRIGHT -{ - Text[ en-US ] = "Copyright © 2000, 2011 Oracle and/or its affiliates. All rights reserved.\nThis product was created by %OOOVENDOR, based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at\n http://www.openoffice.org/welcome/credits.html."; -}; - -StringArray ABOUT_STR_DEVELOPER_ARY -{ - OOO_CONTRIBUTOR_LIST -}; - diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index ba100a2e2ab0..150675a9aea4 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,18 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -// include --------------------------------------------------------------- - #include <svx/SmartTagItem.hxx> -#ifndef _COM_SUN_STAR_SMARTTAGS_XSMARTTAGPROPERTIES_HPP_ #include <com/sun/star/container/XStringKeyMap.hpp> -#endif - -//#include <svl/memberid.hrc> -//#include "svxids.hrc" -//#include "svxitems.hrc" using namespace ::com::sun::star; @@ -72,14 +65,14 @@ SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId, // ----------------------------------------------------------------------- -sal_Bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, sal_uInt8 /* nMemberId */ ) const +bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, sal_uInt8 /* nMemberId */ ) const { - return sal_False; + return false; } // ----------------------------------------------------------------------- -sal_Bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, sal_uInt8 /* nMemberId */) +bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, sal_uInt8 /* nMemberId */) { - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -121,3 +114,5 @@ SfxPoolItem* SvxSmartTagItem::Create(SvStream& , sal_uInt16) const { return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index b5f399f2b88f..3f8adaacd408 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,16 +34,12 @@ #include <tools/stream.hxx> #include <com/sun/star/table/BorderLine.hpp> -#include <com/sun/star/table/CellVertJustify.hpp> #include <com/sun/star/table/ShadowLocation.hpp> #include <com/sun/star/table/TableBorder.hpp> #include <com/sun/star/table/ShadowFormat.hpp> #include <com/sun/star/table/CellRangeAddress.hpp> #include <com/sun/star/table/CellContentType.hpp> #include <com/sun/star/table/TableOrientation.hpp> -#include <com/sun/star/table/CellHoriJustify.hpp> -#include <com/sun/star/style/ParagraphAdjust.hpp> -#include "com/sun/star/style/VerticalAlignment.hpp" #include <com/sun/star/util/SortField.hpp> #include <com/sun/star/util/SortFieldType.hpp> #include <com/sun/star/table/CellOrientation.hpp> @@ -63,334 +60,9 @@ using namespace ::com::sun::star; // STATIC DATA ----------------------------------------------------------- //TYPEINIT1_AUTOFACTORY( SvxHorJustifyItem, SfxEnumItem ); -TYPEINIT1_FACTORY( SvxHorJustifyItem, SfxEnumItem, new SvxHorJustifyItem(SVX_HOR_JUSTIFY_STANDARD, 0)) -TYPEINIT1_FACTORY( SvxVerJustifyItem, SfxEnumItem, new SvxVerJustifyItem(SVX_VER_JUSTIFY_STANDARD, 0) ); TYPEINIT1_FACTORY( SvxOrientationItem, SfxEnumItem, new SvxOrientationItem(SVX_ORIENTATION_STANDARD, 0) ); TYPEINIT1_FACTORY( SvxMarginItem, SfxPoolItem, new SvxMarginItem(0) ); -// class SvxHorJustifyItem ----------------------------------------------- - - -SvxHorJustifyItem::SvxHorJustifyItem( const sal_uInt16 nId ) : - SfxEnumItem( nId, (sal_uInt16)SVX_HOR_JUSTIFY_STANDARD ) -{ -} - -SvxHorJustifyItem::SvxHorJustifyItem( const SvxCellHorJustify eJustify, - const sal_uInt16 nId ) : - SfxEnumItem( nId, (sal_uInt16)eJustify ) -{ -} - -//------------------------------------------------------------------------ - -SfxItemPresentation SvxHorJustifyItem::GetPresentation -( - SfxItemPresentation ePres, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, - XubString& rText, const IntlWrapper *) const -{ - switch ( ePres ) - { - case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); - return SFX_ITEM_PRESENTATION_NONE; - case SFX_ITEM_PRESENTATION_NAMELESS: - case SFX_ITEM_PRESENTATION_COMPLETE: - rText = GetValueText( GetValue() ); - return SFX_ITEM_PRESENTATION_COMPLETE; - default: ; //prevent warning - } - return SFX_ITEM_PRESENTATION_NONE; -} - -//------------------------------------------------------------------------ - -sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const -{ -// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); - nMemberId &= ~CONVERT_TWIPS; - switch ( nMemberId ) - { - case MID_HORJUST_HORJUST: - { - table::CellHoriJustify eUno = table::CellHoriJustify_STANDARD; - switch ( (SvxCellHorJustify)GetValue() ) - { - case SVX_HOR_JUSTIFY_STANDARD: eUno = table::CellHoriJustify_STANDARD; break; - case SVX_HOR_JUSTIFY_LEFT: eUno = table::CellHoriJustify_LEFT; break; - case SVX_HOR_JUSTIFY_CENTER: eUno = table::CellHoriJustify_CENTER; break; - case SVX_HOR_JUSTIFY_RIGHT: eUno = table::CellHoriJustify_RIGHT; break; - case SVX_HOR_JUSTIFY_BLOCK: eUno = table::CellHoriJustify_BLOCK; break; - case SVX_HOR_JUSTIFY_REPEAT: eUno = table::CellHoriJustify_REPEAT; break; - } - rVal <<= eUno; - } - break; - case MID_HORJUST_ADJUST: - { - // ParagraphAdjust values, as in SvxAdjustItem - // (same value for ParaAdjust and ParaLastLineAdjust) - - sal_Int16 nAdjust = style::ParagraphAdjust_LEFT; - switch ( (SvxCellHorJustify)GetValue() ) - { - // ParagraphAdjust_LEFT is used for STANDARD and REPEAT - case SVX_HOR_JUSTIFY_STANDARD: - case SVX_HOR_JUSTIFY_REPEAT: - case SVX_HOR_JUSTIFY_LEFT: nAdjust = style::ParagraphAdjust_LEFT; break; - case SVX_HOR_JUSTIFY_CENTER: nAdjust = style::ParagraphAdjust_CENTER; break; - case SVX_HOR_JUSTIFY_RIGHT: nAdjust = style::ParagraphAdjust_RIGHT; break; - case SVX_HOR_JUSTIFY_BLOCK: nAdjust = style::ParagraphAdjust_BLOCK; break; - } - rVal <<= nAdjust; // as sal_Int16 - } - break; - } - return sal_True; -} - -sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) -{ -// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); - nMemberId &= ~CONVERT_TWIPS; - switch ( nMemberId ) - { - case MID_HORJUST_HORJUST: - { - table::CellHoriJustify eUno; - if(!(rVal >>= eUno)) - { - sal_Int32 nValue = 0; - if(!(rVal >>= nValue)) - return sal_False; - eUno = (table::CellHoriJustify)nValue; - } - SvxCellHorJustify eSvx = SVX_HOR_JUSTIFY_STANDARD; - switch (eUno) - { - case table::CellHoriJustify_STANDARD: eSvx = SVX_HOR_JUSTIFY_STANDARD; break; - case table::CellHoriJustify_LEFT: eSvx = SVX_HOR_JUSTIFY_LEFT; break; - case table::CellHoriJustify_CENTER: eSvx = SVX_HOR_JUSTIFY_CENTER; break; - case table::CellHoriJustify_RIGHT: eSvx = SVX_HOR_JUSTIFY_RIGHT; break; - case table::CellHoriJustify_BLOCK: eSvx = SVX_HOR_JUSTIFY_BLOCK; break; - case table::CellHoriJustify_REPEAT: eSvx = SVX_HOR_JUSTIFY_REPEAT; break; - default: ; //prevent warning - } - SetValue( (sal_uInt16)eSvx ); - } - break; - case MID_HORJUST_ADJUST: - { - // property contains ParagraphAdjust values as sal_Int16 - sal_Int16 nVal = sal_Int16(); - if(!(rVal >>= nVal)) - return sal_False; - - SvxCellHorJustify eSvx = SVX_HOR_JUSTIFY_STANDARD; - switch (nVal) - { - // STRETCH is treated as BLOCK - case style::ParagraphAdjust_LEFT: eSvx = SVX_HOR_JUSTIFY_LEFT; break; - case style::ParagraphAdjust_RIGHT: eSvx = SVX_HOR_JUSTIFY_RIGHT; break; - case style::ParagraphAdjust_STRETCH: - case style::ParagraphAdjust_BLOCK: eSvx = SVX_HOR_JUSTIFY_BLOCK; break; - case style::ParagraphAdjust_CENTER: eSvx = SVX_HOR_JUSTIFY_CENTER; break; - } - SetValue( (sal_uInt16)eSvx ); - } - } - return sal_True; -} - -//------------------------------------------------------------------------ - -XubString SvxHorJustifyItem::GetValueText( sal_uInt16 nVal ) const -{ - DBG_ASSERT( nVal <= SVX_HOR_JUSTIFY_REPEAT, "enum overflow!" ); - return SVX_RESSTR(RID_SVXITEMS_HORJUST_STANDARD + nVal); -} - -//------------------------------------------------------------------------ - -SfxPoolItem* SvxHorJustifyItem::Clone( SfxItemPool* ) const -{ - return new SvxHorJustifyItem( *this ); -} - -//------------------------------------------------------------------------ - -SfxPoolItem* SvxHorJustifyItem::Create( SvStream& rStream, sal_uInt16 ) const -{ - sal_uInt16 nVal; - rStream >> nVal; - return new SvxHorJustifyItem( (SvxCellHorJustify)nVal, Which() ); -} -//------------------------------------------------------------------------ - -sal_uInt16 SvxHorJustifyItem::GetValueCount() const -{ - return SVX_HOR_JUSTIFY_REPEAT + 1; // letzter Enum-Wert + 1 -} - -// class SvxVerJustifyItem ----------------------------------------------- - -SvxVerJustifyItem::SvxVerJustifyItem( const sal_uInt16 nId ) : - SfxEnumItem( nId, (sal_uInt16)SVX_VER_JUSTIFY_STANDARD ) -{ -} - -SvxVerJustifyItem::SvxVerJustifyItem( const SvxCellVerJustify eJustify, - const sal_uInt16 nId ) : - SfxEnumItem( nId, (sal_uInt16)eJustify ) -{ -} - -//------------------------------------------------------------------------ - -SfxItemPresentation SvxVerJustifyItem::GetPresentation -( - SfxItemPresentation ePres, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, - XubString& rText, - const IntlWrapper * ) const -{ - switch ( ePres ) - { - case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); - return SFX_ITEM_PRESENTATION_NONE; - case SFX_ITEM_PRESENTATION_NAMELESS: - case SFX_ITEM_PRESENTATION_COMPLETE: - rText = GetValueText( GetValue() ); - return SFX_ITEM_PRESENTATION_COMPLETE; - default: ; //prevent warning - } - return SFX_ITEM_PRESENTATION_NONE; -} - -//------------------------------------------------------------------------ - -sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const -{ - nMemberId &= ~CONVERT_TWIPS; - switch ( nMemberId ) - { - case MID_HORJUST_ADJUST: - { - style::VerticalAlignment eUno = style::VerticalAlignment_TOP; - switch ( (SvxCellVerJustify)GetValue() ) - { - case SVX_VER_JUSTIFY_TOP: eUno = style::VerticalAlignment_TOP; break; - case SVX_VER_JUSTIFY_CENTER: eUno = style::VerticalAlignment_MIDDLE; break; - case SVX_VER_JUSTIFY_BOTTOM: eUno = style::VerticalAlignment_BOTTOM; break; - default: ; //prevent warning - } - rVal <<= eUno; - break; - } - default: - { - table::CellVertJustify eUno = table::CellVertJustify_STANDARD; - switch ( (SvxCellVerJustify)GetValue() ) - { - case SVX_VER_JUSTIFY_STANDARD: eUno = table::CellVertJustify_STANDARD; break; - case SVX_VER_JUSTIFY_TOP: eUno = table::CellVertJustify_TOP; break; - case SVX_VER_JUSTIFY_CENTER: eUno = table::CellVertJustify_CENTER; break; - case SVX_VER_JUSTIFY_BOTTOM: eUno = table::CellVertJustify_BOTTOM; break; - default: ; //prevent warning - } - rVal <<= eUno; - break; - } - } - return sal_True; -} - -sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) -{ - nMemberId &= ~CONVERT_TWIPS; - switch ( nMemberId ) - { - case MID_HORJUST_ADJUST: - { - // property contains ParagraphAdjust values as sal_Int16 - style::VerticalAlignment nVal = style::VerticalAlignment_TOP; - if(!(rVal >>= nVal)) - return sal_False; - - SvxCellVerJustify eSvx = SVX_VER_JUSTIFY_STANDARD; - switch (nVal) - { - case style::VerticalAlignment_TOP: eSvx = SVX_VER_JUSTIFY_TOP; break; - case style::VerticalAlignment_MIDDLE: eSvx = SVX_VER_JUSTIFY_CENTER; break; - case style::VerticalAlignment_BOTTOM: eSvx = SVX_VER_JUSTIFY_BOTTOM; break; - default:; - } - SetValue( (sal_uInt16)eSvx ); - break; - } - default: - { - table::CellVertJustify eUno; - if(!(rVal >>= eUno)) - { - sal_Int32 nValue = 0; - if(!(rVal >>= nValue)) - return sal_False; - eUno = (table::CellVertJustify)nValue; - } - - SvxCellVerJustify eSvx = SVX_VER_JUSTIFY_STANDARD; - switch (eUno) - { - case table::CellVertJustify_STANDARD: eSvx = SVX_VER_JUSTIFY_STANDARD; break; - case table::CellVertJustify_TOP: eSvx = SVX_VER_JUSTIFY_TOP; break; - case table::CellVertJustify_CENTER: eSvx = SVX_VER_JUSTIFY_CENTER; break; - case table::CellVertJustify_BOTTOM: eSvx = SVX_VER_JUSTIFY_BOTTOM; break; - default: ; //prevent warning - } - SetValue( (sal_uInt16)eSvx ); - break; - } - } - - return sal_True; -} - -//------------------------------------------------------------------------ - -XubString SvxVerJustifyItem::GetValueText( sal_uInt16 nVal ) const -{ - DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" ); - return SVX_RESSTR(RID_SVXITEMS_VERJUST_STANDARD + nVal); -} - -//------------------------------------------------------------------------ - -SfxPoolItem* SvxVerJustifyItem::Clone( SfxItemPool* ) const -{ - return new SvxVerJustifyItem( *this ); -} - -//------------------------------------------------------------------------ - -SfxPoolItem* SvxVerJustifyItem::Create( SvStream& rStream, sal_uInt16 ) const -{ - sal_uInt16 nVal; - rStream >> nVal; - return new SvxVerJustifyItem( (SvxCellVerJustify)nVal, Which() ); -} - -//------------------------------------------------------------------------ - -sal_uInt16 SvxVerJustifyItem::GetValueCount() const -{ - return SVX_VER_JUSTIFY_BOTTOM + 1; // letzter Enum-Wert + 1 -} - // class SvxOrientationItem ---------------------------------------------- SvxOrientationItem::SvxOrientationItem( const SvxCellOrientation eOrientation, @@ -430,7 +102,7 @@ SfxItemPresentation SvxOrientationItem::GetPresentation //------------------------------------------------------------------------ -sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxOrientationItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { table::CellOrientation eUno = table::CellOrientation_STANDARD; switch ( (SvxCellOrientation)GetValue() ) @@ -441,10 +113,10 @@ sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ case SVX_ORIENTATION_STACKED: eUno = table::CellOrientation_STACKED; break; } rVal <<= eUno; - return sal_True; + return true; } -sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { table::CellOrientation eOrient; if(!(rVal >>= eOrient)) @@ -464,7 +136,7 @@ sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMember default: ; //prevent warning } SetValue( (sal_uInt16)eSvx ); - return sal_True; + return true; } //------------------------------------------------------------------------ @@ -583,7 +255,6 @@ SfxItemPresentation SvxMarginItem::GetPresentation XubString& rText, const IntlWrapper *pIntl ) const { -#ifndef SVX_LIGHT switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: @@ -621,7 +292,6 @@ SfxItemPresentation SvxMarginItem::GetPresentation } default: ; //prevent warning } -#endif return SFX_ITEM_PRESENTATION_NONE; } @@ -673,7 +343,7 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) //------------------------------------------------------------------------ -sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -693,15 +363,15 @@ sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const rVal <<= (sal_Int32)( bConvert ? TWIP_TO_MM100(nBottomMargin) : nBottomMargin ); break; default: - DBG_ERROR("unknown MemberId"); - return sal_False; + OSL_FAIL("unknown MemberId"); + return false; } - return sal_True; + return true; } //------------------------------------------------------------------------ -sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 ); long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX; // Members sind sal_Int16 @@ -724,10 +394,10 @@ sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) nBottomMargin = (sal_Int16)( bConvert ? MM100_TO_TWIP(nVal) : nVal ); break; default: - DBG_ERROR("unknown MemberId"); - return sal_False; + OSL_FAIL("unknown MemberId"); + return false; } - return sal_True; + return true; } //------------------------------------------------------------------------ @@ -763,3 +433,4 @@ sal_Bool SvxMarginItem::SetBottomMargin( sal_Int16 nBottom ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 944a520eb648..5c0203e1674d 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ // include --------------------------------------------------------------- #include <tools/stream.hxx> -#ifndef __SBX_SBXVARIABLE_HXX #include <basic/sbxvar.hxx> -#endif #if defined UNX && !defined LINUX #include <wchar.h> #endif @@ -159,7 +158,7 @@ SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c // ----------------------------------------------------------------------- -sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // the order of the two enums is not equal, so a mapping is required ::com::sun::star::chart::ChartAxisArrangeOrderType eAO; @@ -179,12 +178,12 @@ sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, sa rVal <<= eAO; - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // the order of the two enums is not equal, so a mapping is required ::com::sun::star::chart::ChartAxisArrangeOrderType eAO; @@ -195,7 +194,7 @@ sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal // also try an int (for Basic) sal_Int32 nAO = 0; if(!(rVal >>= nAO)) - return sal_False; + return false; eAO = static_cast< ::com::sun::star::chart::ChartAxisArrangeOrderType >( nAO ); } @@ -210,12 +209,12 @@ sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal case ::com::sun::star::chart::ChartAxisArrangeOrderType_AUTO: eOrder = CHTXTORDER_AUTO; break; default: - return sal_False; + return false; } SetValue( (sal_uInt16)eOrder ); - return sal_True; + return true; } /************************************************************************* @@ -361,14 +360,14 @@ SfxFieldUnit SvxDoubleItem::GetUnit() const // ----------------------------------------------------------------------- -sal_Bool SvxDoubleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxDoubleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= fVal; - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool SvxDoubleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvxDoubleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { return rVal >>= fVal; } @@ -502,3 +501,4 @@ sal_uInt16 SvxChartRegressItem::GetVersion (sal_uInt16 nFileFormatVersion) const } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index f65c9bbf6df4..2f5e1febdcd0 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,7 +79,7 @@ SvxClipboardFmtItem::~SvxClipboardFmtItem() delete pImpl; } -sal_Bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { sal_uInt16 nCount = Count(); @@ -93,10 +94,10 @@ sal_Bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uI } rVal <<= aClipFormats; - return sal_True; + return true; } -sal_Bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { ::com::sun::star::frame::status::ClipboardFormats aClipFormats; if ( rVal >>= aClipFormats ) @@ -108,10 +109,10 @@ sal_Bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, for ( sal_uInt16 n=0; n < nCount; n++ ) AddClipbrdFormat( sal_uIntPtr( aClipFormats.Identifiers[n] ), aClipFormats.Names[n], n ); - return sal_True; + return true; } - return sal_False; + return false; } int SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const @@ -178,3 +179,4 @@ const String& SvxClipboardFmtItem::GetClipbrdFormatName( sal_uInt16 nPos ) const } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index b6d24a16ee55..3119696b14ca 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,9 +71,6 @@ SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem( const uno::Sequence< bea sal_Int32 i, j; aPropSeq = rVal; - // hashing property values -// beans::PropertyValue* pPropValues = aPropSeq.getArray(); -// const rtl::OUString* pPtr = NULL; for ( i = 0; i < aPropSeq.getLength(); i++ ) { beans::PropertyValue& rPropVal = aPropSeq[ i ]; @@ -292,7 +290,7 @@ SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem( SvStream& /*rIn*/, sal_u } } -int __EXPORT SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) const +int SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) const { int bRet = SfxPoolItem::operator==( rCmp ); if ( bRet ) @@ -300,7 +298,7 @@ int __EXPORT SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) c return bRet; } -SfxItemPresentation __EXPORT SdrCustomShapeGeometryItem::GetPresentation( +SfxItemPresentation SdrCustomShapeGeometryItem::GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, XubString &rText, const IntlWrapper *) const { @@ -308,19 +306,18 @@ SfxItemPresentation __EXPORT SdrCustomShapeGeometryItem::GetPresentation( if ( ePresentation == SFX_ITEM_PRESENTATION_COMPLETE ) { XubString aStr; -// SdrItemPool::TakeItemName( Which(), aStr ); aStr += sal_Unicode( ' ' ); rText.Insert( aStr, 0 ); } return ePresentation; } -SfxPoolItem* __EXPORT SdrCustomShapeGeometryItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const +SfxPoolItem* SdrCustomShapeGeometryItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const { return new SdrCustomShapeGeometryItem( rIn, nItemVersion ); } -SvStream& __EXPORT SdrCustomShapeGeometryItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const +SvStream& SdrCustomShapeGeometryItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const { if ( nItemVersion ) { @@ -329,54 +326,32 @@ SvStream& __EXPORT SdrCustomShapeGeometryItem::Store( SvStream& rOut, sal_uInt16 return rOut; } -SfxPoolItem* __EXPORT SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/ ) const +SfxPoolItem* SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/ ) const { - SdrCustomShapeGeometryItem* pItem = new SdrCustomShapeGeometryItem( GetGeometry() ); -// SdrCustomShapeGeometryItem* pItem = new SdrCustomShapeGeometryItem( *this ); - -/* - for ( i = 0; i < GetCount(); i++ ) - { - const SdrCustomShapeAdjustmentValue& rVal = GetValue( i ); - pItem->SetValue( i, rVal ); - } -*/ - return pItem; + return new SdrCustomShapeGeometryItem( GetGeometry() ); } -#ifdef SDR_ISPOOLABLE -int __EXPORT SdrCustomShapeGeometryItem::IsPoolable() const -{ - sal_uInt16 nId=Which(); - return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST; -} -#endif sal_uInt16 SdrCustomShapeGeometryItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const { return 1; } -sal_Bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= aPropSeq; - return sal_True; + return true; } -sal_Bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { if ( ! ( rVal >>= aPropSeq ) ) - return sal_False; + return false; else - return sal_True; + return true; } const uno::Sequence< beans::PropertyValue >& SdrCustomShapeGeometryItem::GetGeometry() const { return aPropSeq; } -/* -const uno::Any* GetValueByName( const rtl::OUString& rProperty ) const -{ -} -*/ SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem() : SfxStringItem( SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, String() ) {} @@ -384,3 +359,4 @@ SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem( const String : SfxStringItem( SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, rVal ) {} +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index d2048a0f2644..d19325d5b387 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,19 +105,19 @@ SfxPoolItem* SvxColorTableItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- -sal_Bool SvxColorTableItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxColorTableItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. // Please ask CD if you want to change this. sal_Int64 aValue = sal_Int64( (sal_uLong)pColorTable ); rVal = uno::makeAny( aValue ); - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. @@ -125,10 +126,10 @@ sal_Bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, sal_ if ( rVal >>= aValue ) { pColorTable = (XColorTable *)(sal_uLong)aValue; - return sal_True; + return true; } - return sal_False; + return false; } //================================================================== @@ -188,19 +189,19 @@ SfxPoolItem* SvxGradientListItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- -sal_Bool SvxGradientListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxGradientListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. // Please ask CD if you want to change this. sal_Int64 aValue = sal_Int64( (sal_uLong)pGradientList ); rVal = uno::makeAny( aValue ); - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. @@ -209,10 +210,10 @@ sal_Bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, sa if ( rVal >>= aValue ) { pGradientList = (XGradientList *)(sal_uLong)aValue; - return sal_True; + return true; } - return sal_False; + return false; } //================================================================== @@ -272,19 +273,19 @@ SfxPoolItem* SvxHatchListItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- -sal_Bool SvxHatchListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxHatchListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. // Please ask CD if you want to change this. sal_Int64 aValue = sal_Int64( (sal_uLong)pHatchList ); rVal = uno::makeAny( aValue ); - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. @@ -293,10 +294,10 @@ sal_Bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_u if ( rVal >>= aValue ) { pHatchList = (XHatchList *)(sal_uLong)aValue; - return sal_True; + return true; } - return sal_False; + return false; } //================================================================== @@ -356,19 +357,19 @@ SfxPoolItem* SvxBitmapListItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- -sal_Bool SvxBitmapListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxBitmapListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. // Please ask CD if you want to change this. sal_Int64 aValue = sal_Int64( (sal_uLong)pBitmapList ); rVal = uno::makeAny( aValue ); - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. @@ -377,10 +378,10 @@ sal_Bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_ if ( rVal >>= aValue ) { pBitmapList = (XBitmapList *)(sal_uLong)aValue; - return sal_True; + return true; } - return sal_False; + return false; } @@ -442,18 +443,18 @@ SfxPoolItem* SvxDashListItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- -sal_Bool SvxDashListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxDashListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. sal_Int64 aValue = sal_Int64( (sal_uLong)pDashList ); rVal = uno::makeAny( aValue ); - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. @@ -461,10 +462,10 @@ sal_Bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uI if ( rVal >>= aValue ) { pDashList = (XDashList *)(sal_uLong)aValue; - return sal_True; + return true; } - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -531,18 +532,18 @@ SfxPoolItem* SvxLineEndListItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- -sal_Bool SvxLineEndListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxLineEndListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. sal_Int64 aValue = sal_Int64( (sal_uLong)pLineEndList ); rVal = uno::makeAny( aValue ); - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. @@ -550,8 +551,10 @@ sal_Bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, sal if ( rVal >>= aValue ) { pLineEndList = (XLineEndList *)(sal_uLong)aValue; - return sal_True; + return true; } - return sal_False; + return false; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index 67c87606e04e..3245b1fed799 100644 --- a/svx/source/items/e3ditem.cxx +++ b/svx/source/items/e3ditem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,7 +134,7 @@ SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/ // ----------------------------------------------------------------------- -sal_Bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { drawing::Direction3D aDirection; @@ -143,21 +144,21 @@ sal_Bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) aDirection.DirectionZ = aVal.getZ(); rVal <<= aDirection; - return( sal_True ); + return true; } // ----------------------------------------------------------------------- -sal_Bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { drawing::Direction3D aDirection; if(!(rVal >>= aDirection)) - return sal_False; + return false; aVal.setX(aDirection.DirectionX); aVal.setY(aDirection.DirectionY); aVal.setZ(aDirection.DirectionZ); - return sal_True; + return true; } // ----------------------------------------------------------------------- @@ -168,3 +169,5 @@ sal_uInt16 SvxB3DVectorItem::GetVersion (sal_uInt16 nFileFormatVersion) const } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index 50af1f8f9609..2ca65cdc4b19 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -117,7 +118,7 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, sal_uInt16 nVersion ) const -sal_Bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -137,17 +138,17 @@ sal_Bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const rVal <<= aRet; - return sal_True; + return true; } -sal_Bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; text::GraphicCrop aVal; if(!(rVal >>= aVal)) - return sal_False; + return false; if( bConvert ) { aVal.Right = MM100_TO_TWIP(aVal.Right ); @@ -160,7 +161,7 @@ sal_Bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) nRight = aVal.Right ; nTop = aVal.Top ; nBottom = aVal.Bottom; - return sal_True; + return true; } SfxItemPresentation SvxGrfCrop::GetPresentation( @@ -195,3 +196,4 @@ SfxItemPresentation SvxGrfCrop::GetPresentation( +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 8b4c36ab5eac..5916068f985e 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,18 +32,10 @@ // include --------------------------------------------------------------- #define _SVX_HLNKITEM_CXX -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <tools/stream.hxx> - -#ifndef _MEMBERID_HRC -#include <svx/memberid.hrc> -#endif - -#ifndef __SBX_SBXVARIABLE_HXX +#include <svl/memberid.hrc> #include <basic/sbxvar.hxx> -#endif #include "svx/hlnkitem.hxx" @@ -52,10 +45,6 @@ TYPEINIT1_FACTORY(SvxHyperlinkItem, SfxPoolItem, new SvxHyperlinkItem(0)); // class SvxHyperlinkItem ------------------------------------------------ -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - #define HYPERLINKFF_MARKER 0x599401FE SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const @@ -137,10 +126,6 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ return rStrm; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) const { SvxHyperlinkItem* pNew = new SvxHyperlinkItem( Which() ); @@ -215,10 +200,6 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer return pNew; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SvxHyperlinkItem::SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ): SfxPoolItem(rHyperlinkItem) { @@ -236,10 +217,6 @@ SvxHyperlinkItem::SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ): }; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SvxHyperlinkItem::SvxHyperlinkItem( sal_uInt16 _nWhich, String& rName, String& rURL, String& rTarget, String& rIntName, SvxLinkInsertMode eTyp, sal_uInt16 nEvents, SvxMacroTableDtor *pMacroTbl ): @@ -257,19 +234,11 @@ SvxHyperlinkItem::SvxHyperlinkItem( sal_uInt16 _nWhich, String& rName, String& r pMacroTable=NULL; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SfxPoolItem* SvxHyperlinkItem::Clone( SfxItemPool* ) const { return new SvxHyperlinkItem( *this ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - int SvxHyperlinkItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" ); @@ -312,11 +281,6 @@ int SvxHyperlinkItem::operator==( const SfxPoolItem& rAttr ) const return sal_True; } - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SvxHyperlinkItem::SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro ) { if( nEvent < EVENT_SFX_START ) @@ -348,10 +312,6 @@ void SvxHyperlinkItem::SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro ) pMacroTable->Insert( nEvent, new SvxMacro( rMacro ) ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SvxHyperlinkItem::SetMacroTable( const SvxMacroTableDtor& rTbl ) { if ( pMacroTable ) @@ -360,7 +320,7 @@ void SvxHyperlinkItem::SetMacroTable( const SvxMacroTableDtor& rTbl ) pMacroTable = new SvxMacroTableDtor ( rTbl ); } -sal_Bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -382,13 +342,13 @@ sal_Bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 rVal <<= (sal_Int32) eType; break; default: - return sal_False; + return false; } - return sal_True; + return true; } -sal_Bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -422,9 +382,10 @@ sal_Bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, sal_u eType = (SvxLinkInsertMode) (sal_uInt16) nVal; break; default: - return sal_False; + return false; } - return sal_True; + return true; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/makefile.mk b/svx/source/items/makefile.mk new file mode 100755 index 000000000000..b2f20337191e --- /dev/null +++ b/svx/source/items/makefile.mk @@ -0,0 +1,84 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +PRJ=..$/.. + +PROJECTPCH4DLL=TRUE +PROJECTPCH=svxpch +PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch + +PRJNAME=svx +TARGET=items +LIBTARGET=NO + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +SRS1NAME=svxitems +SRC1FILES = \ + svxerr.src \ + svxitems.src + +LIB1TARGET= $(SLB)$/$(TARGET)-core.lib +LIB1OBJFILES= \ + $(SLO)$/algitem.obj \ + $(SLO)$/chrtitem.obj \ + $(SLO)$/clipfmtitem.obj \ + $(SLO)$/customshapeitem.obj \ + $(SLO)$/drawitem.obj \ + $(SLO)$/e3ditem.obj \ + $(SLO)$/grfitem.obj + +LIB2TARGET= $(SLB)$/$(TARGET).lib +LIB2OBJFILES= \ + $(SLO)$/SmartTagItem.obj \ + $(SLO)$/hlnkitem.obj \ + $(SLO)$/numfmtsh.obj \ + $(SLO)$/numinf.obj \ + $(SLO)$/ofaitem.obj \ + $(SLO)$/pageitem.obj \ + $(SLO)$/postattr.obj \ + $(SLO)$/rotmodit.obj \ + $(SLO)$/svxempty.obj \ + $(SLO)$/svxerr.obj \ + $(SLO)$/viewlayoutitem.obj \ + $(SLO)$/zoomitem.obj \ + $(SLO)$/zoomslideritem.obj + +SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) + +EXCEPTIONSFILES= \ + $(SLO)$/chrtitem.obj \ + $(SLO)$/customshapeitem.obj \ + $(SLO)$/numfmtsh.obj + +.INCLUDE : target.mk + diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 95722e3144c9..8ad28a3e00c8 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,24 +77,19 @@ SvxNumberFormatShell* SvxNumberFormatShell::Create( SvNumberFormatter* pNumForma // ----------------------------------------------------------------------- -#define _INIT \ - pFormatter ( pNumFormatter ), \ - pCurFmtTable ( NULL ), \ - eValType ( eNumValType ), \ - bUndoAddList ( sal_True ), \ - nInitFormatKey ( nFormatKey ), \ - nCurFormatKey ( nFormatKey ), \ - pCurCurrencyEntry(NULL), \ - bBankingSymbol (sal_False), \ - nCurCurrencyEntryPos((sal_uInt16) SELPOS_NONE) - -// ----------------------------------------------------------------------- - SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, - const String& rNumStr ) - : _INIT + const String& rNumStr ) : + pFormatter ( pNumFormatter ), + pCurFmtTable ( NULL ), + eValType ( eNumValType ), + bUndoAddList ( sal_True ), + nInitFormatKey ( nFormatKey ), + nCurFormatKey ( nFormatKey ), + pCurCurrencyEntry(NULL), + bBankingSymbol (sal_False), + nCurCurrencyEntryPos((sal_uInt16) SELPOS_NONE) { nValNum = DEFAULT_NUMVALUE; @@ -115,8 +111,16 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, double nNumVal, - const String* pNumStr ) - : _INIT + const String* pNumStr ) : + pFormatter ( pNumFormatter ), + pCurFmtTable ( NULL ), + eValType ( eNumValType ), + bUndoAddList ( sal_True ), + nInitFormatKey ( nFormatKey ), + nCurFormatKey ( nFormatKey ), + pCurCurrencyEntry(NULL), + bBankingSymbol (sal_False), + nCurCurrencyEntryPos((sal_uInt16) SELPOS_NONE) { // #50441# When used in Writer, the SvxNumberInfoItem contains the // original string in addition to the value @@ -277,7 +281,7 @@ sal_Bool SvxNumberFormatShell::AddFormat( String& rFormat, xub_StrLen& rErrPos, } else { - DBG_ERROR( "Doppeltes Format!" ); + OSL_FAIL( "Doppeltes Format!" ); } } else // neues Format @@ -307,7 +311,7 @@ sal_Bool SvxNumberFormatShell::AddFormat( String& rFormat, xub_StrLen& rErrPos, } else // Doppelt einfuegen nicht moeglich { - DBG_ERROR( "Doppeltes Format!" ); // oder doch? + OSL_FAIL( "Doppeltes Format!" ); // oder doch? } return bInserted; @@ -372,14 +376,14 @@ void SvxNumberFormatShell::MakeFormat( String& rFormat, if(aCurrencyFormatList.Count()>nCurrencyPos) { xub_StrLen rErrPos=0; - sal_uInt16 rCatLbSelPos=0; - short rFmtSelPos=0; SvStrings aFmtEList; sal_uInt32 nFound = pFormatter->TestNewString( *aCurrencyFormatList[nCurrencyPos], eCurLanguage ); if ( nFound == NUMBERFORMAT_ENTRY_NOT_FOUND ) { + sal_uInt16 rCatLbSelPos=0; + short rFmtSelPos=0; AddFormat( *aCurrencyFormatList[nCurrencyPos],rErrPos,rCatLbSelPos, rFmtSelPos,aFmtEList); } @@ -1483,7 +1487,7 @@ short SvxNumberFormatShell::GetListPos4Entry(sal_uInt32 nIdx) } else { - DBG_ERROR("svx::SvxNumberFormatShell::GetListPos4Entry(), list got to large!" ); + OSL_FAIL("svx::SvxNumberFormatShell::GetListPos4Entry(), list got to large!" ); } return nSelP; } @@ -1604,9 +1608,6 @@ void SvxNumberFormatShell::GetCurrencySymbols( SvStringsDtor& rList, sal_Bool bF aStr += ApplyLreOrRleEmbedding( pLanguageTable->GetString( rCurrencyTable[i]->GetLanguage())); pStr = new XubString(aStr); -#if 0 - fprintf( stderr, "currency entry: %s\n", ByteString( *pStr, RTL_TEXTENCODING_UTF8).GetBuffer()); -#endif for(j=nStart;j<rList.Count();j++) { const StringPtr pTestStr=rList[j]; @@ -1731,10 +1732,9 @@ sal_uInt16 SvxNumberFormatShell::FindCurrencyFormat( const String& rFmtString ) sal_uInt16 nPos=FindCurrencyTableEntry(rFmtString, bTestBanking); - sal_uInt16 nStart=0; - if(nPos!=(sal_uInt16)-1) { + sal_uInt16 nStart=0; if(bTestBanking && aCurCurrencyList.Count()>nPos) { nStart=nCount; @@ -1843,13 +1843,12 @@ sal_Bool SvxNumberFormatShell::IsInTable(sal_uInt16 nPos,sal_Bool bTmpBanking,co if(nPos<nCount) { NfWSStringsDtor aWSStringsDtor; - sal_uInt16 nDefault; const NfCurrencyEntry* pTmpCurrencyEntry=rCurrencyTable[nPos]; if ( pTmpCurrencyEntry!=NULL) { - nDefault = pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, + pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pTmpCurrencyEntry, bTmpBanking ); for(sal_uInt16 i=0;i<aWSStringsDtor.Count();i++) @@ -1867,3 +1866,4 @@ sal_Bool SvxNumberFormatShell::IsInTable(sal_uInt16 nPos,sal_Bool bTmpBanking,co return bFlag; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index b57bad8f2707..2f34bdb2f784 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -248,3 +249,4 @@ void SvxNumberInfoItem::SetDelFormatArray( const sal_uInt32* pData, } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx index 75fc574be3b7..e3c7bc2cb114 100644 --- a/svx/source/items/ofaitem.cxx +++ b/svx/source/items/ofaitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,5 @@ sal_Bool DashListPtrItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uI return sal_False; } */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index e05fee56ad52..5069ed15712e 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -164,7 +165,7 @@ SfxItemPresentation SvxPageItem::GetPresentation } //------------------------------------------------------------------------ -sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -190,7 +191,7 @@ sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const case SVX_PAGE_ALL : eRet = style::PageStyleLayout_ALL; break; case SVX_PAGE_MIRROR: eRet = style::PageStyleLayout_MIRRORED; break; default: - DBG_ERROR("was fuer ein Layout ist das?"); + OSL_FAIL("was fuer ein Layout ist das?"); return sal_False; } rVal <<= eRet; @@ -198,10 +199,10 @@ sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const break; } - return sal_True; + return true; } //------------------------------------------------------------------------ -sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { switch( nMemberId ) { @@ -209,7 +210,7 @@ sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) - return sal_False; + return false; eNumType = (SvxNumType)nValue; } @@ -239,7 +240,7 @@ sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } break; } - return sal_True; + return true; } //------------------------------------------------------------------------ @@ -336,3 +337,4 @@ SvStream& SvxSetItem::Store(SvStream &rStrm, sal_uInt16 nItemVersion) const } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index cab4207d56c5..7b6b57ac800e 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,7 +87,7 @@ SfxItemPresentation SvxPostItAuthorItem::GetPresentation // ----------------------------------------------------------------------- -SfxPoolItem* __EXPORT SvxPostItAuthorItem::Clone( SfxItemPool * ) const +SfxPoolItem* SvxPostItAuthorItem::Clone( SfxItemPool * ) const { return new SvxPostItAuthorItem( *this ); } @@ -135,7 +136,7 @@ SfxItemPresentation SvxPostItDateItem::GetPresentation // ----------------------------------------------------------------------- -SfxPoolItem* __EXPORT SvxPostItDateItem::Clone( SfxItemPool * ) const +SfxPoolItem* SvxPostItDateItem::Clone( SfxItemPool * ) const { return new SvxPostItDateItem( *this ); } @@ -184,9 +185,10 @@ SfxItemPresentation SvxPostItTextItem::GetPresentation // ----------------------------------------------------------------------- -SfxPoolItem* __EXPORT SvxPostItTextItem::Clone( SfxItemPool * ) const +SfxPoolItem* SvxPostItTextItem::Clone( SfxItemPool * ) const { return new SvxPostItTextItem( *this ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index 84f2853d9196..6f9b32b6cc85 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,14 +30,13 @@ #include "precompiled_svx.hxx" #include <tools/stream.hxx> #include <com/sun/star/table/BorderLine.hpp> -#include <com/sun/star/table/CellVertJustify.hpp> +#include <com/sun/star/table/CellVertJustify2.hpp> #include <com/sun/star/table/ShadowLocation.hpp> #include <com/sun/star/table/TableBorder.hpp> #include <com/sun/star/table/ShadowFormat.hpp> #include <com/sun/star/table/CellRangeAddress.hpp> #include <com/sun/star/table/CellContentType.hpp> #include <com/sun/star/table/TableOrientation.hpp> -#include <com/sun/star/table/CellHoriJustify.hpp> #include <com/sun/star/util/SortField.hpp> #include <com/sun/star/util/SortFieldType.hpp> #include <com/sun/star/table/CellOrientation.hpp> @@ -66,18 +66,18 @@ SvxRotateModeItem::SvxRotateModeItem( const SvxRotateModeItem& rItem ) { } -__EXPORT SvxRotateModeItem::~SvxRotateModeItem() +SvxRotateModeItem::~SvxRotateModeItem() { } -SfxPoolItem* __EXPORT SvxRotateModeItem::Create( SvStream& rStream, sal_uInt16 ) const +SfxPoolItem* SvxRotateModeItem::Create( SvStream& rStream, sal_uInt16 ) const { sal_uInt16 nVal; rStream >> nVal; return new SvxRotateModeItem( (SvxRotateMode) nVal,Which() ); } -SfxItemPresentation __EXPORT SvxRotateModeItem::GetPresentation( +SfxItemPresentation SvxRotateModeItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, String& rText, const IntlWrapper * ) const @@ -100,7 +100,7 @@ SfxItemPresentation __EXPORT SvxRotateModeItem::GetPresentation( return ePres; } -String __EXPORT SvxRotateModeItem::GetValueText( sal_uInt16 nVal ) const +String SvxRotateModeItem::GetValueText( sal_uInt16 nVal ) const { String aText; @@ -113,66 +113,62 @@ String __EXPORT SvxRotateModeItem::GetValueText( sal_uInt16 nVal ) const aText.AppendAscii("..."); break; default: - DBG_ERROR("SvxRotateModeItem: falscher enum"); + OSL_FAIL("SvxRotateModeItem: falscher enum"); break; } return aText; } -sal_uInt16 __EXPORT SvxRotateModeItem::GetValueCount() const +sal_uInt16 SvxRotateModeItem::GetValueCount() const { return 4; // STANDARD, TOP, CENTER, BOTTOM } -SfxPoolItem* __EXPORT SvxRotateModeItem::Clone( SfxItemPool* ) const +SfxPoolItem* SvxRotateModeItem::Clone( SfxItemPool* ) const { return new SvxRotateModeItem( *this ); } -sal_uInt16 __EXPORT SvxRotateModeItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const +sal_uInt16 SvxRotateModeItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const { return 0; } -// QueryValue/PutValue: Der ::com::sun::star::table::CellVertJustify enum wird mitbenutzt... - -sal_Bool SvxRotateModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxRotateModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { - table::CellVertJustify eUno = table::CellVertJustify_STANDARD; + sal_Int32 nUno = table::CellVertJustify2::STANDARD; switch ( (SvxRotateMode)GetValue() ) { - case SVX_ROTATE_MODE_STANDARD: eUno = table::CellVertJustify_STANDARD; break; - case SVX_ROTATE_MODE_TOP: eUno = table::CellVertJustify_TOP; break; - case SVX_ROTATE_MODE_CENTER: eUno = table::CellVertJustify_CENTER; break; - case SVX_ROTATE_MODE_BOTTOM: eUno = table::CellVertJustify_BOTTOM; break; + case SVX_ROTATE_MODE_STANDARD: nUno = table::CellVertJustify2::STANDARD; break; + case SVX_ROTATE_MODE_TOP: nUno = table::CellVertJustify2::TOP; break; + case SVX_ROTATE_MODE_CENTER: nUno = table::CellVertJustify2::CENTER; break; + case SVX_ROTATE_MODE_BOTTOM: nUno = table::CellVertJustify2::BOTTOM; break; } - rVal <<= eUno; - return sal_True; + rVal <<= nUno; + return true; } -sal_Bool SvxRotateModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvxRotateModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { - table::CellVertJustify eUno; - if(!(rVal >>= eUno)) + sal_Int32 nUno(0); + if(!(rVal >>= nUno)) { - sal_Int32 nValue = 0; - if(!(rVal >>= nValue)) - return sal_False; - eUno = (table::CellVertJustify)nValue; + nUno = table::CellVertJustify2::STANDARD; } SvxRotateMode eSvx = SVX_ROTATE_MODE_STANDARD; - switch (eUno) + switch (nUno) { - case table::CellVertJustify_STANDARD: eSvx = SVX_ROTATE_MODE_STANDARD; break; - case table::CellVertJustify_TOP: eSvx = SVX_ROTATE_MODE_TOP; break; - case table::CellVertJustify_CENTER: eSvx = SVX_ROTATE_MODE_CENTER; break; - case table::CellVertJustify_BOTTOM: eSvx = SVX_ROTATE_MODE_BOTTOM; break; + case table::CellVertJustify2::STANDARD: eSvx = SVX_ROTATE_MODE_STANDARD; break; + case table::CellVertJustify2::TOP: eSvx = SVX_ROTATE_MODE_TOP; break; + case table::CellVertJustify2::CENTER: eSvx = SVX_ROTATE_MODE_CENTER; break; + case table::CellVertJustify2::BOTTOM: eSvx = SVX_ROTATE_MODE_BOTTOM; break; default: ;//prevent warning } SetValue( (sal_uInt16)eSvx ); - return sal_True; + return true; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/svxempty.cxx b/svx/source/items/svxempty.cxx index 6d5d07184898..d7257290819a 100644 --- a/svx/source/items/svxempty.cxx +++ b/svx/source/items/svxempty.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,4 @@ static String aImplSVXEmptySStr; String& rImplEmptySStr = aImplSVXEmptySStr; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx index 89b4266a1339..180ba4764aa1 100644 --- a/svx/source/items/svxerr.cxx +++ b/svx/source/items/svxerr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,19 +37,23 @@ #include <svx/dialogs.hrc> -static SvxErrorHandler* pHandler=NULL; +#include <rtl/instance.hxx> SvxErrorHandler::SvxErrorHandler() : - SfxErrorHandler( RID_SVXERRCODE, ERRCODE_AREA_SVX, ERRCODE_AREA_SVX_END, &DIALOG_MGR() ) { - pHandler = this; } -void SvxErrorHandler::Get() +namespace +{ + class theSvxErrorHandler + : public rtl::Static<SvxErrorHandler, theSvxErrorHandler> {}; +} + +void SvxErrorHandler::ensure() { - if ( !pHandler ) - new SvxErrorHandler; + theSvxErrorHandler::get(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/svxerr.src b/svx/source/items/svxerr.src index 890e5687021d..a7e726f2c2ae 100644 --- a/svx/source/items/svxerr.src +++ b/svx/source/items/svxerr.src @@ -37,26 +37,18 @@ Resource RID_SVXERRCTX { String ERRCTX_SVX_LINGU_THESAURUS&ERRCODE_RES_MASK { - /* ### ACHTUNG: Neuer Text in Resource? $(ERR) beim Ausfhren des Thesaurus. : $(ERR) beim Ausfhren des Thesaurus. */ - /* ### ACHTUNG: Neuer Text in Resource? $(ERR) beim Ausfhren des Thesaurus. : $(ERR) beim Ausfhren des Thesaurus. */ Text [ en-US ] = "$(ERR) executing the thesaurus." ; }; String ERRCTX_SVX_LINGU_SPELLING&ERRCODE_RES_MASK { - /* ### ACHTUNG: Neuer Text in Resource? $(ERR) bei der Ausfhrung der Rechtschreibprfung. : $(ERR) bei der Ausfhrung der Rechtschreibprfung. */ - /* ### ACHTUNG: Neuer Text in Resource? $(ERR) bei der Ausfhrung der Rechtschreibprfung. : $(ERR) bei der Ausfhrung der Rechtschreibprfung. */ Text [ en-US ] = "$(ERR) executing the spellcheck." ; }; String ERRCTX_SVX_LINGU_HYPHENATION&ERRCODE_RES_MASK { - /* ### ACHTUNG: Neuer Text in Resource? $(ERR) bei der Ausfhrung der Trennhilfe. : $(ERR) bei der Ausfhrung der Trennhilfe. */ - /* ### ACHTUNG: Neuer Text in Resource? $(ERR) bei der Ausfhrung der Trennhilfe. : $(ERR) bei der Ausfhrung der Trennhilfe. */ Text [ en-US ] = "$(ERR) executing the hyphenation." ; }; String ERRCTX_SVX_LINGU_DICTIONARY&ERRCODE_RES_MASK { - /* ### ACHTUNG: Neuer Text in Resource? $(ERR) beim Anlegen eines Wrterbuches. : $(ERR) beim Anlegen eines Wrterbuches. */ - /* ### ACHTUNG: Neuer Text in Resource? $(ERR) beim Anlegen eines Wrterbuches. : $(ERR) beim Anlegen eines Wrterbuches. */ Text [ en-US ] = "$(ERR) creating a dictionary." ; }; String ERRCTX_SVX_BACKGROUND&ERRCODE_RES_MASK @@ -73,8 +65,6 @@ Resource RID_SVXERRCODE { String ERRCODE_SVX_LINGU_THESAURUSNOTEXISTS&ERRCODE_RES_MASK { - /* ### ACHTUNG: Neuer Text in Resource? Ein Thesaurus fr die eingestellte Sprache ist nicht verfgbar.\nberprfen Sie bitte Ihre Installation und installieren Sie gegebenenfalls die gewnschte Sprache : Ein Thesaurus fr die eingestellte Sprache ist nicht verfgbar.\nberprfen Sie bitte Ihre Installation und installieren Sie gegebenenfalls die gewnschte Sprache */ - /* ### ACHTUNG: Neuer Text in Resource? Ein Thesaurus fr die eingestellte Sprache ist nicht verfgbar.\nberprfen Sie bitte Ihre Installation und installieren Sie gegebenenfalls die gewnschte Sprache : Ein Thesaurus fr die eingestellte Sprache ist nicht verfgbar.\nberprfen Sie bitte Ihre Installation und installieren Sie gegebenenfalls die gewnschte Sprache */ Text [ en-US ] = "No thesaurus available for the current language.\nPlease check your installation and install the desired language." ; }; String ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS&ERRCODE_RES_MASK @@ -83,26 +73,18 @@ Resource RID_SVXERRCODE }; String ERRCODE_SVX_LINGU_LINGUNOTEXISTS&ERRCODE_RES_MASK { - /* ### ACHTUNG: Neuer Text in Resource? Die Rechtschreibprfung ist nicht verfgbar. : Die Rechtschreibprfung ist nicht verfgbar. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Rechtschreibprfung ist nicht verfgbar. : Die Rechtschreibprfung ist nicht verfgbar. */ Text [ en-US ] = "Spellcheck is not available." ; }; String ERRCODE_SVX_LINGU_HYPHENNOTEXISTS&ERRCODE_RES_MASK { - /* ### ACHTUNG: Neuer Text in Resource? Die Trennhilfe ist nicht verfgbar. : Die Trennhilfe ist nicht verfgbar. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Trennhilfe ist nicht verfgbar. : Die Trennhilfe ist nicht verfgbar. */ Text [ en-US ] = "Hyphenation not available." ; }; String ERRCODE_SVX_LINGU_DICT_NOTREADABLE&ERRCODE_RES_MASK { - /* ### ACHTUNG: Neuer Text in Resource? Das persnliche Wrterbuch $(ARG1) kann nicht gelesen werden. : Das persnliche Wrterbuch $(ARG1) kann nicht gelesen werden. */ - /* ### ACHTUNG: Neuer Text in Resource? Das persnliche Wrterbuch $(ARG1) kann nicht gelesen werden. : Das persnliche Wrterbuch $(ARG1) kann nicht gelesen werden. */ Text [ en-US ] = "The custom dictionary $(ARG1) cannot be read." ; }; String ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE&ERRCODE_RES_MASK { - /* ### ACHTUNG: Neuer Text in Resource? Das persnliche Wrterbuch $(ARG1) kann nicht angelegt werden. : Das persnliche Wrterbuch $(ARG1) kann nicht angelegt werden. */ - /* ### ACHTUNG: Neuer Text in Resource? Das persnliche Wrterbuch $(ARG1) kann nicht angelegt werden. : Das persnliche Wrterbuch $(ARG1) kann nicht angelegt werden. */ Text [ en-US ] = "The custom dictionary $(ARG1) cannot be created." ; }; String ERRCODE_SVX_GRAPHIC_NOTREADABLE&ERRCODE_RES_MASK diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src index d80f871d8b3c..182df54c1d2f 100644 --- a/svx/source/items/svxitems.src +++ b/svx/source/items/svxitems.src @@ -216,46 +216,6 @@ String RID_SVXITEMS_BRUSHSTYLE_BITMAP Text [ en-US ] = "Image" ; }; -String RID_SVXITEMS_HORJUST_STANDARD -{ - Text [ en-US ] = "Horizontal alignment default" ; -}; -String RID_SVXITEMS_HORJUST_LEFT -{ - Text [ en-US ] = "Align left" ; -}; -String RID_SVXITEMS_HORJUST_CENTER -{ - Text [ en-US ] = "Centered horizontally" ; -}; -String RID_SVXITEMS_HORJUST_RIGHT -{ - Text [ en-US ] = "Align right" ; -}; -String RID_SVXITEMS_HORJUST_BLOCK -{ - Text [ en-US ] = "Justify" ; -}; -String RID_SVXITEMS_HORJUST_REPEAT -{ - Text [ en-US ] = "Repeat alignment" ; -}; -String RID_SVXITEMS_VERJUST_STANDARD -{ - Text [ en-US ] = "Vertical alignment default" ; -}; -String RID_SVXITEMS_VERJUST_TOP -{ - Text [ en-US ] = "Align to top" ; -}; -String RID_SVXITEMS_VERJUST_CENTER -{ - Text [ en-US ] = "Centered vertically" ; -}; -String RID_SVXITEMS_VERJUST_BOTTOM -{ - Text [ en-US ] = "Align to bottom" ; -}; String RID_SVXITEMS_ORI_STANDARD { Text [ en-US ] = "Default orientation" ; diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index 7f8dd5854e3b..b1098357ae8f 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,7 +112,7 @@ int SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const mbBookMode == rItem.IsBookMode() ); } -sal_Bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) @@ -130,14 +131,14 @@ sal_Bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt case MID_VIEWLAYOUT_COLUMNS : rVal <<= (sal_Int32) GetValue(); break; case MID_VIEWLAYOUT_BOOKMODE: rVal <<= (sal_Bool) mbBookMode; break; default: - DBG_ERROR("svx::SvxViewLayoutItem::QueryValue(), Wrong MemberId!"); - return sal_False; + OSL_FAIL("svx::SvxViewLayoutItem::QueryValue(), Wrong MemberId!"); + return false; } - return sal_True; + return true; } -sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -170,11 +171,11 @@ sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_ { SetValue( (sal_uInt16)nColumns ); mbBookMode = bBookMode; - return sal_True; + return true; } } - return sal_False; + return false; } case MID_VIEWLAYOUT_COLUMNS: @@ -183,10 +184,10 @@ sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_ if ( rVal >>= nVal ) { SetValue( (sal_uInt16)nVal ); - return sal_True; + return true; } else - return sal_False; + return false; } case MID_VIEWLAYOUT_BOOKMODE: @@ -194,18 +195,19 @@ sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_ sal_Bool bBookMode = sal_False; if ( rVal >>= bBookMode ) { - mbBookMode = bBookMode; - return sal_True; + mbBookMode = bBookMode; + return true; } else - return sal_False; + return false; } default: - DBG_ERROR("svx::SvxViewLayoutItem::PutValue(), Wrong MemberId!"); - return sal_False; + OSL_FAIL("svx::SvxViewLayoutItem::PutValue(), Wrong MemberId!"); + return false; } - return sal_True; + return true; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/zoomitem.cxx b/svx/source/items/zoomitem.cxx index 38ad3f6d9e7b..d15a5e43a193 100644 --- a/svx/source/items/zoomitem.cxx +++ b/svx/source/items/zoomitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <tools/stream.hxx> -#ifndef __SBX_SBXVARIABLE_HXX #include <basic/sbxvar.hxx> -#endif #include <svx/zoomitem.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -117,7 +116,7 @@ int SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const eType == rItem.GetType() ); } -sal_Bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -140,14 +139,14 @@ sal_Bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMem case MID_VALUESET: rVal <<= (sal_Int16) nValueSet; break; case MID_TYPE: rVal <<= (sal_Int16) eType; break; default: - DBG_ERROR("svx::SvxZoomItem::QueryValue(), Wrong MemberId!"); - return sal_False; + OSL_FAIL("svx::SvxZoomItem::QueryValue(), Wrong MemberId!"); + return false; } - return sal_True; + return true; } -sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -187,11 +186,11 @@ sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 SetValue( (sal_uInt16)nValueTmp ); nValueSet = nValueSetTmp; eType = SvxZoomType( nTypeTmp ); - return sal_True; + return true; } } - return sal_False; + return false; } case MID_VALUE: @@ -200,10 +199,10 @@ sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 if ( rVal >>= nVal ) { SetValue( (sal_uInt16)nVal ); - return sal_True; + return true; } else - return sal_False; + return false; } case MID_VALUESET: @@ -216,16 +215,18 @@ sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nValueSet = (sal_Int16) nVal; else if ( nMemberId == MID_TYPE ) eType = SvxZoomType( (sal_Int16) nVal ); - return sal_True; + return true; } else - return sal_False; + return false; } default: - DBG_ERROR("svx::SvxZoomItem::PutValue(), Wrong MemberId!"); - return sal_False; + OSL_FAIL("svx::SvxZoomItem::PutValue(), Wrong MemberId!"); + return false; } - return sal_True; + return true; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index c66432c5b0d4..816f2604038a 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,7 +109,7 @@ int SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const mnMinZoom == rItem.mnMinZoom && mnMaxZoom == rItem.mnMaxZoom ); } -sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) @@ -149,14 +150,14 @@ sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt } break; default: - DBG_ERROR("svx::SvxZoomSliderItem::QueryValue(), Wrong MemberId!"); - return sal_False; + OSL_FAIL("svx::SvxZoomSliderItem::QueryValue(), Wrong MemberId!"); + return false; } - return sal_True; + return true; } -sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -205,11 +206,11 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_ mnMinZoom = sal::static_int_cast< sal_uInt16 >( nMinZoom ); mnMaxZoom = sal::static_int_cast< sal_uInt16 >( nMaxZoom ); - return sal_True; + return true; } } - return sal_False; + return false; } case MID_ZOOMSLIDER_CURRENTZOOM: @@ -218,10 +219,10 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_ if ( rVal >>= nVal ) { SetValue( (sal_uInt16)nVal ); - return sal_True; + return true; } else - return sal_False; + return false; } case MID_ZOOMSLIDER_SNAPPINGPOINTS: @@ -230,10 +231,10 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_ if ( rVal >>= aValues ) { maValues = aValues; - return sal_True; + return true; } else - return sal_False; + return false; } case MID_ZOOMSLIDER_MINZOOM: { @@ -241,10 +242,10 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_ if( rVal >>= nVal ) { mnMinZoom = (sal_uInt16)nVal; - return sal_True; + return true; } else - return sal_False; + return false; } case MID_ZOOMSLIDER_MAXZOOM: { @@ -252,17 +253,17 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_ if( rVal >>= nVal ) { mnMaxZoom = (sal_uInt16)nVal; - return sal_True; + return true; } else - return sal_False; + return false; } default: - DBG_ERROR("svx::SvxZoomSliderItem::PutValue(), Wrong MemberId!"); - return sal_False; + OSL_FAIL("svx::SvxZoomSliderItem::PutValue(), Wrong MemberId!"); + return false; } - return sal_True; + return true; } void SvxZoomSliderItem::AddSnappingPoint( sal_Int32 nNew ) @@ -278,3 +279,4 @@ const com::sun::star::uno::Sequence < sal_Int32 >& SvxZoomSliderItem::GetSnappin return maValues; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx index 471146daf00b..20c15fba2a4d 100644 --- a/svx/source/mnuctrls/SmartTagCtl.cxx +++ b/svx/source/mnuctrls/SmartTagCtl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,23 +31,17 @@ #include <svx/SmartTagCtl.hxx> #include <com/sun/star/smarttags/XSmartTagAction.hpp> -#ifndef _COM_SUN_STAR_SMARTTAGS_XSTRINGKEYMAP_HPP_ #include <com/sun/star/container/XStringKeyMap.hpp> -#endif #include <svtools/stdmenu.hxx> #include <svl/eitem.hxx> #include <sfx2/dispatch.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/SmartTagItem.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -#define C2U(cChar) rtl::OUString::createFromAscii(cChar) - // STATIC DATA ----------------------------------------------------------- SFX_IMPL_MENU_CONTROL(SvxSmartTagsControl, SvxSmartTagItem); @@ -121,7 +116,7 @@ void SvxSmartTagsControl::FillMenu() pSbMenu->SetSelectHdl( LINK( this, SvxSmartTagsControl, MenuSelect ) ); // sub-menu starts with smart tag caption and separator - const rtl::OUString aSmartTagCaption2 = aSmartTagCaption + C2U(": ") + aRangeText; + const rtl::OUString aSmartTagCaption2 = aSmartTagCaption + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": ")) + aRangeText; nSubMenuPos = 0; pSbMenu->InsertItem( nMenuId++, aSmartTagCaption2, MIB_NOSELECT, nSubMenuPos++ ); pSbMenu->InsertSeparator( nSubMenuPos++ ); @@ -223,3 +218,4 @@ PopupMenu* SvxSmartTagsControl::GetPopup() const } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index 52c468d0bda5..73ca655a4646 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -161,3 +162,4 @@ void SvxClipBoardControl::DelPopup() ///////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx index b10eac69bc54..0c7946900171 100755..100644 --- a/svx/source/mnuctrls/fntctl.cxx +++ b/svx/source/mnuctrls/fntctl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,13 +29,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <string> // HACK: prevent conflict between STLPORT and Workshop headern +#include <string> #include <svtools/stdmenu.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <sfx2/dispatch.hxx> -#include <svx/fntctl.hxx> // +#include <svx/fntctl.hxx> #include <svx/svxids.hrc> #include "editeng/flstitem.hxx" #include "editeng/fontitem.hxx" @@ -180,3 +181,4 @@ PopupMenu* SvxFontMenuControl::GetPopup() const +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx index 32933ae8b716..440e12a508e1 100644 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <string> // HACK: prevent conflict between STLPORT and Workshop headern +#include <string> #include <svl/itempool.hxx> #include <svtools/stdmenu.hxx> #include <svtools/ctrltool.hxx> @@ -209,3 +210,4 @@ PopupMenu* SvxFontSizeMenuControl::GetPopup() const } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx index 2fe1bcf9a235..50a6b33fe282 100644 --- a/svx/source/sdr/animation/animationstate.cxx +++ b/svx/source/sdr/animation/animationstate.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -146,3 +147,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/animation/objectanimator.cxx b/svx/source/sdr/animation/objectanimator.cxx index 2dc7d514fdeb..35a6ff120118 100644 --- a/svx/source/sdr/animation/objectanimator.cxx +++ b/svx/source/sdr/animation/objectanimator.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,3 +51,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx index 50441f010fdb..d203de342e3f 100644 --- a/svx/source/sdr/animation/scheduler.cxx +++ b/svx/source/sdr/animation/scheduler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -313,3 +314,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/attribute/sdrfilltextattribute.cxx b/svx/source/sdr/attribute/sdrfilltextattribute.cxx index e281c77068c5..92684d4ab7d0 100644 --- a/svx/source/sdr/attribute/sdrfilltextattribute.cxx +++ b/svx/source/sdr/attribute/sdrfilltextattribute.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,10 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrallattribute.cxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -90,3 +87,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx index 39037faa5031..5df4183598b5 100644 --- a/svx/source/sdr/attribute/sdrformtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -421,3 +422,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx index 6f1925f1f5a8..40450ad381a6 100644 --- a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -183,3 +184,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx index 6d8356833829..48e37a4eebec 100644 --- a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,10 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrallattribute.cxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -93,3 +90,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx index 6b863a11aa03..0dd11e4b9670 100644 --- a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,10 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrallattribute.cxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -91,3 +88,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx index 34485b57399c..556d1514eea7 100644 --- a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,10 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrallattribute.cxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -83,3 +80,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx index a28430f127c1..55a0696d4b33 100644 --- a/svx/source/sdr/attribute/sdrtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrtextattribute.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,6 +72,7 @@ namespace drawinglayer // bitfield unsigned mbContour : 1; unsigned mbFitToSize : 1; + unsigned mbAutoFit : 1; unsigned mbHideContour : 1; unsigned mbBlink : 1; unsigned mbScroll : 1; @@ -91,6 +93,7 @@ namespace drawinglayer SdrTextVertAdjust aSdrTextVertAdjust, bool bContour, bool bFitToSize, + bool bAutoFit, bool bHideContour, bool bBlink, bool bScroll, @@ -110,6 +113,7 @@ namespace drawinglayer maSdrTextVertAdjust(aSdrTextVertAdjust), mbContour(bContour), mbFitToSize(bFitToSize), + mbAutoFit(bAutoFit), mbHideContour(bHideContour), mbBlink(bBlink), mbScroll(bScroll), @@ -147,6 +151,7 @@ namespace drawinglayer maSdrTextVertAdjust(SDRTEXTVERTADJUST_TOP), mbContour(false), mbFitToSize(false), + mbAutoFit(false), mbHideContour(false), mbBlink(false), mbScroll(false), @@ -177,6 +182,7 @@ namespace drawinglayer } bool isContour() const { return mbContour; } bool isFitToSize() const { return mbFitToSize; } + bool isAutoFit() const { return mbAutoFit; } bool isHideContour() const { return mbHideContour; } bool isBlink() const { return mbBlink; } bool isScroll() const { return mbScroll; } @@ -235,6 +241,7 @@ namespace drawinglayer && isContour() == rCandidate.isContour() && isFitToSize() == rCandidate.isFitToSize() + && isAutoFit() == rCandidate.isAutoFit() && isHideContour() == rCandidate.isHideContour() && isBlink() == rCandidate.isBlink() && isScroll() == rCandidate.isScroll() @@ -272,6 +279,7 @@ namespace drawinglayer SdrTextVertAdjust aSdrTextVertAdjust, bool bContour, bool bFitToSize, + bool bAutoFit, bool bHideContour, bool bBlink, bool bScroll, @@ -281,7 +289,7 @@ namespace drawinglayer : mpSdrTextAttribute(new ImpSdrTextAttribute( &rSdrText, rOutlinerParaObject, eFormTextStyle, aTextLeftDistance, aTextUpperDistance, aTextRightDistance, aTextLowerDistance, aSdrTextHorzAdjust, aSdrTextVertAdjust, bContour, - bFitToSize, bHideContour, bBlink, bScroll, bInEditMode, bFixedCellHeight, bWrongSpell)) + bFitToSize, bAutoFit, bHideContour, bBlink, bScroll, bInEditMode, bFixedCellHeight, bWrongSpell)) { } @@ -369,6 +377,11 @@ namespace drawinglayer return mpSdrTextAttribute->isFitToSize(); } + bool SdrTextAttribute::isAutoFit() const + { + return mpSdrTextAttribute->isAutoFit(); + } + bool SdrTextAttribute::isHideContour() const { return mpSdrTextAttribute->isHideContour(); @@ -459,3 +472,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/displayinfo.cxx b/svx/source/sdr/contact/displayinfo.cxx index d964611c59a0..d66de6c0c063 100644 --- a/svx/source/sdr/contact/displayinfo.cxx +++ b/svx/source/sdr/contact/displayinfo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,3 +109,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx index bda2e1529988..2ce632c9d989 100644 --- a/svx/source/sdr/contact/objectcontact.cxx +++ b/svx/source/sdr/contact/objectcontact.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -320,3 +321,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index 5d4e6d71fbe9..feb9f6e3f128 100644 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -224,3 +225,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index d804cce575a1..ef358aade5b7 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -483,3 +484,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/objectcontacttools.cxx b/svx/source/sdr/contact/objectcontacttools.cxx index 5776bd8847ce..70bab11d7f15 100644 --- a/svx/source/sdr/contact/objectcontacttools.cxx +++ b/svx/source/sdr/contact/objectcontacttools.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx index f380a4b8a022..8e30b89fd692 100644 --- a/svx/source/sdr/contact/sdrmediawindow.cxx +++ b/svx/source/sdr/contact/sdrmediawindow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -191,3 +192,5 @@ void SdrMediaWindow::StartDrag( sal_Int8 nAction, const Point& rPosPixel ) } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/sdrmediawindow.hxx b/svx/source/sdr/contact/sdrmediawindow.hxx index 0b9c42cdb615..b58357027fcc 100644 --- a/svx/source/sdr/contact/sdrmediawindow.hxx +++ b/svx/source/sdr/contact/sdrmediawindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx index 3057acf55df1..7a24a508935d 100644 --- a/svx/source/sdr/contact/viewcontact.cxx +++ b/svx/source/sdr/contact/viewcontact.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -209,7 +210,7 @@ namespace sdr ViewContact& ViewContact::GetViewContact(sal_uInt32 /*nIndex*/) const { // This is the default implementation; call would be an error - DBG_ERROR("ViewContact::GetViewContact: This call needs to be overloaded when GetObjectCount() can return results != 0 (!)"); + OSL_FAIL("ViewContact::GetViewContact: This call needs to be overloaded when GetObjectCount() can return results != 0 (!)"); return (ViewContact&)(*this); } @@ -274,7 +275,7 @@ namespace sdr // providing a seqence of primitives -> which cannot be correct. // Since we have no access to any known model data here, the default implementation creates a yellow placeholder // hairline polygon with a default size of (1000, 1000, 5000, 3000) - DBG_ERROR("ViewContact::createViewIndependentPrimitive2DSequence(): Never call the fallback base implementation, this is always an error (!)"); + OSL_FAIL("ViewContact::createViewIndependentPrimitive2DSequence(): Never call the fallback base implementation, this is always an error (!)"); const basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(basegfx::B2DRange(1000.0, 1000.0, 5000.0, 3000.0))); const basegfx::BColor aYellow(1.0, 1.0, 0.0); const drawinglayer::primitive2d::Primitive2DReference xReference( @@ -327,3 +328,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofe3d.cxx b/svx/source/sdr/contact/viewcontactofe3d.cxx index 9d6b253a676a..90828217f0a1 100644 --- a/svx/source/sdr/contact/viewcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewcontactofe3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -225,3 +226,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofe3dcube.cxx b/svx/source/sdr/contact/viewcontactofe3dcube.cxx index 84d456a7a430..c45833fa28a3 100644 --- a/svx/source/sdr/contact/viewcontactofe3dcube.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dcube.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx index 1ff1d81c827c..a983a3179207 100644 --- a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx index 3cd55fcde828..b6af4299846e 100644 --- a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -113,3 +114,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx index ee6943bccd4a..582c3650c005 100644 --- a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -184,3 +185,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx index 8a7d7694a315..13256264aeca 100644 --- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -385,7 +386,7 @@ namespace sdr { // empty scene, no 3d action should be necessary. Prepare some // fallback size - OSL_ENSURE(false, "No need to get ViewInformation3D from an empty scene (!)"); + OSL_FAIL("No need to get ViewInformation3D from an empty scene (!)"); aContentRange.expand(basegfx::B3DPoint(-100.0, -100.0, -100.0)); aContentRange.expand(basegfx::B3DPoint( 100.0, 100.0, 100.0)); } @@ -476,3 +477,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx index c16633f7f2c9..31c4a4537022 100644 --- a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 1ba774ba378f..f2ead048cef4 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -461,3 +462,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofgroup.cxx b/svx/source/sdr/contact/viewcontactofgroup.cxx index 6252811d32a3..cf83c29005c0 100644 --- a/svx/source/sdr/contact/viewcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewcontactofgroup.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx index 6ca5f1c4d172..1b978960a25d 100644 --- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -124,3 +125,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofpageobj.cxx b/svx/source/sdr/contact/viewcontactofpageobj.cxx index 3740ec27bdb5..5c6c89275aaf 100644 --- a/svx/source/sdr/contact/viewcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewcontactofpageobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx index 84e60392a88f..45cd62053ad4 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -177,3 +178,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx index f6f2f094001b..dd41ddcd900a 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,3 +116,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx index 7b4ec93afb38..ebbb005304bf 100644 --- a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx index 9d0d38f688eb..b2854e209926 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,3 +142,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx index ab6598840a8e..5d9de91b3c47 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -182,3 +183,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx index 3b002e406be1..e26c048b69ae 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -192,3 +193,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index 5ddd74004461..16d717451d4e 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -239,3 +240,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx index b88578113c5d..6da5c2b90b29 100644 --- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,8 +69,7 @@ namespace sdr { } - drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrOle2Obj::createPrimitive2DSequenceWithParameters( - bool bHighContrast) const + drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrOle2Obj::createPrimitive2DSequenceWithParameters() const { // take unrotated snap rect (direct model data) for position and size const Rectangle& rRectangle = GetOle2Obj().GetGeoRect(); @@ -101,9 +101,8 @@ namespace sdr // #i104867# add GraphicVersion number to be able to check for // content change in the primitive later - GetOle2Obj().getEmbeddedObjectRef().getGraphicVersion(), - - bHighContrast)); + GetOle2Obj().getEmbeddedObjectRef().getGraphicVersion() + )); // create primitive. Use Ole2 primitive here. Prepare attribute settings, will // be used soon anyways. Always create primitives to allow the decomposition of @@ -120,11 +119,12 @@ namespace sdr drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrOle2Obj::createViewIndependentPrimitive2DSequence() const { - // do as if no HC and call standard creator - return createPrimitive2DSequenceWithParameters(false); + return createPrimitive2DSequenceWithParameters(); } } // end of namespace contact } // end of namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index abe30839aa43..a852a36ed6b2 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -724,3 +725,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx index bc4c500ff155..46a8d4611021 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,7 +69,7 @@ namespace sdr if(!nPointCount) { - OSL_ENSURE(false, "PolyPolygon object without geometry detected, this should not be created (!)"); + OSL_FAIL("PolyPolygon object without geometry detected, this should not be created (!)"); basegfx::B2DPolygon aFallbackLine; aFallbackLine.append(basegfx::B2DPoint(0.0, 0.0)); aFallbackLine.append(basegfx::B2DPoint(1000.0, 1000.0)); @@ -143,3 +144,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx index fdbfa16dd584..cfa44f41a43a 100644 --- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactoftextobj.cxx b/svx/source/sdr/contact/viewcontactoftextobj.cxx index bfa7aa41565c..1e827312b090 100644 --- a/svx/source/sdr/contact/viewcontactoftextobj.cxx +++ b/svx/source/sdr/contact/viewcontactoftextobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx index fb57864903d1..ef7accf7aec1 100644 --- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -179,3 +180,5 @@ namespace sdr { namespace contact { //........................................................................ } } // namespace sdr::contact //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofvirtobj.cxx b/svx/source/sdr/contact/viewcontactofvirtobj.cxx index 54d7e6ddae97..712bca77bfce 100644 --- a/svx/source/sdr/contact/viewcontactofvirtobj.cxx +++ b/svx/source/sdr/contact/viewcontactofvirtobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx index 73e4c12e5066..9afe66ba5494 100644 --- a/svx/source/sdr/contact/viewobjectcontact.cxx +++ b/svx/source/sdr/contact/viewobjectcontact.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -436,3 +437,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx index ec8cdb4ef5ba..769d5f0284c4 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx index a549b1db1233..6027a5a367bb 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -146,3 +147,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx index 110186d41bf4..bdb7d71f05df 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -331,3 +332,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx index 392b8e923212..c7e39da280e4 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -113,3 +114,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx index e779cac4151e..5ef88965d2d0 100644 --- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -151,3 +152,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx index 945d5ff982b1..f4ef570042aa 100644 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -350,3 +351,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx index 6785f69f556b..237cf85809af 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -174,3 +175,5 @@ void ViewObjectContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaIte ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx index 485afe35f9c1..a880b66ce880 100755..100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -150,3 +151,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx index b1a4826609f9..fbd48516d714 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -194,7 +195,7 @@ namespace sdr // create OLE primitive stuff directly at VC with HC as parameter const ViewContactOfSdrOle2Obj& rVC = static_cast< const ViewContactOfSdrOle2Obj& >(GetViewContact()); - xRetval = rVC.createPrimitive2DSequenceWithParameters(GetObjectContact().isDrawModeHighContrast()); + xRetval = rVC.createPrimitive2DSequenceWithParameters(); } if(bIsOutplaceActive) @@ -241,3 +242,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx index f7145dcd9d73..5b2423113570 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -727,3 +728,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 56f9a7bdaaf0..a0056f8e8313 100755..100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,7 +59,7 @@ /** === end UNO includes === **/ #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/scopeguard.hxx> #include <cppuhelper/implbase4.hxx> @@ -193,7 +194,7 @@ namespace sdr { namespace contact { m_xControlView.set( m_xControl, UNO_QUERY ); if ( !m_xControlWindow.is() || !m_xControlView.is() ) { - OSL_ENSURE( false, "ControlHolder::operator=: invalid XControl, missing required interfaces!" ); + OSL_FAIL( "ControlHolder::operator=: invalid XControl, missing required interfaces!" ); clear(); } } @@ -1059,7 +1060,7 @@ namespace sdr { namespace contact { UnoControlContactHelper::adjustControlGeometry_throw( m_aControl, pUnoObject->GetLogicRect(), _rViewTransformation, m_aZoomLevelNormalization ); } else - OSL_ENSURE( false, "ViewObjectContactOfUnoControl_Impl::positionAndZoomControl: no SdrUnoObj!" ); + OSL_FAIL( "ViewObjectContactOfUnoControl_Impl::positionAndZoomControl: no SdrUnoObj!" ); } catch( const Exception& ) { @@ -1139,7 +1140,7 @@ namespace sdr { namespace contact { { if ( m_bCreatingControl ) { - OSL_ENSURE( false, "ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow: reentrance is not really good here!" ); + OSL_FAIL( "ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow: reentrance is not really good here!" ); // We once had a situation where this was called reentrantly, which lead to all kind of strange effects. All // those affected the grid control, which is the only control so far which is visible in design mode (and // not only in alive mode). @@ -1243,16 +1244,15 @@ namespace sdr { namespace contact { _rInitialZoomNormalization ); - // #107049# set design mode before peer is created, + // set design mode before peer is created, // this is also needed for accessibility _out_rControl.setDesignMode( _rPageView.isDesignMode() ); // adjust the initial visibility according to the visibility of the layer - // 2003-06-03 - #110592# - fs@openoffice.org impl_adjustControlVisibilityToLayerVisibility_throw( _out_rControl, _rUnoObject, _rPageView, false, true ); // add the control to the respective control container - // #108327# do this last + // do this last Reference< XControlContainer > xControlContainer( _rPageView.getControlContainer( _rDevice ) ); if ( xControlContainer.is() ) xControlContainer->addControl( sControlServiceName, _out_rControl.getControl() ); @@ -1435,7 +1435,7 @@ namespace sdr { namespace contact { //-------------------------------------------------------------------- void SAL_CALL ViewObjectContactOfUnoControl_Impl::disposing( const EventObject& Source ) throw(RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; // some code below - in particular our disposal - might trigger actions which require the // SolarMutex. In particular, in our disposal, we remove ourself as listener from the control, // which alone needs the SolarMutex. Of course this - a removeFooListener needed the SolarMutex - @@ -1488,7 +1488,7 @@ namespace sdr { namespace contact { //-------------------------------------------------------------------- void SAL_CALL ViewObjectContactOfUnoControl_Impl::propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) throw(RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; // (re)painting might require VCL operations, which need the SolarMutex OSL_PRECOND( !impl_isDisposed_nofail(), "ViewObjectContactOfUnoControl_Impl::propertyChange: already disposed()" ); @@ -1512,17 +1512,16 @@ namespace sdr { namespace contact { { VOCGuard aGuard( *this ); - DBG_ASSERT( _rSource.NewMode.equalsAscii( "design" ) || _rSource.NewMode.equalsAscii( "alive" ), + DBG_ASSERT( _rSource.NewMode.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "design" ) ) || _rSource.NewMode.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "alive" ) ), "ViewObjectContactOfUnoControl_Impl::modeChanged: unexpected mode!" ); - m_eControlDesignMode = _rSource.NewMode.equalsAscii( "design" ) ? eDesign : eAlive; + m_eControlDesignMode = _rSource.NewMode.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "design" ) ) ? eDesign : eAlive; impl_switchDesignModeListening_nothrow( impl_isControlDesignMode_nothrow() ); try { // if the control is part of a invisible layer, we need to explicitly hide it in alive mode - // 2003-06-03 - #110592# - fs@openoffice.org impl_adjustControlVisibilityToLayerVisibility_throw( false ); } catch( const Exception& ) @@ -1540,7 +1539,7 @@ namespace sdr { namespace contact { //-------------------------------------------------------------------- void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementRemoved( const ContainerEvent& Event ) throw (RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; // some code below - in particular our disposal - might trigger actions which require the // SolarMutex. In particular, in our disposal, we remove ourself as listener from the control, // which alone needs the SolarMutex. Of course this - a removeFooListener needed the SolarMutex - @@ -1932,3 +1931,4 @@ namespace sdr { namespace contact { } } // namespace sdr::contact //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactredirector.cxx b/svx/source/sdr/contact/viewobjectcontactredirector.cxx index 8d96b17f0a58..fbe008e60644 100644 --- a/svx/source/sdr/contact/viewobjectcontactredirector.cxx +++ b/svx/source/sdr/contact/viewobjectcontactredirector.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx index 967b6fefe949..1a952910f45f 100644 --- a/svx/source/sdr/event/eventhandler.cxx +++ b/svx/source/sdr/event/eventhandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -160,3 +161,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx index 6fbd294a6559..50afcccc1e02 100644 --- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx +++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -215,3 +216,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx index 2a3a00b25b99..473591d34bf8 100644 --- a/svx/source/sdr/overlay/overlaybitmapex.cxx +++ b/svx/source/sdr/overlay/overlaybitmapex.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlaycrosshair.cxx b/svx/source/sdr/overlay/overlaycrosshair.cxx index cf1c4c4a3c88..40902ce1aa70 100644 --- a/svx/source/sdr/overlay/overlaycrosshair.cxx +++ b/svx/source/sdr/overlay/overlaycrosshair.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayhatchrect.cxx b/svx/source/sdr/overlay/overlayhatchrect.cxx index 64bd9e11b31f..3482083dad71 100644 --- a/svx/source/sdr/overlay/overlayhatchrect.cxx +++ b/svx/source/sdr/overlay/overlayhatchrect.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayhelpline.cxx b/svx/source/sdr/overlay/overlayhelpline.cxx index 3417cc4a651f..b99865f74203 100644 --- a/svx/source/sdr/overlay/overlayhelpline.cxx +++ b/svx/source/sdr/overlay/overlayhelpline.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx index 4d53ac480241..f6f907bdf75c 100644 --- a/svx/source/sdr/overlay/overlayline.cxx +++ b/svx/source/sdr/overlay/overlayline.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 93e3b03d072d..920153ef699f 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -391,3 +392,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index dcbf12991d30..34bca74ba061 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -209,28 +210,6 @@ namespace sdr aTopLeft, aSize, // destination aTopLeft, aSize, // source rSource); - -#ifdef DBG_UTIL - // #i72754# possible graphical region test only with non-pro - static bool bDoPaintForVisualControl(false); - if(bDoPaintForVisualControl) - { - const bool bMapModeWasEnabledTest(getOutputDevice().IsMapModeEnabled()); - getOutputDevice().EnableMapMode(false); - getOutputDevice().SetLineColor(COL_LIGHTRED); - getOutputDevice().SetFillColor(); - getOutputDevice().DrawRect(aRegionRectanglePixel); - getOutputDevice().EnableMapMode(bMapModeWasEnabledTest); - } - - static bool bDoSaveForVisualControl(false); - if(bDoSaveForVisualControl) - { - const Bitmap aBitmap(maBufferDevice.GetBitmap(aTopLeft, aSize)); - SvFileStream aNew((const String&)String(ByteString( "c:\\test.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC); - aNew << aBitmap; - } -#endif } aRegion.EndEnumRects(aRegionHandle); @@ -536,3 +515,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx index 049dfe2ecc4c..076c2d83f875 100644 --- a/svx/source/sdr/overlay/overlayobject.cxx +++ b/svx/source/sdr/overlay/overlayobject.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,7 +73,7 @@ namespace sdr // Default implementation has to assert a missing implementation. It cannot // be useful to have overlay object derivations which have no visualisation // at all - OSL_ENSURE(false, "OverlayObject derivation without visualisation definition (missing createOverlayObjectPrimitive2DSequence implementation) (!)"); + OSL_FAIL("OverlayObject derivation without visualisation definition (missing createOverlayObjectPrimitive2DSequence implementation) (!)"); return drawinglayer::primitive2d::Primitive2DSequence(); } @@ -214,3 +215,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayobjectcell.cxx b/svx/source/sdr/overlay/overlayobjectcell.cxx index dbf38a8cd0f1..3549fbc05d89 100644 --- a/svx/source/sdr/overlay/overlayobjectcell.cxx +++ b/svx/source/sdr/overlay/overlayobjectcell.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,3 +110,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx index e9464bdee09b..837b08a73d8b 100644 --- a/svx/source/sdr/overlay/overlayobjectlist.cxx +++ b/svx/source/sdr/overlay/overlayobjectlist.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -182,3 +183,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx index a8476854ae13..98a210820b53 100644 --- a/svx/source/sdr/overlay/overlaypolypolygon.cxx +++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx index 52f43084c664..a8a7791bf772 100644 --- a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx +++ b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx index 1b09df2ca60e..b0e51add9189 100644 --- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -148,3 +149,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx index 2115d3c63120..368602fcad45 100644 --- a/svx/source/sdr/overlay/overlayselection.cxx +++ b/svx/source/sdr/overlay/overlayselection.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -235,3 +236,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index 215b8484d5bf..cdaea55bb61a 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -491,3 +492,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx index ecf1cf5866e5..7ce9f642073d 100644 --- a/svx/source/sdr/overlay/overlaytriangle.cxx +++ b/svx/source/sdr/overlay/overlaytriangle.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index d148f76576aa..c84049e6c864 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,3 +131,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 8b86f9dec9ce..46ba0fc9f0a6 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -526,7 +527,6 @@ namespace drawinglayer } } - const SdrFitToSizeType eFit(rTextObj.GetFitToSize()); const SdrTextAniKind eAniKind(rTextObj.GetTextAniKind()); // #i107346# @@ -544,7 +544,8 @@ namespace drawinglayer rTextObj.GetTextHorizontalAdjust(rSet), rTextObj.GetTextVerticalAdjust(rSet), ((const SdrTextContourFrameItem&)rSet.Get(SDRATTR_TEXT_CONTOURFRAME)).GetValue(), - (SDRTEXTFIT_PROPORTIONAL == eFit || SDRTEXTFIT_ALLLINES == eFit), + rTextObj.IsFitToSize(), + rTextObj.IsAutoFit(), ((const XFormTextHideFormItem&)rSet.Get(XATTR_FORMTXTHIDEFORM)).GetValue(), SDRTEXTANI_BLINK == eAniKind, SDRTEXTANI_SCROLL == eAniKind || SDRTEXTANI_ALTERNATE == eAniKind || SDRTEXTANI_SLIDE == eAniKind, @@ -1026,3 +1027,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx index 3757d60a3d27..0e676a10a52d 100644 --- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -175,3 +176,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx index 6b52837c3eca..dfaa7c01493e 100644 --- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -122,3 +123,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx index 710beeb444f2..da4406b22d1b 100644 --- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -128,3 +129,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx index 76e6d81bb252..9d8ca953ec6e 100644 --- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx +++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -281,6 +282,11 @@ namespace drawinglayer aAnchorTransform, rText.isFixedCellHeight()); } + else if(rText.isAutoFit()) + { + // isotrophically scaled text in range + pNew = new SdrAutoFitTextPrimitive2D(&rText.getSdrText(), rText.getOutlinerParaObject(), aAnchorTransform, bWordWrap); + } else // text in range { // build new primitive @@ -484,3 +490,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx index 02de307bee77..112618cb3daa 100644 --- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -276,3 +277,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx index e981af91896b..64edcc96cc29 100644 --- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -175,3 +176,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx index e4403cd6df49..bd898d6b77ff 100644 --- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -508,3 +509,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx index 43e3cf72ffbb..2d3af88afb3a 100644 --- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -188,3 +189,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx index 70c1feda75a8..b000dbe6c0fc 100644 --- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,9 +53,7 @@ namespace drawinglayer if(pSource) { - Graphic* pOLEGraphic = (getHighContrast()) - ? pSource->getEmbeddedObjectRef().GetHCGraphic() - : pSource->GetGraphic(); + Graphic* pOLEGraphic = pSource->GetGraphic(); if(pOLEGraphic) { @@ -151,19 +150,18 @@ namespace drawinglayer SdrOleContentPrimitive2D::SdrOleContentPrimitive2D( const SdrOle2Obj& rSdrOle2Obj, const basegfx::B2DHomMatrix& rObjectTransform, - sal_uInt32 nGraphicVersion, - bool bHighContrast) + sal_uInt32 nGraphicVersion + ) : BufferedDecompositionPrimitive2D(), mpSdrOle2Obj(const_cast< SdrOle2Obj* >(&rSdrOle2Obj)), maObjectTransform(rObjectTransform), - mnGraphicVersion(nGraphicVersion), - mbHighContrast(bHighContrast) + mnGraphicVersion(nGraphicVersion) { } bool SdrOleContentPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const { - if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) + if( BufferedDecompositionPrimitive2D::operator==(rPrimitive) ) { const SdrOleContentPrimitive2D& rCompare = (SdrOleContentPrimitive2D&)rPrimitive; const bool bBothNot(!mpSdrOle2Obj.is() && !rCompare.mpSdrOle2Obj.is()); @@ -176,8 +174,7 @@ namespace drawinglayer // #i104867# to find out if the Graphic content of the // OLE has changed, use GraphicVersion number && getGraphicVersion() == rCompare.getGraphicVersion() - - && getHighContrast() == rCompare.getHighContrast()); + ); } return false; @@ -199,3 +196,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx index 2ceea2c69b7d..83d96cceb965 100644 --- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -145,3 +146,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx index 8f188e9fcf6f..38aadfe36516 100644 --- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx +++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -174,3 +175,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx index 60b8ca1c7817..5ece4813b7ed 100644 --- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -160,3 +161,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index cf34f3345e0a..8187b527671e 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,7 +59,7 @@ namespace { try { - const uno::Any aNumber(xSet->getPropertyValue(::rtl::OUString::createFromAscii("Number"))); + const uno::Any aNumber(xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Number")))); aNumber >>= nRetval; } catch(const uno::Exception&) @@ -446,6 +447,55 @@ namespace drawinglayer { namespace primitive2d { + Primitive2DSequence SdrAutoFitTextPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const + { + Primitive2DSequence aRetval; + getSdrText()->GetObject().impDecomposeAutoFitTextPrimitive(aRetval, *this, aViewInformation); + + return encapsulateWithTextHierarchyBlockPrimitive2D(aRetval); + } + + SdrAutoFitTextPrimitive2D::SdrAutoFitTextPrimitive2D( + const SdrText* pSdrText, + const OutlinerParaObject& rParaObj, + const ::basegfx::B2DHomMatrix& rTextRangeTransform, + bool bWordWrap) + : SdrTextPrimitive2D(pSdrText, rParaObj), + maTextRangeTransform(rTextRangeTransform), + mbWordWrap(bWordWrap) + { + } + + bool SdrAutoFitTextPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const + { + if(SdrTextPrimitive2D::operator==(rPrimitive)) + { + const SdrBlockTextPrimitive2D& rCompare = (SdrBlockTextPrimitive2D&)rPrimitive; + + return (getTextRangeTransform() == rCompare.getTextRangeTransform() + && getWordWrap() == rCompare.getWordWrap()); + } + + return false; + } + + SdrTextPrimitive2D* SdrAutoFitTextPrimitive2D::createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const + { + return new SdrAutoFitTextPrimitive2D(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform(), getWordWrap()); + } + + // provide unique ID + ImplPrimitrive2DIDBlock(SdrAutoFitTextPrimitive2D, PRIMITIVE2D_ID_SDRAUTOFITTEXTPRIMITIVE2D) + + } // end of namespace primitive2d + } // end of namespace drawinglayer + + ////////////////////////////////////////////////////////////////////////////// + + namespace drawinglayer + { + namespace primitive2d + { Primitive2DSequence SdrStretchTextPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const { Primitive2DSequence aRetval; @@ -495,3 +545,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx index 3a15c3a392d9..c10faa213ac6 100644 --- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx +++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -156,3 +157,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 39b78849ad7e..9edc2a430498 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -352,7 +353,7 @@ namespace sdr if(pOldPool && pNewPool) { // build a list of to-be-copied Styles - List aList; + std::vector<SfxStyleSheetBase*> aStyleList; SfxStyleSheetBase* pAnchor = 0L; while(pSheet) @@ -361,7 +362,7 @@ namespace sdr if(!pAnchor) { - aList.Insert(pSheet, LIST_APPEND); + aStyleList.push_back(pSheet); pSheet = pOldPool->Find(pSheet->GetParent(), pSheet->GetFamily()); } else @@ -372,15 +373,15 @@ namespace sdr } // copy and set the parents - pSheet = (SfxStyleSheetBase*)aList.First(); SfxStyleSheetBase* pNewSheet = 0L; SfxStyleSheetBase* pLastSheet = 0L; SfxStyleSheetBase* pForThisObject = 0L; - while(pSheet) + std::vector<SfxStyleSheetBase*>::iterator iter; + for (iter = aStyleList.begin(); iter != aStyleList.end(); ++iter) { - pNewSheet = &pNewPool->Make(pSheet->GetName(), pSheet->GetFamily(), pSheet->GetMask()); - pNewSheet->GetItemSet().Put(pSheet->GetItemSet(), sal_False); + pNewSheet = &pNewPool->Make((*iter)->GetName(), (*iter)->GetFamily(), (*iter)->GetMask()); + pNewSheet->GetItemSet().Put((*iter)->GetItemSet(), sal_False); if(bScaleUnitChanged) { @@ -398,7 +399,6 @@ namespace sdr } pLastSheet = pNewSheet; - pSheet = (SfxStyleSheetBase*)aList.Next(); } // Set link to the Style found in the Pool @@ -425,23 +425,20 @@ namespace sdr { // there is no StyleSheetPool in the new model, thus set // all items as hard items in the object - List aList; + std::vector<const SfxItemSet*> aSetList; const SfxItemSet* pItemSet = &pOldStyleSheet->GetItemSet(); while(pItemSet) { - aList.Insert((void*)pItemSet, CONTAINER_APPEND); + aSetList.push_back(pItemSet); pItemSet = pItemSet->GetParent(); } SfxItemSet* pNewSet = &CreateObjectSpecificItemSet(pNewModel->GetItemPool()); - pItemSet = (SfxItemSet*)aList.Last(); - while(pItemSet) - { - pNewSet->Put(*pItemSet); - pItemSet = (SfxItemSet*)aList.Prev(); - } + std::vector<const SfxItemSet*>::reverse_iterator riter; + for (riter = aSetList.rbegin(); riter != aSetList.rend(); ++riter) + pNewSet->Put(*(*riter)); // Items which were hard attributes before need to stay if(mpItemSet) @@ -626,3 +623,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx index e08bf5516f03..431d99b70370 100644 --- a/svx/source/sdr/properties/captionproperties.cxx +++ b/svx/source/sdr/properties/captionproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -118,3 +119,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx index 9dc37cb6b760..0b2d7c635640 100644 --- a/svx/source/sdr/properties/circleproperties.cxx +++ b/svx/source/sdr/properties/circleproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -155,3 +156,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx index 963a541a73c1..114a9711c74f 100644 --- a/svx/source/sdr/properties/connectorproperties.cxx +++ b/svx/source/sdr/properties/connectorproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx index 6146dc66e417..2fbfcb22aa39 100644 --- a/svx/source/sdr/properties/customshapeproperties.cxx +++ b/svx/source/sdr/properties/customshapeproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -237,3 +238,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index 7d51b26a0051..609b6236237c 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -184,7 +185,7 @@ namespace sdr while(aIter != aEnd) { PostItemChange(*aIter); - aIter++; + ++aIter; } ItemSetChanged(aSet); @@ -235,3 +236,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx index a939ed664a8d..d0e383b6618d 100644 --- a/svx/source/sdr/properties/e3dcompoundproperties.cxx +++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -163,3 +164,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/e3dextrudeproperties.cxx b/svx/source/sdr/properties/e3dextrudeproperties.cxx index 91b86551339c..f17a639610bf 100644 --- a/svx/source/sdr/properties/e3dextrudeproperties.cxx +++ b/svx/source/sdr/properties/e3dextrudeproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/e3dlatheproperties.cxx b/svx/source/sdr/properties/e3dlatheproperties.cxx index 135104abab32..6f4f4c1f52d4 100644 --- a/svx/source/sdr/properties/e3dlatheproperties.cxx +++ b/svx/source/sdr/properties/e3dlatheproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx index 9ae3e2565a78..da51d19f362b 100644 --- a/svx/source/sdr/properties/e3dproperties.cxx +++ b/svx/source/sdr/properties/e3dproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index 6fbf34968f3c..338a3769c4e3 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -332,3 +333,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/e3dsphereproperties.cxx b/svx/source/sdr/properties/e3dsphereproperties.cxx index 589a5e639d0a..ac599450f688 100644 --- a/svx/source/sdr/properties/e3dsphereproperties.cxx +++ b/svx/source/sdr/properties/e3dsphereproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx index a33d5b23f84d..1aab5f3cb0a3 100644 --- a/svx/source/sdr/properties/emptyproperties.cxx +++ b/svx/source/sdr/properties/emptyproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -151,3 +152,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index 3afdb66c6daf..d72a8117afaa 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,3 +142,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx index d55d8dcb1a16..9b3aee683c9e 100644 --- a/svx/source/sdr/properties/groupproperties.cxx +++ b/svx/source/sdr/properties/groupproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -296,3 +297,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index 1e804b9716df..236e6926d37d 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -144,3 +145,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index 522f3e44e686..9e3414bc5eef 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -139,3 +140,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/oleproperties.cxx b/svx/source/sdr/properties/oleproperties.cxx index b2a103bd8cfc..82643a2bbd0c 100644 --- a/svx/source/sdr/properties/oleproperties.cxx +++ b/svx/source/sdr/properties/oleproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,9 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: graphicproperties.cxx,v $ - * $Revision: 1.12.76.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -78,3 +76,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx index 2fc92633b953..ec403e39001a 100644 --- a/svx/source/sdr/properties/pageproperties.cxx +++ b/svx/source/sdr/properties/pageproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ namespace sdr //////////////////////////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index f8c307f26309..5e7bb0b6ecff 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -187,3 +188,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/rectangleproperties.cxx b/svx/source/sdr/properties/rectangleproperties.cxx index 21907df0018d..ca47848b8479 100644 --- a/svx/source/sdr/properties/rectangleproperties.cxx +++ b/svx/source/sdr/properties/rectangleproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index b7f2cc5474e6..ff6e2ce34244 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -636,3 +637,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx index dabb4e21231e..57f9d05424a6 100644 --- a/svx/source/smarttags/SmartTagMgr.cxx +++ b/svx/source/smarttags/SmartTagMgr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,7 +32,7 @@ #include "precompiled_svx.hxx" #include <svx/SmartTagMgr.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/smarttags/XSmartTagRecognizer.hpp> #include <com/sun/star/smarttags/XSmartTagAction.hpp> @@ -261,7 +262,7 @@ void SmartTagMgr::WriteConfiguration( const bool* pIsLabelTextWithSmartTags, // ::com::sun::star::util::XModifyListener void SmartTagMgr::modified( const lang::EventObject& ) throw( RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; maRecognizerList.clear(); maActionList.clear(); @@ -273,7 +274,7 @@ void SmartTagMgr::modified( const lang::EventObject& ) throw( RuntimeException // ::com::sun::star::lang::XEventListener void SmartTagMgr::disposing( const lang::EventObject& rEvent ) throw( RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< frame::XModel > xModel( rEvent.Source, uno::UNO_QUERY ); uno::Reference< util::XModifyBroadcaster > xMB(xModel, uno::UNO_QUERY); @@ -300,7 +301,7 @@ void SmartTagMgr::disposing( const lang::EventObject& rEvent ) throw( RuntimeExc // ::com::sun::star::util::XChangesListener void SmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const util::ElementChange* pElementChanges = rEvent.Changes.getConstArray(); const sal_Int32 nNumberOfChanges = rEvent.Changes.getLength(); @@ -550,3 +551,4 @@ void SmartTagMgr::AssociateActionsWithRecognizers() } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc index a1fa24179dc4..8f105d1698b0 100644..100755 --- a/svx/source/src/app.hrc +++ b/svx/source/src/app.hrc @@ -197,6 +197,9 @@ #define RID_OFA_TP_INTERNATIONAL_IMPR (RID_OFA_START + 254) // 4 impress #define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255) #define RID_SW_TP_OPTCAPTION_PAGE (RID_OFA_START + 256) +#define SID_SC_TP_FORMULA (RID_OFA_START + 257) +#define SID_SC_TP_COMPATIBILITY (RID_OFA_START + 258) +#define RID_SC_TP_DEFAULTS (RID_OFA_START + 259) // Strings ------------------------------------------ @@ -242,10 +245,9 @@ #define RID_BMP_DB_RELATIONS_S (RID_OFA_START + 172) #define RID_BMP_DB_RELATIONS_L (RID_OFA_START + 173) #define RID_IMGLIST_TREEOPT (RID_OFA_START + 174) -#define RID_IMGLIST_TREEOPT_HC (RID_OFA_START + 175) - // 12 und 13 nicht benutzen!!! -// ..._BEGIN kann nochmal benutzt werden, nur zum Iterieren +// don't use 12 and 13 !!! +// ..._BEGIN can be used again. Just for iteration here #define RID_STR_PRIO_BEGIN (RID_OFA_START + 17) #define RID_STR_PRIO_HIGHEST (RID_OFA_START + 18) #define RID_STR_PRIO_HIGH (RID_OFA_START + 19) diff --git a/svx/source/src/app.src b/svx/source/src/app.src index 2fea800b4a00..2d59c612fe1a 100644 --- a/svx/source/src/app.src +++ b/svx/source/src/app.src @@ -67,20 +67,6 @@ ImageList RID_DEFAULTIMAGELIST_LC IMAGE_ID_LIST }; -ImageList RID_DEFAULTIMAGELIST_SCH -{ - Prefix = "sch"; - MASKCOLOR - IMAGE_ID_LIST -}; - -ImageList RID_DEFAULTIMAGELIST_LCH -{ - Prefix = "lch"; - MASKCOLOR - IMAGE_ID_LIST -}; - // Strings --------------------------------------------------------------- String RID_DESKTOP diff --git a/svx/source/src/hidgen.hrc b/svx/source/src/hidgen.hrc index 38bea9afca11..38bea9afca11 100644..100755 --- a/svx/source/src/hidgen.hrc +++ b/svx/source/src/hidgen.hrc diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index 34952b1deea9..77d485ef6c46 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif #include <svl/eitem.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> @@ -129,3 +128,4 @@ sal_uIntPtr SvxInsertStatusBarControl::GetDefItemWidth(const StatusBar& rStb) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/stbctrls/makefile.mk b/svx/source/stbctrls/makefile.mk new file mode 100755 index 000000000000..ac9445d982bb --- /dev/null +++ b/svx/source/stbctrls/makefile.mk @@ -0,0 +1,75 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* +PRJ=..$/.. + +PROJECTPCH4DLL=TRUE +PROJECTPCH=svxpch +PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch + +PRJNAME=svx +TARGET=stbctrls +AUTOSEG=true + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +SRS1NAME=$(TARGET) +SRC1FILES = \ + stbctrls.src + +SLOFILES= \ + $(EXCEPTIONSFILES) + +EXCEPTIONSFILES= \ + $(SLO)$/insctrl.obj \ + $(SLO)$/modctrl.obj \ + $(SLO)$/pszctrl.obj \ + $(SLO)$/selctrl.obj \ + $(SLO)$/xmlsecctrl.obj \ + $(SLO)$/zoomctrl.obj \ + $(SLO)$/zoomsliderctrl.obj + +HXX1TARGET=stbctrls +HXX1EXT= hxx +HXX1EXCL= -E:*include* +HXX1DEPN=\ + $(INC)$/insctrl.hxx \ + $(INC)$/zoomctrl.hxx \ + $(INC)$/pszctrl.hxx \ + $(INC)$/selctrl.hxx \ + $(INC)$/modctrl.hxx \ + $(INC)$/xmlsecctrl.hxx \ + $(INC)$/zoomsliderctrl.hxx \ + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk + diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index 87dce0e942df..8239aa8c4a5c 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,29 +31,46 @@ // include --------------------------------------------------------------- -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif +#include <vcl/image.hxx> #include <svl/eitem.hxx> #include <sfx2/app.hxx> -#define _SVX_MODCTRL_CXX - #include <svx/dialogs.hrc> - -#include "svx/modctrl.hxx" +#include <svx/modctrl.hxx> #include <svx/dialmgr.hxx> +#include <com/sun/star/beans/PropertyValue.hpp> + +using ::com::sun::star::uno::Sequence; +using ::com::sun::star::beans::PropertyValue; +using ::rtl::OUString; + SFX_IMPL_STATUSBAR_CONTROL(SvxModifyControl, SfxBoolItem); // class SvxModifyControl ------------------------------------------------ +struct SvxModifyControl::ImplData +{ + Image maModifiedButton; + Image maNonModifiedButton; + + bool mbModified; + + ImplData() : + maModifiedButton( SVX_RES(RID_SVXBMP_DOC_MODIFIED_YES) ), + maNonModifiedButton( SVX_RES(RID_SVXBMP_DOC_MODIFIED_NO) ), + mbModified(false) + { + } +}; + SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& rStb ) : SfxStatusBarControl( _nSlotId, _nId, rStb ), - bState( sal_True ) + mpImpl(new ImplData) { } @@ -62,32 +80,70 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { if ( SFX_ITEM_AVAILABLE != eState ) - GetStatusBar().SetItemText( GetId(), String() ); - else - { - DBG_ASSERT( pState->ISA( SfxBoolItem ), "invalid item type" ); - SfxBoolItem* pItem = (SfxBoolItem*)pState; - bState = pItem->GetValue(); - DrawItemText_Impl(); - } + return; + + DBG_ASSERT( pState->ISA( SfxBoolItem ), "invalid item type" ); + SfxBoolItem* pItem = (SfxBoolItem*)pState; + mpImpl->mbModified = pItem->GetValue(); + + if ( GetStatusBar().AreItemsVisible() ) + GetStatusBar().SetItemData( GetId(), 0 ); // force repaint + + int nResId = mpImpl->mbModified ? RID_SVXSTR_DOC_MODIFIED_YES : RID_SVXSTR_DOC_MODIFIED_NO; + GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(nResId)); } // ----------------------------------------------------------------------- -void SvxModifyControl::Paint( const UserDrawEvent& ) +namespace { + +/** + * Given a bounding rectangle and an image, determine the top-left position + * of the image so that the image would look centered both horizontally and + * vertically. + * + * @param rBoundingRect bounding rectangle + * @param rImg image + * + * @return Point top-left corner of the centered image position + */ +Point centerImage(const Rectangle& rBoundingRect, const Image& rImg) { - DrawItemText_Impl(); + Size aImgSize = rImg.GetSizePixel(); + Size aRectSize = rBoundingRect.GetSize(); + long nXOffset = (aRectSize.getWidth() - aImgSize.getWidth())/2; + long nYOffset = (aRectSize.getHeight() - aImgSize.getHeight())/2; + Point aPt = rBoundingRect.TopLeft(); + aPt += Point(nXOffset, nYOffset); + return aPt; } -// ----------------------------------------------------------------------- +} +void SvxModifyControl::Paint( const UserDrawEvent& rUsrEvt ) +{ + OutputDevice* pDev = rUsrEvt.GetDevice(); + Rectangle aRect = rUsrEvt.GetRect(); + + if (mpImpl->mbModified) + { + Point aPt = centerImage(aRect, mpImpl->maModifiedButton); + pDev->DrawImage(aPt, mpImpl->maModifiedButton); + } + else + { + Point aPt = centerImage(aRect, mpImpl->maNonModifiedButton); + pDev->DrawImage(aPt, mpImpl->maNonModifiedButton); + } +} -void SvxModifyControl::DrawItemText_Impl() +void SvxModifyControl::DoubleClick() { - String sMode; + if (!mpImpl->mbModified) + // document not modified. nothing to do here. + return; - if ( bState ) - sMode = '*'; - GetStatusBar().SetItemText( GetId(), sMode ); + Sequence<PropertyValue> aArgs; + execute(OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save")), aArgs); } sal_uIntPtr SvxModifyControl::GetDefItemWidth(const StatusBar& rStb) @@ -96,3 +152,4 @@ sal_uIntPtr SvxModifyControl::GetDefItemWidth(const StatusBar& rStb) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index d1bc7d4d610e..8be9399aa843 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,9 +58,7 @@ #include <svx/dialogs.hrc> #include <unotools/localedatawrapper.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif // ----------------------------------------------------------------------- @@ -445,3 +444,4 @@ sal_uIntPtr SvxPosSizeStatusBarControl::GetDefItemWidth(const StatusBar& rStb) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index e216a4c204ba..33e9e52ee4c0 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif #include <svl/intitem.hxx> #include <sfx2/dispatch.hxx> #include <tools/urlobj.hxx> @@ -124,7 +123,7 @@ void SvxSelectionModeControl::DrawItemText_Impl() case 3: _nId = RID_SVXSTR_SELMODE_BLK; break; - default: DBG_ERROR( "invalid selection mode!" ); + default: OSL_FAIL( "invalid selection mode!" ); } if ( _nId ) @@ -152,3 +151,4 @@ sal_uIntPtr SvxSelectionModeControl::GetDefItemWidth(const StatusBar& rStb) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/stbctrls/stbctrls.h b/svx/source/stbctrls/stbctrls.h index 5a201d7a7bc7..744082ebe523 100644..100755 --- a/svx/source/stbctrls/stbctrls.h +++ b/svx/source/stbctrls/stbctrls.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src index c6f466955254..cd129d18576b 100644 --- a/svx/source/stbctrls/stbctrls.src +++ b/svx/source/stbctrls/stbctrls.src @@ -89,6 +89,16 @@ String RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG Text [ en-US ] = "Digital Signature: The document signature and the certificate are OK, but not all parts of the document are signed."; }; +String RID_SVXSTR_DOC_MODIFIED_YES +{ + Text [ en-US ] = "The document has been modified. Double-click to save the document."; +}; + +String RID_SVXSTR_DOC_MODIFIED_NO +{ + Text [ en-US ] = "The document has not been modified since the last save."; +}; + // PopupMenu ------------------------------------------------------------- Menu RID_SVXMNU_ZOOM { @@ -250,30 +260,6 @@ Image RID_SVXBMP_SIGNET_NOTVALIDATED }; MaskColor = STD_MASKCOLOR; }; -Image RID_SVXBMP_SIGNET_H -{ - ImageBitmap = Bitmap - { - File = "signet_11x16_h.png" ; - }; - MaskColor = STD_MASKCOLOR; -}; -Image RID_SVXBMP_SIGNET_BROKEN_H -{ - ImageBitmap = Bitmap - { - File = "caution_11x16_h.png" ; - }; - MaskColor = STD_MASKCOLOR; -}; -Image RID_SVXBMP_SIGNET_NOTVALIDATED_H -{ - ImageBitmap = Bitmap - { - File = "notcertificate_16_h.png" ; - }; - MaskColor = STD_MASKCOLOR; -}; Image RID_SVXBMP_SLIDERBUTTON @@ -300,28 +286,19 @@ Image RID_SVXBMP_SLIDERINCREASE }; MaskColor = STD_MASKCOLOR; }; -Image RID_SVXBMP_SLIDERBUTTON_HC +Image RID_SVXBMP_DOC_MODIFIED_YES { ImageBitmap = Bitmap { - File = "navigationball_10_h.png" ; + File = "doc_modified_yes_14.png" ; }; MaskColor = STD_MASKCOLOR; }; -Image RID_SVXBMP_SLIDERDECREASE_HC +Image RID_SVXBMP_DOC_MODIFIED_NO { ImageBitmap = Bitmap { - File = "slidezoomout_11_h.png" ; + File = "doc_modified_no_14.png" ; }; MaskColor = STD_MASKCOLOR; }; -Image RID_SVXBMP_SLIDERINCREASE_HC -{ - ImageBitmap = Bitmap - { - File = "slidezoomin_11_h.png" ; - }; - MaskColor = STD_MASKCOLOR; -}; - diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 4a5062cc6645..2859b3d47b44 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,18 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -// include --------------------------------------------------------------- #include <tools/shl.hxx> -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <vcl/image.hxx> -//#ifndef _SFXITEMPOOL_HXX -//#include <svl/itempool.hxx> -//#endif #include <sfx2/signaturestate.hxx> #include <sfx2/app.hxx> #include <sfx2/module.hxx> @@ -58,21 +51,6 @@ #define PAINT_OFFSET 5 -//#include <editeng/sizeitem.hxx> -//#include <svx/dialmgr.hxx> -//#include "svx/dlgutil.hxx" -//#include "stbctrls.h" - -//#include <svx/dialogs.hrc> - -/*#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX -#include <unotools/localedatawrapper.hxx> -#endif -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX -#include <comphelper/processfactory.hxx> -#endif*/ - - SFX_IMPL_STATUSBAR_CONTROL( XmlSecStatusBarControl, SfxUInt16Item ); @@ -89,17 +67,13 @@ struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl XmlSecStatusBarControl::XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ) :SfxStatusBarControl( _nSlotId, _nId, _rStb ) - ,mpImpl( new XmlSecStatusBarControl_Impl ) { mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN; - sal_Bool bHC = GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode(); - mpImpl->maImage = Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_H : RID_SVXBMP_SIGNET ) ); - mpImpl->maImageBroken = - Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_BROKEN_H : RID_SVXBMP_SIGNET_BROKEN ) ); - mpImpl->maImageNotValidated = - Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_NOTVALIDATED_H : RID_SVXBMP_SIGNET_NOTVALIDATED ) ); + mpImpl->maImage = Image( SVX_RES( RID_SVXBMP_SIGNET ) ); + mpImpl->maImageBroken = Image( SVX_RES( RID_SVXBMP_SIGNET_BROKEN ) ); + mpImpl->maImageNotValidated = Image( SVX_RES( RID_SVXBMP_SIGNET_NOTVALIDATED ) ); } XmlSecStatusBarControl::~XmlSecStatusBarControl() @@ -115,7 +89,6 @@ void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, cons } else if( pState->ISA( SfxUInt16Item ) ) { -// mpImpl->mbSigned = ( ( SfxUInt16Item* ) pState )->GetValue() == 1 /* SIGNED*/ ; mpImpl->mnState = ( ( SfxUInt16Item* ) pState )->GetValue(); } else @@ -170,8 +143,6 @@ void XmlSecStatusBarControl::Paint( const UserDrawEvent& rUsrEvt ) OutputDevice* pDev = rUsrEvt.GetDevice(); DBG_ASSERT( pDev, "-XmlSecStatusBarControl::Paint(): no Output Device... this will lead to nirvana..." ); Rectangle aRect = rUsrEvt.GetRect(); - StatusBar& rBar = GetStatusBar(); - Point aItemPos = rBar.GetItemTextPos( GetId() ); Color aOldLineColor = pDev->GetLineColor(); Color aOldFillColor = pDev->GetFillColor(); @@ -206,3 +177,4 @@ long XmlSecStatusBarControl::GetDefItemWidth( StatusBar& ) return 16; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 9439df87d8b9..7cf7bc8af8d5 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,19 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <tools/shl.hxx> -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <sfx2/dispatch.hxx> #include <tools/urlobj.hxx> #include <svx/dialogs.hrc> #include "svx/zoomctrl.hxx" -//CHINA001 #include "zoom.hxx" #include <svx/zoomitem.hxx> #include "stbctrls.h" #include <svx/dialmgr.hxx> @@ -83,7 +79,7 @@ ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet ) SVX_ZOOM_ENABLE_PAGEWIDTH, ZOOM_PAGE_WIDTH }; - for ( sal_uInt16 nPos = 0; nPos < sizeof(aTable) / sizeof(sal_uInt16); nPos += 2 ) + for ( sal_uInt16 nPos = 0; nPos < SAL_N_ELEMENTS(aTable); nPos += 2 ) if ( ( aTable[nPos] != ( aTable[nPos] & nValueSet ) ) ) EnableItem( aTable[nPos+1], sal_False ); } @@ -221,3 +217,4 @@ sal_uIntPtr SvxZoomStatusBarControl::GetDefItemWidth(const StatusBar& rStb) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index a957482405c4..7062870936d3 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,12 +31,8 @@ // include --------------------------------------------------------------- #include <svx/zoomsliderctrl.hxx> -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <vcl/image.hxx> #include <svx/zoomslideritem.hxx> #include <svx/dialmgr.hxx> @@ -185,10 +182,9 @@ SvxZoomSliderControl::SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nI SfxStatusBarControl( _nSlotId, _nId, _rStb ), mpImpl( new SvxZoomSliderControl_Impl ) { - const sal_Bool bHC = GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode(); - mpImpl->maSliderButton = Image( SVX_RES( bHC ? RID_SVXBMP_SLIDERBUTTON_HC : RID_SVXBMP_SLIDERBUTTON ) ); - mpImpl->maIncreaseButton = Image( SVX_RES( bHC ? RID_SVXBMP_SLIDERINCREASE_HC : RID_SVXBMP_SLIDERINCREASE ) ); - mpImpl->maDecreaseButton = Image( SVX_RES( bHC ? RID_SVXBMP_SLIDERDECREASE_HC : RID_SVXBMP_SLIDERDECREASE ) ); + mpImpl->maSliderButton = Image( SVX_RES( RID_SVXBMP_SLIDERBUTTON ) ); + mpImpl->maIncreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERINCREASE ) ); + mpImpl->maDecreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERDECREASE ) ); } // ----------------------------------------------------------------------- @@ -446,3 +442,5 @@ sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) return sal_True; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx index d6805fb24ee3..f88ab5e8ba61 100644 --- a/svx/source/svdraw/ActionDescriptionProvider.cxx +++ b/svx/source/svdraw/ActionDescriptionProvider.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ aStr.SearchAndReplaceAscii("%1", aName); return rtl::OUString(aStr); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx index b09b7de83c18..22474e59b308 100644 --- a/svx/source/svdraw/clonelist.cxx +++ b/svx/source/svdraw/clonelist.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,18 +36,10 @@ #include <svx/svdoedge.hxx> #include <svx/scene3d.hxx> -CloneList::CloneList() -{ -} - -CloneList::~CloneList() -{ -} - void CloneList::AddPair(const SdrObject* pOriginal, SdrObject* pClone) { - maOriginalList.Insert((SdrObject*)pOriginal, LIST_APPEND); - maCloneList.Insert(pClone, LIST_APPEND); + maOriginalList.push_back(pOriginal); + maCloneList.push_back(pClone); // look for subobjects, too. sal_Bool bOriginalIsGroup(pOriginal->IsGroupObject()); @@ -77,22 +70,24 @@ void CloneList::AddPair(const SdrObject* pOriginal, SdrObject* pClone) sal_uInt32 CloneList::Count() const { - return maOriginalList.Count(); + return maOriginalList.size(); } const SdrObject* CloneList::GetOriginal(sal_uInt32 nIndex) const { - return (SdrObject*)maOriginalList.GetObject(nIndex); + return maOriginalList[nIndex]; } SdrObject* CloneList::GetClone(sal_uInt32 nIndex) const { - return (SdrObject*)maCloneList.GetObject(nIndex); + return maCloneList[nIndex]; } void CloneList::CopyConnections() const { - for(sal_uInt32 a(0); a < maOriginalList.Count(); a++) + sal_uInt32 cloneCount = maCloneList.size(); + + for(sal_uInt32 a = 0; a < maOriginalList.size(); a++) { const SdrEdgeObj* pOriginalEdge = PTR_CAST(SdrEdgeObj, GetOriginal(a)); SdrEdgeObj* pCloneEdge = PTR_CAST(SdrEdgeObj, GetClone(a)); @@ -104,27 +99,41 @@ void CloneList::CopyConnections() const if(pOriginalNode1) { - sal_uLong nPos(maOriginalList.GetPos(pOriginalNode1)); + std::vector<const SdrObject*>::const_iterator it = std::find(maOriginalList.begin(), + maOriginalList.end(), + pOriginalNode1); - if(LIST_ENTRY_NOTFOUND != nPos) + sal_uInt32 nPos = it - maOriginalList.begin(); + + if(it != maOriginalList.end()) { - if(pOriginalEdge->GetConnectedNode(sal_True) != GetClone(nPos)) - { - pCloneEdge->ConnectToNode(sal_True, GetClone(nPos)); - } + SdrObject *cObj = NULL; + + if (nPos < cloneCount) + cObj = GetClone(nPos); + + if(pOriginalEdge->GetConnectedNode(sal_True) != cObj) + pCloneEdge->ConnectToNode(sal_True, cObj); } } if(pOriginalNode2) { - sal_uLong nPos(maOriginalList.GetPos(pOriginalNode2)); + std::vector<const SdrObject*>::const_iterator it = std::find(maOriginalList.begin(), + maOriginalList.end(), + pOriginalNode2); + + sal_uInt32 nPos = it - maOriginalList.begin(); - if(LIST_ENTRY_NOTFOUND != nPos) + if(it != maOriginalList.end()) { - if(pOriginalEdge->GetConnectedNode(sal_False) != GetClone(nPos)) - { - pCloneEdge->ConnectToNode(sal_False, GetClone(nPos)); - } + SdrObject *cObj = NULL; + + if (nPos < cloneCount) + cObj = GetClone(nPos); + + if(pOriginalEdge->GetConnectedNode(sal_False) != cObj) + pCloneEdge->ConnectToNode(sal_False, cObj); } } } @@ -132,3 +141,5 @@ void CloneList::CopyConnections() const } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx index 57f6270c4f91..28c590219ba7 100644 --- a/svx/source/svdraw/gradtrns.cxx +++ b/svx/source/svdraw/gradtrns.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -536,3 +537,5 @@ void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, Grad } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/gradtrns.hxx b/svx/source/svdraw/gradtrns.hxx index bf5352632f40..4d9e826580cf 100644 --- a/svx/source/svdraw/gradtrns.hxx +++ b/svx/source/svdraw/gradtrns.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,3 +63,4 @@ public: #endif // _GRADTRANS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/impgrfll.cxx b/svx/source/svdraw/impgrfll.cxx index a649977b744c..55d221386d23 100644 --- a/svx/source/svdraw/impgrfll.cxx +++ b/svx/source/svdraw/impgrfll.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -253,3 +254,5 @@ void ImpCalcBmpFillSizes( Size& rStartOffset, ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/polypolygoneditor.cxx b/svx/source/svdraw/polypolygoneditor.cxx index 804f39957938..f92f6e67454f 100644 --- a/svx/source/svdraw/polypolygoneditor.cxx +++ b/svx/source/svdraw/polypolygoneditor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,7 +47,7 @@ bool PolyPolygonEditor::DeletePoints( const std::set< sal_uInt16 >& rAbsPoints ) bool bPolyPolyChanged = false; std::set< sal_uInt16 >::const_reverse_iterator aIter;( rAbsPoints.rbegin() ); - for( aIter = rAbsPoints.rbegin(); aIter != rAbsPoints.rend(); aIter++ ) + for( aIter = rAbsPoints.rbegin(); aIter != rAbsPoints.rend(); ++aIter ) { sal_uInt32 nPoly, nPnt; if( GetRelativePolyPoint(maPolyPolygon,(*aIter), nPoly, nPnt) ) @@ -77,7 +78,7 @@ bool PolyPolygonEditor::SetSegmentsKind(SdrPathSegmentKind eKind, const std::set bool bPolyPolyChanged = false; std::set< sal_uInt16 >::const_reverse_iterator aIter;( rAbsPoints.rbegin() ); - for( aIter = rAbsPoints.rbegin(); aIter != rAbsPoints.rend(); aIter++ ) + for( aIter = rAbsPoints.rbegin(); aIter != rAbsPoints.rend(); ++aIter ) { sal_uInt32 nPolyNum, nPntNum; @@ -136,7 +137,7 @@ bool PolyPolygonEditor::SetPointsSmooth( basegfx::B2VectorContinuity eFlags, con bool bPolyPolygonChanged(false); std::set< sal_uInt16 >::const_reverse_iterator aIter;( rAbsPoints.rbegin() ); - for( aIter = rAbsPoints.rbegin(); aIter != rAbsPoints.rend(); aIter++ ) + for( aIter = rAbsPoints.rbegin(); aIter != rAbsPoints.rend(); ++aIter ) { sal_uInt32 nPolyNum, nPntNum; @@ -188,3 +189,5 @@ bool PolyPolygonEditor::GetRelativePolyPoint( const basegfx::B2DPolyPolygon& rPo } } // end of namespace sdr + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/sdrcomment.cxx b/svx/source/svdraw/sdrcomment.cxx index 9f68b3e806ff..989c6c20d6ed 100644 --- a/svx/source/svdraw/sdrcomment.cxx +++ b/svx/source/svdraw/sdrcomment.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx index 58eef58a9fd6..6d0f9dafc751 100644 --- a/svx/source/svdraw/sdrhittesthelper.cxx +++ b/svx/source/svdraw/sdrhittesthelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -171,3 +172,5 @@ bool ViewObjectContactPrimitiveHit( //////////////////////////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx index eb757a8ee41c..015367fe7a8e 100644 --- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx +++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -140,3 +141,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 79c09eea0179..5630043039f4 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,7 +43,7 @@ #include <svx/sdrpaintwindow.hxx> #include <svx/sdr/contact/objectcontactofpageview.hxx> #include <svx/sdr/contact/displayinfo.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svx/fmview.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -104,8 +105,8 @@ using namespace ::com::sun::star; uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); if( xFactory.is() ) { - const_cast< SdrPageWindow* >( this )->mxControlContainer = uno::Reference< awt::XControlContainer >(xFactory->createInstance(rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlContainer")), uno::UNO_QUERY); - uno::Reference< awt::XControlModel > xModel(xFactory->createInstance(rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlContainerModel")), uno::UNO_QUERY); + const_cast< SdrPageWindow* >( this )->mxControlContainer = uno::Reference< awt::XControlContainer >(xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlContainer"))), uno::UNO_QUERY); + uno::Reference< awt::XControlModel > xModel(xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlContainerModel"))), uno::UNO_QUERY); uno::Reference< awt::XControl > xControl(mxControlContainer, uno::UNO_QUERY); if (xControl.is()) xControl->setModel(xModel); @@ -288,8 +289,6 @@ namespace Color aColor(rand()%255, rand()%255, rand()%255); impPaintStrokePolygon(aResult.getB2DPolygon(a), rOutDev, aColor); } - - bool bBla = true; } } } @@ -466,3 +465,5 @@ void SdrPageWindow::SetDesignMode( bool _bDesignMode ) const //////////////////////////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 656ab9f2f27a..98e28a0c3eaa 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -310,3 +311,5 @@ void SdrPaintWindow::SetRedrawRegion(const Region& rNew) //////////////////////////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/selectioncontroller.cxx b/svx/source/svdraw/selectioncontroller.cxx index d76f95837441..3b2d93696b3a 100644 --- a/svx/source/svdraw/selectioncontroller.cxx +++ b/svx/source/svdraw/selectioncontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,3 +113,5 @@ bool SelectionController::ApplyFormatPaintBrush( SfxItemSet& /*rFormatSet*/, boo } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 9b73f0caaab7..d480cc45bab5 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -149,7 +150,7 @@ SdrItemPool::SdrItemPool( mppLocalPoolDefaults[SDRATTR_CUSTOMSHAPE_ADJUSTMENT -SDRATTR_START]=new SdrCustomShapeAdjustmentItem; mppLocalPoolDefaults[SDRATTR_XMLATTRIBUTES -SDRATTR_START]=new SvXMLAttrContainerItem( SDRATTR_XMLATTRIBUTES ); mppLocalPoolDefaults[SDRATTR_TEXT_USEFIXEDCELLHEIGHT -SDRATTR_START]=new SdrTextFixedCellHeightItem; - mppLocalPoolDefaults[SDRATTR_TEXT_WORDWRAP -SDRATTR_START]=new SdrTextWordWrapItem; + mppLocalPoolDefaults[SDRATTR_TEXT_WORDWRAP -SDRATTR_START]=new SdrTextWordWrapItem( sal_True ); mppLocalPoolDefaults[SDRATTR_TEXT_AUTOGROWSIZE -SDRATTR_START]=new SdrTextAutoGrowSizeItem; mppLocalPoolDefaults[SDRATTR_EDGEKIND -SDRATTR_START]=new SdrEdgeKindItem; mppLocalPoolDefaults[SDRATTR_EDGENODE1HORZDIST-SDRATTR_START]=new SdrEdgeNode1HorzDistItem(nDefEdgeDist); @@ -344,7 +345,7 @@ SdrItemPool::SdrItemPool(const SdrItemPool& rPool) |* \************************************************************************/ -SfxItemPool* __EXPORT SdrItemPool::Clone() const +SfxItemPool* SdrItemPool::Clone() const { return new SdrItemPool(*this); } @@ -378,7 +379,7 @@ SdrItemPool::~SdrItemPool() SetSecondaryPool(NULL); } -SfxItemPresentation __EXPORT SdrItemPool::GetPresentation( +SfxItemPresentation SdrItemPool::GetPresentation( const SfxPoolItem& rItem, SfxItemPresentation ePresentation, SfxMapUnit ePresentationMetric, XubString& rText, const IntlWrapper * pIntlWrapper) const @@ -641,13 +642,13 @@ SdrFractionItem::SdrFractionItem(sal_uInt16 nId, SvStream& rIn): nValue=Fraction(nMul,nDiv); } -int __EXPORT SdrFractionItem::operator==(const SfxPoolItem& rCmp) const +int SdrFractionItem::operator==(const SfxPoolItem& rCmp) const { return SfxPoolItem::operator==(rCmp) && ((SdrFractionItem&)rCmp).GetValue()==nValue; } -SfxItemPresentation __EXPORT SdrFractionItem::GetPresentation( +SfxItemPresentation SdrFractionItem::GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, XubString &rText, const IntlWrapper *) const { @@ -680,38 +681,30 @@ SfxItemPresentation __EXPORT SdrFractionItem::GetPresentation( return ePresentation; } -SfxPoolItem* __EXPORT SdrFractionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrFractionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrFractionItem(Which(),rIn); } -SvStream& __EXPORT SdrFractionItem::Store(SvStream& rOut, sal_uInt16 /*nItemVers*/) const +SvStream& SdrFractionItem::Store(SvStream& rOut, sal_uInt16 /*nItemVers*/) const { rOut<<sal_Int32(nValue.GetNumerator()); rOut<<sal_Int32(nValue.GetDenominator()); return rOut; } -SfxPoolItem* __EXPORT SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const +SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const { return new SdrFractionItem(Which(),GetValue()); } -#ifdef SDR_ISPOOLABLE -int __EXPORT SdrFractionItem::IsPoolable() const -{ - sal_uInt16 nId=Which(); - return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST; -} -#endif - //////////////////////////////////////////////////////////////////////////////// // ScaleItem //////////////////////////////////////////////////////////////////////////////// TYPEINIT1_AUTOFACTORY(SdrScaleItem,SdrFractionItem); -SfxItemPresentation __EXPORT SdrScaleItem::GetPresentation( +SfxItemPresentation SdrScaleItem::GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, XubString &rText, const IntlWrapper *) const { @@ -741,12 +734,12 @@ SfxItemPresentation __EXPORT SdrScaleItem::GetPresentation( return ePresentation; } -SfxPoolItem* __EXPORT SdrScaleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrScaleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrScaleItem(Which(),rIn); } -SfxPoolItem* __EXPORT SdrScaleItem::Clone(SfxItemPool * /*pPool*/) const +SfxPoolItem* SdrScaleItem::Clone(SfxItemPool * /*pPool*/) const { return new SdrScaleItem(Which(),GetValue()); } @@ -757,23 +750,23 @@ SfxPoolItem* __EXPORT SdrScaleItem::Clone(SfxItemPool * /*pPool*/) const TYPEINIT1_AUTOFACTORY(SdrOnOffItem,SfxBoolItem); -SfxPoolItem* __EXPORT SdrOnOffItem::Clone(SfxItemPool* /*pPool*/) const +SfxPoolItem* SdrOnOffItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrOnOffItem(Which(),GetValue()); } -SfxPoolItem* __EXPORT SdrOnOffItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrOnOffItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrOnOffItem(Which(),rIn); } -XubString __EXPORT SdrOnOffItem::GetValueTextByVal(sal_Bool bVal) const +XubString SdrOnOffItem::GetValueTextByVal(sal_Bool bVal) const { if (bVal) return ImpGetResStr(STR_ItemValON); else return ImpGetResStr(STR_ItemValOFF); } -SfxItemPresentation __EXPORT SdrOnOffItem::GetPresentation(SfxItemPresentation ePres, +SfxItemPresentation SdrOnOffItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { rText=GetValueTextByVal(GetValue()); @@ -787,33 +780,25 @@ SfxItemPresentation __EXPORT SdrOnOffItem::GetPresentation(SfxItemPresentation e return ePres; } -#ifdef SDR_ISPOOLABLE -int __EXPORT SdrOnOffItem::IsPoolable() const -{ - sal_uInt16 nId=Which(); - return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST; -} -#endif - TYPEINIT1_AUTOFACTORY(SdrYesNoItem,SfxBoolItem); -SfxPoolItem* __EXPORT SdrYesNoItem::Clone(SfxItemPool* /*pPool*/) const +SfxPoolItem* SdrYesNoItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrYesNoItem(Which(),GetValue()); } -SfxPoolItem* __EXPORT SdrYesNoItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrYesNoItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrYesNoItem(Which(),rIn); } -XubString __EXPORT SdrYesNoItem::GetValueTextByVal(sal_Bool bVal) const +XubString SdrYesNoItem::GetValueTextByVal(sal_Bool bVal) const { if (bVal) return ImpGetResStr(STR_ItemValYES); else return ImpGetResStr(STR_ItemValNO); } -SfxItemPresentation __EXPORT SdrYesNoItem::GetPresentation(SfxItemPresentation ePres, +SfxItemPresentation SdrYesNoItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { rText=GetValueTextByVal(GetValue()); @@ -827,31 +812,23 @@ SfxItemPresentation __EXPORT SdrYesNoItem::GetPresentation(SfxItemPresentation e return ePres; } -#ifdef SDR_ISPOOLABLE -int __EXPORT SdrYesNoItem::IsPoolable() const -{ - sal_uInt16 nId=Which(); - return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST; -} -#endif - //------------------------------------------------------------ // class SdrPercentItem //------------------------------------------------------------ TYPEINIT1_AUTOFACTORY(SdrPercentItem,SfxUInt16Item); -SfxPoolItem* __EXPORT SdrPercentItem::Clone(SfxItemPool* /*pPool*/) const +SfxPoolItem* SdrPercentItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrPercentItem(Which(),GetValue()); } -SfxPoolItem* __EXPORT SdrPercentItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrPercentItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrPercentItem(Which(),rIn); } -SfxItemPresentation __EXPORT SdrPercentItem::GetPresentation( +SfxItemPresentation SdrPercentItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { @@ -870,31 +847,23 @@ SfxItemPresentation __EXPORT SdrPercentItem::GetPresentation( return ePres; } -#ifdef SDR_ISPOOLABLE -int __EXPORT SdrPercentItem::IsPoolable() const -{ - sal_uInt16 nId=Which(); - return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST; -} -#endif - //------------------------------------------------------------ // class SdrAngleItem //------------------------------------------------------------ TYPEINIT1_AUTOFACTORY(SdrAngleItem,SfxInt32Item); -SfxPoolItem* __EXPORT SdrAngleItem::Clone(SfxItemPool* /*pPool*/) const +SfxPoolItem* SdrAngleItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrAngleItem(Which(),GetValue()); } -SfxPoolItem* __EXPORT SdrAngleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrAngleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrAngleItem(Which(),rIn); } -SfxItemPresentation __EXPORT SdrAngleItem::GetPresentation( +SfxItemPresentation SdrAngleItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper * pIntlWrapper) const { @@ -967,36 +936,28 @@ SfxItemPresentation __EXPORT SdrAngleItem::GetPresentation( return ePres; } -#ifdef SDR_ISPOOLABLE -int __EXPORT SdrAngleItem::IsPoolable() const -{ - sal_uInt16 nId=Which(); - return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST; -} -#endif - //------------------------------------------------------------ // class SdrMetricItem //------------------------------------------------------------ TYPEINIT1_AUTOFACTORY(SdrMetricItem,SfxInt32Item); -SfxPoolItem* __EXPORT SdrMetricItem::Clone(SfxItemPool* /*pPool*/) const +SfxPoolItem* SdrMetricItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMetricItem(Which(),GetValue()); } -SfxPoolItem* __EXPORT SdrMetricItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrMetricItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMetricItem(Which(),rIn); } -FASTBOOL __EXPORT SdrMetricItem::HasMetrics() const +bool SdrMetricItem::HasMetrics() const { return sal_True; } -FASTBOOL __EXPORT SdrMetricItem::ScaleMetrics(long nMul, long nDiv) +bool SdrMetricItem::ScaleMetrics(long nMul, long nDiv) { if (GetValue()!=0) { BigInt aVal(GetValue()); @@ -1008,7 +969,7 @@ FASTBOOL __EXPORT SdrMetricItem::ScaleMetrics(long nMul, long nDiv) return sal_True; } -SfxItemPresentation __EXPORT SdrMetricItem::GetPresentation(SfxItemPresentation ePres, +SfxItemPresentation SdrMetricItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, XubString& rText, const IntlWrapper *) const { long nValue=GetValue(); @@ -1027,32 +988,24 @@ SfxItemPresentation __EXPORT SdrMetricItem::GetPresentation(SfxItemPresentation return ePres; } -#ifdef SDR_ISPOOLABLE -int __EXPORT SdrMetricItem::IsPoolable() const -{ - sal_uInt16 nId=Which(); - return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST; -} -#endif - //////////////////////////////////////////////////////////////////////////////// // Items des Legendenobjekts //////////////////////////////////////////////////////////////////////////////// TYPEINIT1_AUTOFACTORY(SdrCaptionTypeItem,SfxEnumItem); -SfxPoolItem* __EXPORT SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionTypeItem(*this); } +SfxPoolItem* SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionTypeItem(*this); } -SfxPoolItem* __EXPORT SdrCaptionTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCaptionTypeItem(rIn); } +SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCaptionTypeItem(rIn); } -sal_uInt16 __EXPORT SdrCaptionTypeItem::GetValueCount() const { return 4; } +sal_uInt16 SdrCaptionTypeItem::GetValueCount() const { return 4; } -XubString __EXPORT SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const +XubString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValCAPTIONTYPE1+nPos); } -SfxItemPresentation __EXPORT SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres, +SfxItemPresentation SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1068,18 +1021,18 @@ SfxItemPresentation __EXPORT SdrCaptionTypeItem::GetPresentation(SfxItemPresenta TYPEINIT1_AUTOFACTORY(SdrCaptionEscDirItem,SfxEnumItem); -SfxPoolItem* __EXPORT SdrCaptionEscDirItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionEscDirItem(*this); } +SfxPoolItem* SdrCaptionEscDirItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionEscDirItem(*this); } -SfxPoolItem* __EXPORT SdrCaptionEscDirItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCaptionEscDirItem(rIn); } +SfxPoolItem* SdrCaptionEscDirItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCaptionEscDirItem(rIn); } -sal_uInt16 __EXPORT SdrCaptionEscDirItem::GetValueCount() const { return 3; } +sal_uInt16 SdrCaptionEscDirItem::GetValueCount() const { return 3; } -XubString __EXPORT SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const +XubString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValCAPTIONESCHORI+nPos); } -SfxItemPresentation __EXPORT SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres, +SfxItemPresentation SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1100,18 +1053,18 @@ SfxItemPresentation __EXPORT SdrCaptionEscDirItem::GetPresentation(SfxItemPresen // FitToSize TYPEINIT1_AUTOFACTORY(SdrTextFitToSizeTypeItem,SfxEnumItem); -SfxPoolItem* __EXPORT SdrTextFitToSizeTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextFitToSizeTypeItem(*this); } +SfxPoolItem* SdrTextFitToSizeTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextFitToSizeTypeItem(*this); } -SfxPoolItem* __EXPORT SdrTextFitToSizeTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextFitToSizeTypeItem(rIn); } +SfxPoolItem* SdrTextFitToSizeTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextFitToSizeTypeItem(rIn); } -sal_uInt16 __EXPORT SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; } +sal_uInt16 SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; } -XubString __EXPORT SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const +XubString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValFITTOSIZENONE+nPos); } -SfxItemPresentation __EXPORT SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres, +SfxItemPresentation SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1125,51 +1078,51 @@ SfxItemPresentation __EXPORT SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPr return ePres; } -int __EXPORT SdrTextFitToSizeTypeItem::HasBoolValue() const { return sal_True; } +int SdrTextFitToSizeTypeItem::HasBoolValue() const { return sal_True; } -sal_Bool __EXPORT SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; } +sal_Bool SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; } -void __EXPORT SdrTextFitToSizeTypeItem::SetBoolValue(sal_Bool bVal) { SetValue(sal::static_int_cast< sal_uInt16 >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); } +void SdrTextFitToSizeTypeItem::SetBoolValue(sal_Bool bVal) { SetValue(sal::static_int_cast< sal_uInt16 >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); } -sal_Bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { drawing::TextFitToSizeType eFS = (drawing::TextFitToSizeType)GetValue(); rVal <<= eFS; - return sal_True; + return true; } -sal_Bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextFitToSizeType eFS; if(!(rVal >>= eFS)) { sal_Int32 nEnum = 0; if(!(rVal >>= nEnum)) - return sal_False; + return false; eFS = (drawing::TextFitToSizeType) nEnum; } SetValue( sal::static_int_cast< sal_uInt16 >( (SdrFitToSizeType)eFS ) ); - return sal_True; + return true; } TYPEINIT1_AUTOFACTORY(SdrTextVertAdjustItem,SfxEnumItem); -SfxPoolItem* __EXPORT SdrTextVertAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextVertAdjustItem(*this); } +SfxPoolItem* SdrTextVertAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextVertAdjustItem(*this); } -SfxPoolItem* __EXPORT SdrTextVertAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextVertAdjustItem(rIn); } +SfxPoolItem* SdrTextVertAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextVertAdjustItem(rIn); } -sal_uInt16 __EXPORT SdrTextVertAdjustItem::GetValueCount() const { return 5; } +sal_uInt16 SdrTextVertAdjustItem::GetValueCount() const { return 5; } -XubString __EXPORT SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const +XubString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTVADJTOP+nPos); } -SfxItemPresentation __EXPORT SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres, +SfxItemPresentation SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1183,43 +1136,43 @@ SfxItemPresentation __EXPORT SdrTextVertAdjustItem::GetPresentation(SfxItemPrese return ePres; } -sal_Bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextVerticalAdjust)GetValue(); - return sal_True; + return true; } -sal_Bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextVerticalAdjust eAdj; if(!(rVal >>= eAdj)) { sal_Int32 nEnum = 0; if(!(rVal >>= nEnum)) - return sal_False; + return false; eAdj = (drawing::TextVerticalAdjust)nEnum; } SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextVertAdjust)eAdj ) ); - return sal_True; + return true; } TYPEINIT1_AUTOFACTORY(SdrTextHorzAdjustItem,SfxEnumItem); -SfxPoolItem* __EXPORT SdrTextHorzAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextHorzAdjustItem(*this); } +SfxPoolItem* SdrTextHorzAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextHorzAdjustItem(*this); } -SfxPoolItem* __EXPORT SdrTextHorzAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextHorzAdjustItem(rIn); } +SfxPoolItem* SdrTextHorzAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextHorzAdjustItem(rIn); } -sal_uInt16 __EXPORT SdrTextHorzAdjustItem::GetValueCount() const { return 5; } +sal_uInt16 SdrTextHorzAdjustItem::GetValueCount() const { return 5; } -XubString __EXPORT SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const +XubString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTHADJLEFT+nPos); } -SfxItemPresentation __EXPORT SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres, +SfxItemPresentation SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1233,43 +1186,43 @@ SfxItemPresentation __EXPORT SdrTextHorzAdjustItem::GetPresentation(SfxItemPrese return ePres; } -sal_Bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextHorizontalAdjust)GetValue(); - return sal_True; + return true; } -sal_Bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextHorizontalAdjust eAdj; if(!(rVal >>= eAdj)) { sal_Int32 nEnum = 0; if(!(rVal >>= nEnum)) - return sal_False; + return false; eAdj = (drawing::TextHorizontalAdjust)nEnum; } SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextHorzAdjust)eAdj ) ); - return sal_True; + return true; } TYPEINIT1_AUTOFACTORY(SdrTextAniKindItem,SfxEnumItem); -SfxPoolItem* __EXPORT SdrTextAniKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniKindItem(*this); } +SfxPoolItem* SdrTextAniKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniKindItem(*this); } -SfxPoolItem* __EXPORT SdrTextAniKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniKindItem(rIn); } +SfxPoolItem* SdrTextAniKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniKindItem(rIn); } -sal_uInt16 __EXPORT SdrTextAniKindItem::GetValueCount() const { return 5; } +sal_uInt16 SdrTextAniKindItem::GetValueCount() const { return 5; } -XubString __EXPORT SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const +XubString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTANI_NONE+nPos); } -SfxItemPresentation __EXPORT SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres, +SfxItemPresentation SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1283,42 +1236,42 @@ SfxItemPresentation __EXPORT SdrTextAniKindItem::GetPresentation(SfxItemPresenta return ePres; } -sal_Bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextAnimationKind)GetValue(); - return sal_True; + return true; } -sal_Bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextAnimationKind eKind; if(!(rVal >>= eKind)) { sal_Int32 nEnum = 0; if(!(rVal >>= nEnum)) - return sal_False; + return false; eKind = (drawing::TextAnimationKind)nEnum; } SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextAniKind)eKind ) ); - return sal_True; + return true; } TYPEINIT1_AUTOFACTORY(SdrTextAniDirectionItem,SfxEnumItem); -SfxPoolItem* __EXPORT SdrTextAniDirectionItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDirectionItem(*this); } +SfxPoolItem* SdrTextAniDirectionItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDirectionItem(*this); } -SfxPoolItem* __EXPORT SdrTextAniDirectionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniDirectionItem(rIn); } +SfxPoolItem* SdrTextAniDirectionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniDirectionItem(rIn); } -sal_uInt16 __EXPORT SdrTextAniDirectionItem::GetValueCount() const { return 4; } +sal_uInt16 SdrTextAniDirectionItem::GetValueCount() const { return 4; } -XubString __EXPORT SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const +XubString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTANI_LEFT+nPos); } -SfxItemPresentation __EXPORT SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres, +SfxItemPresentation SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1332,36 +1285,36 @@ SfxItemPresentation __EXPORT SdrTextAniDirectionItem::GetPresentation(SfxItemPre return ePres; } -sal_Bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextAnimationDirection)GetValue(); - return sal_True; + return true; } -sal_Bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextAnimationDirection eDir; if(!(rVal >>= eDir)) { sal_Int32 nEnum = 0; if(!(rVal >>= nEnum)) - return sal_False; + return false; eDir = (drawing::TextAnimationDirection)nEnum; } SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextAniDirection)eDir ) ); - return sal_True; + return true; } TYPEINIT1_AUTOFACTORY(SdrTextAniDelayItem,SfxUInt16Item); -SfxPoolItem* __EXPORT SdrTextAniDelayItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDelayItem(*this); } +SfxPoolItem* SdrTextAniDelayItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDelayItem(*this); } -SfxPoolItem* __EXPORT SdrTextAniDelayItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniDelayItem(rIn); } +SfxPoolItem* SdrTextAniDelayItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniDelayItem(rIn); } -SfxItemPresentation __EXPORT SdrTextAniDelayItem::GetPresentation( +SfxItemPresentation SdrTextAniDelayItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { @@ -1383,16 +1336,16 @@ SfxItemPresentation __EXPORT SdrTextAniDelayItem::GetPresentation( TYPEINIT1_AUTOFACTORY(SdrTextAniAmountItem,SfxInt16Item); -SfxPoolItem* __EXPORT SdrTextAniAmountItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniAmountItem(*this); } +SfxPoolItem* SdrTextAniAmountItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniAmountItem(*this); } -SfxPoolItem* __EXPORT SdrTextAniAmountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniAmountItem(rIn); } +SfxPoolItem* SdrTextAniAmountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniAmountItem(rIn); } -FASTBOOL __EXPORT SdrTextAniAmountItem::HasMetrics() const +bool SdrTextAniAmountItem::HasMetrics() const { return GetValue()>0; } -FASTBOOL __EXPORT SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv) +bool SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv) { if (GetValue()>0) { BigInt aVal(GetValue()); @@ -1404,7 +1357,7 @@ FASTBOOL __EXPORT SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv) } else return sal_False; } -SfxItemPresentation __EXPORT SdrTextAniAmountItem::GetPresentation( +SfxItemPresentation SdrTextAniAmountItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, XubString& rText, const IntlWrapper *) const { @@ -1415,10 +1368,8 @@ SfxItemPresentation __EXPORT SdrTextAniAmountItem::GetPresentation( if(nValue < 0) { - sal_Char aText[] = "pixel"; - rText = UniString::CreateFromInt32(-nValue); - rText += UniString(aText, sizeof(aText-1)); + rText += UniString(RTL_CONSTASCII_USTRINGPARAM("pixel")); } else { @@ -1457,7 +1408,7 @@ SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( SvStream & rStream, sal_ SetValue( bValue ); } } -SfxItemPresentation __EXPORT SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresentation ePres, +SfxItemPresentation SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, String &rText, const IntlWrapper * ) const { @@ -1471,11 +1422,11 @@ SfxItemPresentation __EXPORT SdrTextFixedCellHeightItem::GetPresentation( SfxIte } return ePres; } -SfxPoolItem* __EXPORT SdrTextFixedCellHeightItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const +SfxPoolItem* SdrTextFixedCellHeightItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const { return new SdrTextFixedCellHeightItem( rIn, nItemVersion ); } -SvStream& __EXPORT SdrTextFixedCellHeightItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const +SvStream& SdrTextFixedCellHeightItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const { if ( nItemVersion ) { @@ -1484,7 +1435,7 @@ SvStream& __EXPORT SdrTextFixedCellHeightItem::Store( SvStream& rOut, sal_uInt16 } return rOut; } -SfxPoolItem* __EXPORT SdrTextFixedCellHeightItem::Clone( SfxItemPool * /*pPool*/) const +SfxPoolItem* SdrTextFixedCellHeightItem::Clone( SfxItemPool * /*pPool*/) const { return new SdrTextFixedCellHeightItem( GetValue() ); } @@ -1492,27 +1443,20 @@ sal_uInt16 SdrTextFixedCellHeightItem::GetVersion( sal_uInt16 /*nFileFormatVersi { return 1; } -sal_Bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { sal_Bool bValue = (sal_Bool)GetValue(); rVal <<= bValue; - return sal_True; + return true; } -sal_Bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Bool bValue = sal_Bool(); if( !( rVal >>= bValue ) ) - return sal_False; + return false; SetValue( bValue ); - return sal_True; -} -#ifdef SDR_ISPOOLABLE -int __EXPORT SdrTextFixedCellHeightItem::IsPoolable() const -{ - sal_uInt16 nId=Which(); - return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST; + return true; } -#endif TYPEINIT1_AUTOFACTORY( SdrCustomShapeAdjustmentItem, SfxPoolItem ); @@ -1538,34 +1482,26 @@ SdrCustomShapeAdjustmentItem::SdrCustomShapeAdjustmentItem( SvStream& rIn, sal_u SdrCustomShapeAdjustmentItem::~SdrCustomShapeAdjustmentItem() { - void* pPtr; - for ( pPtr = aAdjustmentValueList.First(); pPtr; pPtr = aAdjustmentValueList.Next() ) - delete (SdrCustomShapeAdjustmentValue*)pPtr; } -int __EXPORT SdrCustomShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const +int SdrCustomShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const { int bRet = SfxPoolItem::operator==( rCmp ); if ( bRet ) { - bRet = ((SdrCustomShapeAdjustmentItem&)rCmp).GetCount() == GetCount(); - if ( bRet ) + bRet = GetCount() == ((SdrCustomShapeAdjustmentItem&)rCmp).GetCount(); + + if (bRet) { - sal_uInt32 i; - for ( i = 0; i < GetCount(); i++ ) - { - if ( ((SdrCustomShapeAdjustmentItem&)rCmp).GetValue( i ).nValue != GetValue( i ).nValue ) - { - bRet = 0; - break; - } - } + for (sal_uInt32 i = 0; i < GetCount(); ++i) + if (aAdjustmentValueList[i].nValue != ((SdrCustomShapeAdjustmentItem&)rCmp).aAdjustmentValueList[i].nValue) + return false; } } return bRet; } -SfxItemPresentation __EXPORT SdrCustomShapeAdjustmentItem::GetPresentation( +SfxItemPresentation SdrCustomShapeAdjustmentItem::GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, XubString &rText, const IntlWrapper *) const { @@ -1587,12 +1523,12 @@ SfxItemPresentation __EXPORT SdrCustomShapeAdjustmentItem::GetPresentation( return ePresentation; } -SfxPoolItem* __EXPORT SdrCustomShapeAdjustmentItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const +SfxPoolItem* SdrCustomShapeAdjustmentItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const { return new SdrCustomShapeAdjustmentItem( rIn, nItemVersion ); } -SvStream& __EXPORT SdrCustomShapeAdjustmentItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const +SvStream& SdrCustomShapeAdjustmentItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const { if ( nItemVersion ) { @@ -1604,45 +1540,31 @@ SvStream& __EXPORT SdrCustomShapeAdjustmentItem::Store( SvStream& rOut, sal_uInt return rOut; } -SfxPoolItem* __EXPORT SdrCustomShapeAdjustmentItem::Clone( SfxItemPool * /*pPool*/) const +SfxPoolItem* SdrCustomShapeAdjustmentItem::Clone( SfxItemPool * /*pPool*/) const { - sal_uInt32 i; SdrCustomShapeAdjustmentItem* pItem = new SdrCustomShapeAdjustmentItem; - for ( i = 0; i < GetCount(); i++ ) - { - const SdrCustomShapeAdjustmentValue& rVal = GetValue( i ); - pItem->SetValue( i, rVal ); - } - return pItem; -} -#ifdef SDR_ISPOOLABLE -int __EXPORT SdrCustomShapeAdjustmentItem::IsPoolable() const -{ - sal_uInt16 nId=Which(); - return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST; + if (pItem) + pItem->aAdjustmentValueList = aAdjustmentValueList; + + return pItem; } -#endif const SdrCustomShapeAdjustmentValue& SdrCustomShapeAdjustmentItem::GetValue( sal_uInt32 nIndex ) const { #ifdef DBG_UTIL - if ( aAdjustmentValueList.Count() <= nIndex ) - DBG_ERROR( "SdrCustomShapeAdjustemntItem::GetValue - nIndex out of range (SJ)" ); + if ( aAdjustmentValueList.size() <= nIndex ) + OSL_FAIL( "SdrCustomShapeAdjustemntItem::GetValue - nIndex out of range (SJ)" ); #endif - return *(SdrCustomShapeAdjustmentValue*)aAdjustmentValueList.GetObject( nIndex ); + return aAdjustmentValueList[nIndex]; } void SdrCustomShapeAdjustmentItem::SetValue( sal_uInt32 nIndex, const SdrCustomShapeAdjustmentValue& rVal ) { - sal_uInt32 i; - for ( i = GetCount(); i <= nIndex; i++ ) - { - SdrCustomShapeAdjustmentValue* pItem = new SdrCustomShapeAdjustmentValue; - aAdjustmentValueList.Insert( pItem, LIST_APPEND ); - } - SdrCustomShapeAdjustmentValue& rValue = *(SdrCustomShapeAdjustmentValue*)aAdjustmentValueList.GetObject( nIndex ); - rValue.nValue = rVal.nValue; + for (sal_uInt32 i = aAdjustmentValueList.size(); i <= nIndex; i++ ) + aAdjustmentValueList.push_back(SdrCustomShapeAdjustmentValue()); + + aAdjustmentValueList[nIndex] = rVal; } sal_uInt16 SdrCustomShapeAdjustmentItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const @@ -1650,7 +1572,7 @@ sal_uInt16 SdrCustomShapeAdjustmentItem::GetVersion( sal_uInt16 /*nFileFormatVer return 1; } -sal_Bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { sal_uInt32 i, nCount = GetCount(); uno::Sequence< sal_Int32 > aSequence( nCount ); @@ -1661,31 +1583,29 @@ sal_Bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, sal_uInt8 /*n *pPtr++ = GetValue( i ).nValue; } rVal <<= aSequence; - return sal_True; + return true; } -sal_Bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { uno::Sequence< sal_Int32 > aSequence; if( !( rVal >>= aSequence ) ) - return sal_False; + return false; - void* pPtr; - for ( pPtr = aAdjustmentValueList.First(); pPtr; pPtr = aAdjustmentValueList.Next() ) - delete (SdrCustomShapeAdjustmentValue*)pPtr; + aAdjustmentValueList.clear(); sal_uInt32 i, nCount = aSequence.getLength(); if ( nCount ) { + SdrCustomShapeAdjustmentValue val; const sal_Int32* pPtr2 = aSequence.getConstArray(); for ( i = 0; i < nCount; i++ ) { - SdrCustomShapeAdjustmentValue* pItem = new SdrCustomShapeAdjustmentValue; - pItem->nValue = *pPtr2++; - aAdjustmentValueList.Insert( pItem, LIST_APPEND ); + val.nValue = *pPtr2++; + aAdjustmentValueList.push_back(val); } } - return sal_True; + return true; } @@ -1696,18 +1616,18 @@ sal_Bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, sal_uInt8 // EdgeKind TYPEINIT1_AUTOFACTORY(SdrEdgeKindItem,SfxEnumItem); -SfxPoolItem* __EXPORT SdrEdgeKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeKindItem(*this); } +SfxPoolItem* SdrEdgeKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeKindItem(*this); } -SfxPoolItem* __EXPORT SdrEdgeKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrEdgeKindItem(rIn); } +SfxPoolItem* SdrEdgeKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrEdgeKindItem(rIn); } -sal_uInt16 __EXPORT SdrEdgeKindItem::GetValueCount() const { return 4; } +sal_uInt16 SdrEdgeKindItem::GetValueCount() const { return 4; } -XubString __EXPORT SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const +XubString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValEDGE_ORTHOLINES+nPos); } -SfxItemPresentation __EXPORT SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres, +SfxItemPresentation SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1721,7 +1641,7 @@ SfxItemPresentation __EXPORT SdrEdgeKindItem::GetPresentation(SfxItemPresentatio return ePres; } -sal_Bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { drawing::ConnectorType eCT = drawing::ConnectorType_STANDARD; @@ -1733,22 +1653,22 @@ sal_Bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) c case SDREDGE_BEZIER : eCT = drawing::ConnectorType_CURVE; break; case SDREDGE_ARC : eCT = drawing::ConnectorType_CURVE; break; default: - DBG_ERROR( "SdrEdgeKindItem::QueryValue : unknown enum" ); + OSL_FAIL( "SdrEdgeKindItem::QueryValue : unknown enum" ); } rVal <<= eCT; - return sal_True; + return true; } -sal_Bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::ConnectorType eCT; if(!(rVal >>= eCT)) { sal_Int32 nEnum = 0; if(!(rVal >>= nEnum)) - return sal_False; + return false; eCT = (drawing::ConnectorType)nEnum; } @@ -1761,123 +1681,123 @@ sal_Bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId* case drawing::ConnectorType_LINE : eEK = SDREDGE_ONELINE; break; case drawing::ConnectorType_LINES : eEK = SDREDGE_THREELINES; break; default: - DBG_ERROR( "SdrEdgeKindItem::PuValue : unknown enum" ); + OSL_FAIL( "SdrEdgeKindItem::PuValue : unknown enum" ); } SetValue( sal::static_int_cast< sal_uInt16 >( eEK ) ); - return sal_True; + return true; } -sal_Bool SdrEdgeNode1HorzDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrEdgeNode1HorzDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); - return sal_True; + return true; } -sal_Bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) - return sal_False; + return false; SetValue( nValue ); - return sal_True; + return true; } -sal_Bool SdrEdgeNode1VertDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrEdgeNode1VertDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); - return sal_True; + return true; } -sal_Bool SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) - return sal_False; + return false; SetValue( nValue ); - return sal_True; + return true; } -sal_Bool SdrEdgeNode2HorzDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrEdgeNode2HorzDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); - return sal_True; + return true; } -sal_Bool SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) - return sal_False; + return false; SetValue( nValue ); - return sal_True; + return true; } -sal_Bool SdrEdgeNode2VertDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrEdgeNode2VertDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); - return sal_True; + return true; } -sal_Bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) - return sal_False; + return false; SetValue( nValue ); - return sal_True; + return true; } -sal_Bool SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); - return sal_True; + return true; } -sal_Bool SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) - return sal_False; + return false; SetValue( nValue ); - return sal_True; + return true; } -sal_Bool SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); - return sal_True; + return true; } -sal_Bool SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) - return sal_False; + return false; SetValue( nValue ); - return sal_True; + return true; } -sal_Bool SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); - return sal_True; + return true; } -sal_Bool SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) - return sal_False; + return false; SetValue( nValue ); - return sal_True; + return true; } //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -1887,18 +1807,18 @@ sal_Bool SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMem // MeasureKind TYPEINIT1_AUTOFACTORY(SdrMeasureKindItem,SfxEnumItem); -SfxPoolItem* __EXPORT SdrMeasureKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureKindItem(*this); } +SfxPoolItem* SdrMeasureKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureKindItem(*this); } -SfxPoolItem* __EXPORT SdrMeasureKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureKindItem(rIn); } +SfxPoolItem* SdrMeasureKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureKindItem(rIn); } -sal_uInt16 __EXPORT SdrMeasureKindItem::GetValueCount() const { return 2; } +sal_uInt16 SdrMeasureKindItem::GetValueCount() const { return 2; } -XubString __EXPORT SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const +XubString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValMEASURE_STD+nPos); } -SfxItemPresentation __EXPORT SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres, +SfxItemPresentation SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1912,42 +1832,42 @@ SfxItemPresentation __EXPORT SdrMeasureKindItem::GetPresentation(SfxItemPresenta return ePres; } -sal_Bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::MeasureKind)GetValue(); - return sal_True; + return true; } -sal_Bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::MeasureKind eKind; if(!(rVal >>= eKind)) { sal_Int32 nEnum = 0; if(!(rVal >>= nEnum)) - return sal_False; + return false; eKind = (drawing::MeasureKind)nEnum; } SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureKind)eKind ) ); - return sal_True; + return true; } TYPEINIT1_AUTOFACTORY(SdrMeasureTextHPosItem,SfxEnumItem); -SfxPoolItem* __EXPORT SdrMeasureTextHPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextHPosItem(*this); } +SfxPoolItem* SdrMeasureTextHPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextHPosItem(*this); } -SfxPoolItem* __EXPORT SdrMeasureTextHPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureTextHPosItem(rIn); } +SfxPoolItem* SdrMeasureTextHPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureTextHPosItem(rIn); } -sal_uInt16 __EXPORT SdrMeasureTextHPosItem::GetValueCount() const { return 4; } +sal_uInt16 SdrMeasureTextHPosItem::GetValueCount() const { return 4; } -XubString __EXPORT SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const +XubString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValMEASURE_TEXTHAUTO+nPos); } -SfxItemPresentation __EXPORT SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres, +SfxItemPresentation SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1961,42 +1881,42 @@ SfxItemPresentation __EXPORT SdrMeasureTextHPosItem::GetPresentation(SfxItemPres return ePres; } -sal_Bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::MeasureTextHorzPos)GetValue(); - return sal_True; + return true; } -sal_Bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::MeasureTextHorzPos ePos; if(!(rVal >>= ePos)) { sal_Int32 nEnum = 0; if(!(rVal >>= nEnum)) - return sal_False; + return false; ePos = (drawing::MeasureTextHorzPos)nEnum; } SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureTextHPos)ePos ) ); - return sal_True; + return true; } TYPEINIT1_AUTOFACTORY(SdrMeasureTextVPosItem,SfxEnumItem); -SfxPoolItem* __EXPORT SdrMeasureTextVPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextVPosItem(*this); } +SfxPoolItem* SdrMeasureTextVPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextVPosItem(*this); } -SfxPoolItem* __EXPORT SdrMeasureTextVPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureTextVPosItem(rIn); } +SfxPoolItem* SdrMeasureTextVPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureTextVPosItem(rIn); } -sal_uInt16 __EXPORT SdrMeasureTextVPosItem::GetValueCount() const { return 5; } +sal_uInt16 SdrMeasureTextVPosItem::GetValueCount() const { return 5; } -XubString __EXPORT SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const +XubString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValMEASURE_TEXTVAUTO+nPos); } -SfxItemPresentation __EXPORT SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres, +SfxItemPresentation SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -2010,54 +1930,49 @@ SfxItemPresentation __EXPORT SdrMeasureTextVPosItem::GetPresentation(SfxItemPres return ePres; } -sal_Bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::MeasureTextVertPos)GetValue(); - return sal_True; + return true; } -sal_Bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::MeasureTextVertPos ePos; if(!(rVal >>= ePos)) { sal_Int32 nEnum = 0; if(!(rVal >>= nEnum)) - return sal_False; + return false; ePos = (drawing::MeasureTextVertPos)nEnum; } SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureTextHPos)ePos ) ); - return sal_True; + return true; } TYPEINIT1_AUTOFACTORY(SdrMeasureUnitItem,SfxEnumItem); -SfxPoolItem* __EXPORT SdrMeasureUnitItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureUnitItem(*this); } +SfxPoolItem* SdrMeasureUnitItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureUnitItem(*this); } -SfxPoolItem* __EXPORT SdrMeasureUnitItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureUnitItem(rIn); } +SfxPoolItem* SdrMeasureUnitItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureUnitItem(rIn); } -sal_uInt16 __EXPORT SdrMeasureUnitItem::GetValueCount() const { return 14; } +sal_uInt16 SdrMeasureUnitItem::GetValueCount() const { return 14; } -XubString __EXPORT SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const +XubString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const { XubString aRetval; if((FieldUnit)nPos == FUNIT_NONE) - { - sal_Char aText[] = "default"; - aRetval += UniString(aText, sizeof(aText-1)); - } + aRetval += UniString(RTL_CONSTASCII_USTRINGPARAM("default")); else - { SdrFormatter::TakeUnitStr((FieldUnit)nPos, aRetval); - } return aRetval; } -SfxItemPresentation __EXPORT SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres, +SfxItemPresentation SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -2071,20 +1986,20 @@ SfxItemPresentation __EXPORT SdrMeasureUnitItem::GetPresentation(SfxItemPresenta return ePres; } -sal_Bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); - return sal_True; + return true; } -sal_Bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nMeasure = 0; if(!(rVal >>= nMeasure)) - return sal_False; + return false; SetValue( sal::static_int_cast< sal_uInt16 >( (FieldUnit)nMeasure ) ); - return sal_True; + return true; } //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -2094,18 +2009,18 @@ sal_Bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMember // CircKind TYPEINIT1_AUTOFACTORY(SdrCircKindItem,SfxEnumItem); -SfxPoolItem* __EXPORT SdrCircKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCircKindItem(*this); } +SfxPoolItem* SdrCircKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCircKindItem(*this); } -SfxPoolItem* __EXPORT SdrCircKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCircKindItem(rIn); } +SfxPoolItem* SdrCircKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCircKindItem(rIn); } -sal_uInt16 __EXPORT SdrCircKindItem::GetValueCount() const { return 4; } +sal_uInt16 SdrCircKindItem::GetValueCount() const { return 4; } -XubString __EXPORT SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const +XubString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValCIRC_FULL+nPos); } -SfxItemPresentation __EXPORT SdrCircKindItem::GetPresentation(SfxItemPresentation ePres, +SfxItemPresentation SdrCircKindItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -2119,26 +2034,26 @@ SfxItemPresentation __EXPORT SdrCircKindItem::GetPresentation(SfxItemPresentatio return ePres; } -sal_Bool SdrCircKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrCircKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::CircleKind)GetValue(); - return sal_True; + return true; } -sal_Bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::CircleKind eKind; if(!(rVal >>= eKind)) { sal_Int32 nEnum = 0; if(!(rVal >>= nEnum)) - return sal_False; + return false; eKind = (drawing::CircleKind)nEnum; } SetValue( sal::static_int_cast< sal_uInt16 >( (SdrCircKind)eKind ) ); - return sal_True; + return true; } //------------------------------------------------------------ @@ -2148,17 +2063,17 @@ sal_Bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId* TYPEINIT1_AUTOFACTORY( SdrSignedPercentItem, SfxInt16Item ); -SfxPoolItem* __EXPORT SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const +SfxPoolItem* SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrSignedPercentItem( Which(), GetValue() ); } -SfxPoolItem* __EXPORT SdrSignedPercentItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrSignedPercentItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrSignedPercentItem( Which(), rIn ); } -SfxItemPresentation __EXPORT SdrSignedPercentItem::GetPresentation( +SfxItemPresentation SdrSignedPercentItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { @@ -2177,27 +2092,18 @@ SfxItemPresentation __EXPORT SdrSignedPercentItem::GetPresentation( return ePres; } -#ifdef SDR_ISPOOLABLE - -int __EXPORT SdrSignedPercentItem::IsPoolable() const -{ - sal_uInt16 nId=Which(); - return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST; -} -#endif - //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ // SdrGrafRedItem //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ TYPEINIT1( SdrGrafRedItem, SdrSignedPercentItem ); -SfxPoolItem* __EXPORT SdrGrafRedItem::Clone( SfxItemPool* /*pPool*/) const +SfxPoolItem* SdrGrafRedItem::Clone( SfxItemPool* /*pPool*/) const { return new SdrGrafRedItem( *this ); } -SfxPoolItem* __EXPORT SdrGrafRedItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrGrafRedItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafRedItem( rIn ); } @@ -2208,12 +2114,12 @@ SfxPoolItem* __EXPORT SdrGrafRedItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/ TYPEINIT1( SdrGrafGreenItem, SdrSignedPercentItem ); -SfxPoolItem* __EXPORT SdrGrafGreenItem::Clone( SfxItemPool* /*pPool*/) const +SfxPoolItem* SdrGrafGreenItem::Clone( SfxItemPool* /*pPool*/) const { return new SdrGrafGreenItem( *this ); } -SfxPoolItem* __EXPORT SdrGrafGreenItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrGrafGreenItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafGreenItem( rIn ); } @@ -2224,12 +2130,12 @@ SfxPoolItem* __EXPORT SdrGrafGreenItem::Create( SvStream& rIn, sal_uInt16 /*nVer TYPEINIT1( SdrGrafBlueItem, SdrSignedPercentItem ); -SfxPoolItem* __EXPORT SdrGrafBlueItem::Clone( SfxItemPool* /*pPool*/) const +SfxPoolItem* SdrGrafBlueItem::Clone( SfxItemPool* /*pPool*/) const { return new SdrGrafBlueItem( *this ); } -SfxPoolItem* __EXPORT SdrGrafBlueItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrGrafBlueItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafBlueItem( rIn ); } @@ -2240,12 +2146,12 @@ SfxPoolItem* __EXPORT SdrGrafBlueItem::Create( SvStream& rIn, sal_uInt16 /*nVer* TYPEINIT1( SdrGrafLuminanceItem, SdrSignedPercentItem ); -SfxPoolItem* __EXPORT SdrGrafLuminanceItem::Clone( SfxItemPool* /*pPool*/) const +SfxPoolItem* SdrGrafLuminanceItem::Clone( SfxItemPool* /*pPool*/) const { return new SdrGrafLuminanceItem( *this ); } -SfxPoolItem* __EXPORT SdrGrafLuminanceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrGrafLuminanceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafLuminanceItem( rIn ); } @@ -2256,12 +2162,12 @@ SfxPoolItem* __EXPORT SdrGrafLuminanceItem::Create( SvStream& rIn, sal_uInt16 /* TYPEINIT1( SdrGrafContrastItem, SdrSignedPercentItem ); -SfxPoolItem* __EXPORT SdrGrafContrastItem::Clone( SfxItemPool* /*pPool*/) const +SfxPoolItem* SdrGrafContrastItem::Clone( SfxItemPool* /*pPool*/) const { return new SdrGrafContrastItem( *this ); } -SfxPoolItem* __EXPORT SdrGrafContrastItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrGrafContrastItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafContrastItem( rIn ); } @@ -2272,30 +2178,30 @@ SfxPoolItem* __EXPORT SdrGrafContrastItem::Create( SvStream& rIn, sal_uInt16 /*n TYPEINIT1( SdrGrafGamma100Item, SfxUInt32Item ); -SfxPoolItem* __EXPORT SdrGrafGamma100Item::Clone( SfxItemPool* /*pPool */) const +SfxPoolItem* SdrGrafGamma100Item::Clone( SfxItemPool* /*pPool */) const { return new SdrGrafGamma100Item( *this ); } -SfxPoolItem* __EXPORT SdrGrafGamma100Item::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrGrafGamma100Item::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafGamma100Item( rIn ); } -sal_Bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= ((double)GetValue()) / 100.0; - return sal_True; + return true; } -sal_Bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { double nGamma = 0; if(!(rVal >>= nGamma)) - return sal_False; + return false; SetValue( (sal_uInt32)(nGamma * 100.0 ) ); - return sal_True; + return true; } //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -2304,12 +2210,12 @@ sal_Bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, sal_uInt8 /*nMembe TYPEINIT1( SdrGrafInvertItem, SdrOnOffItem ); -SfxPoolItem* __EXPORT SdrGrafInvertItem::Clone( SfxItemPool* /*pPool*/) const +SfxPoolItem* SdrGrafInvertItem::Clone( SfxItemPool* /*pPool*/) const { return new SdrGrafInvertItem( *this ); } -SfxPoolItem* __EXPORT SdrGrafInvertItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrGrafInvertItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafInvertItem( rIn ); } @@ -2320,12 +2226,12 @@ SfxPoolItem* __EXPORT SdrGrafInvertItem::Create( SvStream& rIn, sal_uInt16 /*nVe TYPEINIT1( SdrGrafTransparenceItem, SdrPercentItem ); -SfxPoolItem* __EXPORT SdrGrafTransparenceItem::Clone( SfxItemPool* /*pPool*/) const +SfxPoolItem* SdrGrafTransparenceItem::Clone( SfxItemPool* /*pPool*/) const { return new SdrGrafTransparenceItem( *this ); } -SfxPoolItem* __EXPORT SdrGrafTransparenceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrGrafTransparenceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafTransparenceItem( rIn ); } @@ -2336,22 +2242,22 @@ SfxPoolItem* __EXPORT SdrGrafTransparenceItem::Create( SvStream& rIn, sal_uInt16 TYPEINIT1( SdrGrafModeItem, SfxEnumItem ); -SfxPoolItem* __EXPORT SdrGrafModeItem::Clone(SfxItemPool* /*pPool*/) const +SfxPoolItem* SdrGrafModeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrGrafModeItem( *this ); } -SfxPoolItem* __EXPORT SdrGrafModeItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const +SfxPoolItem* SdrGrafModeItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafModeItem( rIn ); } -sal_uInt16 __EXPORT SdrGrafModeItem::GetValueCount() const +sal_uInt16 SdrGrafModeItem::GetValueCount() const { return 4; } -XubString __EXPORT SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const +XubString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const { XubString aStr; @@ -2359,26 +2265,22 @@ XubString __EXPORT SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const { case 1: { - sal_Char aTextGreys[] = "Greys"; - aStr += UniString(aTextGreys, sizeof(aTextGreys-1)); + aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Greys")); break; } case 2: { - sal_Char aTextBlackWhite[] = "Black/White"; - aStr += UniString(aTextBlackWhite, sizeof(aTextBlackWhite-1)); + aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Black/White")); break; } case 3: { - sal_Char aTextWatermark[] = "Watermark"; - aStr += UniString(aTextWatermark, sizeof(aTextWatermark-1)); + aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Watermark")); break; } default: { - sal_Char aTextStandard[] = "Standard"; - aStr += UniString(aTextStandard, sizeof(aTextStandard-1)); + aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Standard")); break; } } @@ -2386,7 +2288,7 @@ XubString __EXPORT SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const return aStr; } -SfxItemPresentation __EXPORT SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres, +SfxItemPresentation SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { @@ -2427,3 +2329,5 @@ sal_uInt16 SdrGrafCropItem::GetVersion( sal_uInt16 /*nFileVersion*/) const } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 6fa8b0552f35..8849ca59958b 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -298,12 +299,8 @@ void SdrCreateView::TakeActionRect(Rectangle& rRect) const sal_Bool SdrCreateView::CheckEdgeMode() { - sal_uInt32 nInv=nAktInvent; - sal_uInt16 nIdn=nAktIdent; if (pAktCreate!=NULL) { - nInv=pAktCreate->GetObjInventor(); - nIdn=pAktCreate->GetObjIdentifier(); // wird vom EdgeObj gemanaged if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return sal_False; } @@ -472,7 +469,6 @@ sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, c } if (pAktCreate!=NULL) { - sal_Bool bStartEdit=sal_False; // nach Ende von Create automatisch TextEdit starten if (pDefaultStyleSheet!=NULL) pAktCreate->NbcSetStyleSheet(pDefaultStyleSheet, sal_False); // #101618# SW uses a naked SdrObject for frame construction. Normally, such an @@ -491,8 +487,6 @@ sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, c aSet.Put(XFillStyleItem(XFILL_NONE)); pAktCreate->SetMergedItemSet(aSet); - - bStartEdit=sal_True; } if (nInvent==SdrInventor && (nIdent==OBJ_TEXT || nIdent==OBJ_TEXTEXT || nIdent==OBJ_TITLETEXT || nIdent==OBJ_OUTLINETEXT)) @@ -505,8 +499,6 @@ sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, c aSet.Put(XLineStyleItem(XLINE_NONE)); pAktCreate->SetMergedItemSet(aSet); - - bStartEdit=sal_True; } if (!rLogRect.IsEmpty()) pAktCreate->NbcSetLogicRect(rLogRect); @@ -962,3 +954,4 @@ sal_Bool SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDont } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx index c21d0e7bc631..c2fb309b2e74 100644 --- a/svx/source/svdraw/svddrag.cxx +++ b/svx/source/svdraw/svddrag.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,7 @@ #include <svx/svdview.hxx> #include <svx/svddrag.hxx> -void SdrDragStat::Clear(FASTBOOL bLeaveOne) +void SdrDragStat::Clear(bool bLeaveOne) { void* pP=aPnts.First(); while (pP!=NULL) { @@ -84,7 +85,7 @@ void SdrDragStat::NextMove(const Point& rPnt) Now()=aBla; } -void SdrDragStat::NextPoint(FASTBOOL bSaveReal) +void SdrDragStat::NextPoint(bool bSaveReal) { Point aPnt(GetNow()); if (bSaveReal) aPnt=aRealNow; @@ -108,7 +109,7 @@ Point SdrDragStat::KorregPos(const Point& rNow, const Point& /*rPrev*/) const return aRet; } -FASTBOOL SdrDragStat::CheckMinMoved(const Point& rPnt) +bool SdrDragStat::CheckMinMoved(const Point& rPnt) { if (!bMinMoved) { long dx=rPnt.X()-GetPrev().X(); if (dx<0) dx=-dx; @@ -151,3 +152,4 @@ void SdrDragStat::TakeCreateRect(Rectangle& rRect) const } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx index 201d02e7b9f3..dd9ed18bc4c3 100644 --- a/svx/source/svdraw/svddrgm1.hxx +++ b/svx/source/svdraw/svddrgm1.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -275,3 +276,5 @@ public: #endif //_SVDDRGM1_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index afbb6d0b4066..89c0e1ab3211 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -915,7 +916,7 @@ bool SdrDragMovHdl::BeginSdrDrag() { if (pH1==NULL || pH2==NULL) { - DBG_ERROR("SdrDragMovHdl::BeginSdrDrag(): Verschieben der Spiegelachse: Referenzhandles nicht gefunden"); + OSL_FAIL("SdrDragMovHdl::BeginSdrDrag(): Verschieben der Spiegelachse: Referenzhandles nicht gefunden"); return false; } @@ -2058,7 +2059,7 @@ bool SdrDragRotate::BeginSdrDrag() } else { - DBG_ERROR("SdrDragRotate::BeginSdrDrag(): Kein Referenzpunkt-Handle gefunden"); + OSL_FAIL("SdrDragRotate::BeginSdrDrag(): Kein Referenzpunkt-Handle gefunden"); return false; } } @@ -2207,7 +2208,7 @@ bool SdrDragShear::BeginSdrDrag() } else { - DBG_ERROR("SdrDragShear::BeginSdrDrag(): Kein Referenzpunkt-Handle fuer Shear gefunden"); + OSL_FAIL("SdrDragShear::BeginSdrDrag(): Kein Referenzpunkt-Handle fuer Shear gefunden"); return false; } @@ -2501,7 +2502,7 @@ bool SdrDragMirror::BeginSdrDrag() } else { - DBG_ERROR("SdrDragMirror::BeginSdrDrag(): Spiegelachse nicht gefunden"); + OSL_FAIL("SdrDragMirror::BeginSdrDrag(): Spiegelachse nicht gefunden"); return false; } } @@ -2642,7 +2643,7 @@ bool SdrDragGradient::BeginSdrDrag() } else { - DBG_ERROR("SdrDragGradient::BeginSdrDrag(): IAOGradient nicht gefunden"); + OSL_FAIL("SdrDragGradient::BeginSdrDrag(): IAOGradient nicht gefunden"); } return bRetval; @@ -3660,3 +3661,5 @@ Pointer SdrDragCrop::GetSdrDragPointer() const //////////////////////////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index ea2b67ca12f6..e232947cf933 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -819,7 +820,7 @@ sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt) } else { - DBG_ERROR("BegInsGluePoint(): GluePoint-Handle nicht gefunden"); + OSL_FAIL("BegInsGluePoint(): GluePoint-Handle nicht gefunden"); } } else @@ -1004,3 +1005,5 @@ bool SdrDragView::IsSolidDragging() const } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index d8b31a9a0ccb..f5ada616c0f8 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -340,37 +341,44 @@ void SdrEditView::EndUndo() void SdrEditView::ImpBroadcastEdgesOfMarkedNodes() { - const List& rAllMarkedObjects = GetTransitiveHullOfMarkedObjects(); + std::vector<SdrObject*>::const_iterator iterPos; + const std::vector<SdrObject*>& rAllMarkedObjects = GetTransitiveHullOfMarkedObjects(); // #i13033# // New mechanism to search for necessary disconnections for // changed connectors inside the transitive hull of all at // the beginning of UNDO selected objects - for(sal_uInt32 a(0L); a < rAllMarkedObjects.Count(); a++) + for(sal_uInt32 a(0L); a < rAllMarkedObjects.size(); a++) { - SdrEdgeObj* pEdge = PTR_CAST(SdrEdgeObj, (SdrObject*)rAllMarkedObjects.GetObject(a)); + SdrEdgeObj* pEdge = PTR_CAST(SdrEdgeObj, rAllMarkedObjects[a]); if(pEdge) { SdrObject* pObj1 = pEdge->GetConnectedNode(sal_False); SdrObject* pObj2 = pEdge->GetConnectedNode(sal_True); - if(pObj1 - && LIST_ENTRY_NOTFOUND == rAllMarkedObjects.GetPos(pObj1) - && !pEdge->CheckNodeConnection(sal_False)) + if(pObj1 && !pEdge->CheckNodeConnection(sal_False)) { - if( IsUndoEnabled() ) - AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pEdge)); - pEdge->DisconnectFromNode(sal_False); + iterPos = std::find(rAllMarkedObjects.begin(),rAllMarkedObjects.end(),pObj1); + + if (iterPos == rAllMarkedObjects.end()) + { + if( IsUndoEnabled() ) + AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pEdge)); + pEdge->DisconnectFromNode(sal_False); + } } - if(pObj2 - && LIST_ENTRY_NOTFOUND == rAllMarkedObjects.GetPos(pObj2) - && !pEdge->CheckNodeConnection(sal_True)) + if(pObj2 && !pEdge->CheckNodeConnection(sal_True)) { - if( IsUndoEnabled() ) - AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pEdge)); - pEdge->DisconnectFromNode(sal_True); + iterPos = std::find(rAllMarkedObjects.begin(),rAllMarkedObjects.end(),pObj2); + + if (iterPos == rAllMarkedObjects.end()) + { + if( IsUndoEnabled() ) + AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pEdge)); + pEdge->DisconnectFromNode(sal_True); + } } } } @@ -982,7 +990,7 @@ void SdrEditView::CopyMarkedObj() } aStr += " Objektverbindungen werden nicht mitkopiert."; - DBG_ERROR(aStr.GetBuffer()); + OSL_FAIL(aStr.GetBuffer()); #endif } MarkListHasChanged(); @@ -1047,3 +1055,5 @@ bool SdrEditView::IsUndoEnabled() const { return pMod->IsUndoEnabled(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 3502db48e4e9..8081ab2a48db 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -146,7 +147,7 @@ void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy) } pO->SetSnapRect(aR1); } else { - DBG_ERROR("SetMarkedObjRect(): pObj->GetSnapRect() liefert leeres Rect"); + OSL_FAIL("SetMarkedObjRect(): pObj->GetSnapRect() liefert leeres Rect"); } } if( bUndo ) @@ -1369,7 +1370,6 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) nRotateY = nOldRotateY = aRotateAxe.Y(); } - long nNewShearAngle=0; long nShearAngle=0; long nShearX=0; long nShearY=0; @@ -1377,7 +1377,6 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) sal_Bool bChgPos=sal_False; sal_Bool bChgSiz=sal_False; - sal_Bool bChgHgt=sal_False; sal_Bool bRotate=sal_False; sal_Bool bShear =sal_False; @@ -1403,7 +1402,6 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,sal_True,&pPoolItem)) { nSizY=((const SfxUInt32Item*)pPoolItem)->GetValue(); bChgSiz=sal_True; - bChgHgt=sal_True; } if (bChgSiz) { eSizePoint=(RECT_POINT)((const SfxAllEnumItem&)rAttr.Get(SID_ATTR_TRANSFORM_SIZE_POINT)).GetValue(); @@ -1425,7 +1423,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) // Shear if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,sal_True,&pPoolItem)) { - nNewShearAngle=((const SfxInt32Item*)pPoolItem)->GetValue(); + long nNewShearAngle=((const SfxInt32Item*)pPoolItem)->GetValue(); if (nNewShearAngle>SDRMAXSHEAR) nNewShearAngle=SDRMAXSHEAR; if (nNewShearAngle<-SDRMAXSHEAR) nNewShearAngle=-SDRMAXSHEAR; if (nNewShearAngle!=nOldShearAngle) { @@ -1536,20 +1534,6 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) // linear combination will not decompose to the same start values again, but to a // new combination. Thus it makes no sense to check if the wanted shear is reached // or not. Taking out. -#if 0 - long nTempAngle=GetMarkedObjShear(); - if (nTempAngle!=0 && nTempAngle!=nNewShearAngle && !bShearVert) { - // noch eine 2. Iteration zur Kompensation der Rundungsfehler - double nOld=tan((double)nTempAngle*nPi180); - double nNew=tan((double)nNewShearAngle*nPi180); - nNew-=nOld; - nNew=atan(nNew)/nPi180; - nTempAngle=Round(nNew); - if (nTempAngle!=0) { - ShearMarkedObj(aRef,nTempAngle,bShearVert); - } - } -#endif } // Position aendern @@ -1782,3 +1766,4 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_B EndUndo(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 7af96024cb5e..a27d1d1b4a4f 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,13 +51,16 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <svx/svxdlg.hxx> //CHINA001 -#include <svx/dialogs.hrc> //CHINA001 +#include <svx/svxdlg.hxx> +#include <svx/dialogs.hrc> // #i37011# #include <svx/svdoashp.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> +#include <vector> +using ::std::vector; + //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -142,7 +146,7 @@ void SdrEditView::MovMarkedToTop() SdrObject* pCmpObj=pOL->GetObj(nCmpPos); if (pCmpObj==NULL) { - DBG_ERROR("MovMarkedToTop(): Vergleichsobjekt nicht gefunden"); + OSL_FAIL("MovMarkedToTop(): Vergleichsobjekt nicht gefunden"); bEnd=sal_True; } else if (pCmpObj==pMaxObj) @@ -231,7 +235,7 @@ void SdrEditView::MovMarkedToBtm() SdrObject* pCmpObj=pOL->GetObj(nCmpPos); if (pCmpObj==NULL) { - DBG_ERROR("MovMarkedToBtm(): Vergleichsobjekt nicht gefunden"); + OSL_FAIL("MovMarkedToBtm(): Vergleichsobjekt nicht gefunden"); bEnd=sal_True; } else if (pCmpObj==pMaxObj) @@ -800,7 +804,7 @@ struct ImpDistributeEntry sal_Int32 mnLength; }; -DECLARE_LIST(ImpDistributeEntryList, ImpDistributeEntry*) +typedef vector< ImpDistributeEntry*> ImpDistributeEntryList; void SdrEditView::DistributeMarkedObjects() { @@ -809,12 +813,12 @@ void SdrEditView::DistributeMarkedObjects() if(nMark > 2) { SfxItemSet aNewAttr(pMod->GetItemPool()); - //CHINA001 SvxDistributeDialog* pDlg = new SvxDistributeDialog(NULL, aNewAttr); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { AbstractSvxDistributeDialog *pDlg = pFact->CreateSvxDistributeDialog(NULL, aNewAttr); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); sal_uInt16 nResult = pDlg->Execute(); @@ -823,7 +827,8 @@ void SdrEditView::DistributeMarkedObjects() SvxDistributeHorizontal eHor = pDlg->GetDistributeHor(); SvxDistributeVertical eVer = pDlg->GetDistributeVer(); ImpDistributeEntryList aEntryList; - sal_uInt32 a, nInsPos, nFullLength; + ImpDistributeEntryList::iterator itEntryList; + sal_uInt32 nFullLength; const bool bUndo = IsUndoEnabled(); if( bUndo ) @@ -834,13 +839,12 @@ void SdrEditView::DistributeMarkedObjects() // build sorted entry list nFullLength = 0L; - for(a=0;a<nMark;a++) + for( sal_uInt32 a = 0; a < nMark; a++ ) { SdrMark* pMark = GetSdrMarkByIndex(a); ImpDistributeEntry* pNew = new ImpDistributeEntry; pNew->mpObj = pMark->GetMarkedSdrObj(); - nInsPos = 0; switch(eHor) { @@ -869,25 +873,29 @@ void SdrEditView::DistributeMarkedObjects() default: break; } - while(nInsPos < aEntryList.Count() && aEntryList.GetObject(nInsPos)->mnPos < pNew->mnPos) - nInsPos++; - - aEntryList.Insert(pNew, nInsPos); + for ( itEntryList = aEntryList.begin(); + itEntryList < aEntryList.end() && (*itEntryList)->mnPos < pNew->mnPos; + ++itEntryList ) + {}; + if ( itEntryList < aEntryList.end() ) + aEntryList.insert( itEntryList, pNew ); + else + aEntryList.push_back( pNew ); } if(eHor == SvxDistributeHorizontalDistance) { // calc room in-between sal_Int32 nWidth = GetAllMarkedBoundRect().GetWidth() + 1; - double fStepWidth = ((double)nWidth - (double)nFullLength) / (double)(aEntryList.Count() - 1); - double fStepStart = (double)aEntryList.GetObject(0)->mnPos; - fStepStart += fStepWidth + (double)((aEntryList.GetObject(0)->mnLength + aEntryList.GetObject(1)->mnLength) / 2); + double fStepWidth = ((double)nWidth - (double)nFullLength) / (double)(aEntryList.size() - 1); + double fStepStart = (double)aEntryList[ 0 ]->mnPos; + fStepStart += fStepWidth + (double)((aEntryList[ 0 ]->mnLength + aEntryList[ 1 ]->mnLength) / 2); // move entries 1..n-1 - for(a=1;a<aEntryList.Count()-1;a++) + for( size_t i = 1, n = aEntryList.size()-1; i < n; ++i ) { - ImpDistributeEntry* pCurr = aEntryList.GetObject(a); - ImpDistributeEntry* pNext = aEntryList.GetObject(a+1); + ImpDistributeEntry* pCurr = aEntryList[ i ]; + ImpDistributeEntry* pNext = aEntryList[ i + 1]; sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos; if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj)); @@ -898,15 +906,15 @@ void SdrEditView::DistributeMarkedObjects() else { // calc distances - sal_Int32 nWidth = aEntryList.GetObject(aEntryList.Count() - 1)->mnPos - aEntryList.GetObject(0)->mnPos; - double fStepWidth = (double)nWidth / (double)(aEntryList.Count() - 1); - double fStepStart = (double)aEntryList.GetObject(0)->mnPos; + sal_Int32 nWidth = aEntryList[ aEntryList.size() - 1 ]->mnPos - aEntryList[ 0 ]->mnPos; + double fStepWidth = (double)nWidth / (double)(aEntryList.size() - 1); + double fStepStart = (double)aEntryList[ 0 ]->mnPos; fStepStart += fStepWidth; // move entries 1..n-1 - for(a=1;a<aEntryList.Count()-1;a++) + for( size_t i = 1 ; i < aEntryList.size()-1 ; ++i ) { - ImpDistributeEntry* pCurr = aEntryList.GetObject(a); + ImpDistributeEntry* pCurr = aEntryList[ i ]; sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos; if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj)); @@ -916,8 +924,9 @@ void SdrEditView::DistributeMarkedObjects() } // clear list - while(aEntryList.Count()) - delete aEntryList.Remove((sal_uIntPtr)0L); + for ( size_t i = 0, n = aEntryList.size(); i < n; ++i ) + delete aEntryList[ i ]; + aEntryList.clear(); } if(eVer != SvxDistributeVerticalNone) @@ -925,13 +934,12 @@ void SdrEditView::DistributeMarkedObjects() // build sorted entry list nFullLength = 0L; - for(a=0;a<nMark;a++) + for( sal_uInt32 a = 0; a < nMark; a++ ) { SdrMark* pMark = GetSdrMarkByIndex(a); ImpDistributeEntry* pNew = new ImpDistributeEntry; pNew->mpObj = pMark->GetMarkedSdrObj(); - nInsPos = 0; switch(eVer) { @@ -960,25 +968,29 @@ void SdrEditView::DistributeMarkedObjects() default: break; } - while(nInsPos < aEntryList.Count() && aEntryList.GetObject(nInsPos)->mnPos < pNew->mnPos) - nInsPos++; - - aEntryList.Insert(pNew, nInsPos); + for ( itEntryList = aEntryList.begin(); + itEntryList < aEntryList.end() && (*itEntryList)->mnPos < pNew->mnPos; + ++itEntryList ) + {}; + if ( itEntryList < aEntryList.end() ) + aEntryList.insert( itEntryList, pNew ); + else + aEntryList.push_back( pNew ); } if(eVer == SvxDistributeVerticalDistance) { // calc room in-between sal_Int32 nHeight = GetAllMarkedBoundRect().GetHeight() + 1; - double fStepWidth = ((double)nHeight - (double)nFullLength) / (double)(aEntryList.Count() - 1); - double fStepStart = (double)aEntryList.GetObject(0)->mnPos; - fStepStart += fStepWidth + (double)((aEntryList.GetObject(0)->mnLength + aEntryList.GetObject(1)->mnLength) / 2); + double fStepWidth = ((double)nHeight - (double)nFullLength) / (double)(aEntryList.size() - 1); + double fStepStart = (double)aEntryList[ 0 ]->mnPos; + fStepStart += fStepWidth + (double)((aEntryList[ 0 ]->mnLength + aEntryList[ 1 ]->mnLength) / 2); // move entries 1..n-1 - for(a=1;a<aEntryList.Count()-1;a++) + for( size_t i = 1, n = aEntryList.size()-1; i < n; ++i) { - ImpDistributeEntry* pCurr = aEntryList.GetObject(a); - ImpDistributeEntry* pNext = aEntryList.GetObject(a+1); + ImpDistributeEntry* pCurr = aEntryList[ i ]; + ImpDistributeEntry* pNext = aEntryList[ i + 1 ]; sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos; if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj)); @@ -989,15 +1001,15 @@ void SdrEditView::DistributeMarkedObjects() else { // calc distances - sal_Int32 nHeight = aEntryList.GetObject(aEntryList.Count() - 1)->mnPos - aEntryList.GetObject(0)->mnPos; - double fStepWidth = (double)nHeight / (double)(aEntryList.Count() - 1); - double fStepStart = (double)aEntryList.GetObject(0)->mnPos; + sal_Int32 nHeight = aEntryList[ aEntryList.size() - 1 ]->mnPos - aEntryList[ 0 ]->mnPos; + double fStepWidth = (double)nHeight / (double)(aEntryList.size() - 1); + double fStepStart = (double)aEntryList[ 0 ]->mnPos; fStepStart += fStepWidth; // move entries 1..n-1 - for(a=1;a<aEntryList.Count()-1;a++) + for(size_t i = 1, n = aEntryList.size()-1; i < n; ++i) { - ImpDistributeEntry* pCurr = aEntryList.GetObject(a); + ImpDistributeEntry* pCurr = aEntryList[ i ]; sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos; if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj)); @@ -1007,8 +1019,9 @@ void SdrEditView::DistributeMarkedObjects() } // clear list - while(aEntryList.Count()) - delete aEntryList.Remove((sal_uIntPtr)0L); + for ( size_t i = 0, n = aEntryList.size(); i < n; ++i ) + delete aEntryList[ i ]; + aEntryList.clear(); } // UNDO-Comment and end of UNDO @@ -1972,7 +1985,6 @@ SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bo void SdrEditView::ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea) { sal_Bool bMrkChg=sal_False; - sal_Bool bModChg=sal_False; if (AreObjectsMarked()) { sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); sal_uInt16 nDscrID=0; @@ -2007,12 +2019,11 @@ void SdrEditView::ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea) SdrObjListIter aIter(*pGrp,IM_DEEPNOGROUPS); while (aIter.IsMore()) { pObj=aIter.Next(); - if (ImpConvertOneObj(pObj,bPath,bLineToArea)) bModChg=sal_True; + ImpConvertOneObj(pObj,bPath,bLineToArea); } } else { SdrObject* pNewObj=ImpConvertOneObj(pObj,bPath,bLineToArea); if (pNewObj!=NULL) { - bModChg=sal_True; bMrkChg=sal_True; GetMarkedObjectListWriteAccess().ReplaceMark(SdrMark(pNewObj,pPV),nm); } @@ -2137,3 +2148,4 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index a8a0663a4b04..18876c50a14d 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,7 +36,6 @@ #include <svx/svdedxv.hxx> #include <svl/solar.hrc> -//#include <tools/string.h> #include <svl/itemiter.hxx> #include <vcl/msgbox.hxx> #include <vcl/hatch.hxx> @@ -73,9 +73,8 @@ #include <editeng/outliner.hxx> #include <editeng/adjitem.hxx> -// #98988# #include <svtools/colorcfg.hxx> -#include <vcl/svapp.hxx> //add CHINA001 +#include <vcl/svapp.hxx> #include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -155,7 +154,7 @@ void SdrObjEditView::TakeActionRect(Rectangle& rRect) const } } -void __EXPORT SdrObjEditView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) +void SdrObjEditView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { SdrGlueEditView::Notify(rBC,rHint); // Printerwechsel waerend des Editierens @@ -316,7 +315,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang { const SdrTextObj* pText = PTR_CAST(SdrTextObj,GetTextEditObject()); bool bTextFrame(pText && pText->IsTextFrame()); - bool bFitToSize(0 != (pTextEditOutliner->GetControlWord() & EE_CNTRL_STRETCHING)); + bool bFitToSize(pText && pText->IsFitToSize()); bool bModifyMerk(pTextEditOutliner->IsModified()); // #43095# Rectangle aBlankRect(rOutlView.GetOutputArea()); aBlankRect.Union(aMinTextEditArea); @@ -385,7 +384,7 @@ void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView& rOutlView) const { const SdrTextObj* pText = PTR_CAST(SdrTextObj,GetTextEditObject()); bool bTextFrame(pText && pText->IsTextFrame()); - bool bFitToSize(0 != (pTextEditOutliner->GetControlWord() & EE_CNTRL_STRETCHING)); + bool bFitToSize(pText && pText->IsFitToSize()); if(bTextFrame && !bFitToSize) { @@ -455,8 +454,9 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, sal_Bool /*bNoPa pOutlView->SetAnchorMode((EVAnchorMode)(pText->GetOutlinerViewAnchorMode())); pTextEditOutliner->SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)pText->GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue()); } - pOutlView->SetOutputArea(aTextEditArea); + // do update before setting output area so that aTextEditArea can be recalculated pTextEditOutliner->SetUpdateMode(sal_True); + pOutlView->SetOutputArea(aTextEditArea); ImpInvalidateOutlinerView(*pOutlView); return pOutlView; } @@ -587,7 +587,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( if(pTextEditOutliner) { - DBG_ERROR("SdrObjEditView::SdrBeginTextEdit() da stand noch ein alter Outliner rum"); + OSL_FAIL("SdrObjEditView::SdrBeginTextEdit() da stand noch ein alter Outliner rum"); delete pTextEditOutliner; pTextEditOutliner = 0L; } @@ -632,7 +632,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( // alten Cursor merken if (pTextEditOutliner->GetViewCount()!=0) { - OutlinerView* pTmpOLV=pTextEditOutliner->RemoveView(sal_uIntPtr(0)); + OutlinerView* pTmpOLV=pTextEditOutliner->RemoveView(static_cast<size_t>(0)); if(pTmpOLV!=NULL && pTmpOLV!=pGivenOutlinerView) delete pTmpOLV; } @@ -650,8 +650,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( if ( !pTextObj->IsContourTextFrame() ) { // FitToSize erstmal nicht mit ContourFrame - SdrFitToSizeType eFit = pTextObj->GetFitToSize(); - if (eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES) + if (pTextObj->IsFitToSize()) aTextRect = aAnchorRect; } @@ -719,8 +718,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( // #71519# if(!bExtraInvalidate) { - SdrFitToSizeType eFit = pTextObj->GetFitToSize(); - if(eFit == SDRTEXTFIT_PROPORTIONAL || eFit == SDRTEXTFIT_ALLLINES) + if(pTextObj->IsFitToSize()) bExtraInvalidate = sal_True; } @@ -1162,7 +1160,7 @@ sal_Bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin) ShowItemBrowser(); } #endif - if (pTextEditOutlinerView->PostKeyEvent(rKEvt)) + if (pTextEditOutlinerView->PostKeyEvent(rKEvt, pWin)) { if( pMod /* && !pMod->IsChanged() */ ) { @@ -2144,3 +2142,5 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index b68909ffa99a..d34a5df97c42 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,7 +67,7 @@ #include <svx/xflbckit.hxx> #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> -#include <vcl/svapp.hxx> //add CHINA001 +#include <vcl/svapp.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/svdpage.hxx> #include <svx/svdotable.hxx> @@ -321,7 +322,7 @@ void UShortCont::Sort() class ImpClipMerk { Region aClip; - FASTBOOL bClip; + bool bClip; public: ImpClipMerk(const OutputDevice& rOut): aClip(rOut.GetClipRegion()),bClip(rOut.IsClipRegion()) {} void Restore(OutputDevice& rOut) @@ -385,7 +386,7 @@ public: const Color& GetLineColor() const { return aLineColor; } }; -ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode, FASTBOOL bAutoMerk): +ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode, bool bAutoMerk): pFarbMerk(NULL), pClipMerk(NULL), pLineColorMerk(NULL), @@ -477,10 +478,10 @@ void SdrLinkList::InsertLink(const Link& rLink, unsigned nPos) if (rLink.IsSet()) { aList.Insert(new Link(rLink),nPos); } else { - DBG_ERROR("SdrLinkList::InsertLink(): Versuch, einen nicht gesetzten Link einzufuegen"); + OSL_FAIL("SdrLinkList::InsertLink(): Versuch, einen nicht gesetzten Link einzufuegen"); } } else { - DBG_ERROR("SdrLinkList::InsertLink(): Link schon vorhanden"); + OSL_FAIL("SdrLinkList::InsertLink(): Link schon vorhanden"); } } @@ -491,24 +492,24 @@ void SdrLinkList::RemoveLink(const Link& rLink) Link* pLink=(Link*)aList.Remove(nFnd); delete pLink; } else { - DBG_ERROR("SdrLinkList::RemoveLink(): Link nicht gefunden"); + OSL_FAIL("SdrLinkList::RemoveLink(): Link nicht gefunden"); } } //////////////////////////////////////////////////////////////////////////////////////////////////// // #98988# Re-implement GetDraftFillColor(...) -FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) +bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) { XFillStyle eFill=((XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE)).GetValue(); - FASTBOOL bRetval(sal_False); + bool bRetval = false; switch(eFill) { case XFILL_SOLID: { rCol = ((XFillColorItem&)rSet.Get(XATTR_FILLCOLOR)).GetColorValue(); - bRetval = sal_True; + bRetval = true; break; } @@ -526,7 +527,7 @@ FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) const basegfx::BColor aAverageColor(basegfx::average(aCol1.getBColor(), aCol2.getBColor())); rCol = Color(aAverageColor); - bRetval = sal_True; + bRetval = true; break; } @@ -536,7 +537,7 @@ FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) Color aCol2(rGrad.GetEndColor()); const basegfx::BColor aAverageColor(basegfx::average(aCol1.getBColor(), aCol2.getBColor())); rCol = Color(aAverageColor); - bRetval = sal_True; + bRetval = true; break; } @@ -580,7 +581,7 @@ FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) rCol = Color(sal_uInt8(nRt), sal_uInt8(nGn), sal_uInt8(nBl)); - bRetval = sal_True; + bRetval = true; } if(pAccess) @@ -670,9 +671,8 @@ ResMgr* ImpGetResMgr() if(!rGlobalData.pResMgr) { - ByteString aName("svx"); rGlobalData.pResMgr = - ResMgr::CreateResMgr( aName.GetBuffer(), Application::GetSettings().GetUILocale() ); + ResMgr::CreateResMgr( "svx", Application::GetSettings().GetUILocale() ); } return rGlobalData.pResMgr; @@ -1116,3 +1116,5 @@ Color GetTextEditBackgroundColor(const SdrObjEditView& rView) //////////////////////////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 0a4bc82e45f8..ca4667aec226 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,6 +82,7 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport(SdrModel& rModel): nLineWidth(0), maLineJoin(basegfx::B2DLINEJOIN_NONE), maDash(XDASH_RECT, 0, 0, 0, 0, 0), + fScaleX(0.0),fScaleY(0.0), bFntDirty(sal_True), bLastObjWasPolyWithoutLine(sal_False),bNoLine(sal_False),bNoFill(sal_False),bLastObjWasLine(sal_False) { @@ -112,7 +114,7 @@ sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, pPage = rOL.GetPage(); GDIMetaFile* pTmpMtf=NULL; GDIMetaFile* pMtf = (GDIMetaFile*) &rMtf; - sal_uIntPtr nActionAnz=pMtf->GetActionCount(); + size_t nActionAnz = pMtf->GetActionSize(); sal_Bool bError = sal_False; @@ -154,7 +156,7 @@ sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, if(pProgrInfo) pProgrInfo->SetActionCount(nActionAnz); - sal_uIntPtr nActionsToReport = 0; + size_t nActionsToReport = 0; for( MetaAction* pAct = pMtf->FirstAction(); pAct; pAct = pMtf->NextAction() ) { @@ -221,11 +223,11 @@ sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, // Objekte in vorgegebenes Rechteck hineinskalieren sal_uIntPtr nAnz=aTmpList.GetObjCount(); - // Beim berechnen der Fortschrittsanzeige wird GetActionCount()*3 benutzt. - // Da in aTmpList allerdings weniger eintraege als GetActionCount() + // Beim berechnen der Fortschrittsanzeige wird GetActionSize()*3 benutzt. + // Da in aTmpList allerdings weniger eintraege als GetActionSize() // existieren koennen, muessen hier die zuviel vermuteten Actionen wieder // hinzugefuegt werden. - nActionsToReport = (pMtf->GetActionCount() - nAnz)*2; + nActionsToReport = (pMtf->GetActionSize() - nAnz)*2; // Alle noch nicht gemeldeten Rescales melden @@ -268,12 +270,12 @@ sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, return aTmpList.GetObjCount(); } -void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, FASTBOOL bForceTextAttr) +void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr) { bNoLine = sal_False; bNoFill = sal_False; - FASTBOOL bLine=sal_True && !bForceTextAttr; - FASTBOOL bFill=pObj==NULL || ( pObj->IsClosedObj() && !bForceTextAttr ); - FASTBOOL bText=bForceTextAttr || (pObj!=NULL && pObj->GetOutlinerParaObject()!=NULL); + bool bLine = !bForceTextAttr; + bool bFill = (pObj==NULL) || (pObj->IsClosedObj() && !bForceTextAttr); + bool bText = bForceTextAttr || (pObj!=NULL && pObj->GetOutlinerParaObject()!=NULL); if ( bLine ) { @@ -431,7 +433,7 @@ void ImpSdrGDIMetaFileImport::InsertObj( SdrObject* pObj, sal_Bool bScale ) aTmpList.InsertObject( pObj ); if ( HAS_BASE( SdrPathObj, pObj ) ) { - FASTBOOL bClosed=pObj->IsClosedObj(); + bool bClosed=pObj->IsClosedObj(); bLastObjWasPolyWithoutLine=bNoLine && bClosed; bLastObjWasLine=!bClosed; } @@ -444,12 +446,11 @@ void ImpSdrGDIMetaFileImport::InsertObj( SdrObject* pObj, sal_Bool bScale ) } /**************************************************************************************************/ - -void ImpSdrGDIMetaFileImport::DoAction(MetaPixelAction& /*rAct*/) +void ImpSdrGDIMetaFileImport::DoAction(MetaPixelAction& /*rAct*/) const { } -void ImpSdrGDIMetaFileImport::DoAction(MetaPointAction& /*rAct*/) +void ImpSdrGDIMetaFileImport::DoAction(MetaPointAction& /*rAct*/) const { } @@ -1047,3 +1048,5 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaRenderGraphicAction& rAct) } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx index 463915d48096..c2f99a212d79 100644 --- a/svx/source/svdraw/svdfmtf.hxx +++ b/svx/source/svdraw/svdfmtf.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,8 +106,8 @@ protected: sal_Bool bLastObjWasLine; protected: - void DoAction(MetaPixelAction & rAct); - void DoAction(MetaPointAction & rAct); + void DoAction(MetaPixelAction & rAct) const; + void DoAction(MetaPointAction & rAct) const; void DoAction(MetaLineAction & rAct); void DoAction(MetaRectAction & rAct); void DoAction(MetaRoundRectAction & rAct); @@ -143,7 +144,7 @@ protected: void DoAction(MetaRenderGraphicAction& rAct); void ImportText( const Point& rPos, const XubString& rStr, const MetaAction& rAct ); - void SetAttributes(SdrObject* pObj, FASTBOOL bForceTextAttr=sal_False); + void SetAttributes(SdrObject* pObj, bool bForceTextAttr = false); void InsertObj( SdrObject* pObj, sal_Bool bScale = sal_True ); void MapScaling(); @@ -165,3 +166,5 @@ public: #endif //_SVDFMTF_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index a9c1e387d46e..11061c0ea02a 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -420,3 +421,4 @@ void SdrGlueEditView::RotateMarkedGluePoints(const Point& rRef, long nWink, bool AdjustMarkHdl(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index f5df7171499f..737542d43fe0 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,7 +36,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrGluePoint::SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj) +void SdrGluePoint::SetReallyAbsolute(bool bOn, const SdrObject& rObj) { if ( bReallyAbsolute != bOn ) { @@ -245,7 +246,7 @@ void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nWink, co if (pObj!=NULL) SetAbsolutePos(aPt,*pObj); else SetPos(aPt); } -void SdrGluePoint::Shear(const Point& rRef, long /*nWink*/, double tn, FASTBOOL bVShear, const SdrObject* pObj) +void SdrGluePoint::Shear(const Point& rRef, long /*nWink*/, double tn, bool bVShear, const SdrObject* pObj) { Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); ShearPoint(aPt,rRef,tn,bVShear); @@ -305,7 +306,7 @@ void SdrGluePoint::Invalidate(Window& rWin, const SdrObject* pObj) const rWin.EnableMapMode(bMapMerk); } -FASTBOOL SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const +bool SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const { Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); Size aSiz=rOut.PixelToLogic(Size(3,3)); @@ -344,22 +345,22 @@ sal_uInt16 SdrGluePointList::Insert(const SdrGluePoint& rGP) sal_uInt16 nInsPos=nAnz; sal_uInt16 nLastId=nAnz!=0 ? GetObject(nAnz-1)->GetId() : 0; DBG_ASSERT(nLastId>=nAnz,"SdrGluePointList::Insert(): nLastId<nAnz"); - FASTBOOL bHole=nLastId>nAnz; + bool bHole = nLastId>nAnz; if (nId<=nLastId) { if (!bHole || nId==0) { nId=nLastId+1; } else { - FASTBOOL bBrk=sal_False; + bool bBrk = false; for (sal_uInt16 nNum=0; nNum<nAnz && !bBrk; nNum++) { const SdrGluePoint* pGP2=GetObject(nNum); sal_uInt16 nTmpId=pGP2->GetId(); if (nTmpId==nId) { nId=nLastId+1; // bereits vorhanden - bBrk=sal_True; + bBrk = true; } if (nTmpId>nId) { nInsPos=nNum; // Hier einfuegen (einsortieren) - bBrk=sal_True; + bBrk = true; } } } @@ -390,7 +391,7 @@ sal_uInt16 SdrGluePointList::FindGluePoint(sal_uInt16 nId) const return nRet; } -sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, FASTBOOL bBack, FASTBOOL bNext, sal_uInt16 nId0) const +sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack, bool bNext, sal_uInt16 nId0) const { sal_uInt16 nAnz=GetCount(); sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND; @@ -408,7 +409,7 @@ sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut return nRet; } -void SdrGluePointList::SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj) +void SdrGluePointList::SetReallyAbsolute(bool bOn, const SdrObject& rObj) { sal_uInt16 nAnz=GetCount(); for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { @@ -439,7 +440,7 @@ void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, long nWink } } -void SdrGluePointList::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear, const SdrObject* pObj) +void SdrGluePointList::Shear(const Point& rRef, long nWink, double tn, bool bVShear, const SdrObject* pObj) { sal_uInt16 nAnz=GetCount(); for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { @@ -448,3 +449,5 @@ void SdrGluePointList::Shear(const Point& rRef, long nWink, double tn, FASTBOOL } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index b587945b183d..837dcb9c4a17 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,7 +142,7 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal { default: { - DBG_ERROR( "unknown kind of marker" ); + OSL_FAIL( "unknown kind of marker" ); // no break here, return Rect_7x7 as default } case Rect_7x7: @@ -285,12 +286,6 @@ SdrHdlBitmapSet& getModernSet() return *aModernSet.get(); } -SdrHdlBitmapSet& getHighContrastSet() -{ - static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aHighContrastSet(new SdrHdlBitmapSet(SIP_SA_ACCESSIBILITY_MARKERS)); - return *aHighContrastSet.get(); -} - //////////////////////////////////////////////////////////////////////////////////////////////////// SdrHdl::SdrHdl(): @@ -624,24 +619,16 @@ BitmapMarkerKind SdrHdl::GetNextBigger(BitmapMarkerKind eKnd) const case Rect_7x7: eRetval = Rect_9x9; break; case Rect_9x9: eRetval = Rect_11x11; break; case Rect_11x11: eRetval = Rect_13x13; break; - //case Rect_13x13: eRetval = ; break; case Circ_7x7: eRetval = Circ_9x9; break; case Circ_9x9: eRetval = Circ_11x11; break; - //case Circ_11x11: eRetval = ; break; case Elli_7x9: eRetval = Elli_9x11; break; - //case Elli_9x11: eRetval = ; break; case Elli_9x7: eRetval = Elli_11x9; break; - //case Elli_11x9: eRetval = ; break; case RectPlus_7x7: eRetval = RectPlus_9x9; break; case RectPlus_9x9: eRetval = RectPlus_11x11; break; - //case RectPlus_11x11: eRetval = ; break; - - //case Crosshair: eRetval = ; break; - //case Glue: eRetval = ; break; // #98388# let anchor blink with it's pressed state case Anchor: eRetval = AnchorPressed; break; @@ -656,22 +643,15 @@ BitmapMarkerKind SdrHdl::GetNextBigger(BitmapMarkerKind eKnd) const } // #101928# -BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine, sal_Bool bIsHighContrast) +BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine ) { - if(bIsHighContrast) + if(bFine) { - return getHighContrastSet().GetBitmapEx(eKindOfMarker, nInd); + return getModernSet().GetBitmapEx(eKindOfMarker, nInd); } else { - if(bFine) - { - return getModernSet().GetBitmapEx(eKindOfMarker, nInd); - } - else - { - return getSimpleSet().GetBitmapEx(eKindOfMarker, nInd); - } + return getSimpleSet().GetBitmapEx(eKindOfMarker, nInd); } } @@ -681,8 +661,6 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, { ::sdr::overlay::OverlayObject* pRetval = 0L; sal_Bool bIsFineHdl(pHdlList->IsFineHdl()); - const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - sal_Bool bIsHighContrast(rStyleSettings.GetHighContrastMode()); // support bigger sizes sal_Bool bForceBiggerSize(sal_False); @@ -692,17 +670,6 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, bForceBiggerSize = sal_True; } - // #101928# ...for high contrast, too. - if(!bForceBiggerSize && bIsHighContrast) - { - // #107925# - // ...but not for anchors, else they will not blink when activated - if(Anchor != eKindOfMarker && AnchorTR != eKindOfMarker) - { - bForceBiggerSize = sal_True; - } - } - if(bForceBiggerSize) { eKindOfMarker = GetNextBigger(eKindOfMarker); @@ -740,11 +707,12 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, // create animated hdl // #101928# use ImpGetBitmapEx(...) now - BitmapEx aBmpEx1 = ImpGetBitmapEx(eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl, bIsHighContrast); - BitmapEx aBmpEx2 = ImpGetBitmapEx(eNextBigger, (sal_uInt16)eColIndex, bIsFineHdl, bIsHighContrast); + BitmapEx aBmpEx1 = ImpGetBitmapEx( eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl ); + BitmapEx aBmpEx2 = ImpGetBitmapEx( eNextBigger, (sal_uInt16)eColIndex, bIsFineHdl ); // #i53216# Use system cursor blink time. Use the unsigned value. - const sal_uInt32 nBlinkTime((sal_uInt32)Application::GetSettings().GetStyleSettings().GetCursorBlinkTime()); + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); + const sal_uInt32 nBlinkTime((sal_uInt32)rStyleSettings.GetCursorBlinkTime()); if(eKindOfMarker == Anchor || eKindOfMarker == AnchorPressed) { @@ -772,7 +740,7 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, { // create normal handle // #101928# use ImpGetBitmapEx(...) now - BitmapEx aBmpEx = ImpGetBitmapEx(eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl, bIsHighContrast); + BitmapEx aBmpEx = ImpGetBitmapEx(eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl ); if(eKindOfMarker == Anchor || eKindOfMarker == AnchorPressed) { @@ -2276,16 +2244,9 @@ SdrCropHdl::SdrCropHdl(const Point& rPnt, SdrHdlKind eNewKind) // -------------------------------------------------------------------- -BitmapEx SdrCropHdl::GetHandlesBitmap( bool bIsFineHdl, bool bIsHighContrast ) +BitmapEx SdrCropHdl::GetHandlesBitmap( bool bIsFineHdl ) { - if( bIsHighContrast ) - { - static BitmapEx* pHighContrastBitmap = 0; - if( pHighContrastBitmap == 0 ) - pHighContrastBitmap = new BitmapEx(ResId(SIP_SA_ACCESSIBILITY_CROP_MARKERS, *ImpGetResMgr())); - return *pHighContrastBitmap; - } - else if( bIsFineHdl ) + if( bIsFineHdl ) { static BitmapEx* pModernBitmap = 0; if( pModernBitmap == 0 ) @@ -2357,12 +2318,9 @@ void SdrCropHdl::CreateB2dIAObject() { sal_Bool bIsFineHdl(pHdlList->IsFineHdl()); const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - sal_Bool bIsHighContrast(rStyleSettings.GetHighContrastMode()); int nHdlSize = pHdlList->GetHdlSize(); - if( bIsHighContrast ) - nHdlSize = 4; - const BitmapEx aHandlesBitmap( GetHandlesBitmap( bIsFineHdl, bIsHighContrast ) ); + const BitmapEx aHandlesBitmap( GetHandlesBitmap( bIsFineHdl ) ); BitmapEx aBmpEx1( GetBitmapForHandle( aHandlesBitmap, nHdlSize ) ); for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++) @@ -2415,3 +2373,5 @@ void SdrCropHdl::CreateB2dIAObject() } // -------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx index 588c7a3d57f2..30d4dd31824b 100644 --- a/svx/source/svdraw/svdhlpln.cxx +++ b/svx/source/svdraw/svdhlpln.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,11 +48,11 @@ Pointer SdrHelpLine::GetPointer() const } // switch } -FASTBOOL SdrHelpLine::IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const +bool SdrHelpLine::IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const { Size a1Pix(rOut.PixelToLogic(Size(1,1))); - FASTBOOL bXHit=rPnt.X()>=aPos.X()-nTolLog && rPnt.X()<=aPos.X()+nTolLog+a1Pix.Width(); - FASTBOOL bYHit=rPnt.Y()>=aPos.Y()-nTolLog && rPnt.Y()<=aPos.Y()+nTolLog+a1Pix.Height(); + bool bXHit=rPnt.X()>=aPos.X()-nTolLog && rPnt.X()<=aPos.X()+nTolLog+a1Pix.Width(); + bool bYHit=rPnt.Y()>=aPos.Y()-nTolLog && rPnt.Y()<=aPos.Y()+nTolLog+a1Pix.Height(); switch (eKind) { case SDRHELPLINE_VERTICAL : return bXHit; case SDRHELPLINE_HORIZONTAL: return bYHit; @@ -123,13 +124,13 @@ void SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList) bool SdrHelpLineList::operator==(const SdrHelpLineList& rSrcList) const { - FASTBOOL bEqual=sal_False; + bool bEqual = false; sal_uInt16 nAnz=GetCount(); if (nAnz==rSrcList.GetCount()) { - bEqual=sal_True; + bEqual = true; for (sal_uInt16 i=0; i<nAnz && bEqual; i++) { if (*GetObject(i)!=*rSrcList.GetObject(i)) { - bEqual=sal_False; + bEqual = false; } } } @@ -147,3 +148,5 @@ sal_uInt16 SdrHelpLineList::HitTest(const Point& rPnt, sal_uInt16 nTolLog, const } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 82cd950bbbed..3db4a25fd613 100755..100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -187,11 +188,11 @@ public: virtual void KeyInput(const KeyEvent& rEvt); }; -__EXPORT ImpItemEdit::~ImpItemEdit() +ImpItemEdit::~ImpItemEdit() { } -void __EXPORT ImpItemEdit::KeyInput(const KeyEvent& rKEvt) +void ImpItemEdit::KeyInput(const KeyEvent& rKEvt) { _SdrItemBrowserControl* pBrowseMerk = pBrowse; @@ -228,7 +229,7 @@ _SdrItemBrowserControl::_SdrItemBrowserControl(Window* pParent, WinBits nBits): ImpCtor(); } -__EXPORT _SdrItemBrowserControl::~_SdrItemBrowserControl() +_SdrItemBrowserControl::~_SdrItemBrowserControl() { if(pEditControl) delete pEditControl; @@ -302,12 +303,12 @@ void _SdrItemBrowserControl::Clear() BrowseBox::Clear(); } -long __EXPORT _SdrItemBrowserControl::GetRowCount() const +long _SdrItemBrowserControl::GetRowCount() const { return aList.Count(); } -sal_Bool __EXPORT _SdrItemBrowserControl::SeekRow(long nRow) +sal_Bool _SdrItemBrowserControl::SeekRow(long nRow) { nAktPaintRow=nRow; return sal_True; @@ -356,7 +357,7 @@ String _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const return sRet; } -void __EXPORT _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const +void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const { if (nAktPaintRow<0 || (sal_uIntPtr)nAktPaintRow>=aList.Count()) { return; @@ -404,7 +405,7 @@ sal_uInt16 _SdrItemBrowserControl::GetCurrentWhich() const return nRet; } -void __EXPORT _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&) +void _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&) { sal_uIntPtr nPos=GetCurrentPos(); if (nPos!=CONTAINER_ENTRY_NOTFOUND) { @@ -412,14 +413,14 @@ void __EXPORT _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&) } } -void __EXPORT _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt) +void _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt) { sal_uInt16 nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier(); - FASTBOOL bAusgewertet=sal_False; + bool bAusgewertet = false; sal_uIntPtr nPos=GetCurrentPos(); if (nPos!=CONTAINER_ENTRY_NOTFOUND) { if (nKeyCode==KEY_RETURN) { - if (BegChangeEntry(nPos)) bAusgewertet=sal_True; + if (BegChangeEntry(nPos)) bAusgewertet = true; } else if (nKeyCode==KEY_ESCAPE) { // ... } else if (rKEvt.GetKeyCode().GetModifier()==KEY_SHIFT+KEY_MOD1+KEY_MOD2) { // Strg @@ -457,7 +458,7 @@ sal_Int32 _SdrItemBrowserControl::GetFieldIndexAtPoint(sal_Int32 /*_nRow*/,sal_I return -1; } -void __EXPORT _SdrItemBrowserControl::Select() +void _SdrItemBrowserControl::Select() { EndChangeEntry(); BrowseBox::Select(); @@ -483,18 +484,14 @@ void _SdrItemBrowserControl::ImpSaveWhich() void _SdrItemBrowserControl::ImpRestoreWhich() { if (nLastWhich!=0) { - FASTBOOL bFnd=sal_False; - sal_uInt16 nBestMinWh=0,nBestMaxWh=0xFFFF; // not implemented yet - sal_uIntPtr nBestMinPos=0,nBestMaxPos=0xFFFFFFFF; // not implemented yet + bool bFnd = false; sal_uIntPtr nAnz=aList.Count(); sal_uIntPtr nNum; for (nNum=0; nNum<nAnz && !bFnd; nNum++) { ImpItemListRow* pEntry=ImpGetEntry(nNum); if (!pEntry->bComment) { sal_uInt16 nWh=pEntry->nWhichId; - if (nWh==nLastWhich) bFnd=sal_True; - else if (nWh<nLastWhich && nWh>nBestMinWh) nBestMinPos=nNum; - else if (nWh>nLastWhich && nWh<nBestMaxWh) nBestMaxPos=nNum; + if (nWh==nLastWhich) bFnd = true; } } if (bFnd) { @@ -508,10 +505,10 @@ void _SdrItemBrowserControl::ImpRestoreWhich() } } -FASTBOOL _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos) +bool _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos) { BrkChangeEntry(); - FASTBOOL bRet=sal_False; + bool bRet = false; ImpItemListRow* pEntry=ImpGetEntry(nPos); if (pEntry!=NULL && !pEntry->bComment) { SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT); @@ -542,14 +539,14 @@ FASTBOOL _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos) aNeuNam.AppendAscii(" - Type 'del' to reset to default."); pParent->SetText(aNeuNam); pAktChangeEntry=new ImpItemListRow(*pEntry); - bRet=sal_True; + bRet = true; } return bRet; } -FASTBOOL _SdrItemBrowserControl::EndChangeEntry() +bool _SdrItemBrowserControl::EndChangeEntry() { - FASTBOOL bRet=sal_False; + bool bRet = false; if (pEditControl!=NULL) { aEntryChangedHdl.Call(this); delete pEditControl; @@ -559,7 +556,7 @@ FASTBOOL _SdrItemBrowserControl::EndChangeEntry() Window* pParent=GetParent(); pParent->SetText(aWNamMerk); SetMode(MYBROWSEMODE); - bRet=sal_True; + bRet = true; } return bRet; } @@ -584,15 +581,15 @@ void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntP aList.Insert(new ImpItemListRow(rEntry),CONTAINER_APPEND); RowInserted(nEntryNum); } else if (*pAktEntry!=rEntry) { - FASTBOOL bStateDiff=rEntry.eState!=pAktEntry->eState; - FASTBOOL bValueDiff=!rEntry.aValue.Equals(pAktEntry->aValue); - FASTBOOL bAllDiff=sal_True; + bool bStateDiff=rEntry.eState!=pAktEntry->eState; + bool bValueDiff=!rEntry.aValue.Equals(pAktEntry->aValue); + bool bAllDiff = true; if (bStateDiff || bValueDiff) { // Checken, ob nur State und/oder Value geaendert ImpItemListRow aTest(rEntry); aTest.eState=pAktEntry->eState; aTest.aValue=pAktEntry->aValue; - if (aTest==*pAktEntry) bAllDiff=sal_False; + if (aTest==*pAktEntry) bAllDiff = false; } *pAktEntry=rEntry; if (bAllDiff) { @@ -604,7 +601,7 @@ void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntP } } -FASTBOOL ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& rpItem) +bool ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& rpItem) { SfxItemState eState=rSet.GetItemState(nWhich,sal_True,&rpItem); if (eState==SFX_ITEM_DEFAULT) { @@ -613,12 +610,12 @@ FASTBOOL ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem return (eState==SFX_ITEM_DEFAULT || eState==SFX_ITEM_SET) && rpItem!=NULL; } -FASTBOOL IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIndent) +bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIndent) { rIndent=0; if (pSet==NULL) return sal_False; const SfxPoolItem* pItem=NULL; - FASTBOOL bRet=sal_False; + bool bRet = false; switch (nWhich) { case XATTR_LINEDASH : case XATTR_LINEWIDTH : @@ -687,17 +684,15 @@ FASTBOOL IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16 if (nWhich==XATTR_FILLBITMAP || nWhich==XATTR_FILLBMP_TILE) { return sal_False; // immer anwaehlbar } - FASTBOOL bTileTRUE=sal_False; - FASTBOOL bTileFALSE=sal_False; - FASTBOOL bStretchTRUE=sal_False; - FASTBOOL bStretchFALSE=sal_False; + bool bTileTRUE = false; + bool bTileFALSE = false; + bool bStretchTRUE = false; if (ImpGetItem(*pSet,XATTR_FILLBMP_TILE,pItem)) { bTileTRUE=((const XFillBmpTileItem*)pItem)->GetValue(); bTileFALSE=!bTileTRUE; } if (ImpGetItem(*pSet,XATTR_FILLBMP_STRETCH,pItem)) { bStretchTRUE=((const XFillBmpStretchItem*)pItem)->GetValue(); - bStretchFALSE=!bStretchTRUE; } // Stretch nicht anwaehlbar, wenn Tile=TRUE if (nWhich==XATTR_FILLBMP_STRETCH) return bTileTRUE; @@ -717,14 +712,14 @@ FASTBOOL IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16 if (nWhich==XATTR_FILLBMP_TILEOFFSETX || nWhich==XATTR_FILLBMP_TILEOFFSETY) { if (bTileFALSE) return sal_True; sal_uInt16 nX=0,nY=0; - FASTBOOL bX=sal_False,bY=sal_False; + bool bX = false,bY = false; if (ImpGetItem(*pSet,XATTR_FILLBMP_TILEOFFSETX,pItem)) { nX=((const XFillBmpTileOffsetXItem*)pItem)->GetValue(); - bX=sal_True; + bX = true; } if (ImpGetItem(*pSet,XATTR_FILLBMP_TILEOFFSETY,pItem)) { nY=((const XFillBmpTileOffsetYItem*)pItem)->GetValue(); - bY=sal_True; + bY = true; } if (nWhich==XATTR_FILLBMP_TILEOFFSETX) { if (nX!=0 || !bX) return sal_False; @@ -777,7 +772,7 @@ FASTBOOL IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16 case SDRATTR_SHADOWPERSP : { rIndent=1; if (ImpGetItem(*pSet,SDRATTR_SHADOW,pItem)) { - FASTBOOL bShadow=((const SdrShadowItem*)pItem)->GetValue(); + bool bShadow=((const SdrShadowItem*)pItem)->GetValue(); if (!bShadow) return sal_True; } } break; @@ -785,7 +780,7 @@ FASTBOOL IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16 case SDRATTR_CAPTIONANGLE: { rIndent=1; if (ImpGetItem(*pSet,SDRATTR_CAPTIONFIXEDANGLE,pItem)) { - FASTBOOL bFixed=((const SdrCaptionFixedAngleItem*)pItem)->GetValue(); + bool bFixed=((const SdrCaptionFixedAngleItem*)pItem)->GetValue(); if (!bFixed) return sal_True; } } break; @@ -793,7 +788,7 @@ FASTBOOL IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16 case SDRATTR_CAPTIONESCABS: { rIndent=1; if (ImpGetItem(*pSet,SDRATTR_CAPTIONESCISREL,pItem)) { - FASTBOOL bRel=((const SdrCaptionEscIsRelItem*)pItem)->GetValue(); + bool bRel=((const SdrCaptionEscIsRelItem*)pItem)->GetValue(); if (bRel && nWhich==SDRATTR_CAPTIONESCABS) return sal_True; if (!bRel && nWhich==SDRATTR_CAPTIONESCREL) return sal_True; } @@ -801,7 +796,7 @@ FASTBOOL IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16 case SDRATTR_CAPTIONLINELEN: { rIndent=1; if (ImpGetItem(*pSet,SDRATTR_CAPTIONFITLINELEN,pItem)) { - FASTBOOL bFit=((const SdrCaptionFitLineLenItem*)pItem)->GetValue(); + bool bFit=((const SdrCaptionFitLineLenItem*)pItem)->GetValue(); if (bFit) return sal_True; } } break; @@ -810,7 +805,7 @@ FASTBOOL IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16 case SDRATTR_TEXT_MAXFRAMEHEIGHT: { rIndent=1; if (ImpGetItem(*pSet,SDRATTR_TEXT_AUTOGROWHEIGHT,pItem)) { - FASTBOOL bAutoGrow=((const SdrTextAutoGrowHeightItem*)pItem)->GetValue(); + bool bAutoGrow=((const SdrTextAutoGrowHeightItem*)pItem)->GetValue(); if (!bAutoGrow) return sal_True; } } break; @@ -818,7 +813,7 @@ FASTBOOL IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16 case SDRATTR_TEXT_MAXFRAMEWIDTH: { rIndent=1; if (ImpGetItem(*pSet,SDRATTR_TEXT_AUTOGROWWIDTH,pItem)) { - FASTBOOL bAutoGrow=((const SdrTextAutoGrowWidthItem*)pItem)->GetValue(); + bool bAutoGrow=((const SdrTextAutoGrowWidthItem*)pItem)->GetValue(); if (!bAutoGrow) return sal_True; } } break; @@ -956,7 +951,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem XubString aCommentStr; INSERTCOMMENT(XATTR_LINE_FIRST,XATTR_LINE_LAST,String("L I N I E", aTextEncoding)); - INSERTCOMMENT(XATTR_FILL_FIRST,XATTR_FILL_LAST,String("F L C H E", aTextEncoding)); + INSERTCOMMENT(XATTR_FILL_FIRST,XATTR_FILL_LAST,String("F L � C H E", aTextEncoding)); INSERTCOMMENT(XATTR_TEXT_FIRST,XATTR_TEXT_LAST,String("F O N T W O R K", aTextEncoding)); INSERTCOMMENT(SDRATTR_SHADOW_FIRST,SDRATTR_SHADOW_LAST,String("S C H A T T E N", aTextEncoding)); INSERTCOMMENT(SDRATTR_CAPTION_FIRST,SDRATTR_CAPTION_LAST,String("L E G E N D E", aTextEncoding)); @@ -975,7 +970,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem if(aCommentStr.Len()) { ImpItemListRow aEntry; - aEntry.bComment=sal_True; + aEntry.bComment = true; aEntry.aName=aCommentStr; ImpSetEntry(aEntry,nEntryNum); nEntryNum++; @@ -1018,20 +1013,20 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem else if (HAS_BASE(SvxCharScaleWidthItem,&rItem)) aEntry.eItemType=ITEM_FONTWIDTH; else if (HAS_BASE(SvxFieldItem ,&rItem)) aEntry.eItemType=ITEM_FIELD; switch (aEntry.eItemType) { - case ITEM_BYTE : aEntry.bIsNum=sal_True; aEntry.nVal=((SfxByteItem &)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=255; break; - case ITEM_INT16 : aEntry.bIsNum=sal_True; aEntry.nVal=((SfxInt16Item &)rItem).GetValue(); aEntry.nMin=-32767; aEntry.nMax=32767; break; - case ITEM_UINT16 : aEntry.bIsNum=sal_True; aEntry.nVal=((SfxUInt16Item&)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=65535; break; - case ITEM_INT32 : aEntry.bIsNum=sal_True; aEntry.nVal=((SfxInt32Item &)rItem).GetValue(); break; - case ITEM_UINT32 : aEntry.bIsNum=sal_True; aEntry.nVal=((SfxUInt32Item&)rItem).GetValue(); aEntry.nMin=0; /*aEntry.nMax=0xFF...*/;break; - case ITEM_ENUM : aEntry.bCanNum=sal_True; aEntry.nVal=((SfxEnumItemInterface&)rItem).GetEnumValue(); aEntry.nMin=0; aEntry.nMax=((SfxEnumItemInterface&)rItem).GetValueCount()-1; break; - case ITEM_BOOL : aEntry.bCanNum=sal_True; aEntry.nVal=((SfxBoolItem &)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=1; break; - case ITEM_FLAG : aEntry.bCanNum=sal_True; aEntry.nVal=((SfxFlagItem &)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=0xFFFF; break; - case ITEM_FONTHEIGHT: aEntry.bCanNum=sal_True; aEntry.nVal=((SvxFontHeightItem&)rItem).GetHeight(); aEntry.nMin=0; break; - case ITEM_FONTWIDTH : aEntry.bCanNum=sal_True; aEntry.nVal=((SvxCharScaleWidthItem&)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=0xFFFF;break; + case ITEM_BYTE : aEntry.bIsNum = true; aEntry.nVal=((SfxByteItem &)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=255; break; + case ITEM_INT16 : aEntry.bIsNum = true; aEntry.nVal=((SfxInt16Item &)rItem).GetValue(); aEntry.nMin=-32767; aEntry.nMax=32767; break; + case ITEM_UINT16 : aEntry.bIsNum = true; aEntry.nVal=((SfxUInt16Item&)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=65535; break; + case ITEM_INT32 : aEntry.bIsNum = true; aEntry.nVal=((SfxInt32Item &)rItem).GetValue(); break; + case ITEM_UINT32 : aEntry.bIsNum = true; aEntry.nVal=((SfxUInt32Item&)rItem).GetValue(); aEntry.nMin=0; /*aEntry.nMax=0xFF...*/;break; + case ITEM_ENUM : aEntry.bCanNum = true; aEntry.nVal=((SfxEnumItemInterface&)rItem).GetEnumValue(); aEntry.nMin=0; aEntry.nMax=((SfxEnumItemInterface&)rItem).GetValueCount()-1; break; + case ITEM_BOOL : aEntry.bCanNum = true; aEntry.nVal=((SfxBoolItem &)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=1; break; + case ITEM_FLAG : aEntry.bCanNum = true; aEntry.nVal=((SfxFlagItem &)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=0xFFFF; break; + case ITEM_FONTHEIGHT: aEntry.bCanNum = true; aEntry.nVal=((SvxFontHeightItem&)rItem).GetHeight(); aEntry.nMin=0; break; + case ITEM_FONTWIDTH : aEntry.bCanNum = true; aEntry.nVal=((SvxCharScaleWidthItem&)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=0xFFFF;break; default: break; } // switch - if (aEntry.bIsNum) aEntry.bCanNum=sal_True; - FASTBOOL bGetPres=sal_True; + if (aEntry.bIsNum) aEntry.bCanNum = true; + bool bGetPres = true; if (bGetPres) { rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS, pPool->GetMetric(nWhich), @@ -1083,16 +1078,16 @@ _SdrItemBrowserWindow::_SdrItemBrowserWindow(Window* pParent, WinBits nBits): aBrowse.Show(); } -__EXPORT _SdrItemBrowserWindow::~_SdrItemBrowserWindow() +_SdrItemBrowserWindow::~_SdrItemBrowserWindow() { } -void __EXPORT _SdrItemBrowserWindow::Resize() +void _SdrItemBrowserWindow::Resize() { aBrowse.SetSizePixel(GetOutputSizePixel()); } -void __EXPORT _SdrItemBrowserWindow::GetFocus() +void _SdrItemBrowserWindow::GetFocus() { aBrowse.GrabFocus(); } @@ -1136,7 +1131,7 @@ void SdrItemBrowser::ForceParent() void SdrItemBrowser::SetDirty() { if (!bDirty) { - bDirty=sal_True; + bDirty = true; aIdleTimer.SetTimeout(1); aIdleTimer.Start(); } @@ -1197,9 +1192,8 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) if (nLongVal>pEntry->nMax) nLongVal=pEntry->nMax; if (nLongVal<pEntry->nMin) nLongVal=pEntry->nMin; } - FASTBOOL bPair=sal_False; - FASTBOOL bPairX=sal_True; - FASTBOOL bPairY=sal_False; + bool bPairX = true; + bool bPairY = false; sal_uInt16 nSepLen=1; long nLongX = aNewText.ToInt32(); long nLongY=0; @@ -1208,7 +1202,6 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) if (nPos==STRING_NOTFOUND) nPos=aNewText.Search(sal_Unicode(' ')); if (nPos==STRING_NOTFOUND) { nPos=aNewText.SearchAscii(".."); if (nPos!=STRING_NOTFOUND) nSepLen=2; } if (nPos!=STRING_NOTFOUND) { - bPair=sal_True; bPairX=nPos>0; XubString s(aNewText); s.Erase(0,nPos+nSepLen); @@ -1297,3 +1290,4 @@ IMPL_LINK(SdrItemBrowser,SetDirtyHdl,_SdrItemBrowserControl*,EMPTYARG) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx index 7bc03d3a5957..efb55c74f4c3 100644 --- a/svx/source/svdraw/svditer.cxx +++ b/svx/source/svdraw/svditer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,46 +37,42 @@ // #99190# #include <svx/scene3d.hxx> -SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode, sal_Bool bReverse) -: maObjList(1024, 64, 64), - mnIndex(0L), +SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode, bool bReverse) +: mnIndex(0L), mbReverse(bReverse) { - ImpProcessObjectList(rObjList, eMode, sal_True); + ImpProcessObjectList(rObjList, eMode, true); Reset(); } -SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, sal_Bool bUseZOrder, SdrIterMode eMode, sal_Bool bReverse) -: maObjList(1024, 64, 64), - mnIndex(0L), +SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, bool bUseZOrder, SdrIterMode eMode, bool bReverse) +: mnIndex(0L), mbReverse(bReverse) { ImpProcessObjectList(rObjList, eMode, bUseZOrder); Reset(); } -SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode, sal_Bool bReverse ) -: maObjList(1024, 64, 64), - mnIndex(0L), +SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode, bool bReverse ) +: mnIndex(0L), mbReverse(bReverse) { if ( rObj.ISA( SdrObjGroup ) ) - ImpProcessObjectList(*rObj.GetSubList(), eMode, sal_True); + ImpProcessObjectList(*rObj.GetSubList(), eMode, true); else - maObjList.Insert( (void*)&rObj, LIST_APPEND ); + maObjList.push_back(const_cast<SdrObject*>(&rObj)); Reset(); } -SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode, sal_Bool bReverse ) -: maObjList(1024, 64, 64), - mnIndex(0L), +SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode, bool bReverse ) +: mnIndex(0L), mbReverse(bReverse) { ImpProcessMarkList(rMarkList, eMode); Reset(); } -void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, sal_Bool bUseZOrder) +void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, bool bUseZOrder) { for( sal_uIntPtr nIdx = 0, nCount = rObjList.GetObjCount(); nIdx < nCount; ++nIdx ) { @@ -91,10 +88,10 @@ void SdrObjListIter::ImpProcessMarkList( const SdrMarkList& rMarkList, SdrIterMo { for( sal_uIntPtr nIdx = 0, nCount = rMarkList.GetMarkCount(); nIdx < nCount; ++nIdx ) if( SdrObject* pObj = rMarkList.GetMark( nIdx )->GetMarkedSdrObj() ) - ImpProcessObj( pObj, eMode, sal_False ); + ImpProcessObj( pObj, eMode, false ); } -void SdrObjListIter::ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, sal_Bool bUseZOrder) +void SdrObjListIter::ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, bool bUseZOrder) { bool bIsGroup = pObj->IsGroupObject(); // #99190# 3D objects are no group objects, IsGroupObject() @@ -103,8 +100,10 @@ void SdrObjListIter::ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, sal_Bool bIsGroup = false; if( !bIsGroup || (eMode != IM_DEEPNOGROUPS) ) - maObjList.Insert( pObj, LIST_APPEND ); + maObjList.push_back(pObj); if( bIsGroup && (eMode != IM_FLAT) ) ImpProcessObjectList( *pObj->GetSubList(), eMode, bUseZOrder ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index f4df93fc843e..232c63ab450b 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -196,7 +197,7 @@ void SetOfByte::QueryValue( com::sun::star::uno::Any & rAny ) const // SdrLayer //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrLayer::SetStandardLayer(FASTBOOL bStd) +void SdrLayer::SetStandardLayer(bool bStd) { nType=(sal_uInt16)bStd; if (bStd) { @@ -242,8 +243,7 @@ SdrLayerAdmin::SdrLayerAdmin(SdrLayerAdmin* pNewParent): aLSets(1024,16,16), pModel(NULL) { - sal_Char aTextControls[] = "Controls"; - aControlLayerName = String(aTextControls, sizeof(aTextControls-1)); + aControlLayerName = String(RTL_CONSTASCII_USTRINGPARAM("Controls")); pParent=pNewParent; } @@ -253,8 +253,7 @@ SdrLayerAdmin::SdrLayerAdmin(const SdrLayerAdmin& rSrcLayerAdmin): pParent(NULL), pModel(NULL) { - sal_Char aTextControls[] = "Controls"; - aControlLayerName = String(aTextControls, sizeof(aTextControls-1)); + aControlLayerName = String(RTL_CONSTASCII_USTRINGPARAM("Controls")); *this = rSrcLayerAdmin; } @@ -291,7 +290,7 @@ bool SdrLayerAdmin::operator==(const SdrLayerAdmin& rCmpLayerAdmin) const if (pParent!=rCmpLayerAdmin.pParent || aLayer.Count()!=rCmpLayerAdmin.aLayer.Count() || aLSets.Count()!=rCmpLayerAdmin.aLSets.Count()) return sal_False; - FASTBOOL bOk=sal_True; + bool bOk = true; sal_uInt16 nAnz=GetLayerCount(); sal_uInt16 i=0; while (bOk && i<nAnz) { @@ -383,7 +382,7 @@ sal_uInt16 SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const return sal_uInt16(nRet); } -const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, FASTBOOL /*bInherited*/) const +const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, bool /*bInherited*/) const { sal_uInt16 i(0); const SdrLayer* pLay = NULL; @@ -404,7 +403,7 @@ const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, FASTBOOL /*bInhe return pLay; } -SdrLayerID SdrLayerAdmin::GetLayerID(const XubString& rName, FASTBOOL bInherited) const +SdrLayerID SdrLayerAdmin::GetLayerID(const XubString& rName, bool bInherited) const { SdrLayerID nRet=SDRLAYER_NOTFOUND; const SdrLayer* pLay=GetLayer(rName,bInherited); @@ -456,3 +455,4 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const return i; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 8949b1418f94..1aa2a742b0ca 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -904,7 +905,7 @@ namespace sdr mbEdgesOfMarkedNodesDirty = sal_True; maEdgesOfMarkedNodes.Clear(); maMarkedEdgesOfMarkedNodes.Clear(); - maAllMarkedObjects.Clear(); + maAllMarkedObjects.clear(); } } @@ -928,12 +929,10 @@ namespace sdr return maMarkedEdgesOfMarkedNodes; } - const List& ViewSelection::GetAllMarkedObjects() const + const std::vector<SdrObject*>& ViewSelection::GetAllMarkedObjects() const { if(mbEdgesOfMarkedNodesDirty) - { ((ViewSelection*)this)->ImpForceEdgesOfMarkedNodes(); - } return maAllMarkedObjects; } @@ -960,7 +959,7 @@ namespace sdr } } - maAllMarkedObjects.Insert(pObj, LIST_APPEND); + maAllMarkedObjects.push_back(pObj); } } @@ -972,7 +971,7 @@ namespace sdr maMarkedObjectList.ForceSort(); maEdgesOfMarkedNodes.Clear(); maMarkedEdgesOfMarkedNodes.Clear(); - maAllMarkedObjects.Clear(); + maAllMarkedObjects.clear(); // #126320# GetMarkCount after ForceSort const sal_uLong nMarkAnz(maMarkedObjectList.GetMarkCount()); @@ -1038,3 +1037,5 @@ namespace sdr //////////////////////////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 30628a10df86..f7a18f4f2d1d 100755..100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,6 @@ #include <svx/svdmodel.hxx> -#include <rtl/uuid.h> #include <com/sun/star/lang/XComponent.hpp> #include <osl/endian.h> #include <rtl/logfile.hxx> @@ -82,6 +82,7 @@ #include "editeng/forbiddencharacterstable.hxx" #include <svl/zforlist.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/servicehelper.hxx> // #90477# #include <tools/tenccvt.hxx> @@ -116,8 +117,8 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe mpImpl = new SdrModelImpl; mpImpl->mpUndoManager=0; mpImpl->mpUndoFactory=0; - mpImpl->mbAllowShapePropertyChangeListener=false; - mbInDestruction=false; + mpImpl->mbAllowShapePropertyChangeListener = false; + mbInDestruction = false; aObjUnit=SdrEngineDefaults::GetMapFraction(); eObjUnit=SdrEngineDefaults::GetMapUnit(); eUIUnit=FUNIT_MM; @@ -174,7 +175,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe nStarDrawPreviewMasterPageNum = SDRPAGE_NOTFOUND; pModelStorage = NULL; mpForbiddenCharactersTable = NULL; - mbModelLocked = sal_False; + mbModelLocked = false; mpOutlinerCache = NULL; mbKernAsianPunctuation = sal_False; mbAddExtLeading = sal_False; @@ -234,7 +235,7 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal #endif DBG_CTOR(SdrModel,NULL); - ImpCtor(pPool,pPers,sal_False, (FASTBOOL)bLoadRefCounts); + ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts); } SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal_Bool bLoadRefCounts): @@ -247,10 +248,10 @@ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbed #endif DBG_CTOR(SdrModel,NULL); - ImpCtor(pPool,pPers,sal_False, (FASTBOOL)bLoadRefCounts); + ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts); } -SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts): +SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts): maMaPag(1024,32,32), maPages(1024,32,32) { @@ -259,10 +260,10 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FAS #endif DBG_CTOR(SdrModel,NULL); - ImpCtor(pPool,pPers,bUseExtColorTable, (FASTBOOL)bLoadRefCounts); + ImpCtor(pPool,pPers,bUseExtColorTable, (bool)bLoadRefCounts); } -SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts): +SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts): maMaPag(1024,32,32), maPages(1024,32,32), aTablePath(rPath) @@ -272,7 +273,7 @@ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbed #endif DBG_CTOR(SdrModel,NULL); - ImpCtor(pPool,pPers,bUseExtColorTable, (FASTBOOL)bLoadRefCounts); + ImpCtor(pPool,pPers,bUseExtColorTable, (bool)bLoadRefCounts); } SdrModel::SdrModel(const SdrModel& /*rSrcModel*/): @@ -286,7 +287,7 @@ SdrModel::SdrModel(const SdrModel& /*rSrcModel*/): #endif // noch nicht implementiert - DBG_ERROR("SdrModel::CopyCtor() ist noch nicht implementiert"); + OSL_FAIL("SdrModel::CopyCtor() ist noch nicht implementiert"); } SdrModel::~SdrModel() @@ -312,7 +313,7 @@ SdrModel::~SdrModel() aStr += ByteString(pAktUndoGroup->GetComment(), gsl_getSystemTextEncoding()); aStr += '\"'; - DBG_ERROR(aStr.GetBuffer()); + OSL_FAIL(aStr.GetBuffer()); } #endif if (pAktUndoGroup!=NULL) @@ -395,26 +396,26 @@ const SvNumberFormatter& SdrModel::GetNumberFormatter() const // noch nicht implementiert: void SdrModel::operator=(const SdrModel& /*rSrcModel*/) { - DBG_ERROR("SdrModel::operator=() ist noch nicht implementiert"); + OSL_FAIL("SdrModel::operator=() ist noch nicht implementiert"); } -FASTBOOL SdrModel::operator==(const SdrModel& /*rCmpModel*/) const +bool SdrModel::operator==(const SdrModel& /*rCmpModel*/) const { - DBG_ERROR("SdrModel::operator==() ist noch nicht implementiert"); + OSL_FAIL("SdrModel::operator==() ist noch nicht implementiert"); return sal_False; } -void SdrModel::SetSwapGraphics( FASTBOOL bSwap ) +void SdrModel::SetSwapGraphics( bool bSwap ) { bSwapGraphics = bSwap; } -FASTBOOL SdrModel::IsReadOnly() const +bool SdrModel::IsReadOnly() const { return bReadOnly; } -void SdrModel::SetReadOnly(FASTBOOL bYes) +void SdrModel::SetReadOnly(bool bYes) { bReadOnly=bYes; } @@ -450,12 +451,12 @@ void SdrModel::ClearUndoBuffer() } } -FASTBOOL SdrModel::Undo() +bool SdrModel::Undo() { - FASTBOOL bRet=sal_False; + bool bRet = false; if( mpImpl->mpUndoManager ) { - DBG_ERROR("svx::SdrModel::Undo(), method not supported with application undo manager!"); + OSL_FAIL("svx::SdrModel::Undo(), method not supported with application undo manager!"); } else { @@ -474,12 +475,12 @@ FASTBOOL SdrModel::Undo() return bRet; } -FASTBOOL SdrModel::Redo() +bool SdrModel::Redo() { - FASTBOOL bRet=sal_False; + bool bRet = false; if( mpImpl->mpUndoManager ) { - DBG_ERROR("svx::SdrModel::Redo(), method not supported with application undo manager!"); + OSL_FAIL("svx::SdrModel::Redo(), method not supported with application undo manager!"); } else { @@ -498,12 +499,12 @@ FASTBOOL SdrModel::Redo() return bRet; } -FASTBOOL SdrModel::Repeat(SfxRepeatTarget& rView) +bool SdrModel::Repeat(SfxRepeatTarget& rView) { - FASTBOOL bRet=sal_False; + bool bRet = false; if( mpImpl->mpUndoManager ) { - DBG_ERROR("svx::SdrModel::Redo(), method not supported with application undo manager!"); + OSL_FAIL("svx::SdrModel::Redo(), method not supported with application undo manager!"); } else { @@ -513,7 +514,7 @@ FASTBOOL SdrModel::Repeat(SfxRepeatTarget& rView) if(pDo->CanRepeat(rView)) { pDo->Repeat(rView); - bRet=sal_True; + bRet = true; } } } @@ -618,7 +619,7 @@ void SdrModel::BegUndo(SdrUndoGroup* pUndoGrp) { if( mpImpl->mpUndoManager ) { - DBG_ERROR("svx::SdrModel::BegUndo(), method not supported with application undo manager!" ); + OSL_FAIL("svx::SdrModel::BegUndo(), method not supported with application undo manager!" ); nUndoLevel++; } else if( IsUndoEnabled() ) @@ -681,7 +682,7 @@ void SdrModel::SetUndoComment(const XubString& rComment) if( mpImpl->mpUndoManager ) { - DBG_ERROR("svx::SdrModel::SetUndoComment(), method not supported with application undo manager!" ); + OSL_FAIL("svx::SdrModel::SetUndoComment(), method not supported with application undo manager!" ); } else if( IsUndoEnabled() ) { @@ -697,7 +698,7 @@ void SdrModel::SetUndoComment(const XubString& rComment, const XubString& rObjDe DBG_ASSERT(nUndoLevel!=0,"SdrModel::SetUndoComment(): UndoLevel is 0!"); if( mpImpl->mpUndoManager ) { - DBG_ERROR("svx::SdrModel::SetUndoComment(), method not supported with application undo manager!" ); + OSL_FAIL("svx::SdrModel::SetUndoComment(), method not supported with application undo manager!" ); } else { @@ -808,7 +809,7 @@ SdrModel* SdrModel::AllocModel() const return pModel; } -SdrPage* SdrModel::AllocPage(FASTBOOL bMasterPage) +SdrPage* SdrModel::AllocPage(bool bMasterPage) { return new SdrPage(*this,bMasterPage); } @@ -1085,6 +1086,9 @@ void SdrModel::ImpSetUIUnit() // sonstiges case FUNIT_CUSTOM : break; case FUNIT_PERCENT: nUIUnitKomma+=2; break; + // TODO: Add code to handle the following if needed (added to removed warning) + case FUNIT_CHAR : break; + case FUNIT_LINE : break; } // switch // check if mapping is from metric to inch and adapt @@ -1221,20 +1225,17 @@ void SdrModel::TakeUnitStr(FieldUnit eUnit, XubString& rStr) } case FUNIT_100TH_MM: { - sal_Char aText[] = "/100mm"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("/100mm")); break; } case FUNIT_MM : { - sal_Char aText[] = "mm"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("mm")); break; } case FUNIT_CM : { - sal_Char aText[] = "cm"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("cm")); break; } case FUNIT_M : @@ -1245,26 +1246,22 @@ void SdrModel::TakeUnitStr(FieldUnit eUnit, XubString& rStr) } case FUNIT_KM : { - sal_Char aText[] = "km"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("km")); break; } case FUNIT_TWIP : { - sal_Char aText[] = "twip"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("twip")); break; } case FUNIT_POINT : { - sal_Char aText[] = "pt"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("pt")); break; } case FUNIT_PICA : { - sal_Char aText[] = "pica"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("pica")); break; } case FUNIT_INCH : @@ -1275,14 +1272,12 @@ void SdrModel::TakeUnitStr(FieldUnit eUnit, XubString& rStr) } case FUNIT_FOOT : { - sal_Char aText[] = "ft"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("ft")); break; } case FUNIT_MILE : { - sal_Char aText[] = "mile(s)"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("mile(s)")); break; } case FUNIT_PERCENT: @@ -1294,7 +1289,7 @@ void SdrModel::TakeUnitStr(FieldUnit eUnit, XubString& rStr) } } -void SdrModel::TakeMetricStr(long nVal, XubString& rStr, FASTBOOL bNoUnitChars, sal_Int32 nNumDigits) const +void SdrModel::TakeMetricStr(long nVal, XubString& rStr, bool bNoUnitChars, sal_Int32 nNumDigits) const { // #i22167# // change to double precision usage to not loose decimal places after comma @@ -1408,7 +1403,7 @@ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, FASTBOOL bNoUnitChars, rStr += aUIUnitStr; } -void SdrModel::TakeWinkStr(long nWink, XubString& rStr, FASTBOOL bNoDegChar) const +void SdrModel::TakeWinkStr(long nWink, XubString& rStr, bool bNoDegChar) const { sal_Bool bNeg(nWink < 0); @@ -1436,7 +1431,7 @@ void SdrModel::TakeWinkStr(long nWink, XubString& rStr, FASTBOOL bNoDegChar) con rStr += DEGREE_CHAR; } -void SdrModel::TakePercentStr(const Fraction& rVal, XubString& rStr, FASTBOOL bNoPercentChar) const +void SdrModel::TakePercentStr(const Fraction& rVal, XubString& rStr, bool bNoPercentChar) const { sal_Int32 nMul(rVal.GetNumerator()); sal_Int32 nDiv(rVal.GetDenominator()); @@ -1469,7 +1464,7 @@ void SdrModel::SetChanged(sal_Bool bFlg) mbChanged = bFlg; } -void SdrModel::RecalcPageNums(FASTBOOL bMaster) +void SdrModel::RecalcPageNums(bool bMaster) { Container& rPL=*(bMaster ? &maMaPag : &maPages); sal_uInt16 nAnz=sal_uInt16(rPL.Count()); @@ -1604,9 +1599,9 @@ void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) //////////////////////////////////////////////////////////////////////////////////////////////////// -FASTBOOL SdrModel::CheckConsistence() const +bool SdrModel::CheckConsistence() const { - FASTBOOL bRet=sal_True; + bool bRet = true; #ifdef DBG_UTIL DBG_CHKTHIS(SdrModel,NULL); #endif @@ -1618,7 +1613,7 @@ FASTBOOL SdrModel::CheckConsistence() const // #48289# void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, sal_uInt16 nDestPos, - FASTBOOL bUndo, FASTBOOL bMoveNoCopy) + bool bUndo, bool bMoveNoCopy) { if( bUndo && !IsUndoEnabled() ) bUndo = false; @@ -1635,7 +1630,7 @@ void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, nFirstPageNum=nMaxPage; if (nLastPageNum>nMaxPage) nLastPageNum =nMaxPage; - FASTBOOL bReverse=nLastPageNum<nFirstPageNum; + bool bReverse=nLastPageNum<nFirstPageNum; if (nDestPos>nPageAnz) nDestPos=nPageAnz; @@ -1696,8 +1691,8 @@ void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, void SdrModel::Merge(SdrModel& rSourceModel, sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, sal_uInt16 nDestPos, - FASTBOOL bMergeMasterPages, FASTBOOL bAllMasterPages, - FASTBOOL bUndo, FASTBOOL bTreadSourceAsConst) + bool bMergeMasterPages, bool bAllMasterPages, + bool bUndo, bool bTreadSourceAsConst) { if (&rSourceModel==this) { // #48289# @@ -1714,24 +1709,24 @@ void SdrModel::Merge(SdrModel& rSourceModel, sal_uInt16 nSrcPageAnz=rSourceModel.GetPageCount(); sal_uInt16 nSrcMasterPageAnz=rSourceModel.GetMasterPageCount(); sal_uInt16 nDstMasterPageAnz=GetMasterPageCount(); - FASTBOOL bInsPages=(nFirstPageNum<nSrcPageAnz || nLastPageNum<nSrcPageAnz); + bool bInsPages=(nFirstPageNum<nSrcPageAnz || nLastPageNum<nSrcPageAnz); sal_uInt16 nMaxSrcPage=nSrcPageAnz; if (nMaxSrcPage!=0) nMaxSrcPage--; if (nFirstPageNum>nMaxSrcPage) nFirstPageNum=nMaxSrcPage; if (nLastPageNum>nMaxSrcPage) nLastPageNum =nMaxSrcPage; - FASTBOOL bReverse=nLastPageNum<nFirstPageNum; + bool bReverse=nLastPageNum<nFirstPageNum; sal_uInt16* pMasterMap=NULL; - int* pMasterNeed=NULL; + bool* pMasterNeed=NULL; sal_uInt16 nMasterNeed=0; if (bMergeMasterPages && nSrcMasterPageAnz!=0) { // Feststellen, welche MasterPages aus rSrcModel benoetigt werden pMasterMap=new sal_uInt16[nSrcMasterPageAnz]; - pMasterNeed=new int[nSrcMasterPageAnz]; + pMasterNeed=new bool[nSrcMasterPageAnz]; memset(pMasterMap,0xFF,nSrcMasterPageAnz*sizeof(sal_uInt16)); if (bAllMasterPages) { - memset(pMasterNeed,sal_True,nSrcMasterPageAnz*sizeof(FASTBOOL)); + memset(pMasterNeed, true, nSrcMasterPageAnz * sizeof(bool)); } else { - memset(pMasterNeed,sal_False,nSrcMasterPageAnz*sizeof(FASTBOOL)); + memset(pMasterNeed, false, nSrcMasterPageAnz * sizeof(bool)); sal_uInt16 nAnf= bReverse ? nLastPageNum : nFirstPageNum; sal_uInt16 nEnd= bReverse ? nFirstPageNum : nLastPageNum; for (sal_uInt16 i=nAnf; i<=nEnd; i++) { @@ -1743,7 +1738,7 @@ void SdrModel::Merge(SdrModel& rSourceModel, if(nMPgNum < nSrcMasterPageAnz) { - pMasterNeed[nMPgNum] = sal_True; + pMasterNeed[nMPgNum] = true; } } } @@ -1783,7 +1778,7 @@ void SdrModel::Merge(SdrModel& rSourceModel, bMPgNumsDirty=sal_True; if (bUndo) AddUndo(GetSdrUndoFactory().CreateUndoNewPage(*pPg)); } else { - DBG_ERROR("SdrModel::Merge(): MasterPage im SourceModel nicht gefunden"); + OSL_FAIL("SdrModel::Merge(): MasterPage im SourceModel nicht gefunden"); } } } @@ -1840,7 +1835,7 @@ void SdrModel::Merge(SdrModel& rSourceModel, } } else { - DBG_ERROR("SdrModel::Merge(): Zeichenseite im SourceModel nicht gefunden"); + OSL_FAIL("SdrModel::Merge(): Zeichenseite im SourceModel nicht gefunden"); } nDestPos++; if (bReverse) nSourcePos--; @@ -1889,12 +1884,12 @@ void SdrModel::setUnoModel( ::com::sun::star::uno::Reference< ::com::sun::star:: uno::Reference< uno::XInterface > SdrModel::createUnoModel() { - DBG_ERROR( "SdrModel::createUnoModel() - base implementation should not be called!" ); + OSL_FAIL( "SdrModel::createUnoModel() - base implementation should not be called!" ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInt; return xInt; } -void SdrModel::setLock( sal_Bool bLock ) +void SdrModel::setLock( bool bLock ) { if( mbModelLocked != bLock ) { @@ -1970,12 +1965,12 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrModel::SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars ) +void SdrModel::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ) { if( mpForbiddenCharactersTable ) mpForbiddenCharactersTable->release(); - mpForbiddenCharactersTable = xForbiddenChars.getBodyPtr(); + mpForbiddenCharactersTable = xForbiddenChars.get(); if( mpForbiddenCharactersTable ) mpForbiddenCharactersTable->acquire(); @@ -1984,7 +1979,7 @@ void SdrModel::SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xF ImpSetOutlinerDefaults( pHitTestOutliner ); } -vos::ORef<SvxForbiddenCharactersTable> SdrModel::GetForbiddenCharsTable() const +rtl::Reference<SvxForbiddenCharactersTable> SdrModel::GetForbiddenCharsTable() const { return mpForbiddenCharactersTable; } @@ -2024,20 +2019,20 @@ void SdrModel::ReformatAllTextObjects() ImpReformatAllTextObjects(); } -FASTBOOL SdrModel::HasTransparentObjects( sal_Bool bCheckForAlphaChannel ) const +bool SdrModel::HasTransparentObjects( bool bCheckForAlphaChannel ) const { - FASTBOOL bRet = sal_False; + bool bRet = false; sal_uInt16 n, nCount; for( n = 0, nCount = GetMasterPageCount(); ( n < nCount ) && !bRet; n++ ) if( GetMasterPage( n )->HasTransparentObjects( bCheckForAlphaChannel ) ) - bRet = sal_True; + bRet = true; if( !bRet ) { for( n = 0, nCount = GetPageCount(); ( n < nCount ) && !bRet; n++ ) if( GetPage( n )->HasTransparentObjects( bCheckForAlphaChannel ) ) - bRet = sal_True; + bRet = true; } return bRet; @@ -2151,20 +2146,14 @@ void SdrModel::SetAllowShapePropertyChangeListener( bool bAllow ) } } +namespace +{ + class theSdrModelUnoTunnelImplementationId : public rtl::Static< UnoTunnelIdInit, theSdrModelUnoTunnelImplementationId > {}; +} + const ::com::sun::star::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelImplementationId() { - static ::com::sun::star::uno::Sequence< sal_Int8 > * pSeq = 0; - if( !pSeq ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if( !pSeq ) - { - static Sequence< sal_Int8 > aSeq( 16 ); - rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); - pSeq = &aSeq; - } - } - return *pSeq; + return theSdrModelUnoTunnelImplementationId::get().getSeq(); } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -2256,3 +2245,5 @@ const Rectangle& SdrHint::GetRect() const } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index f9055fedcabc..0469d7015105 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -193,7 +194,7 @@ SdrMarkView::~SdrMarkView() delete mpSdrViewSelection; } -void __EXPORT SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) +void SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint); if (pSdrHint!=NULL) @@ -2175,3 +2176,4 @@ void SdrMarkView::SetDesignMode( sal_Bool _bOn ) // In diesem Fall bekomme ich kein Notify und beim Aufruf des // PaintHandlers->CompleteRedraw() sind auch die SolidHandles sichtbar. +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index a1d2a2ecae9d..3ac2df22674c 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -263,7 +264,7 @@ sal_Bool SdrMarkView::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) } else { #ifdef DBG_UTIL if (pObj->IsInserted()) { - DBG_ERROR("SdrMarkView::MarkPoints(const Rectangle* pRect): Markiertes Objekt nicht gefunden"); + OSL_FAIL("SdrMarkView::MarkPoints(const Rectangle* pRect): Markiertes Objekt nicht gefunden"); } #endif pM=NULL; @@ -401,7 +402,7 @@ void SdrMarkView::UndirtyMrkPnt() const } else { - DBG_ERROR("SdrMarkView::UndirtyMrkPnt(): Markierte Punkte an einem Objekt, dass kein PolyObj ist!"); + OSL_FAIL("SdrMarkView::UndirtyMrkPnt(): Markierte Punkte an einem Objekt, dass kein PolyObj ist!"); if(pPts && pPts->GetCount()) { pPts->Clear(); @@ -722,3 +723,4 @@ const Rectangle& SdrMarkView::GetMarkedGluePointsRect() const return aMarkedGluePointsRect; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 30791ce216d4..f615a0e5e704 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,7 +58,7 @@ #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 <svx/svdoedge.hxx> // Die Verbinder nach Move nochmal anbroadcasten #include "svx/svdglob.hxx" // StringCache #include "svx/svdstr.hrc" // Objektname #include <editeng/eeitem.hxx> @@ -93,7 +94,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -// #104018# replace macros above with type-safe methods inline double ImplTwipsToMM(double fVal) { return (fVal * (127.0 / 72.0)); } inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); } @@ -103,12 +103,92 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::drawing; + +static void lcl_ShapeSegmentFromBinary( EnhancedCustomShapeSegment& rSegInfo, sal_uInt16 nSDat ) +{ + switch( nSDat >> 8 ) + { + case 0x00 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::LINETO; + rSegInfo.Count = nSDat & 0xff; + if ( !rSegInfo.Count ) + rSegInfo.Count = 1; + break; + case 0x20 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CURVETO; + rSegInfo.Count = nSDat & 0xff; + if ( !rSegInfo.Count ) + rSegInfo.Count = 1; + break; + case 0x40 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::MOVETO; + rSegInfo.Count = nSDat & 0xff; + if ( !rSegInfo.Count ) + rSegInfo.Count = 1; + break; + case 0x60 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; + rSegInfo.Count = 0; + break; + case 0x80 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ENDSUBPATH; + rSegInfo.Count = 0; + break; + case 0xa1 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO; + rSegInfo.Count = ( nSDat & 0xff ) / 3; + break; + case 0xa2 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE; + rSegInfo.Count = ( nSDat & 0xff ) / 3; + break; + case 0xa3 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ARCTO; + rSegInfo.Count = ( nSDat & 0xff ) >> 2; + break; + case 0xa4 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ARC; + rSegInfo.Count = ( nSDat & 0xff ) >> 2; + break; + case 0xa5 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO; + rSegInfo.Count = ( nSDat & 0xff ) >> 2; + break; + case 0xa6 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOCKWISEARC; + rSegInfo.Count = ( nSDat & 0xff ) >> 2; + break; + case 0xa7 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX; + rSegInfo.Count = nSDat & 0xff; + break; + case 0xa8 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY; + rSegInfo.Count = nSDat & 0xff; + break; + case 0xaa : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::NOFILL; + rSegInfo.Count = 0; + break; + case 0xab : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::NOSTROKE; + rSegInfo.Count = 0; + break; + default: + case 0xf8 : + rSegInfo.Command = EnhancedCustomShapeSegmentCommand::UNKNOWN; + rSegInfo.Count = nSDat; + break; + } + return; +} + static MSO_SPT ImpGetCustomShapeType( const SdrObjCustomShape& rCustoShape ) { MSO_SPT eRetValue = mso_sptNil; rtl::OUString aEngine( ( (SdrCustomShapeEngineItem&)rCustoShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE ) ).GetValue() ); - if ( !aEngine.getLength() || aEngine.equalsAscii( "com.sun.star.drawing.EnhancedCustomShapeEngine" ) ) + if ( !aEngine.getLength() || aEngine.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.EnhancedCustomShapeEngine" ) ) ) { rtl::OUString sShapeType; const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) ); @@ -133,27 +213,11 @@ static sal_Bool ImpVerticalSwitch( const SdrObjCustomShape& rCustoShape ) bRet = sal_True; } break; -/* - case mso_sptCallout1 : - case mso_sptAccentCallout1 : - case mso_sptAccentBorderCallout1 : - case mso_sptBorderCallout90 : - case mso_sptCallout90 : - case mso_sptAccentCallout90 : - case mso_sptCallout2 : - case mso_sptCallout3 : - case mso_sptAccentCallout2 : - case mso_sptAccentCallout3 : - case mso_sptBorderCallout3 : - case mso_sptAccentBorderCallout2 : - case mso_sptAccentBorderCallout3 : -*/ default: break; } return bRet; } -//////////////////////////////////////////////////////////////////////////////////////////////////// // #i37011# create a clone with all attributes changed to shadow attributes // and translation executed, too. SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemSet& rOriginalSet) @@ -226,7 +290,7 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS // set items as needed SfxItemSet aTempSet(rOriginalSet); - // SJ: #40108# :-( if a SvxWritingModeItem (Top->Bottom) is set the text object + // if a SvxWritingModeItem (Top->Bottom) is set the text object // is creating a paraobject, but paraobjects can not be created without model. So // we are preventing the crash by setting the writing mode always left to right, // this is not bad since our shadow geometry does not contain text. @@ -358,7 +422,7 @@ Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine( const S { Sequence< Any > aArgument( 1 ); Sequence< PropertyValue > aPropValues( 1 ); - aPropValues[ 0 ].Name = rtl::OUString::createFromAscii( "CustomShape" ); + aPropValues[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CustomShape")); aPropValues[ 0 ].Value <<= aXShape; aArgument[ 0 ] <<= aPropValues; Reference< XInterface > xInterface( xFactory->createInstanceWithArguments( aEngine, aArgument ) ); @@ -454,7 +518,6 @@ void SdrObjCustomShape::SetMirroredX( const sal_Bool bMirrorX ) { SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); const rtl::OUString sMirroredX( RTL_CONSTASCII_USTRINGPARAM ( "MirroredX" ) ); - //com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredX ); PropertyValue aPropVal; aPropVal.Name = sMirroredX; aPropVal.Value <<= bMirrorX; @@ -465,7 +528,6 @@ void SdrObjCustomShape::SetMirroredY( const sal_Bool bMirrorY ) { SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); const rtl::OUString sMirroredY( RTL_CONSTASCII_USTRINGPARAM ( "MirroredY" ) ); - //com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredY ); PropertyValue aPropVal; aPropVal.Name = sMirroredY; aPropVal.Value <<= bMirrorY; @@ -507,7 +569,6 @@ sal_Bool SdrObjCustomShape::GetTextBounds( Rectangle& rTextBound ) const basegfx::B2DPolyPolygon SdrObjCustomShape::GetLineGeometry( const SdrObjCustomShape* pCustomShape, const sal_Bool bBezierAllowed ) { basegfx::B2DPolyPolygon aRetval; - sal_Bool bRet = sal_False; Reference< XCustomShapeEngine > xCustomShapeEngine( GetCustomShapeEngine( pCustomShape ) ); if ( xCustomShapeEngine.is() ) { @@ -519,7 +580,6 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::GetLineGeometry( const SdrObjCustomSh { aRetval = basegfx::tools::adaptiveSubdivideByAngle(aRetval); } - bRet = sal_True; } catch ( const com::sun::star::lang::IllegalArgumentException ) { @@ -621,6 +681,151 @@ std::vector< SdrCustomShapeInteraction > SdrObjCustomShape::GetInteractionHandle #define DEFAULT_MINIMUM_SIGNED_COMPARE ((sal_Int32)0x80000000) #define DEFAULT_MAXIMUM_SIGNED_COMPARE ((sal_Int32)0x7fffffff) +static sal_Int32 GetNumberOfProperties ( const SvxMSDffHandle* pData ) +{ + sal_Int32 nPropertiesNeeded=1; // position is always needed + sal_Int32 nFlags = pData->nFlags; + + if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X ) + nPropertiesNeeded++; + if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y ) + nPropertiesNeeded++; + if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED ) + nPropertiesNeeded++; + if ( nFlags & MSDFF_HANDLE_FLAGS_POLAR ) + { + nPropertiesNeeded++; + if ( nFlags & MSDFF_HANDLE_FLAGS_RADIUS_RANGE ) + { + if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) + nPropertiesNeeded++; + if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) + nPropertiesNeeded++; + } + } + else if ( nFlags & MSDFF_HANDLE_FLAGS_RANGE ) + { + if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) + nPropertiesNeeded++; + if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) + nPropertiesNeeded++; + if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) + nPropertiesNeeded++; + if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) + nPropertiesNeeded++; + } + + return nPropertiesNeeded; +} + +static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::star::beans::PropertyValues& rPropValues ) +{ + sal_Int32 nFlags = pData->nFlags, n=0; + + // POSITION + { + const rtl::OUString sPosition( RTL_CONSTASCII_USTRINGPARAM ( "Position" ) ); + ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition; + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.First, pData->nPositionX, sal_True, sal_True ); + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.Second, pData->nPositionY, sal_True, sal_False ); + rPropValues[ n ].Name = sPosition; + rPropValues[ n++ ].Value <<= aPosition; + } + if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X ) + { + const rtl::OUString sMirroredX( RTL_CONSTASCII_USTRINGPARAM ( "MirroredX" ) ); + sal_Bool bMirroredX = sal_True; + rPropValues[ n ].Name = sMirroredX; + rPropValues[ n++ ].Value <<= bMirroredX; + } + if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y ) + { + const rtl::OUString sMirroredY( RTL_CONSTASCII_USTRINGPARAM ( "MirroredY" ) ); + sal_Bool bMirroredY = sal_True; + rPropValues[ n ].Name = sMirroredY; + rPropValues[ n++ ].Value <<= bMirroredY; + } + if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED ) + { + const rtl::OUString sSwitched( RTL_CONSTASCII_USTRINGPARAM ( "Switched" ) ); + sal_Bool bSwitched = sal_True; + rPropValues[ n ].Name = sSwitched; + rPropValues[ n++ ].Value <<= bSwitched; + } + if ( nFlags & MSDFF_HANDLE_FLAGS_POLAR ) + { + const rtl::OUString sPolar( RTL_CONSTASCII_USTRINGPARAM ( "Polar" ) ); + ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aCenter; + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.First, pData->nCenterX, + ( nFlags & MSDFF_HANDLE_FLAGS_CENTER_X_IS_SPECIAL ) != 0, sal_True ); + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.Second, pData->nCenterY, + ( nFlags & MSDFF_HANDLE_FLAGS_CENTER_Y_IS_SPECIAL ) != 0, sal_False ); + rPropValues[ n ].Name = sPolar; + rPropValues[ n++ ].Value <<= aCenter; + if ( nFlags & MSDFF_HANDLE_FLAGS_RADIUS_RANGE ) + { + if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) + { + const rtl::OUString sRadiusRangeMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RadiusRangeMinimum" ) ); + ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMinimum, pData->nRangeXMin, + ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, sal_True ); + rPropValues[ n ].Name = sRadiusRangeMinimum; + rPropValues[ n++ ].Value <<= aRadiusRangeMinimum; + } + if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) + { + const rtl::OUString sRadiusRangeMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RadiusRangeMaximum" ) ); + ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMaximum, pData->nRangeXMax, + ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, sal_False ); + rPropValues[ n ].Name = sRadiusRangeMaximum; + rPropValues[ n++ ].Value <<= aRadiusRangeMaximum; + } + } + } + else if ( nFlags & MSDFF_HANDLE_FLAGS_RANGE ) + { + if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) + { + const rtl::OUString sRangeXMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RangeXMinimum" ) ); + ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMinimum; + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMinimum, pData->nRangeXMin, + ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, sal_True ); + rPropValues[ n ].Name = sRangeXMinimum; + rPropValues[ n++ ].Value <<= aRangeXMinimum; + } + if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) + { + const rtl::OUString sRangeXMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RangeXMaximum" ) ); + ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum; + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMaximum, pData->nRangeXMax, + ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, sal_False ); + rPropValues[ n ].Name = sRangeXMaximum; + rPropValues[ n++ ].Value <<= aRangeXMaximum; + } + if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) + { + const rtl::OUString sRangeYMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RangeYMinimum" ) ); + ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMinimum; + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMinimum, pData->nRangeYMin, + ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL ) != 0, sal_True ); + rPropValues[ n ].Name = sRangeYMinimum; + rPropValues[ n++ ].Value <<= aRangeYMinimum; + } + if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) + { + const rtl::OUString sRangeYMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RangeYMaximum" ) ); + ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMaximum; + EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMaximum, pData->nRangeYMax, + ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL ) != 0, sal_False ); + rPropValues[ n ].Name = sRangeYMaximum; + rPropValues[ n++ ].Value <<= aRangeYMaximum; + } + } + return; +} + sdr::properties::BaseProperties* SdrObjCustomShape::CreateObjectSpecificProperties() { return new sdr::properties::CustomShapeProperties(*this); @@ -753,9 +958,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) aGeometryItem.SetPropertyValue( sPath, aPropVal ); } - ///////////////////// // Path/GluePoints // - ///////////////////// const rtl::OUString sGluePoints( RTL_CONSTASCII_USTRINGPARAM ( "GluePoints" ) ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sGluePoints ); if ( !pAny && pDefCustomShape && pDefCustomShape->nGluePoints && pDefCustomShape->pGluePoints ) @@ -773,9 +976,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) aGeometryItem.SetPropertyValue( sPath, aPropVal ); } - /////////////////// // Path/Segments // - /////////////////// const rtl::OUString sSegments( RTL_CONSTASCII_USTRINGPARAM ( "Segments" ) ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( !pAny && pDefCustomShape && pDefCustomShape->nElements && pDefCustomShape->pElements ) @@ -788,121 +989,14 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) { EnhancedCustomShapeSegment& rSegInfo = seqSegments[ i ]; sal_uInt16 nSDat = pDefCustomShape->pElements[ i ]; - switch( nSDat >> 8 ) - { - case 0x00 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::LINETO; - rSegInfo.Count = nSDat & 0xff; - if ( !rSegInfo.Count ) - rSegInfo.Count = 1; - } - break; - case 0x20 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CURVETO; - rSegInfo.Count = nSDat & 0xff; - if ( !rSegInfo.Count ) - rSegInfo.Count = 1; - } - break; - case 0x40 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::MOVETO; - rSegInfo.Count = nSDat & 0xff; - if ( !rSegInfo.Count ) - rSegInfo.Count = 1; - } - break; - case 0x60 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; - rSegInfo.Count = 0; - } - break; - case 0x80 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ENDSUBPATH; - rSegInfo.Count = 0; - } - break; - case 0xa1 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO; - rSegInfo.Count = ( nSDat & 0xff ) / 3; - } - break; - case 0xa2 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE; - rSegInfo.Count = ( nSDat & 0xff ) / 3; - } - break; - case 0xa3 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ARCTO; - rSegInfo.Count = ( nSDat & 0xff ) >> 2; - } - break; - case 0xa4 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ARC; - rSegInfo.Count = ( nSDat & 0xff ) >> 2; - } - break; - case 0xa5 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO; - rSegInfo.Count = ( nSDat & 0xff ) >> 2; - } - break; - case 0xa6 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOCKWISEARC; - rSegInfo.Count = ( nSDat & 0xff ) >> 2; - } - break; - case 0xa7 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX; - rSegInfo.Count = nSDat & 0xff; - } - break; - case 0xa8 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY; - rSegInfo.Count = nSDat & 0xff; - } - break; - case 0xaa : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::NOFILL; - rSegInfo.Count = 0; - } - break; - case 0xab : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::NOSTROKE; - rSegInfo.Count = 0; - } - break; - default: - case 0xf8 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::UNKNOWN; - rSegInfo.Count = nSDat; - } - break; - } + lcl_ShapeSegmentFromBinary( rSegInfo, nSDat ); } aPropVal.Name = sSegments; aPropVal.Value <<= seqSegments; aGeometryItem.SetPropertyValue( sPath, aPropVal ); } - /////////////////// // Path/StretchX // - /////////////////// const rtl::OUString sStretchX( RTL_CONSTASCII_USTRINGPARAM ( "StretchX" ) ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchX ); if ( !pAny && pDefCustomShape ) @@ -916,9 +1010,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } } - /////////////////// // Path/StretchY // - /////////////////// const rtl::OUString sStretchY( RTL_CONSTASCII_USTRINGPARAM ( "StretchY" ) ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchY ); if ( !pAny && pDefCustomShape ) @@ -932,9 +1024,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } } - ///////////////////// // Path/TextFrames // - ///////////////////// const rtl::OUString sTextFrames( RTL_CONSTASCII_USTRINGPARAM ( "TextFrames" ) ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sTextFrames ); if ( !pAny && pDefCustomShape && pDefCustomShape->nTextRect && pDefCustomShape->pTextRect ) @@ -956,9 +1046,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) aGeometryItem.SetPropertyValue( sPath, aPropVal ); } - /////////////// // Equations // - /////////////// const rtl::OUString sEquations( RTL_CONSTASCII_USTRINGPARAM( "Equations" ) ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sEquations ); if ( !pAny && pDefCustomShape && pDefCustomShape->nCalculation && pDefCustomShape->pCalculation ) @@ -975,156 +1063,23 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) aGeometryItem.SetPropertyValue( aPropVal ); } - ///////////// // Handles // - ///////////// const rtl::OUString sHandles( RTL_CONSTASCII_USTRINGPARAM( "Handles" ) ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sHandles ); if ( !pAny && pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles ) { com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValues > seqHandles; - sal_Int32 i, n, nCount = pDefCustomShape->nHandles; + sal_Int32 i, nCount = pDefCustomShape->nHandles; const SvxMSDffHandle* pData = pDefCustomShape->pHandles; seqHandles.realloc( nCount ); for ( i = 0; i < nCount; i++, pData++ ) { - sal_Int32 nPropertiesNeeded = 1; // position is always needed - sal_Int32 nFlags = pData->nFlags; - if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X ) - nPropertiesNeeded++; - if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y ) - nPropertiesNeeded++; - if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED ) - nPropertiesNeeded++; - if ( nFlags & MSDFF_HANDLE_FLAGS_POLAR ) - { - nPropertiesNeeded++; - if ( nFlags & MSDFF_HANDLE_FLAGS_RADIUS_RANGE ) - { - if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - } - } - else if ( nFlags & MSDFF_HANDLE_FLAGS_RANGE ) - { - if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - } - - n = 0; + sal_Int32 nPropertiesNeeded; com::sun::star::beans::PropertyValues& rPropValues = seqHandles[ i ]; + nPropertiesNeeded = GetNumberOfProperties( pData ); rPropValues.realloc( nPropertiesNeeded ); - - // POSITION - { - const rtl::OUString sPosition( RTL_CONSTASCII_USTRINGPARAM ( "Position" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.First, pData->nPositionX, sal_True, sal_True ); - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.Second, pData->nPositionY, sal_True, sal_False ); - rPropValues[ n ].Name = sPosition; - rPropValues[ n++ ].Value <<= aPosition; - } - if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X ) - { - const rtl::OUString sMirroredX( RTL_CONSTASCII_USTRINGPARAM ( "MirroredX" ) ); - sal_Bool bMirroredX = sal_True; - rPropValues[ n ].Name = sMirroredX; - rPropValues[ n++ ].Value <<= bMirroredX; - } - if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y ) - { - const rtl::OUString sMirroredY( RTL_CONSTASCII_USTRINGPARAM ( "MirroredY" ) ); - sal_Bool bMirroredY = sal_True; - rPropValues[ n ].Name = sMirroredY; - rPropValues[ n++ ].Value <<= bMirroredY; - } - if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED ) - { - const rtl::OUString sSwitched( RTL_CONSTASCII_USTRINGPARAM ( "Switched" ) ); - sal_Bool bSwitched = sal_True; - rPropValues[ n ].Name = sSwitched; - rPropValues[ n++ ].Value <<= bSwitched; - } - if ( nFlags & MSDFF_HANDLE_FLAGS_POLAR ) - { - const rtl::OUString sPolar( RTL_CONSTASCII_USTRINGPARAM ( "Polar" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aCenter; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.First, pData->nCenterX, - ( nFlags & MSDFF_HANDLE_FLAGS_CENTER_X_IS_SPECIAL ) != 0, sal_True ); - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.Second, pData->nCenterY, - ( nFlags & MSDFF_HANDLE_FLAGS_CENTER_Y_IS_SPECIAL ) != 0, sal_False ); - rPropValues[ n ].Name = sPolar; - rPropValues[ n++ ].Value <<= aCenter; - if ( nFlags & MSDFF_HANDLE_FLAGS_RADIUS_RANGE ) - { - if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRadiusRangeMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RadiusRangeMinimum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMinimum, pData->nRangeXMin, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, sal_True ); - rPropValues[ n ].Name = sRadiusRangeMinimum; - rPropValues[ n++ ].Value <<= aRadiusRangeMinimum; - } - if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRadiusRangeMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RadiusRangeMaximum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMaximum, pData->nRangeXMax, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, sal_False ); - rPropValues[ n ].Name = sRadiusRangeMaximum; - rPropValues[ n++ ].Value <<= aRadiusRangeMaximum; - } - } - } - else if ( nFlags & MSDFF_HANDLE_FLAGS_RANGE ) - { - if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRangeXMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RangeXMinimum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMinimum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMinimum, pData->nRangeXMin, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, sal_True ); - rPropValues[ n ].Name = sRangeXMinimum; - rPropValues[ n++ ].Value <<= aRangeXMinimum; - } - if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRangeXMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RangeXMaximum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMaximum, pData->nRangeXMax, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, sal_False ); - rPropValues[ n ].Name = sRangeXMaximum; - rPropValues[ n++ ].Value <<= aRangeXMaximum; - } - if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRangeYMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RangeYMinimum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMinimum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMinimum, pData->nRangeYMin, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL ) != 0, sal_True ); - rPropValues[ n ].Name = sRangeYMinimum; - rPropValues[ n++ ].Value <<= aRangeYMinimum; - } - if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRangeYMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RangeYMaximum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMaximum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMaximum, pData->nRangeYMax, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL ) != 0, sal_False ); - rPropValues[ n ].Name = sRangeYMaximum; - rPropValues[ n++ ].Value <<= aRangeYMaximum; - } - } + lcl_ShapePropertiesFromDFF( pData, rPropValues ); } aPropVal.Name = sHandles; aPropVal.Value <<= seqHandles; @@ -1218,9 +1173,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_SEGMENTS : { - /////////////////// // Path/Segments // - /////////////////// const rtl::OUString sSegments( RTL_CONSTASCII_USTRINGPARAM ( "Segments" ) ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( pAny ) @@ -1238,112 +1191,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) { EnhancedCustomShapeSegment& rSegInfo = seqSegments2[ i ]; sal_uInt16 nSDat = pDefCustomShape->pElements[ i ]; - switch( nSDat >> 8 ) - { - case 0x00 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::LINETO; - rSegInfo.Count = nSDat & 0xff; - if ( !rSegInfo.Count ) - rSegInfo.Count = 1; - } - break; - case 0x20 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CURVETO; - rSegInfo.Count = nSDat & 0xff; - if ( !rSegInfo.Count ) - rSegInfo.Count = 1; - } - break; - case 0x40 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::MOVETO; - rSegInfo.Count = nSDat & 0xff; - if ( !rSegInfo.Count ) - rSegInfo.Count = 1; - } - break; - case 0x60 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; - rSegInfo.Count = 0; - } - break; - case 0x80 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ENDSUBPATH; - rSegInfo.Count = 0; - } - break; - case 0xa1 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO; - rSegInfo.Count = ( nSDat & 0xff ) / 3; - } - break; - case 0xa2 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE; - rSegInfo.Count = ( nSDat & 0xff ) / 3; - } - break; - case 0xa3 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ARCTO; - rSegInfo.Count = ( nSDat & 0xff ) >> 2; - } - break; - case 0xa4 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ARC; - rSegInfo.Count = ( nSDat & 0xff ) >> 2; - } - break; - case 0xa5 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO; - rSegInfo.Count = ( nSDat & 0xff ) >> 2; - } - break; - case 0xa6 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOCKWISEARC; - rSegInfo.Count = ( nSDat & 0xff ) >> 2; - } - break; - case 0xa7 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX; - rSegInfo.Count = nSDat & 0xff; - } - break; - case 0xa8 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY; - rSegInfo.Count = nSDat & 0xff; - } - break; - case 0xaa : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::NOFILL; - rSegInfo.Count = 0; - } - break; - case 0xab : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::NOSTROKE; - rSegInfo.Count = 0; - } - break; - default: - case 0xf8 : - { - rSegInfo.Command = EnhancedCustomShapeSegmentCommand::UNKNOWN; - rSegInfo.Count = nSDat; - } - break; - } + lcl_ShapeSegmentFromBinary( rSegInfo, nSDat ); } if ( seqSegments1 == seqSegments2 ) bIsDefaultGeometry = sal_True; @@ -1466,147 +1314,16 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValues > seqHandles1, seqHandles2; if ( *pAny >>= seqHandles1 ) { - sal_Int32 i, n, nCount = pDefCustomShape->nHandles; + sal_Int32 i, nCount = pDefCustomShape->nHandles; const SvxMSDffHandle* pData = pDefCustomShape->pHandles; seqHandles2.realloc( nCount ); for ( i = 0; i < nCount; i++, pData++ ) { - sal_Int32 nPropertiesNeeded = 1; // position is always needed - sal_Int32 nFlags = pData->nFlags; - if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X ) - nPropertiesNeeded++; - if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y ) - nPropertiesNeeded++; - if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED ) - nPropertiesNeeded++; - if ( nFlags & MSDFF_HANDLE_FLAGS_POLAR ) - { - nPropertiesNeeded++; - if ( nFlags & MSDFF_HANDLE_FLAGS_RADIUS_RANGE ) - { - if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - } - } - else if ( nFlags & MSDFF_HANDLE_FLAGS_RANGE ) - { - if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - nPropertiesNeeded++; - } - - n = 0; + sal_Int32 nPropertiesNeeded; com::sun::star::beans::PropertyValues& rPropValues = seqHandles2[ i ]; + nPropertiesNeeded = GetNumberOfProperties( pData ); rPropValues.realloc( nPropertiesNeeded ); - - // POSITION - { - const rtl::OUString sPosition( RTL_CONSTASCII_USTRINGPARAM ( "Position" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.First, pData->nPositionX, sal_True, sal_True ); - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.Second, pData->nPositionY, sal_True, sal_False ); - rPropValues[ n ].Name = sPosition; - rPropValues[ n++ ].Value <<= aPosition; - } - if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X ) - { - const rtl::OUString sMirroredX( RTL_CONSTASCII_USTRINGPARAM ( "MirroredX" ) ); - sal_Bool bMirroredX = sal_True; - rPropValues[ n ].Name = sMirroredX; - rPropValues[ n++ ].Value <<= bMirroredX; - } - if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y ) - { - const rtl::OUString sMirroredY( RTL_CONSTASCII_USTRINGPARAM ( "MirroredY" ) ); - sal_Bool bMirroredY = sal_True; - rPropValues[ n ].Name = sMirroredY; - rPropValues[ n++ ].Value <<= bMirroredY; - } - if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED ) - { - const rtl::OUString sSwitched( RTL_CONSTASCII_USTRINGPARAM ( "Switched" ) ); - sal_Bool bSwitched = sal_True; - rPropValues[ n ].Name = sSwitched; - rPropValues[ n++ ].Value <<= bSwitched; - } - if ( nFlags & MSDFF_HANDLE_FLAGS_POLAR ) - { - const rtl::OUString sPolar( RTL_CONSTASCII_USTRINGPARAM ( "Polar" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aCenter; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.First, pData->nCenterX, - ( nFlags & MSDFF_HANDLE_FLAGS_CENTER_X_IS_SPECIAL ) != 0, sal_True ); - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.Second, pData->nCenterY, - ( nFlags & MSDFF_HANDLE_FLAGS_CENTER_Y_IS_SPECIAL ) != 0, sal_False ); - rPropValues[ n ].Name = sPolar; - rPropValues[ n++ ].Value <<= aCenter; - if ( nFlags & MSDFF_HANDLE_FLAGS_RADIUS_RANGE ) - { - if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRadiusRangeMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RadiusRangeMinimum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMinimum, pData->nRangeXMin, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, sal_True ); - rPropValues[ n ].Name = sRadiusRangeMinimum; - rPropValues[ n++ ].Value <<= aRadiusRangeMinimum; - } - if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRadiusRangeMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RadiusRangeMaximum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMaximum, pData->nRangeXMax, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, sal_False ); - rPropValues[ n ].Name = sRadiusRangeMaximum; - rPropValues[ n++ ].Value <<= aRadiusRangeMaximum; - } - } - } - else if ( nFlags & MSDFF_HANDLE_FLAGS_RANGE ) - { - if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRangeXMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RangeXMinimum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMinimum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMinimum, pData->nRangeXMin, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, sal_True ); - rPropValues[ n ].Name = sRangeXMinimum; - rPropValues[ n++ ].Value <<= aRangeXMinimum; - } - if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRangeXMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RangeXMaximum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMaximum, pData->nRangeXMax, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, sal_False ); - rPropValues[ n ].Name = sRangeXMaximum; - rPropValues[ n++ ].Value <<= aRangeXMaximum; - } - if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRangeYMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RangeYMinimum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMinimum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMinimum, pData->nRangeYMin, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL ) != 0, sal_True ); - rPropValues[ n ].Name = sRangeYMinimum; - rPropValues[ n++ ].Value <<= aRangeYMinimum; - } - if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) - { - const rtl::OUString sRangeYMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RangeYMaximum" ) ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMaximum; - EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMaximum, pData->nRangeYMax, - ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL ) != 0, sal_False ); - rPropValues[ n ].Name = sRangeYMaximum; - rPropValues[ n++ ].Value <<= aRangeYMaximum; - } - } + lcl_ShapePropertiesFromDFF( pData, rPropValues ); } if ( seqHandles1 == seqHandles2 ) bIsDefaultGeometry = sal_True; @@ -1669,6 +1386,16 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { rInfo.bCanConvToContour = aInfo.bCanConvToContour; } + + if(rInfo.bShearAllowed != aInfo.bShearAllowed) + { + rInfo.bShearAllowed = aInfo.bShearAllowed; + } + + if(rInfo.bEdgeRadiusAllowed != aInfo.bEdgeRadiusAllowed) + { + rInfo.bEdgeRadiusAllowed = aInfo.bEdgeRadiusAllowed; + } } } } @@ -1686,8 +1413,6 @@ sal_uInt16 SdrObjCustomShape::GetObjIdentifier() const } //////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// void SdrObjCustomShape::RecalcSnapRect() { @@ -1777,7 +1502,6 @@ void SdrObjCustomShape::Move( const Size& rSiz ) Rectangle aBoundRect0; if ( pUserCall ) aBoundRect0 = GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcMove(rSiz); SetChanged(); BroadcastObjectChange(); @@ -1909,7 +1633,6 @@ void SdrObjCustomShape::NbcRotate( const Point& rRef, long nWink, double sn, dou void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 ) { // storing horizontal and vertical flipping without modifying the rotate angle - sal_Bool bHorz = sal_False; sal_Bool bVert = sal_False; if ( rRef1.X() == rRef2.X() ) @@ -1923,9 +1646,7 @@ void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 ) { SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - ///////////////// // "MirroredX" // - ///////////////// if ( bHorz ) { const rtl::OUString sMirroredX( RTL_CONSTASCII_USTRINGPARAM ( "MirroredX" ) ); @@ -1945,9 +1666,7 @@ void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 ) aGeometryItem.SetPropertyValue( aPropVal ); } - ///////////////// // "MirroredY" // - ///////////////// if ( bVert ) { const rtl::OUString sMirroredY( RTL_CONSTASCII_USTRINGPARAM ( "MirroredY" ) ); @@ -1972,12 +1691,12 @@ void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 ) InvalidateRenderGeometry(); } -void SdrObjCustomShape::Shear( const Point& rRef, long nWink, double tn, FASTBOOL bVShear ) +void SdrObjCustomShape::Shear( const Point& rRef, long nWink, double tn, bool bVShear ) { SdrTextObj::Shear( rRef, nWink, tn, bVShear ); InvalidateRenderGeometry(); } -void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, FASTBOOL bVShear ) +void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, bool bVShear ) { long nDrehWink = aGeo.nDrehWink; if ( nDrehWink ) @@ -2134,13 +1853,6 @@ const SdrGluePointList* SdrObjCustomShape::GetGluePointList() const } // #i38892# -//SdrGluePointList* SdrObjCustomShape::GetGluePointList() -//{ -// ImpCheckCustomGluePointsAreAdded(); -// return SdrTextObj::GetGluePointList(); -//} - -// #i38892# SdrGluePointList* SdrObjCustomShape::ForceGluePointList() { if(SdrTextObj::ForceGluePointList()) @@ -2155,8 +1867,6 @@ SdrGluePointList* SdrObjCustomShape::ForceGluePointList() } //////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// sal_uInt32 SdrObjCustomShape::GetHdlCount() const { @@ -2467,12 +2177,12 @@ void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat ) bSnapRectDirty=sal_True; } -FASTBOOL SdrObjCustomShape::BegCreate( SdrDragStat& rDrag ) +bool SdrObjCustomShape::BegCreate( SdrDragStat& rDrag ) { return SdrTextObj::BegCreate( rDrag ); } -FASTBOOL SdrObjCustomShape::MovCreate(SdrDragStat& rStat) +bool SdrObjCustomShape::MovCreate(SdrDragStat& rStat) { SdrView* pView = rStat.GetView(); // #i37448# if( pView && pView->IsSolidDragging() ) @@ -2484,7 +2194,7 @@ FASTBOOL SdrObjCustomShape::MovCreate(SdrDragStat& rStat) return sal_True; } -FASTBOOL SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) +bool SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) { DragCreateObject( rStat ); @@ -2517,23 +2227,21 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeCreatePoly(const SdrDragStat& /*r } //////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// // in context with the SdrObjCustomShape the SdrTextAutoGrowHeightItem == true -> Resize Shape to fit text, // the SdrTextAutoGrowWidthItem == true -> Word wrap text in Shape -FASTBOOL SdrObjCustomShape::IsAutoGrowHeight() const +bool SdrObjCustomShape::IsAutoGrowHeight() const { const SfxItemSet& rSet = GetMergedItemSet(); - FASTBOOL bIsAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); + bool bIsAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); if ( bIsAutoGrowHeight && IsVerticalWriting() ) bIsAutoGrowHeight = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False; return bIsAutoGrowHeight; } -FASTBOOL SdrObjCustomShape::IsAutoGrowWidth() const +bool SdrObjCustomShape::IsAutoGrowWidth() const { const SfxItemSet& rSet = GetMergedItemSet(); - FASTBOOL bIsAutoGrowWidth = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); + bool bIsAutoGrowWidth = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); if ( bIsAutoGrowWidth && !IsVerticalWriting() ) bIsAutoGrowWidth = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False; return bIsAutoGrowWidth; @@ -2558,7 +2266,7 @@ void SdrObjCustomShape::SetVerticalWriting( sal_Bool bVertical ) // get item settings const SfxItemSet& rSet = GetObjectItemSet(); - // #103516# Also exchange hor/ver adjust items + // Also exchange hor/ver adjust items SdrTextHorzAdjust eHorz = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue(); SdrTextVertAdjust eVert = ((SdrTextVertAdjustItem&)(rSet.Get(SDRATTR_TEXT_VERTADJUST))).GetValue(); @@ -2568,14 +2276,14 @@ void SdrObjCustomShape::SetVerticalWriting( sal_Bool bVertical ) // prepare ItemSet to set exchanged width and height items SfxItemSet aNewSet(*rSet.GetPool(), SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT, - // #103516# Expanded item ranges to also support hor and ver adjust. + // Expanded item ranges to also support hor and ver adjust. SDRATTR_TEXT_VERTADJUST, SDRATTR_TEXT_VERTADJUST, SDRATTR_TEXT_AUTOGROWWIDTH, SDRATTR_TEXT_HORZADJUST, 0, 0); aNewSet.Put(rSet); - // #103516# Exchange horz and vert adjusts + // Exchange horz and vert adjusts switch(eVert) { case SDRTEXTVERTADJUST_TOP: aNewSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); break; @@ -2601,12 +2309,12 @@ void SdrObjCustomShape::SetVerticalWriting( sal_Bool bVertical ) } } } -FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt, FASTBOOL bWdt) const +bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bWdt) const { if ( pModel && HasText() && !rR.IsEmpty() ) { - FASTBOOL bWdtGrow=bWdt && IsAutoGrowWidth(); - FASTBOOL bHgtGrow=bHgt && IsAutoGrowHeight(); + bool bWdtGrow=bWdt && IsAutoGrowWidth(); + bool bHgtGrow=bHgt && IsAutoGrowHeight(); if ( bWdtGrow || bHgtGrow ) { Rectangle aR0(rR); @@ -2745,7 +2453,7 @@ FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOO return sal_False; } -Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const FASTBOOL bHgt, const FASTBOOL bWdt ) +Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const bool bHgt, const bool bWdt ) { Rectangle aReturnValue; @@ -2775,7 +2483,7 @@ Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const FASTBOOL bHgt, const F return aReturnValue; } -FASTBOOL SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt) +bool SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) { Rectangle aNewTextRect = ImpCalculateTextFrame( bHgt, bWdt ); sal_Bool bRet = !aNewTextRect.IsEmpty() && ( aNewTextRect != aRect ); @@ -2805,7 +2513,7 @@ FASTBOOL SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FAST } return bRet; } -FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt) +bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) { Rectangle aNewTextRect = ImpCalculateTextFrame( bHgt, bWdt ); sal_Bool bRet = !aNewTextRect.IsEmpty() && ( aNewTextRect != aRect ); @@ -2818,7 +2526,6 @@ FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOO // taking care of handles that should not been changed std::vector< SdrCustomShapeInteraction > aInteractionHandles( GetInteractionHandles( this ) ); -// SendRepaintBroadcast(); aRect = aNewTextRect; SetRectsDirty(); @@ -2838,7 +2545,6 @@ FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOO InvalidateRenderGeometry(); SetChanged(); -// SendRepaintBroadcast(); BroadcastObjectChange(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); } @@ -2925,12 +2631,12 @@ void SdrObjCustomShape::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Recta if( IsVerticalWriting() ) aPaperMin.Width() = 0; else - aPaperMin.Height() = 0; // #33102# + aPaperMin.Height() = 0; if( eHAdj != SDRTEXTHORZADJUST_BLOCK ) aPaperMin.Width()=0; - // #103516# For complete ver adjust support, set paper min height to 0, here. + // For complete ver adjust support, set paper min height to 0, here. if(SDRTEXTVERTADJUST_BLOCK != eVAdj ) aPaperMin.Height() = 0; @@ -2968,8 +2674,8 @@ void SdrObjCustomShape::TakeTextAnchorRect( Rectangle& rAnchorRect ) const else SdrTextObj::TakeTextAnchorRect( rAnchorRect ); } -void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, - Rectangle* pAnchorRect, sal_Bool /*bLineWidth*/) const +void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, + Rectangle* pAnchorRect, bool /*bLineWidth*/) const { Rectangle aAnkRect; // Rect innerhalb dem geankert wird TakeTextAnchorRect(aAnkRect); @@ -3044,7 +2750,6 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe Point aTextPos(aAnkRect.TopLeft()); Size aTextSiz(rOutliner.GetPaperSize()); // GetPaperSize() hat etwas Toleranz drauf, oder? - // #106653# // For draw objects containing text correct hor/ver alignment if text is bigger // than the object itself. Without that correction, the text would always be // formatted to the left edge (or top edge when vertical) of the draw object. @@ -3053,7 +2758,6 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe { if(aAnkRect.GetWidth() < aTextSiz.Width() && !IsVerticalWriting()) { - // #110129# // Horizontal case here. Correct only if eHAdj == SDRTEXTHORZADJUST_BLOCK, // else the alignment is wanted. if(SDRTEXTHORZADJUST_BLOCK == eHAdj) @@ -3064,7 +2768,6 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe if(aAnkRect.GetHeight() < aTextSiz.Height() && IsVerticalWriting()) { - // #110129# // Vertical case here. Correct only if eHAdj == SDRTEXTVERTADJUST_BLOCK, // else the alignment is wanted. if(SDRTEXTVERTADJUST_BLOCK == eVAdj) @@ -3108,12 +2811,20 @@ void SdrObjCustomShape::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject InvalidateRenderGeometry(); } -void SdrObjCustomShape::operator=(const SdrObject& rObj) +SdrObjCustomShape* SdrObjCustomShape::Clone() const +{ + return CloneHelper< SdrObjCustomShape >(); +} + +SdrObjCustomShape& SdrObjCustomShape::operator=(const SdrObjCustomShape& rObj) { + if( this == &rObj ) + return *this; SdrTextObj::operator=( rObj ); - aName =((SdrObjCustomShape&)rObj).aName; - fObjectRotation = ((SdrObjCustomShape&)rObj).fObjectRotation; + aName = rObj.aName; + fObjectRotation = rObj.fObjectRotation; InvalidateRenderGeometry(); + return *this; } @@ -3293,7 +3004,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, } default: { - DBG_ERROR("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); + OSL_FAIL("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); } } } @@ -3346,7 +3057,6 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const { // get turn and shear -// double fRotate = (aGeo.nDrehWink / 100.0) * F_PI180; double fRotate = fObjectRotation * F_PI180; double fShearX = (aGeo.nShearWink / 100.0) * F_PI180; @@ -3439,7 +3149,7 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba } default: { - DBG_ERROR("TRGetBaseGeometry: Missing unit translation to 100th mm!"); + OSL_FAIL("TRGetBaseGeometry: Missing unit translation to 100th mm!"); } } } @@ -3501,4 +3211,4 @@ void SdrObjCustomShape::InvalidateRenderGeometry() mpLastShadowGeometry = 0L; } -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index 27c31647e881..23b7eccc40d6 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,7 +62,6 @@ #include "editeng/fontitem.hxx" #include <editeng/fhgtitem.hxx> -//#include <editeng/charscaleitem.hxx> #include <svx/xlnstcit.hxx> #include <svx/xlnwtit.hxx> #include <svl/style.hxx> @@ -137,7 +137,7 @@ void SdrAttrObj::SetModel(SdrModel* pNewModel) //////////////////////////////////////////////////////////////////////////////////////////////////// // syntactical sugar for ItemSet accesses -void __EXPORT SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint) +void SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint) { SfxSimpleHint *pSimple = PTR_CAST(SfxSimpleHint, &rHint); sal_Bool bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId()); @@ -178,3 +178,5 @@ sal_Bool SdrAttrObj::HasLine() const } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 81ff5005d0f6..5fbb55f46bc3 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,7 +93,6 @@ #include <vcl/salbtype.hxx> // FRound #include <svl/whiter.hxx> -// #97849# #include <svx/fmmodel.hxx> #include <sfx2/objsh.hxx> #include <sfx2/objface.hxx> @@ -124,7 +124,7 @@ using namespace ::com::sun::star; -// #104018# replace macros above with type-detecting methods +// replace macros above with type-detecting methods inline double ImplTwipsToMM(double fVal) { return (fVal * (127.0 / 72.0)); } inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); } @@ -144,25 +144,11 @@ void SdrObjUserCall::Changed(const SdrObject& /*rObj*/, SdrUserCallType /*eType* TYPEINIT0(SdrObjUserData); -void SdrObjUserData::operator=(const SdrObjUserData& /*rData*/) // nicht implementiert -{ -} - -sal_Bool SdrObjUserData::operator==(const SdrObjUserData& /*rData*/) const // nicht implementiert -{ - return sal_False; -} - -sal_Bool SdrObjUserData::operator!=(const SdrObjUserData& /*rData*/) const // nicht implementiert -{ - return sal_False; -} - SdrObjUserData::~SdrObjUserData() { } -FASTBOOL SdrObjUserData::HasMacro(const SdrObject* /*pObj*/) const +bool SdrObjUserData::HasMacro(const SdrObject* /*pObj*/) const { return sal_False; } @@ -206,7 +192,7 @@ void SdrObjUserData::PaintMacro(OutputDevice& rOut, const Rectangle& /*rDirtyRec rOut.SetRasterOp(eRop); } -FASTBOOL SdrObjUserData::DoMacro(const SdrObjMacroHitRec& /*rRec*/, SdrObject* /*pObj*/) +bool SdrObjUserData::DoMacro(const SdrObjMacroHitRec& /*rRec*/, SdrObject* /*pObj*/) { return sal_False; } @@ -279,7 +265,7 @@ SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const if (pNeuUserData!=NULL) { pNeuPlusData->pUserDataList->InsertUserData(pNeuUserData); } else { - DBG_ERROR("SdrObjPlusData::Clone(): UserData.Clone() liefert NULL"); + OSL_FAIL("SdrObjPlusData::Clone(): UserData.Clone() liefert NULL"); } } } @@ -303,18 +289,6 @@ SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const return pNeuPlusData; } -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@@@ @@@@@ @@@@@@ @@@@@ @@@@ @@@@@@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@@@ @@ @@@@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@@@ @@@@@ @@@@ @@@@@ @@@@ @@ -// -//////////////////////////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////////////////////////////// // BaseProperties section @@ -352,7 +326,7 @@ void SdrObject::RemoveObjectUser(sdr::ObjectUser& rOldUser) } ////////////////////////////////////////////////////////////////////////////// -// #110094# DrawContact section +// DrawContact section sdr::contact::ViewContact* SdrObject::CreateObjectSpecificViewContact() { @@ -423,9 +397,6 @@ SdrObject::SdrObject() // #i25616# mbSupportTextIndentingOnLineWidthChange = sal_False; - //#110094#-1 - //bWriterFlyFrame =sal_False; - bNotMasterCachable=sal_False; bIsEdge=sal_False; bIs3DObj=sal_False; @@ -474,7 +445,6 @@ SdrObject::~SdrObject() mpProperties = 0L; } - // #110094# if(mpViewContact) { delete mpViewContact; @@ -678,7 +648,7 @@ AutoTimer* SdrObject::ForceAutoTimer() return pPlusData->pAutoTimer; } -FASTBOOL SdrObject::HasRefPoint() const +bool SdrObject::HasRefPoint() const { return sal_False; } @@ -711,8 +681,7 @@ void SdrObject::SetName(const String& rStr) if(pPlusData && pPlusData->aObjName != rStr) { - // --> OD 2009-07-09 #i73249# - // Undo/Redo for setting object's name + // Undo/Redo for setting object's name (#i73249#) bool bUndo( false ); if ( GetModel() && GetModel()->IsUndoEnabled() ) { @@ -726,14 +695,12 @@ void SdrObject::SetName(const String& rStr) GetModel()->BegUndo( pUndoAction->GetComment() ); GetModel()->AddUndo( pUndoAction ); } - // <-- pPlusData->aObjName = rStr; - // --> OD 2009-07-09 #i73249# + // Undo/Redo for setting object's name (#i73249#) if ( bUndo ) { GetModel()->EndUndo(); } - // <-- SetChanged(); BroadcastObjectChange(); } @@ -758,8 +725,7 @@ void SdrObject::SetTitle(const String& rStr) if(pPlusData && pPlusData->aObjTitle != rStr) { - // --> OD 2009-07-13 #i73249# - // Undo/Redo for setting object's title + // Undo/Redo for setting object's title (#i73249#) bool bUndo( false ); if ( GetModel() && GetModel()->IsUndoEnabled() ) { @@ -773,14 +739,12 @@ void SdrObject::SetTitle(const String& rStr) GetModel()->BegUndo( pUndoAction->GetComment() ); GetModel()->AddUndo( pUndoAction ); } - // <-- pPlusData->aObjTitle = rStr; - // --> OD 2009-07-13 #i73249# + // Undo/Redo for setting object's title (#i73249#) if ( bUndo ) { GetModel()->EndUndo(); } - // <-- SetChanged(); BroadcastObjectChange(); } @@ -805,8 +769,7 @@ void SdrObject::SetDescription(const String& rStr) if(pPlusData && pPlusData->aObjDescription != rStr) { - // --> OD 2009-07-13 #i73249# - // Undo/Redo for setting object's description + // Undo/Redo for setting object's description (#i73249#) bool bUndo( false ); if ( GetModel() && GetModel()->IsUndoEnabled() ) { @@ -820,14 +783,12 @@ void SdrObject::SetDescription(const String& rStr) GetModel()->BegUndo( pUndoAction->GetComment() ); GetModel()->AddUndo( pUndoAction ); } - // <-- pPlusData->aObjDescription = rStr; - // --> OD 2009-07-13 #i73249# + // Undo/Redo for setting object's description (#i73249#) if ( bUndo ) { GetModel()->EndUndo(); } - // <-- SetChanged(); BroadcastObjectChange(); } @@ -901,7 +862,6 @@ void SdrObject::SetNavigationPosition (const sal_uInt32 nNewPosition) -// #111111# // To make clearer that this method may trigger RecalcBoundRect and thus may be // expensive and somtimes problematic (inside a bigger object change You will get // non-useful BoundRects sometimes) i rename that method from GetBoundRect() to @@ -916,7 +876,6 @@ const Rectangle& SdrObject::GetCurrentBoundRect() const return aOutRect; } -// #111111# // To have a possibility to get the last calculated BoundRect e.g for producing // the first rectangle for repaints (old and new need to be used) without forcing // a RecalcBoundRect (which may be problematical and expensive sometimes) i add here @@ -980,7 +939,6 @@ void SdrObject::BroadcastObjectChange() const void SdrObject::SetChanged() { - // #110094#-11 // For test purposes, use the new ViewContact for change // notification now. ActionChanged(); @@ -1014,24 +972,20 @@ sal_Bool SdrObject::LineGeometryUsageIsNecessary() const SdrObject* SdrObject::Clone() const { - SdrObject* pObj=SdrObjFactory::MakeNewObject(GetObjInventor(),GetObjIdentifier(),NULL); - if (pObj!=NULL) { - pObj->pModel=pModel; - pObj->pPage=pPage; - *pObj=*this; - } - return pObj; + return CloneHelper< SdrObject >(); } -void SdrObject::operator=(const SdrObject& rObj) +SdrObject& SdrObject::operator=(const SdrObject& rObj) { + if( this == &rObj ) + return *this; + if(mpProperties) { delete mpProperties; mpProperties = 0L; } - // #110094# if(mpViewContact) { delete mpViewContact; @@ -1044,6 +998,7 @@ void SdrObject::operator=(const SdrObject& rObj) mpProperties = &rObj.GetProperties().Clone(*this); pModel =rObj.pModel; + pPage = rObj.pPage; aOutRect=rObj.aOutRect; mnLayerID = rObj.mnLayerID; aAnchor =rObj.aAnchor; @@ -1053,13 +1008,14 @@ void SdrObject::operator=(const SdrObject& rObj) bNoPrint=rObj.bNoPrint; mbVisible=rObj.mbVisible; bMarkProt=rObj.bMarkProt; - //EmptyPresObj wird nicht kopiert: nun doch! (25-07-1995, Joe) + //EmptyPresObj wird nicht kopiert: nun doch! bEmptyPresObj =rObj.bEmptyPresObj; - //NotVisibleAsMaster wird nicht kopiert: nun doch! (25-07-1995, Joe) + //NotVisibleAsMaster wird nicht kopiert: nun doch! bNotVisibleAsMaster=rObj.bNotVisibleAsMaster; - bSnapRectDirty=sal_True; //rObj.bSnapRectDirty; + bSnapRectDirty=sal_True; bNotMasterCachable=rObj.bNotMasterCachable; - if (pPlusData!=NULL) { delete pPlusData; pPlusData=NULL; } + delete pPlusData; + pPlusData=NULL; if (rObj.pPlusData!=NULL) { pPlusData=rObj.pPlusData->Clone(this); } @@ -1067,6 +1023,7 @@ void SdrObject::operator=(const SdrObject& rObj) delete pPlusData->pBroadcast; // der Broadcaster wird nicht mitkopiert pPlusData->pBroadcast=NULL; } + return *this; } void SdrObject::TakeObjNameSingul(XubString& rName) const @@ -1115,7 +1072,7 @@ void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, s } } -XubString SdrObject::GetWinkStr(long nWink, FASTBOOL bNoDegChar) const +XubString SdrObject::GetWinkStr(long nWink, bool bNoDegChar) const { XubString aStr; if (pModel!=NULL) { @@ -1124,7 +1081,7 @@ XubString SdrObject::GetWinkStr(long nWink, FASTBOOL bNoDegChar) const return aStr; } -XubString SdrObject::GetMetrStr(long nVal, MapUnit /*eWantMap*/, FASTBOOL bNoUnitChars) const +XubString SdrObject::GetMetrStr(long nVal, MapUnit /*eWantMap*/, bool bNoUnitChars) const { XubString aStr; if (pModel!=NULL) { @@ -1279,14 +1236,14 @@ Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const Rectangle aRect(aTmpRect); const SdrHdl* pHdl=rDrag.GetHdl(); SdrHdlKind eHdl=pHdl==NULL ? HDL_MOVE : pHdl->GetKind(); - FASTBOOL bEcke=(eHdl==HDL_UPLFT || eHdl==HDL_UPRGT || eHdl==HDL_LWLFT || eHdl==HDL_LWRGT); - FASTBOOL bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho(); - FASTBOOL bBigOrtho=bEcke && bOrtho && rDrag.GetView()->IsBigOrtho(); + bool bEcke=(eHdl==HDL_UPLFT || eHdl==HDL_UPRGT || eHdl==HDL_LWLFT || eHdl==HDL_LWRGT); + bool bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho(); + bool bBigOrtho=bEcke && bOrtho && rDrag.GetView()->IsBigOrtho(); Point aPos(rDrag.GetNow()); - FASTBOOL bLft=(eHdl==HDL_UPLFT || eHdl==HDL_LEFT || eHdl==HDL_LWLFT); - FASTBOOL bRgt=(eHdl==HDL_UPRGT || eHdl==HDL_RIGHT || eHdl==HDL_LWRGT); - FASTBOOL bTop=(eHdl==HDL_UPRGT || eHdl==HDL_UPPER || eHdl==HDL_UPLFT); - FASTBOOL bBtm=(eHdl==HDL_LWRGT || eHdl==HDL_LOWER || eHdl==HDL_LWLFT); + bool bLft=(eHdl==HDL_UPLFT || eHdl==HDL_LEFT || eHdl==HDL_LWLFT); + bool bRgt=(eHdl==HDL_UPRGT || eHdl==HDL_RIGHT || eHdl==HDL_LWRGT); + bool bTop=(eHdl==HDL_UPRGT || eHdl==HDL_UPPER || eHdl==HDL_UPLFT); + bool bBtm=(eHdl==HDL_LWRGT || eHdl==HDL_LOWER || eHdl==HDL_LWLFT); if (bLft) aTmpRect.Left() =aPos.X(); if (bRgt) aTmpRect.Right() =aPos.X(); if (bTop) aTmpRect.Top() =aPos.Y(); @@ -1298,8 +1255,8 @@ Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const long nYMul=aTmpRect.Bottom()-aTmpRect.Top(); long nXDiv=nWdt0; long nYDiv=nHgt0; - FASTBOOL bXNeg=(nXMul<0)!=(nXDiv<0); - FASTBOOL bYNeg=(nYMul<0)!=(nYDiv<0); + bool bXNeg=(nXMul<0)!=(nXDiv<0); + bool bYNeg=(nYMul<0)!=(nYDiv<0); nXMul=Abs(nXMul); nYMul=Abs(nYMul); nXDiv=Abs(nXDiv); @@ -1311,7 +1268,7 @@ Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const nXDiv=aXFact.GetDenominator(); nYDiv=aYFact.GetDenominator(); if (bEcke) { // Eckpunkthandles - FASTBOOL bUseX=(aXFact<aYFact) != bBigOrtho; + bool bUseX=(aXFact<aYFact) != bBigOrtho; if (bUseX) { long nNeed=long(BigInt(nHgt0)*BigInt(nXMul)/BigInt(nXDiv)); if (bYNeg) nNeed=-nNeed; @@ -1401,7 +1358,7 @@ basegfx::B2DPolyPolygon SdrObject::getSpecialDragPoly(const SdrDragStat& /*rDrag //////////////////////////////////////////////////////////////////////////////////////////////////// // Create -FASTBOOL SdrObject::BegCreate(SdrDragStat& rStat) +bool SdrObject::BegCreate(SdrDragStat& rStat) { rStat.SetOrtho4Possible(); Rectangle aRect1(rStat.GetStart(), rStat.GetNow()); @@ -1411,7 +1368,7 @@ FASTBOOL SdrObject::BegCreate(SdrDragStat& rStat) return sal_True; } -FASTBOOL SdrObject::MovCreate(SdrDragStat& rStat) +bool SdrObject::MovCreate(SdrDragStat& rStat) { rStat.TakeCreateRect(aOutRect); rStat.SetActionRect(aOutRect); @@ -1428,7 +1385,7 @@ FASTBOOL SdrObject::MovCreate(SdrDragStat& rStat) return sal_True; } -FASTBOOL SdrObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +bool SdrObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { rStat.TakeCreateRect(aOutRect); aOutRect.Justify(); @@ -1444,7 +1401,7 @@ void SdrObject::BrkCreate(SdrDragStat& /*rStat*/) { } -FASTBOOL SdrObject::BckCreate(SdrDragStat& /*rStat*/) +bool SdrObject::BckCreate(SdrDragStat& /*rStat*/) { return sal_False; } @@ -1475,8 +1432,8 @@ void SdrObject::NbcMove(const Size& rSiz) void SdrObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); - FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); + bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); + bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); if (bXMirr || bYMirr) { Point aRef1(GetSnapRect().Center()); if (bXMirr) { @@ -1553,7 +1510,7 @@ void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2) SetGlueReallyAbsolute(sal_False); } -void SdrObject::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SdrObject::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { SetGlueReallyAbsolute(sal_True); NbcShearGluePoints(rRef,nWink,tn,bVShear); @@ -1564,7 +1521,6 @@ void SdrObject::Move(const Size& rSiz) { if (rSiz.Width()!=0 || rSiz.Height()!=0) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcMove(rSiz); SetChanged(); BroadcastObjectChange(); @@ -1576,7 +1532,6 @@ void SdrObject::Resize(const Point& rRef, const Fraction& xFact, const Fraction& { if (xFact.GetNumerator()!=xFact.GetDenominator() || yFact.GetNumerator()!=yFact.GetDenominator()) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcResize(rRef,xFact,yFact); SetChanged(); BroadcastObjectChange(); @@ -1588,7 +1543,6 @@ void SdrObject::Rotate(const Point& rRef, long nWink, double sn, double cs) { if (nWink!=0) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcRotate(rRef,nWink,sn,cs); SetChanged(); BroadcastObjectChange(); @@ -1599,18 +1553,16 @@ void SdrObject::Rotate(const Point& rRef, long nWink, double sn, double cs) void SdrObject::Mirror(const Point& rRef1, const Point& rRef2) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcMirror(rRef1,rRef2); SetChanged(); BroadcastObjectChange(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); } -void SdrObject::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SdrObject::Shear(const Point& rRef, long nWink, double tn, bool bVShear) { if (nWink!=0) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcShear(rRef,nWink,tn,bVShear); SetChanged(); BroadcastObjectChange(); @@ -1629,7 +1581,6 @@ void SdrObject::SetRelativePos(const Point& rPnt) { if (rPnt!=GetRelativePos()) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcSetRelativePos(rPnt); SetChanged(); BroadcastObjectChange(); @@ -1653,7 +1604,6 @@ void SdrObject::SetAnchorPos(const Point& rPnt) { if (rPnt!=aAnchor) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcSetAnchorPos(rPnt); SetChanged(); BroadcastObjectChange(); @@ -1698,7 +1648,6 @@ void SdrObject::AdjustToMaxRect( const Rectangle& rMaxRect, bool /* bShrinkOnly void SdrObject::SetSnapRect(const Rectangle& rRect) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcSetSnapRect(rRect); SetChanged(); BroadcastObjectChange(); @@ -1708,7 +1657,6 @@ void SdrObject::SetSnapRect(const Rectangle& rRect) void SdrObject::SetLogicRect(const Rectangle& rRect) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcSetLogicRect(rRect); SetChanged(); BroadcastObjectChange(); @@ -1720,7 +1668,7 @@ long SdrObject::GetRotateAngle() const return 0; } -long SdrObject::GetShearAngle(FASTBOOL /*bVertical*/) const +long SdrObject::GetShearAngle(bool /*bVertical*/) const { return 0; } @@ -1753,7 +1701,6 @@ Point SdrObject::GetPoint(sal_uInt32 /*i*/) const void SdrObject::SetPoint(const Point& rPnt, sal_uInt32 i) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcSetPoint(rPnt, i); SetChanged(); BroadcastObjectChange(); @@ -1764,7 +1711,7 @@ void SdrObject::NbcSetPoint(const Point& /*rPnt*/, sal_uInt32 /*i*/) { } -FASTBOOL SdrObject::HasTextEdit() const +bool SdrObject::HasTextEdit() const { return sal_False; } @@ -1781,7 +1728,6 @@ void SdrObject::EndTextEdit(SdrOutliner& /*rOutl*/) void SdrObject::SetOutlinerParaObject(OutlinerParaObject* pTextObject) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcSetOutlinerParaObject(pTextObject); SetChanged(); BroadcastObjectChange(); @@ -1832,7 +1778,7 @@ SdrObjUserData* SdrObject::ImpGetMacroUserData() const return pData; } -FASTBOOL SdrObject::HasMacro() const +bool SdrObject::HasMacro() const { SdrObjUserData* pData=ImpGetMacroUserData(); return pData!=NULL ? pData->HasMacro(this) : sal_False; @@ -1891,7 +1837,7 @@ void SdrObject::PaintMacro(OutputDevice& rOut, const Rectangle& rDirtyRect, cons } } -FASTBOOL SdrObject::DoMacro(const SdrObjMacroHitRec& rRec) +bool SdrObject::DoMacro(const SdrObjMacroHitRec& rRec) { SdrObjUserData* pData=ImpGetMacroUserData(); if (pData!=NULL) { @@ -2149,7 +2095,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) SetResizeProtect(b); } - /* #67368# move protect always sets size protect */ + /* move protect always sets size protect */ if( IsMoveProtect() ) SetResizeProtect( true ); @@ -2211,13 +2157,13 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) } } -void lcl_SetItem(SfxItemSet& rAttr, FASTBOOL bMerge, const SfxPoolItem& rItem) +void lcl_SetItem(SfxItemSet& rAttr, bool bMerge, const SfxPoolItem& rItem) { if (bMerge) rAttr.MergeValue(rItem,sal_True); else rAttr.Put(rItem); } -void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, FASTBOOL bMerge) const +void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const { const Rectangle& rSnap=GetSnapRect(); const Rectangle& rLogic=GetLogicRect(); @@ -2272,7 +2218,6 @@ void SdrObject::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemov if(pUserCall) aBoundRect0 = GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcSetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr); SetChanged(); BroadcastObjectChange(); @@ -2291,9 +2236,9 @@ void SdrObject::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRe // Das Broadcasting beim Setzen der Attribute wird vom AttrObj gemanagt //////////////////////////////////////////////////////////////////////////////////////////////////// -FASTBOOL SdrObject::IsNode() const +bool SdrObject::IsNode() const { - return sal_True; + return true; } SdrGluePoint SdrObject::GetVertexGluePoint(sal_uInt16 nPosNum) const @@ -2339,11 +2284,6 @@ const SdrGluePointList* SdrObject::GetGluePointList() const return NULL; } -//SdrGluePointList* SdrObject::GetGluePointList() -//{ -// if (pPlusData!=NULL) return pPlusData->pGluePoints; -// return NULL; -//} SdrGluePointList* SdrObject::ForceGluePointList() { @@ -2354,7 +2294,7 @@ SdrGluePointList* SdrObject::ForceGluePointList() return pPlusData->pGluePoints; } -void SdrObject::SetGlueReallyAbsolute(FASTBOOL bOn) +void SdrObject::SetGlueReallyAbsolute(bool bOn) { // erst Const-Aufruf um zu sehen, ob // ueberhaupt Klebepunkte da sind @@ -2387,7 +2327,7 @@ void SdrObject::NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2) } } -void SdrObject::NbcShearGluePoints(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SdrObject::NbcShearGluePoints(const Point& rRef, long nWink, double tn, bool bVShear) { // erst Const-Aufruf um zu sehen, ob // ueberhaupt Klebepunkte da sind @@ -2398,20 +2338,20 @@ void SdrObject::NbcShearGluePoints(const Point& rRef, long nWink, double tn, FAS } } -FASTBOOL SdrObject::IsEdge() const +bool SdrObject::IsEdge() const { - return sal_False; + return false; } -void SdrObject::ConnectToNode(FASTBOOL /*bTail1*/, SdrObject* /*pObj*/) +void SdrObject::ConnectToNode(bool /*bTail1*/, SdrObject* /*pObj*/) { } -void SdrObject::DisconnectFromNode(FASTBOOL /*bTail1*/) +void SdrObject::DisconnectFromNode(bool /*bTail1*/) { } -SdrObject* SdrObject::GetConnectedNode(FASTBOOL /*bTail1*/) const +SdrObject* SdrObject::GetConnectedNode(bool /*bTail1*/) const { return NULL; } @@ -2520,7 +2460,6 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, sal_Bool bForceLin { if(eOldFillStyle != XFILL_NONE) { - // #107600# use new boolean here bAddOriginalGeometry = true; } } @@ -2750,7 +2689,7 @@ void SdrObject::InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos) if (pPlusData->pUserDataList==NULL) pPlusData->pUserDataList=new SdrObjUserDataList; pPlusData->pUserDataList->InsertUserData(pData,nPos); } else { - DBG_ERROR("SdrObject::InsertUserData(): pData ist NULL-Pointer"); + OSL_FAIL("SdrObject::InsertUserData(): pData ist NULL-Pointer"); } } @@ -2764,7 +2703,7 @@ void SdrObject::DeleteUserData(sal_uInt16 nNum) pPlusData->pUserDataList=NULL; } } else { - DBG_ERROR("SdrObject::DeleteUserData(): ungueltiger Index"); + OSL_FAIL("SdrObject::DeleteUserData(): ungueltiger Index"); } } @@ -2777,7 +2716,6 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundR if ( pUserCall ) { - // UserCall ausfuehren pUserCall->Changed( *this, eUserCall, rBoundRect ); } @@ -3030,7 +2968,7 @@ sal_Bool SdrObject::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B } default: { - DBG_ERROR("TRGetBaseGeometry: Missing unit translation to 100th mm!"); + OSL_FAIL("TRGetBaseGeometry: Missing unit translation to 100th mm!"); } } } @@ -3081,7 +3019,7 @@ void SdrObject::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const ba } default: { - DBG_ERROR("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); + OSL_FAIL("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); } } } @@ -3103,7 +3041,6 @@ void SdrObject::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const ba SetSnapRect(aBaseRect); } -// #116168# // Give info if object is in destruction sal_Bool SdrObject::IsInDestruction() const { @@ -3145,17 +3082,6 @@ void SdrObject::SetContextWritingMode( const sal_Int16 /*_nContextWritingMode*/ // this base class does not support different writing modes, so ignore the call } -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@@@ @@@@@ @@@@@@ @@@@@ @@@@ @@@@ @@@@@@ @@@@ @@@@@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@@@ @@ @@@@ @@@@@@ @@ @@ @@ @@ @@@@@ @@@@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@@@ @@@@@ @@@@ @@ @@ @@ @@@@ @@ @@@@ @@ @@ @@ -// -//////////////////////////////////////////////////////////////////////////////////////////////////// SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel) { @@ -3307,4 +3233,4 @@ namespace svx } } -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 53f255c361a1..3c0b242913a9 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,9 +78,9 @@ public: long nEscAbs; long nLineLen; SdrCaptionEscDir eEscDir; - FASTBOOL bFitLineLen; - FASTBOOL bEscRel; - FASTBOOL bFixedAngle; + bool bFitLineLen; + bool bEscRel; + bool bFixedAngle; public: ImpCaptParams() @@ -115,7 +116,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi nY+=rRect.Top(); Point aBestPt; EscDir eBestDir=LKS; - FASTBOOL bTryH=eEscDir==SDRCAPT_ESCBESTFIT; + bool bTryH=eEscDir==SDRCAPT_ESCBESTFIT; if (!bTryH) { if (eType!=SDRCAPT_TYPE1) { bTryH=eEscDir==SDRCAPT_ESCHORIZONTAL; @@ -123,7 +124,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi bTryH=eEscDir==SDRCAPT_ESCVERTICAL; } } - FASTBOOL bTryV=eEscDir==SDRCAPT_ESCBESTFIT; + bool bTryV=eEscDir==SDRCAPT_ESCBESTFIT; if (!bTryV) { if (eType!=SDRCAPT_TYPE1) { bTryV=eEscDir==SDRCAPT_ESCVERTICAL; @@ -135,7 +136,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi if (bTryH) { Point aLft(rRect.Left()-nGap,nY); Point aRgt(rRect.Right()+nGap,nY); - FASTBOOL bLft=(aTl.X()-aLft.X()<aRgt.X()-aTl.X()); + bool bLft=(aTl.X()-aLft.X()<aRgt.X()-aTl.X()); if (bLft) { eBestDir=LKS; aBestPt=aLft; @@ -147,7 +148,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi if (bTryV) { Point aTop(nX,rRect.Top()-nGap); Point aBtm(nX,rRect.Bottom()+nGap); - FASTBOOL bTop=(aTl.Y()-aTop.Y()<aBtm.Y()-aTl.Y()); + bool bTop=(aTl.Y()-aTop.Y()<aBtm.Y()-aTl.Y()); Point aBest2; EscDir eBest2; if (bTop) { @@ -157,7 +158,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi eBest2=UNT; aBest2=aBtm; } - FASTBOOL bTakeIt=eEscDir!=SDRCAPT_ESCBESTFIT; + bool bTakeIt=eEscDir!=SDRCAPT_ESCBESTFIT; if (!bTakeIt) { BigInt aHorX(aBestPt.X()-aTl.X()); aHorX*=aHorX; BigInt aHorY(aBestPt.Y()-aTl.Y()); aHorY*=aHorY; @@ -250,10 +251,9 @@ sal_uInt16 SdrCaptionObj::GetObjIdentifier() const return sal_uInt16(OBJ_CAPTION); } -void SdrCaptionObj::operator=(const SdrObject& rObj) +SdrCaptionObj* SdrCaptionObj::Clone() const { - SdrRectObj::operator=(rObj); - aTailPoly=((SdrCaptionObj&)rObj).aTailPoly; + return CloneHelper< SdrCaptionObj >(); } void SdrCaptionObj::TakeObjNameSingul(XubString& rName) const @@ -286,7 +286,6 @@ basegfx::B2DPolyPolygon SdrCaptionObj::TakeXorPoly() const sal_uInt32 SdrCaptionObj::GetHdlCount() const { sal_uInt32 nAnz1(SdrRectObj::GetHdlCount()); - // sal_uInt32 nAnz2(aTailPoly.GetSize()); // Derzeit ist nur das Draggen des Schwanzendes implementiert return nAnz1 + 1L; } @@ -557,7 +556,7 @@ void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, Polygon& rPoly, Rect } } -FASTBOOL SdrCaptionObj::BegCreate(SdrDragStat& rStat) +bool SdrCaptionObj::BegCreate(SdrDragStat& rStat) { if (aRect.IsEmpty()) return sal_False; // Create z.Zt. nur mit vorgegebenen Rect @@ -570,7 +569,7 @@ FASTBOOL SdrCaptionObj::BegCreate(SdrDragStat& rStat) return sal_True; } -FASTBOOL SdrCaptionObj::MovCreate(SdrDragStat& rStat) +bool SdrCaptionObj::MovCreate(SdrDragStat& rStat) { ImpCaptParams aPara; ImpGetCaptParams(aPara); @@ -582,7 +581,7 @@ FASTBOOL SdrCaptionObj::MovCreate(SdrDragStat& rStat) return sal_True; } -FASTBOOL SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +bool SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { ImpCaptParams aPara; ImpGetCaptParams(aPara); @@ -592,7 +591,7 @@ FASTBOOL SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointAnz()>=2); } -FASTBOOL SdrCaptionObj::BckCreate(SdrDragStat& /*rStat*/) +bool SdrCaptionObj::BckCreate(SdrDragStat& /*rStat*/) { return sal_False; } @@ -660,7 +659,6 @@ void SdrCaptionObj::RecalcSnapRect() { SdrRectObj::RecalcSnapRect(); // #i32599# - // maSnapRect.Union(aTailPoly.GetBoundRect()); // !!!!! fehlende Impl. } @@ -698,7 +696,6 @@ void SdrCaptionObj::SetTailPos(const Point& rPos) { if (aTailPoly.GetSize()==0 || aTailPoly[0]!=rPos) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcSetTailPos(rPos); SetChanged(); BroadcastObjectChange(); @@ -756,17 +753,17 @@ void SdrCaptionObj::RestGeoData(const SdrObjGeoData& rGeo) } SdrObject* SdrCaptionObj::DoConvertToPolyObj(sal_Bool bBezier) const -{ // #42334# - Convert implementiert +{ SdrObject* pRect=SdrRectObj::DoConvertToPolyObj(bBezier); SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), sal_False, bBezier); SdrObject* pRet=(pTail!=NULL) ? pTail : pRect; if (pTail!=NULL && pRect!=NULL) { - FASTBOOL bInsRect=sal_True; - FASTBOOL bInsTail=sal_True; + bool bInsRect = true; + bool bInsTail = true; SdrObjList* pOL=pTail->GetSubList(); - if (pOL!=NULL) { pRet=pRect; bInsTail=sal_False; } + if (pOL!=NULL) { pRet=pRect; bInsTail = false; } if (pOL==NULL) pOL=pRect->GetSubList(); - if (pOL!=NULL) { pRet=pRect; bInsRect=sal_False; } + if (pOL!=NULL) { pRet=pRect; bInsRect = false; } if (pOL==NULL) { SdrObjGroup* pGrp=new SdrObjGroup; pOL=pGrp->GetSubList(); @@ -817,7 +814,7 @@ void SdrCaptionObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, cons } default: { - DBG_ERROR("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); + OSL_FAIL("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); } } } @@ -848,4 +845,4 @@ basegfx::B2DPolygon SdrCaptionObj::getTailPolygon() const return aTailPoly.getB2DPolygon(); } -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 1d00e13571d9..98537d10816b 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,7 +77,7 @@ Point GetWinkPnt(const Rectangle& rR, long nWink) if (nWdt!=nHgt) { if (nWdt>nHgt) { if (nWdt!=0) { - // eventuelle Ueberlaeufe bei sehr grossen Objekten abfangen (Bug 23384) + // eventuelle Ueberlaeufe bei sehr grossen Objekten abfangen if (Abs(nHgt)>32767 || Abs(aRetval.Y())>32767) { aRetval.Y()=BigMulDiv(aRetval.Y(),nHgt,nWdt); } else { @@ -85,7 +86,7 @@ Point GetWinkPnt(const Rectangle& rR, long nWink) } } else { if (nHgt!=0) { - // eventuelle Ueberlaeufe bei sehr grossen Objekten abfangen (Bug 23384) + // eventuelle Ueberlaeufe bei sehr grossen Objekten abfangen if (Abs(nWdt)>32767 || Abs(aRetval.X())>32767) { aRetval.X()=BigMulDiv(aRetval.X(),nWdt,nHgt); } else { @@ -152,7 +153,7 @@ SdrCircObj::~SdrCircObj() void SdrCircObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - FASTBOOL bCanConv=!HasText() || ImpCanConvTextToCurve(); + bool bCanConv=!HasText() || ImpCanConvTextToCurve(); rInfo.bEdgeRadiusAllowed = sal_False; rInfo.bCanConvToPath=bCanConv; rInfo.bCanConvToPoly=bCanConv; @@ -164,15 +165,15 @@ sal_uInt16 SdrCircObj::GetObjIdentifier() const return sal_uInt16(meCircleKind); } -FASTBOOL SdrCircObj::PaintNeedsXPolyCirc() const +bool SdrCircObj::PaintNeedsXPolyCirc() const { // XPoly ist notwendig fuer alle gedrehten Ellipsenobjekte, // fuer alle Kreis- und Ellipsenabschnitte // und wenn nicht WIN dann (erstmal) auch fuer Kreis-/Ellipsenausschnitte // und Kreis-/Ellipsenboegen (wg. Genauigkeit) - FASTBOOL bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || meCircleKind==OBJ_CCUT; + bool bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || meCircleKind==OBJ_CCUT; // Wenn nicht Win, dann fuer alle ausser Vollkreis (erstmal!!!) - if (meCircleKind!=OBJ_CIRC) bNeed=sal_True; + if (meCircleKind!=OBJ_CIRC) bNeed = true; const SfxItemSet& rSet = GetObjectItemSet(); if(!bNeed) @@ -209,7 +210,7 @@ FASTBOOL SdrCircObj::PaintNeedsXPolyCirc() const } if(!bNeed && meCircleKind != OBJ_CIRC && nStartWink == nEndWink) - bNeed=sal_True; // Weil sonst Vollkreis gemalt wird + bNeed = true; // Weil sonst Vollkreis gemalt wird return bNeed; } @@ -348,12 +349,9 @@ void SdrCircObj::TakeObjNamePlural(XubString& rName) const rName=ImpGetResStr(nID); } -void SdrCircObj::operator=(const SdrObject& rObj) +SdrCircObj* SdrCircObj::Clone() const { - SdrRectObj::operator=(rObj); - - nStartWink = ((SdrCircObj&)rObj).nStartWink; - nEndWink = ((SdrCircObj&)rObj).nEndWink; + return CloneHelper< SdrCircObj >(); } basegfx::B2DPolyPolygon SdrCircObj::TakeXorPoly() const @@ -375,7 +373,7 @@ struct ImpCircUser : public SdrDragStatUserData long nStart; long nEnd; long nWink; - FASTBOOL bRight; // noch nicht implementiert + bool bRight; // noch nicht implementiert public: ImpCircUser() @@ -384,6 +382,7 @@ public: nWdt(0), nStart(0), nEnd(0), + nWink(0), bRight(sal_False) {} void SetCreateParams(SdrDragStat& rStat); @@ -690,7 +689,7 @@ void SdrCircObj::ImpSetCreateParams(SdrDragStat& rStat) const pU->SetCreateParams(rStat); } -FASTBOOL SdrCircObj::BegCreate(SdrDragStat& rStat) +bool SdrCircObj::BegCreate(SdrDragStat& rStat) { rStat.SetOrtho4Possible(); Rectangle aRect1(rStat.GetStart(), rStat.GetNow()); @@ -701,7 +700,7 @@ FASTBOOL SdrCircObj::BegCreate(SdrDragStat& rStat) return sal_True; } -FASTBOOL SdrCircObj::MovCreate(SdrDragStat& rStat) +bool SdrCircObj::MovCreate(SdrDragStat& rStat) { ImpSetCreateParams(rStat); ImpCircUser* pU=(ImpCircUser*)rStat.GetUser(); @@ -724,11 +723,11 @@ FASTBOOL SdrCircObj::MovCreate(SdrDragStat& rStat) return sal_True; } -FASTBOOL SdrCircObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +bool SdrCircObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { ImpSetCreateParams(rStat); ImpCircUser* pU=(ImpCircUser*)rStat.GetUser(); - FASTBOOL bRet=sal_False; + bool bRet = false; if (eCmd==SDRCREATE_FORCEEND && rStat.GetPointAnz()<4) meCircleKind=OBJ_CIRC; if (meCircleKind==OBJ_CIRC) { bRet=rStat.GetPointAnz()>=2; @@ -765,7 +764,7 @@ void SdrCircObj::BrkCreate(SdrDragStat& rStat) rStat.SetUser(NULL); } -FASTBOOL SdrCircObj::BckCreate(SdrDragStat& rStat) +bool SdrCircObj::BckCreate(SdrDragStat& rStat) { rStat.SetNoSnap(rStat.GetPointAnz()>=3); rStat.SetOrtho4Possible(rStat.GetPointAnz()<3); @@ -823,12 +822,12 @@ void SdrCircObj::NbcMove(const Size& aSiz) void SdrCircObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { long nWink0=aGeo.nDrehWink; - FASTBOOL bNoShearRota=(aGeo.nDrehWink==0 && aGeo.nShearWink==0); + bool bNoShearRota=(aGeo.nDrehWink==0 && aGeo.nShearWink==0); SdrTextObj::NbcResize(rRef,xFact,yFact); bNoShearRota|=(aGeo.nDrehWink==0 && aGeo.nShearWink==0); if (meCircleKind!=OBJ_CIRC) { - FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); - FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); + bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); + bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); if (bXMirr || bYMirr) { // bei bXMirr!=bYMirr muessten eigentlich noch die beiden // Linienende vertauscht werden. Das ist jedoch mal wieder @@ -872,7 +871,7 @@ void SdrCircObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract ImpSetCircInfoToAttr(); } -void SdrCircObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SdrCircObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { SdrTextObj::NbcShear(rRef,nWink,tn,bVShear); SetXPolyDirty(); @@ -881,8 +880,7 @@ void SdrCircObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVS void SdrCircObj::NbcMirror(const Point& rRef1, const Point& rRef2) { - //long nWink0=aGeo.nDrehWink; - FASTBOOL bFreeMirr=meCircleKind!=OBJ_CIRC; + bool bFreeMirr=meCircleKind!=OBJ_CIRC; Point aTmpPt1; Point aTmpPt2; if (bFreeMirr) { // bei freier Spiegelachse einige Vorbereitungen Treffen @@ -1071,7 +1069,7 @@ Point SdrCircObj::GetSnapPoint(sal_uInt32 i) const } } -void __EXPORT SdrCircObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) +void SdrCircObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { SetXPolyDirty(); SdrRectObj::Notify(rBC,rHint); @@ -1133,7 +1131,7 @@ void SdrCircObj::ImpSetCircInfoToAttr() if(eNewKindA != eOldKindA || nStartWink != nOldStartWink || nEndWink != nOldEndWink) { - // #81921# since SetItem() implicitly calls ImpSetAttrToCircInfo() + // since SetItem() implicitly calls ImpSetAttrToCircInfo() // setting the item directly is necessary here. if(eNewKindA != eOldKindA) { @@ -1165,5 +1163,4 @@ SdrObject* SdrCircObj::DoConvertToPolyObj(sal_Bool bBezier) const return pRet; } -////////////////////////////////////////////////////////////////////////////// -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 6eec6e855bf9..b1b9c9064e67 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,23 +77,23 @@ void SdrObjConnection::ResetVars() bAutoCorner=sal_False; } -FASTBOOL SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, FASTBOOL bSetAbsPos) const +bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsPos) const { - FASTBOOL bRet=sal_False; + bool bRet = false; if (pObj!=NULL) { // Ein Obj muss schon angedockt sein! if (bAutoVertex) { rGP=pObj->GetVertexGluePoint(nConId); - bRet=sal_True; + bRet = true; } else if (bAutoCorner) { rGP=pObj->GetCornerGluePoint(nConId); - bRet=sal_True; + bRet = true; } else { const SdrGluePointList* pGPL=pObj->GetGluePointList(); if (pGPL!=NULL) { sal_uInt16 nNum=pGPL->FindGluePoint(nConId); if (nNum!=SDRGLUEPOINT_NOTFOUND) { rGP=(*pGPL)[nNum]; - bRet=sal_True; + bRet = true; } } } @@ -129,13 +130,13 @@ sal_uInt16 SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolyg return 0; } -FASTBOOL SdrEdgeInfoRec::ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const +bool SdrEdgeInfoRec::ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const { sal_uInt16 nIdx=ImpGetPolyIdx(eLineCode,rXP); - FASTBOOL bHorz=nAngle1==0 || nAngle1==18000; + bool bHorz=nAngle1==0 || nAngle1==18000; if (eLineCode==OBJ2LINE2 || eLineCode==OBJ2LINE3) { - nIdx=rXP.GetPointCount()-nIdx; // #36314# - bHorz=nAngle2==0 || nAngle2==18000; // #52000# + nIdx=rXP.GetPointCount()-nIdx; + bHorz=nAngle2==0 || nAngle2==18000; } if ((nIdx & 1)==1) bHorz=!bHorz; return bHorz; @@ -180,9 +181,8 @@ SdrEdgeObj::SdrEdgeObj() nNotifyingCount(0), bEdgeTrackDirty(sal_False), bEdgeTrackUserDefined(sal_False), - // #109007# Default is to allow default connects + // Default is to allow default connects mbSuppressDefaultConnect(sal_False), - // #110649# mbBoundRectCalculationRunning(sal_False) { bClosedObj=sal_False; @@ -265,7 +265,6 @@ void SdrEdgeObj::ImpSetAttrToEdgeInfo() } } - // #84649# ImpDirtyEdgeTrack(); } @@ -324,7 +323,7 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr() if(n != nValAnz || nVals[0] != nVal1 || nVals[1] != nVal2 || nVals[2] != nVal3) { - // #75371# Here no more notifying is necessary, just local changes are OK. + // Here no more notifying is necessary, just local changes are OK. if(n != nValAnz) { GetProperties().SetObjectItemDirect(SdrEdgeLineDeltaAnzItem(n)); @@ -373,7 +372,7 @@ void SdrEdgeObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bGradientAllowed = sal_False; rInfo.bShearAllowed =sal_False; rInfo.bEdgeRadiusAllowed=sal_False; - FASTBOOL bCanConv=!HasText() || ImpCanConvTextToCurve(); + bool bCanConv=!HasText() || ImpCanConvTextToCurve(); rInfo.bCanConvToPath=bCanConv; rInfo.bCanConvToPoly=bCanConv; rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); @@ -414,9 +413,9 @@ void SdrEdgeObj::TakeUnrotatedSnapRect(Rectangle& rRect) const rRect=GetSnapRect(); } -FASTBOOL SdrEdgeObj::IsNode() const +bool SdrEdgeObj::IsNode() const { - return sal_True; + return true; } SdrGluePoint SdrEdgeObj::GetVertexGluePoint(sal_uInt16 nNum) const @@ -454,20 +453,20 @@ SdrGluePoint SdrEdgeObj::GetCornerGluePoint(sal_uInt16 nNum) const const SdrGluePointList* SdrEdgeObj::GetGluePointList() const { - return NULL; // Keine benutzerdefinierten Klebepunkte fuer Verbinder #31671# + return NULL; // Keine benutzerdefinierten Klebepunkte fuer Verbinder } SdrGluePointList* SdrEdgeObj::ForceGluePointList() { - return NULL; // Keine benutzerdefinierten Klebepunkte fuer Verbinder #31671# + return NULL; // Keine benutzerdefinierten Klebepunkte fuer Verbinder } -FASTBOOL SdrEdgeObj::IsEdge() const +bool SdrEdgeObj::IsEdge() const { - return sal_True; + return true; } -void SdrEdgeObj::ConnectToNode(FASTBOOL bTail1, SdrObject* pObj) +void SdrEdgeObj::ConnectToNode(bool bTail1, SdrObject* pObj) { SdrObjConnection& rCon=GetConnection(bTail1); DisconnectFromNode(bTail1); @@ -478,7 +477,7 @@ void SdrEdgeObj::ConnectToNode(FASTBOOL bTail1, SdrObject* pObj) } } -void SdrEdgeObj::DisconnectFromNode(FASTBOOL bTail1) +void SdrEdgeObj::DisconnectFromNode(bool bTail1) { SdrObjConnection& rCon=GetConnection(bTail1); if (rCon.pObj!=NULL) { @@ -487,16 +486,16 @@ void SdrEdgeObj::DisconnectFromNode(FASTBOOL bTail1) } } -SdrObject* SdrEdgeObj::GetConnectedNode(FASTBOOL bTail1) const +SdrObject* SdrEdgeObj::GetConnectedNode(bool bTail1) const { SdrObject* pObj=GetConnection(bTail1).pObj; if (pObj!=NULL && (pObj->GetPage()!=pPage || !pObj->IsInserted())) pObj=NULL; return pObj; } -FASTBOOL SdrEdgeObj::CheckNodeConnection(FASTBOOL bTail1) const +bool SdrEdgeObj::CheckNodeConnection(bool bTail1) const { - FASTBOOL bRet=sal_False; + bool bRet = false; const SdrObjConnection& rCon=GetConnection(bTail1); sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount(); if (rCon.pObj!=NULL && rCon.pObj->GetPage()==pPage && nPtAnz!=0) { @@ -519,7 +518,7 @@ FASTBOOL SdrEdgeObj::CheckNodeConnection(FASTBOOL bTail1) const return bRet; } -void SdrEdgeObj::ImpSetTailPoint(FASTBOOL bTail1, const Point& rPt) +void SdrEdgeObj::ImpSetTailPoint(bool bTail1, const Point& rPt) { sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount(); if (nPtAnz==0) { @@ -554,7 +553,6 @@ void SdrEdgeObj::ImpRecalcEdgeTrack() if ( bEdgeTrackUserDefined && (GetModel() && GetModel()->isLocked()) ) return; - // #110649# if(IsBoundRectCalculationRunning()) { // this object is involved into another ImpRecalcEdgeTrack() call @@ -581,18 +579,15 @@ void SdrEdgeObj::ImpRecalcEdgeTrack() Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); SetRectsDirty(); - // #110094#-14 if (!bEdgeTrackDirty) SendRepaintBroadcast(); *pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo); ImpSetEdgeInfoToAttr(); // Die Werte aus aEdgeInfo in den Pool kopieren bEdgeTrackDirty=sal_False; // Only redraw here, no object change ActionChanged(); - // BroadcastObjectChange(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); - // #110649# ((SdrEdgeObj*)this)->mbBoundRectCalculationRunning = sal_False; } } @@ -605,11 +600,11 @@ sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const long dyo=rPt.Y()-aR.Top(); long dxr=aR.Right()-rPt.X(); long dyu=aR.Bottom()-rPt.Y(); - FASTBOOL bxMitt=Abs(dxl-dxr)<2; - FASTBOOL byMitt=Abs(dyo-dyu)<2; + bool bxMitt=Abs(dxl-dxr)<2; + bool byMitt=Abs(dyo-dyu)<2; long dx=Min(dxl,dxr); long dy=Min(dyo,dyu); - FASTBOOL bDiag=Abs(dx-dy)<2; + bool bDiag=Abs(dx-dy)<2; if (bxMitt && byMitt) return SDRESC_ALL; // In der Mitte if (bDiag) { // diagonal sal_uInt16 nRet=0; @@ -635,7 +630,7 @@ sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const } } -FASTBOOL SdrEdgeObj::ImpStripPolyPoints(XPolygon& /*rXP*/) const +bool SdrEdgeObj::ImpStripPolyPoints(XPolygon& /*rXP*/) const { // fehlende Implementation !!! return sal_False; @@ -645,10 +640,10 @@ XPolygon SdrEdgeObj::ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, cons { XPolygon aXP; aXP.Insert(XPOLY_APPEND,rStPt,XPOLY_NORMAL); - FASTBOOL bRts=nEscAngle==0; - FASTBOOL bObn=nEscAngle==9000; - FASTBOOL bLks=nEscAngle==18000; - FASTBOOL bUnt=nEscAngle==27000; + bool bRts=nEscAngle==0; + bool bObn=nEscAngle==9000; + bool bLks=nEscAngle==18000; + bool bUnt=nEscAngle==27000; Point aP1(rStPt); // erstmal den Pflichtabstand if (bLks) aP1.X()=rRect.Left(); @@ -656,48 +651,45 @@ XPolygon SdrEdgeObj::ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, cons if (bObn) aP1.Y()=rRect.Top(); if (bUnt) aP1.Y()=rRect.Bottom(); - FASTBOOL bFinish=sal_False; - if (!bFinish) { - Point aP2(aP1); // Und nun den Pflichtabstand ggf. bis auf Meetinghoehe erweitern - if (bLks && rMeeting.X()<=aP2.X()) aP2.X()=rMeeting.X(); - if (bRts && rMeeting.X()>=aP2.X()) aP2.X()=rMeeting.X(); - if (bObn && rMeeting.Y()<=aP2.Y()) aP2.Y()=rMeeting.Y(); - if (bUnt && rMeeting.Y()>=aP2.Y()) aP2.Y()=rMeeting.Y(); - aXP.Insert(XPOLY_APPEND,aP2,XPOLY_NORMAL); - - Point aP3(aP2); - if ((bLks && rMeeting.X()>aP2.X()) || (bRts && rMeeting.X()<aP2.X())) { // Aussenrum - if (rMeeting.Y()<aP2.Y()) { - aP3.Y()=rRect.Top(); - if (rMeeting.Y()<aP3.Y()) aP3.Y()=rMeeting.Y(); - } else { - aP3.Y()=rRect.Bottom(); - if (rMeeting.Y()>aP3.Y()) aP3.Y()=rMeeting.Y(); - } + Point aP2(aP1); // Und nun den Pflichtabstand ggf. bis auf Meetinghoehe erweitern + if (bLks && rMeeting.X()<=aP2.X()) aP2.X()=rMeeting.X(); + if (bRts && rMeeting.X()>=aP2.X()) aP2.X()=rMeeting.X(); + if (bObn && rMeeting.Y()<=aP2.Y()) aP2.Y()=rMeeting.Y(); + if (bUnt && rMeeting.Y()>=aP2.Y()) aP2.Y()=rMeeting.Y(); + aXP.Insert(XPOLY_APPEND,aP2,XPOLY_NORMAL); + + Point aP3(aP2); + if ((bLks && rMeeting.X()>aP2.X()) || (bRts && rMeeting.X()<aP2.X())) { // Aussenrum + if (rMeeting.Y()<aP2.Y()) { + aP3.Y()=rRect.Top(); + if (rMeeting.Y()<aP3.Y()) aP3.Y()=rMeeting.Y(); + } else { + aP3.Y()=rRect.Bottom(); + if (rMeeting.Y()>aP3.Y()) aP3.Y()=rMeeting.Y(); + } + aXP.Insert(XPOLY_APPEND,aP3,XPOLY_NORMAL); + if (aP3.Y()!=rMeeting.Y()) { + aP3.X()=rMeeting.X(); aXP.Insert(XPOLY_APPEND,aP3,XPOLY_NORMAL); - if (aP3.Y()!=rMeeting.Y()) { - aP3.X()=rMeeting.X(); - aXP.Insert(XPOLY_APPEND,aP3,XPOLY_NORMAL); - } } - if ((bObn && rMeeting.Y()>aP2.Y()) || (bUnt && rMeeting.Y()<aP2.Y())) { // Aussenrum - if (rMeeting.X()<aP2.X()) { - aP3.X()=rRect.Left(); - if (rMeeting.X()<aP3.X()) aP3.X()=rMeeting.X(); - } else { - aP3.X()=rRect.Right(); - if (rMeeting.X()>aP3.X()) aP3.X()=rMeeting.X(); - } + } + if ((bObn && rMeeting.Y()>aP2.Y()) || (bUnt && rMeeting.Y()<aP2.Y())) { // Aussenrum + if (rMeeting.X()<aP2.X()) { + aP3.X()=rRect.Left(); + if (rMeeting.X()<aP3.X()) aP3.X()=rMeeting.X(); + } else { + aP3.X()=rRect.Right(); + if (rMeeting.X()>aP3.X()) aP3.X()=rMeeting.X(); + } + aXP.Insert(XPOLY_APPEND,aP3,XPOLY_NORMAL); + if (aP3.X()!=rMeeting.X()) { + aP3.Y()=rMeeting.Y(); aXP.Insert(XPOLY_APPEND,aP3,XPOLY_NORMAL); - if (aP3.X()!=rMeeting.X()) { - aP3.Y()=rMeeting.Y(); - aXP.Insert(XPOLY_APPEND,aP3,XPOLY_NORMAL); - } } } #ifdef DBG_UTIL if (aXP.GetPointCount()>4) { - DBG_ERROR("SdrEdgeObj::ImpCalcObjToCenter(): Polygon hat mehr als 4 Punkte!"); + OSL_FAIL("SdrEdgeObj::ImpCalcObjToCenter(): Polygon hat mehr als 4 Punkte!"); } #endif return aXP; @@ -724,14 +716,14 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& aPt2=aOutRect.BottomRight(); } } - FASTBOOL bCon1=rCon1.pObj!=NULL && rCon1.pObj->GetPage()==pPage && rCon1.pObj->IsInserted(); - FASTBOOL bCon2=rCon2.pObj!=NULL && rCon2.pObj->GetPage()==pPage && rCon2.pObj->IsInserted(); + bool bCon1=rCon1.pObj!=NULL && rCon1.pObj->GetPage()==pPage && rCon1.pObj->IsInserted(); + bool bCon2=rCon2.pObj!=NULL && rCon2.pObj->GetPage()==pPage && rCon2.pObj->IsInserted(); const SfxItemSet& rSet = GetObjectItemSet(); if (bCon1) { if (rCon1.pObj==(SdrObject*)this) { - // sicherheitshalber Abfragen #44515# + // sicherheitshalber Abfragen aBoundRect1=aOutRect; } else @@ -754,7 +746,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& aBewareRect1=aBoundRect1; } if (bCon2) { - if (rCon2.pObj==(SdrObject*)this) { // sicherheitshalber Abfragen #44515# + if (rCon2.pObj==(SdrObject*)this) { // sicherheitshalber Abfragen aBoundRect2=aOutRect; } else @@ -779,8 +771,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& XPolygon aBestXP; sal_uIntPtr nBestQual=0xFFFFFFFF; SdrEdgeInfoRec aBestInfo; - FASTBOOL bAuto1=bCon1 && rCon1.bBestVertex; - FASTBOOL bAuto2=bCon2 && rCon2.bBestVertex; + bool bAuto1=bCon1 && rCon1.bBestVertex; + bool bAuto2=bCon2 && rCon2.bBestVertex; if (bAuto1) rCon1.bAutoVertex=sal_True; if (bAuto2) rCon2.bAutoVertex=sal_True; sal_uInt16 nBestAuto1=0; @@ -833,19 +825,19 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const { SdrEdgeKind eKind=((SdrEdgeKindItem&)(GetObjectItem(SDRATTR_EDGEKIND))).GetValue(); - FASTBOOL bRts1=nAngle1==0; - FASTBOOL bObn1=nAngle1==9000; - FASTBOOL bLks1=nAngle1==18000; - FASTBOOL bUnt1=nAngle1==27000; - FASTBOOL bHor1=bLks1 || bRts1; - FASTBOOL bVer1=bObn1 || bUnt1; - FASTBOOL bRts2=nAngle2==0; - FASTBOOL bObn2=nAngle2==9000; - FASTBOOL bLks2=nAngle2==18000; - FASTBOOL bUnt2=nAngle2==27000; - FASTBOOL bHor2=bLks2 || bRts2; - FASTBOOL bVer2=bObn2 || bUnt2; - FASTBOOL bInfo=pInfo!=NULL; + bool bRts1=nAngle1==0; + bool bObn1=nAngle1==9000; + bool bLks1=nAngle1==18000; + bool bUnt1=nAngle1==27000; + bool bHor1=bLks1 || bRts1; + bool bVer1=bObn1 || bUnt1; + bool bRts2=nAngle2==0; + bool bObn2=nAngle2==9000; + bool bLks2=nAngle2==18000; + bool bUnt2=nAngle2==27000; + bool bHor2=bLks2 || bRts2; + bool bVer2=bObn2 || bUnt2; + bool bInfo=pInfo!=NULL; if (bInfo) { pInfo->cOrthoForm=0; pInfo->nAngle1=nAngle1; @@ -861,8 +853,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec Rectangle aBewareRect1(rBewareRect1); Rectangle aBewareRect2(rBewareRect2); Point aMeeting((aPt1.X()+aPt2.X()+1)/2,(aPt1.Y()+aPt2.Y()+1)/2); - FASTBOOL bMeetingXMid=sal_True; - FASTBOOL bMeetingYMid=sal_True; if (eKind==SDREDGE_ONELINE) { XPolygon aXP(2); aXP[0]=rPt1; @@ -908,7 +898,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec return aXP; } sal_uInt16 nIntersections=0; - FASTBOOL bForceMeeting=sal_False; // Muss die Linie durch den MeetingPoint laufen? { Point aC1(aBewareRect1.Center()); Point aC2(aBewareRect2.Center()); @@ -946,10 +935,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec long nXMax=Max(aBewareRect1.Right(),aBewareRect2.Right()); long nYMin=Min(aBewareRect1.Top(),aBewareRect2.Top()); long nYMax=Max(aBewareRect1.Bottom(),aBewareRect2.Bottom()); - //int bBoundOverlap=aBoundRect1.Right()>aBoundRect2.Left() && aBoundRect1.Left()<aBoundRect2.Right() && - aBoundRect1.Bottom()>aBoundRect2.Top() && aBoundRect1.Top()<aBoundRect2.Bottom(); - FASTBOOL bBewareOverlap=aBewareRect1.Right()>aBewareRect2.Left() && aBewareRect1.Left()<aBewareRect2.Right() && - aBewareRect1.Bottom()>aBewareRect2.Top() && aBewareRect1.Top()<aBewareRect2.Bottom(); + bool bBewareOverlap=aBewareRect1.Right()>aBewareRect2.Left() && aBewareRect1.Left()<aBewareRect2.Right() && + aBewareRect1.Bottom()>aBewareRect2.Top() && aBewareRect1.Top()<aBewareRect2.Bottom(); unsigned nMainCase=3; if (nAngle1==nAngle2) nMainCase=1; else if ((bHor1 && bHor2) || (bVer1 && bVer2)) nMainCase=2; @@ -957,45 +944,40 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec if (bVer1) aMeeting.X()=(aPt1.X()+aPt2.X()+1)/2; // ist hier besser, als der if (bHor1) aMeeting.Y()=(aPt1.Y()+aPt2.Y()+1)/2; // Mittelpunkt des Freiraums // bX1Ok bedeutet, dass die Vertikale, die aus Obj1 austritt, keinen Konflikt mit Obj2 bildet, ... - FASTBOOL bX1Ok=aPt1.X()<=aBewareRect2.Left() || aPt1.X()>=aBewareRect2.Right(); - FASTBOOL bX2Ok=aPt2.X()<=aBewareRect1.Left() || aPt2.X()>=aBewareRect1.Right(); - FASTBOOL bY1Ok=aPt1.Y()<=aBewareRect2.Top() || aPt1.Y()>=aBewareRect2.Bottom(); - FASTBOOL bY2Ok=aPt2.Y()<=aBewareRect1.Top() || aPt2.Y()>=aBewareRect1.Bottom(); + bool bX1Ok=aPt1.X()<=aBewareRect2.Left() || aPt1.X()>=aBewareRect2.Right(); + bool bX2Ok=aPt2.X()<=aBewareRect1.Left() || aPt2.X()>=aBewareRect1.Right(); + bool bY1Ok=aPt1.Y()<=aBewareRect2.Top() || aPt1.Y()>=aBewareRect2.Bottom(); + bool bY2Ok=aPt2.Y()<=aBewareRect1.Top() || aPt2.Y()>=aBewareRect1.Bottom(); if (bLks1 && (bY1Ok || aBewareRect1.Left()<aBewareRect2.Right()) && (bY2Ok || aBewareRect2.Left()<aBewareRect1.Right())) { aMeeting.X()=nXMin; - bMeetingXMid=sal_False; } if (bRts1 && (bY1Ok || aBewareRect1.Right()>aBewareRect2.Left()) && (bY2Ok || aBewareRect2.Right()>aBewareRect1.Left())) { aMeeting.X()=nXMax; - bMeetingXMid=sal_False; } if (bObn1 && (bX1Ok || aBewareRect1.Top()<aBewareRect2.Bottom()) && (bX2Ok || aBewareRect2.Top()<aBewareRect1.Bottom())) { aMeeting.Y()=nYMin; - bMeetingYMid=sal_False; } if (bUnt1 && (bX1Ok || aBewareRect1.Bottom()>aBewareRect2.Top()) && (bX2Ok || aBewareRect2.Bottom()>aBewareRect1.Top())) { aMeeting.Y()=nYMax; - bMeetingYMid=sal_False; } } else if (nMainCase==2) { // Fall 2: - bForceMeeting=sal_True; if (bHor1) { // beide waagerecht - /* 9 Moeglichkeiten: */ - /* 2.1 Gegenueber, Ueberschneidung */ - /* nur auf der Y-Achse */ - /* 2.2, 2.3 Gegenueber, vertikal versetzt. */ - /* Ueberschneidung weder auf der */ - /* X- noch auf der Y-Achse */ - /* 2.4, 2.5 Untereinander, */ - /* Ueberschneidung */ - /* nur auf X-Achse */ - /* 2.6, 2.7 Gegeneinander, vertikal versetzt. */ - /* Ueberschneidung weder auf der */ - /* X- noch auf der Y-Achse. */ - /* 2.8 Gegeneinander. */ - /* Ueberschneidung nur */ - /* auf der Y-Achse. */ + /* 9 Moeglichkeiten: � � � */ + /* 2.1 Gegenueber, Ueberschneidung � � � */ + /* nur auf der Y-Achse � � � */ + /* 2.2, 2.3 Gegenueber, vertikal versetzt. � � � � � � */ + /* Ueberschneidung weder auf der � � � � � � */ + /* X- noch auf der Y-Achse � � � � � � */ + /* 2.4, 2.5 Untereinander, � � � � � � */ + /* Ueberschneidung � � � � � � */ + /* nur auf X-Achse � � � � � � */ + /* 2.6, 2.7 Gegeneinander, vertikal versetzt. � � � � � � */ + /* Ueberschneidung weder auf der � � � � � � */ + /* X- noch auf der Y-Achse. � � � � � � */ + /* 2.8 Gegeneinander. � � � */ + /* Ueberschneidung nur � � � */ + /* auf der Y-Achse. � � � */ /* 2.9 Die BewareRects der Objekte ueberschneiden */ /* sich auf X- und Y-Achse. */ /* Die Faelle gelten entsprechend umgesetzt auch fuer */ @@ -1019,22 +1001,21 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec // Ueberschneidung der BewareRects ohne Ueberschneidung der // Boundrects wenn die Linienaustritte sonst das BewareRect // des jeweils anderen Objekts verletzen wuerden. - FASTBOOL bCase29Direct=sal_False; - FASTBOOL bCase29=aBewR1.Right()>aBewR2.Left(); + bool bCase29Direct = false; + bool bCase29=aBewR1.Right()>aBewR2.Left(); if (aBndR1.Right()<=aBndR2.Left()) { // Fall 2.9 und keine Boundrectueberschneidung if ((aPt1.Y()>aBewareRect2.Top() && aPt1.Y()<aBewareRect2.Bottom()) || (aPt2.Y()>aBewareRect1.Top() && aPt2.Y()<aBewareRect1.Bottom())) { - bCase29Direct=sal_True; + bCase29Direct = true; } } if (!bCase29Direct) { - FASTBOOL bObenLang=Abs(nYMin-aMeeting.Y())<=Abs(nYMax-aMeeting.Y()); + bool bObenLang=Abs(nYMin-aMeeting.Y())<=Abs(nYMax-aMeeting.Y()); if (bObenLang) { aMeeting.Y()=nYMin; } else { aMeeting.Y()=nYMax; } - bMeetingYMid=sal_False; if (bCase29) { // und nun noch dafuer sorgen, dass das // umzingelte Obj nicht durchquert wird @@ -1043,7 +1024,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } else { aMeeting.X()=aBewR1.Left(); } - bMeetingXMid=sal_False; } } else { // Direkte Verbindung (3-Linien Z-Verbindung), da @@ -1079,22 +1059,21 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec // Ueberschneidung der BewareRects ohne Ueberschneidung der // Boundrects wenn die Linienaustritte sonst das BewareRect // des jeweils anderen Objekts verletzen wuerden. - FASTBOOL bCase29Direct=sal_False; - FASTBOOL bCase29=aBewR1.Bottom()>aBewR2.Top(); + bool bCase29Direct = false; + bool bCase29=aBewR1.Bottom()>aBewR2.Top(); if (aBndR1.Bottom()<=aBndR2.Top()) { // Fall 2.9 und keine Boundrectueberschneidung if ((aPt1.X()>aBewareRect2.Left() && aPt1.X()<aBewareRect2.Right()) || (aPt2.X()>aBewareRect1.Left() && aPt2.X()<aBewareRect1.Right())) { - bCase29Direct=sal_True; + bCase29Direct = true; } } if (!bCase29Direct) { - FASTBOOL bLinksLang=Abs(nXMin-aMeeting.X())<=Abs(nXMax-aMeeting.X()); + bool bLinksLang=Abs(nXMin-aMeeting.X())<=Abs(nXMax-aMeeting.X()); if (bLinksLang) { aMeeting.X()=nXMin; } else { aMeeting.X()=nXMax; } - bMeetingXMid=sal_False; if (bCase29) { // und nun noch dafuer sorgen, dass das // umzingelte Obj nicht durchquert wird @@ -1103,7 +1082,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } else { aMeeting.Y()=aBewR1.Top(); } - bMeetingYMid=sal_False; } } else { // Direkte Verbindung (3-Linien Z-Verbindung), da @@ -1127,39 +1105,39 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } } else if (nMainCase==3) { // Fall 3: Einer waagerecht und der andere senkrecht. Sehr viele Fallunterscheidungen - /* Kleine Legende: -> Ohne Ueberschneidung, maximal Beruehrung. */ - /* -> Ueberschneidung */ - /* -> Selbe Hoehe */ - /* -> Ueberschneidung */ - /* -> Ohne Ueberschneidung, maximal Beruehrung. */ - /* Linienaustritte links , rechts , oben und unten . */ + /* Kleine Legende: � � � � � -> Ohne Ueberschneidung, maximal Beruehrung. */ + /* � � � � � -> Ueberschneidung */ + /* � � � � � -> Selbe Hoehe */ + /* � � � � � -> Ueberschneidung */ + /* � � � � � -> Ohne Ueberschneidung, maximal Beruehrung. */ + /* Linienaustritte links �, rechts �, oben � und unten �. */ /* Insgesamt sind 96 Konstellationen moeglich, wobei einige nicht einmal */ /* eindeutig einem Fall und damit einer Behandlungsmethode zugeordnet werden */ /* koennen. */ /* 3.1: Hierzu moegen alle Konstellationen zaehlen, die durch den */ /* Default-MeetingPoint zufriedenstellend abgedeckt sind (20+12). */ - /* Diese 12 */ - /* Konstel. */ - /* jedoch */ - /* nur zum */ - /* Teil: */ + /* � � � � � � � � � � Diese 12 � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � Konstel. � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � jedoch � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � nur zum � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � Teil: � � � � � � � � � � � � � � � � � � � � */ /* Letztere 16 Faelle scheiden aus, sobald sich die Objekte offen */ /* gegenueberstehen (siehe Fall 3.2). */ /* 3.2: Die Objekte stehen sich offen gegenueber und somit ist eine */ /* Verbindung mit lediglich 2 Linien moeglich (4+20). */ /* Dieser Fall hat 1. Prioritaet. */ - /* Diese 20 */ - /* Konstel. */ - /* jedoch */ - /* nur zum */ - /* Teil: */ + /* � � � � � � � � � � Diese 20 � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � Konstel. � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � jedoch � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � nur zum � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � Teil: � � � � � � � � � � � � � � � � � � � � */ /* 3.3: Die Linienaustritte zeigen vom anderen Objekt weg bzw. hinter */ /* dessen Ruecken vorbei (52+4). */ - /* Diese 4 */ - /* Konstel. */ - /* jedoch */ - /* nur zum */ - /* Teil: */ + /* � � � � � � � � � � � � � � � � � � � � Diese 4 � � � � � � � � � � */ + /* � � � � � � � � � � � � � � � � � � � � Konstel. � � � � � � � � � � */ + /* � � � � � � � � � � � � � � � � � � � � jedoch � � � � � � � � � � */ + /* � � � � � � � � � � � � � � � � � � � � nur zum � � � � � � � � � � */ + /* � � � � � � � � � � � � � � � � � � � � Teil: � � � � � � � � � � */ // Fall 3.2 Rectangle aTmpR1(aBewareRect1); @@ -1174,9 +1152,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec (((bRts2 && aTmpR2.Right ()<=aPt1.X()) || (bLks2 && aTmpR2.Left()>=aPt1.X())) && ((bUnt1 && aTmpR1.Bottom()<=aPt2.Y()) || (bObn1 && aTmpR1.Top ()>=aPt2.Y())))) { // Fall 3.2 trifft zu: Verbindung mit lediglich 2 Linien - bForceMeeting=sal_True; - bMeetingXMid=sal_False; - bMeetingYMid=sal_False; if (bHor1) { aMeeting.X()=aPt2.X(); aMeeting.Y()=aPt1.Y(); @@ -1196,11 +1171,10 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec ((bUnt1 && aBewareRect1.Bottom()>aBewareRect2.Top ()) || (bObn1 && aBewareRect1.Top ()<aBewareRect2.Bottom())))) { // Fall 3.3 - bForceMeeting=sal_True; - if (bRts1 || bRts2) { aMeeting.X()=nXMax; bMeetingXMid=sal_False; } - if (bLks1 || bLks2) { aMeeting.X()=nXMin; bMeetingXMid=sal_False; } - if (bUnt1 || bUnt2) { aMeeting.Y()=nYMax; bMeetingYMid=sal_False; } - if (bObn1 || bObn2) { aMeeting.Y()=nYMin; bMeetingYMid=sal_False; } + if (bRts1 || bRts2) { aMeeting.X()=nXMax; } + if (bLks1 || bLks2) { aMeeting.X()=nXMin; } + if (bUnt1 || bUnt2) { aMeeting.Y()=nYMax; } + if (bObn1 || bObn2) { aMeeting.Y()=nYMin; } } } } @@ -1215,15 +1189,13 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } Point aEP1(aXP1[nXP1Anz-1]); Point aEP2(aXP2[nXP2Anz-1]); - FASTBOOL bInsMeetingPoint=aEP1.X()!=aEP2.X() && aEP1.Y()!=aEP2.Y(); - FASTBOOL bHorzE1=aEP1.Y()==aXP1[nXP1Anz-2].Y(); // letzte Linie von XP1 horizontal? - FASTBOOL bHorzE2=aEP2.Y()==aXP2[nXP2Anz-2].Y(); // letzte Linie von XP2 horizontal? - if (aEP1==aEP2 && (bHorzE1 && bHorzE2 && aEP1.Y()==aEP2.Y()) || (!bHorzE1 && !bHorzE2 && aEP1.X()==aEP2.X())) { + bool bInsMeetingPoint=aEP1.X()!=aEP2.X() && aEP1.Y()!=aEP2.Y(); + bool bHorzE1=aEP1.Y()==aXP1[nXP1Anz-2].Y(); // letzte Linie von XP1 horizontal? + bool bHorzE2=aEP2.Y()==aXP2[nXP2Anz-2].Y(); // letzte Linie von XP2 horizontal? + if (aEP1==aEP2 && ((bHorzE1 && bHorzE2 && aEP1.Y()==aEP2.Y()) || (!bHorzE1 && !bHorzE2 && aEP1.X()==aEP2.X()))) { // Sonderbehandlung fuer 'I'-Verbinder nXP1Anz--; aXP1.Remove(nXP1Anz,1); nXP2Anz--; aXP2.Remove(nXP2Anz,1); - bMeetingXMid=sal_False; - bMeetingYMid=sal_False; } if (bInsMeetingPoint) { aXP1.Insert(XPOLY_APPEND,aMeeting,XPOLY_NORMAL); @@ -1263,8 +1235,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec else if (nPntAnz==4) { // Z oder U if (nAngle1==nAngle2) cForm='U'; else cForm='Z'; - } else if (nPntAnz==4) { /* - - */ - /* ... - - */ + } else if (nPntAnz==4) { /* �-� �-� */ + /* ... -� -� */ } else if (nPntAnz==6) { // S oder C oder ... if (nAngle1!=nAngle2) { // Fuer Typ S hat Linie2 dieselbe Richtung wie Linie4. @@ -1303,12 +1275,12 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec if (pnQuality!=NULL) { sal_uIntPtr nQual=0; sal_uIntPtr nQual0=nQual; // Ueberlaeufe vorbeugen - FASTBOOL bOverflow=sal_False; + bool bOverflow = false; Point aPt0(aXP1[0]); for (sal_uInt16 nPntNum=1; nPntNum<nPntAnz; nPntNum++) { Point aPt1b(aXP1[nPntNum]); nQual+=Abs(aPt1b.X()-aPt0.X())+Abs(aPt1b.Y()-aPt0.Y()); - if (nQual<nQual0) bOverflow=sal_True; + if (nQual<nQual0) bOverflow = true; nQual0=nQual; aPt0=aPt1b; } @@ -1332,7 +1304,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec if (nTmp>=3) { nQual0=nQual; nQual+=(sal_uIntPtr)nTmp*0x01000000; - if (nQual<nQual0 || nTmp>15) bOverflow=sal_True; + if (nQual<nQual0 || nTmp>15) bOverflow = true; } if (nPntAnz>=2) { // Austrittswinkel nochmal pruefen Point aP1(aXP1[1]); aP1-=aXP1[0]; @@ -1353,9 +1325,9 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec for (sal_uInt16 i=0; i<nPntAnz; i++) { Point aPt1b(aXP1[i]); - FASTBOOL b1=aPt1b.X()>aBewareRect1.Left() && aPt1b.X()<aBewareRect1.Right() && + bool b1=aPt1b.X()>aBewareRect1.Left() && aPt1b.X()<aBewareRect1.Right() && aPt1b.Y()>aBewareRect1.Top() && aPt1b.Y()<aBewareRect1.Bottom(); - FASTBOOL b2=aPt1b.X()>aBewareRect2.Left() && aPt1b.X()<aBewareRect2.Right() && + bool b2=aPt1b.X()>aBewareRect2.Left() && aPt1b.X()<aBewareRect2.Right() && aPt1b.Y()>aBewareRect2.Top() && aPt1b.Y()<aBewareRect2.Bottom(); sal_uInt16 nInt0=nIntersections; if (i==0 || i==nPntAnz-1) { @@ -1387,7 +1359,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec if (nPntAnz<=1) nIntersections++; nQual0=nQual; nQual+=(sal_uIntPtr)nIntersections*0x10000000; - if (nQual<nQual0 || nIntersections>15) bOverflow=sal_True; + if (nQual<nQual0 || nIntersections>15) bOverflow = true; if (bOverflow || nQual==0xFFFFFFFF) nQual=0xFFFFFFFE; *pnQuality=nQual; @@ -1522,17 +1494,17 @@ Normalisiert auf 1. Austrittswinkel nach rechts bleiben dann noch 31. Dann noch eine vertikale Spiegelung wegnormalisiert bleiben noch 16 characteristische Verlaufszuege mit 1-5 Linien: Mit 1 Linie (Typ 'I'): -- -Mit 2 Linien (Typ 'L'): - -Mit 3 Linien (Typ 'U'): - (Typ 'Z'): - - - - +Mit 2 Linien (Typ 'L'): -� +Mit 3 Linien (Typ 'U'): -� (Typ 'Z'): �- + -� -� Mit 4 Linien: 1 ist nicht plausibel, 3 ist=2 (90deg Drehung). Verbleibt 2,4 - - ڿ ڿ ڿ - - - - - - - - + �-� ڿ � ڿ ڿ �-� + -� -� -� -� -� -� Mit 5 Linien: nicht plausibel sind 1,2,4,5. 7 ist identisch mit 3 (Richtungsumkehr) Bleibt also 3,6 und 8. '4' 'S' 'C' - - - - - - - - - - - - - - - - - - - - - - -- - - + � � -� �- �-� �- + �-� �-� �-� �-� � � -� � �-� �-� � �-� + -� -� -� � -� �- -� -� --� � � -� � -� � � Insgesamt sind also 9 Grundtypen zu unterscheiden die den 400 Konstellationen aus Objektposition und Austrittswinkeln zuzuordnen sind. 4 der 9 Grundtypen haben eine 'Mittellinie'. Die Anzahl der zu Objektabstaende @@ -1549,16 +1521,16 @@ je Objekt variiert von 0-3: 'C': n 0-3 0-3 = 1+U+1 */ -void __EXPORT SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) +void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { SfxSimpleHint* pSimple=PTR_CAST(SfxSimpleHint,&rHint); sal_uIntPtr nId=pSimple==0 ? 0 : pSimple->GetId(); - FASTBOOL bDataChg=nId==SFX_HINT_DATACHANGED; - FASTBOOL bDying=nId==SFX_HINT_DYING; - FASTBOOL bObj1=aCon1.pObj!=NULL && aCon1.pObj->GetBroadcaster()==&rBC; - FASTBOOL bObj2=aCon2.pObj!=NULL && aCon2.pObj->GetBroadcaster()==&rBC; + bool bDataChg=nId==SFX_HINT_DATACHANGED; + bool bDying=nId==SFX_HINT_DYING; + bool bObj1=aCon1.pObj!=NULL && aCon1.pObj->GetBroadcaster()==&rBC; + bool bObj2=aCon2.pObj!=NULL && aCon2.pObj->GetBroadcaster()==&rBC; if (bDying && (bObj1 || bObj2)) { - // #35605# Dying vorher abfangen, damit AttrObj nicht + // Dying vorher abfangen, damit AttrObj nicht // wg. vermeintlicher Vorlagenaenderung rumbroadcastet if (bObj1) aCon1.pObj=NULL; if (bObj2) aCon2.pObj=NULL; @@ -1582,12 +1554,10 @@ void __EXPORT SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { // Broadcasting nur, wenn auf der selben Page Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 if (!bEdgeTrackDirty) SendRepaintBroadcast(); ImpDirtyEdgeTrack(); // only redraw here, no objectchange ActionChanged(); - // BroadcastObjectChange(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); } @@ -1597,7 +1567,6 @@ void __EXPORT SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) /** updates edges that are connected to the edges of this object as if the connected objects send a repaint broadcast - #103122# */ void SdrEdgeObj::Reformat() { @@ -1614,16 +1583,24 @@ void SdrEdgeObj::Reformat() } } -void SdrEdgeObj::operator=(const SdrObject& rObj) +SdrEdgeObj* SdrEdgeObj::Clone() const { + return CloneHelper< SdrEdgeObj >(); +} + +SdrEdgeObj& SdrEdgeObj::operator=(const SdrEdgeObj& rObj) +{ + if( this == &rObj ) + return *this; SdrTextObj::operator=(rObj); - *pEdgeTrack =*((SdrEdgeObj&)rObj).pEdgeTrack; - bEdgeTrackDirty=((SdrEdgeObj&)rObj).bEdgeTrackDirty; - aCon1 =((SdrEdgeObj&)rObj).aCon1; - aCon2 =((SdrEdgeObj&)rObj).aCon2; + *pEdgeTrack =*rObj.pEdgeTrack; + bEdgeTrackDirty=rObj.bEdgeTrackDirty; + aCon1 =rObj.aCon1; + aCon2 =rObj.aCon2; aCon1.pObj=NULL; aCon2.pObj=NULL; - aEdgeInfo=((SdrEdgeObj&)rObj).aEdgeInfo; + aEdgeInfo=rObj.aEdgeInfo; + return *this; } void SdrEdgeObj::TakeObjNameSingul(XubString& rName) const @@ -1909,8 +1886,6 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat) // save EdgeInfos and mark object as user modified ImpSetEdgeInfoToAttr(); bEdgeTrackUserDefined = false; - //SetRectsDirty(); - //SetChanged(); if(bOriginalEdgeModified && rDragStat.GetView()) { @@ -2004,7 +1979,7 @@ basegfx::B2DPolygon SdrEdgeObj::ImplAddConnectorOverlay(SdrDragMethod& rDragMeth return aResult; } -FASTBOOL SdrEdgeObj::BegCreate(SdrDragStat& rDragStat) +bool SdrEdgeObj::BegCreate(SdrDragStat& rDragStat) { rDragStat.SetNoSnap(sal_True); pEdgeTrack->SetPointCount(2); @@ -2018,7 +1993,7 @@ FASTBOOL SdrEdgeObj::BegCreate(SdrDragStat& rDragStat) return sal_True; } -FASTBOOL SdrEdgeObj::MovCreate(SdrDragStat& rDragStat) +bool SdrEdgeObj::MovCreate(SdrDragStat& rDragStat) { sal_uInt16 nMax=pEdgeTrack->GetPointCount(); (*pEdgeTrack)[nMax-1]=rDragStat.GetNow(); @@ -2034,9 +2009,9 @@ FASTBOOL SdrEdgeObj::MovCreate(SdrDragStat& rDragStat) return sal_True; } -FASTBOOL SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd) +bool SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd) { - FASTBOOL bOk=(eCmd==SDRCREATE_FORCEEND || rDragStat.GetPointAnz()>=2); + bool bOk=(eCmd==SDRCREATE_FORCEEND || rDragStat.GetPointAnz()>=2); if (bOk) { ConnectToNode(sal_True,aCon1.pObj); ConnectToNode(sal_False,aCon2.pObj); @@ -2049,7 +2024,7 @@ FASTBOOL SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd) return bOk; } -FASTBOOL SdrEdgeObj::BckCreate(SdrDragStat& rDragStat) +bool SdrEdgeObj::BckCreate(SdrDragStat& rDragStat) { if (rDragStat.GetView()!=NULL) { rDragStat.GetView()->HideConnectMarker(); @@ -2076,10 +2051,10 @@ Pointer SdrEdgeObj::GetCreatePointer() const return Pointer(POINTER_DRAW_CONNECT); } -FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut) +bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut) { rCon.ResetVars(); - if (pOut==NULL) pOut=rPV.GetView().GetFirstOutputDevice(); // GetWin(0); + if (pOut==NULL) pOut=rPV.GetView().GetFirstOutputDevice(); if (pOut==NULL) return sal_False; SdrObjList* pOL=rPV.GetObjList(); const SetOfByte& rVisLayer=rPV.GetVisibleLayers(); @@ -2095,11 +2070,9 @@ FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, aMouseRect.Bottom()+=aHalfConSiz.Height(); sal_uInt16 nBoundHitTol=(sal_uInt16)aHalfConSiz.Width()/2; if (nBoundHitTol==0) nBoundHitTol=1; sal_uIntPtr no=pOL->GetObjCount(); - FASTBOOL bFnd=sal_False; + bool bFnd = false; SdrObjConnection aTestCon; SdrObjConnection aBestCon; - FASTBOOL bTestBoundHit=sal_False; - //int bBestBoundHit=sal_False; while (no>0 && !bFnd) { // Problem: Gruppenobjekt mit verschiedenen Layern liefert LayerID 0 !!!! @@ -2112,60 +2085,58 @@ FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, Rectangle aObjBound(pObj->GetCurrentBoundRect()); if (aObjBound.IsOver(aMouseRect)) { aTestCon.ResetVars(); - bTestBoundHit=sal_False; - FASTBOOL bEdge=HAS_BASE(SdrEdgeObj,pObj); // kein BestCon fuer Edge + bool bEdge=HAS_BASE(SdrEdgeObj,pObj); // kein BestCon fuer Edge // Die Userdefined Konnektoren haben absolute Prioritaet. // Danach kommt Vertex, Corner und Mitte(Best) gleich priorisiert. // Zum Schluss kommt noch ein HitTest aufs Obj. const SdrGluePointList* pGPL=pObj->GetGluePointList(); sal_uInt16 nConAnz=pGPL==NULL ? 0 : pGPL->GetCount(); sal_uInt16 nGesAnz=nConAnz+9; - FASTBOOL bUserFnd=sal_False; + bool bUserFnd = false; sal_uIntPtr nBestDist=0xFFFFFFFF; for (sal_uInt16 i=0; i<nGesAnz; i++) { - FASTBOOL bUser=i<nConAnz; - FASTBOOL bVertex=i>=nConAnz+0 && i<nConAnz+4; - FASTBOOL bCorner=i>=nConAnz+4 && i<nConAnz+8; - FASTBOOL bCenter=i==nConAnz+8; - FASTBOOL bOk=sal_False; + bool bUser=i<nConAnz; + bool bVertex=i>=nConAnz+0 && i<nConAnz+4; + bool bCorner=i>=nConAnz+4 && i<nConAnz+8; + bool bCenter=i==nConAnz+8; + bool bOk = false; Point aConPos; sal_uInt16 nConNum=i; if (bUser) { const SdrGluePoint& rGP=(*pGPL)[nConNum]; aConPos=rGP.GetAbsolutePos(*pObj); nConNum=rGP.GetId(); - bOk=sal_True; + bOk = true; } else if (bVertex && !bUserFnd) { nConNum=nConNum-nConAnz; if (rPV.GetView().IsAutoVertexConnectors()) { SdrGluePoint aPt(pObj->GetVertexGluePoint(nConNum)); aConPos=aPt.GetAbsolutePos(*pObj); - bOk=sal_True; + bOk = true; } else i+=3; } else if (bCorner && !bUserFnd) { nConNum-=nConAnz+4; if (rPV.GetView().IsAutoCornerConnectors()) { SdrGluePoint aPt(pObj->GetCornerGluePoint(nConNum)); aConPos=aPt.GetAbsolutePos(*pObj); - bOk=sal_True; + bOk = true; } else i+=3; } else if (bCenter && !bUserFnd && !bEdge) { - // #109007# // Suppress default connect at object center if(!pThis || !pThis->GetSuppressDefaultConnect()) { // Edges nicht! nConNum=0; aConPos=aObjBound.Center(); - bOk=sal_True; + bOk = true; } } if (bOk && aMouseRect.IsInside(aConPos)) { - if (bUser) bUserFnd=sal_True; - bFnd=sal_True; + if (bUser) bUserFnd = true; + bFnd = true; sal_uIntPtr nDist=(sal_uIntPtr)Abs(aConPos.X()-rPt.X())+(sal_uIntPtr)Abs(aConPos.Y()-rPt.Y()); if (nDist<nBestDist) { nBestDist=nDist; @@ -2184,11 +2155,10 @@ FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, !bEdge && SdrObjectPrimitiveHit(*pObj, rPt, nBoundHitTol, rPV, &rVisLayer, false)) { - // #109007# // Suppress default connect at object inside bound if(!pThis || !pThis->GetSuppressDefaultConnect()) { - bFnd=sal_True; + bFnd = true; aTestCon.pObj=pObj; aTestCon.bBestConn=sal_True; } @@ -2199,7 +2169,7 @@ FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, aMouseRect.Top() -=nBoundHitTol; aMouseRect.Right() +=nBoundHitTol; aMouseRect.Bottom()+=nBoundHitTol; - bTestBoundHit=aObjBound.IsOver(aMouseRect2); + aObjBound.IsOver(aMouseRect2); } } @@ -2249,10 +2219,9 @@ void SdrEdgeObj::NbcResize(const Point& rRefPnt, const Fraction& aXFact, const F SdrTextObj::NbcResize(rRefPnt,aXFact,aXFact); ResizeXPoly(*pEdgeTrack,rRefPnt,aXFact,aYFact); - // #75371# if resize is not from paste, forget user distances + // if resize is not from paste, forget user distances if(!GetModel()->IsPasteResize()) { - // #75735# aEdgeInfo.aObj1Line2 = Point(); aEdgeInfo.aObj1Line3 = Point(); aEdgeInfo.aObj2Line2 = Point(); @@ -2403,7 +2372,6 @@ void SdrEdgeObj::SetTailPoint( sal_Bool bTail, const Point& rPt ) void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */ ) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetCurrentBoundRect(); - // #110094#-14 BroadcastObjectChange(); SdrObjConnection& rConn1 = GetConnection( bTail ); @@ -2413,8 +2381,7 @@ void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */ if( nIndex > 3 ) { -// nIndex -= 4; - nIndex -= 3; // SJ: the start api index is 0, whereas the implementation in svx starts from 1 + nIndex -= 3; // the start api index is 0, whereas the implementation in svx starts from 1 // for user defined glue points we have // to get the id for this index first @@ -2432,7 +2399,6 @@ void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */ SetChanged(); SetRectsDirty(); ImpRecalcEdgeTrack(); - // bEdgeTrackDirty=sal_True; } /** this method is used by the api to return a glue point id for a connection. @@ -2445,13 +2411,12 @@ sal_Int32 SdrEdgeObj::getGluePointIndex( sal_Bool bTail ) { nId = rConn1.GetConnectorId(); if( !rConn1.IsAutoVertex() ) -// nId += 4; - nId += 3; // SJ: the start api index is 0, whereas the implementation in svx starts from 1 + nId += 3; // the start api index is 0, whereas the implementation in svx starts from 1 } return nId; } -// #102344# Implementation was missing; edge track needs to be invalidated additionally. +// Implementation was missing; edge track needs to be invalidated additionally. void SdrEdgeObj::NbcSetAnchorPos(const Point& rPnt) { // call parent functionality @@ -2493,5 +2458,4 @@ void SdrEdgeObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b } } -////////////////////////////////////////////////////////////////////////////// -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 5895eface327..926e011110be 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,7 +72,6 @@ #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; @@ -100,10 +100,10 @@ const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilt if ( pInStrm ) { pInStrm->Seek( STREAM_SEEK_TO_BEGIN ); - GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); + GraphicFilter& rGF = GraphicFilter::GetGraphicFilter(); - const sal_uInt16 nFilter = rFilterName.Len() && pGF->GetImportFormatCount() - ? pGF->GetImportFormatNumber( rFilterName ) + const sal_uInt16 nFilter = rFilterName.Len() && rGF.GetImportFormatCount() + ? rGF.GetImportFormatNumber( rFilterName ) : GRFILTER_FORMAT_DONTKNOW; String aEmptyStr; @@ -115,7 +115,7 @@ const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilt // 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 ); + rGF.ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData ); } return aGraphic; } @@ -131,8 +131,9 @@ public: virtual ~SdrGraphicLink(); virtual void Closed(); - virtual void DataChanged( const String& rMimeType, - const ::com::sun::star::uno::Any & rValue ); + + virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( + const String& rMimeType, const ::com::sun::star::uno::Any & rValue ); void DataChanged( const Graphic& rGraphic ); sal_Bool Connect() { return 0 != GetRealObject(); } @@ -200,7 +201,7 @@ void SAL_CALL SdrGraphicUpdater::run(void) { Graphic aGraphic( ImpLoadLinkedGraphic( mrFileName, mrFilterName ) ); ::osl::MutexGuard aGuard(maMutex); - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; if ( !mbIsTerminated ) { mrGraphicLink.DataChanged( aGraphic ); @@ -242,8 +243,8 @@ void SdrGraphicLink::RemoveGraphicUpdater() // ----------------------------------------------------------------------------- -void SdrGraphicLink::DataChanged( const String& rMimeType, - const ::com::sun::star::uno::Any & rValue ) +::sfx2::SvBaseLink::UpdateResult SdrGraphicLink::DataChanged( + const String& rMimeType, const ::com::sun::star::uno::Any & rValue ) { SdrModel* pModel = pGrafObj ? pGrafObj->GetModel() : 0; sfx2::LinkManager* pLinkManager= pModel ? pModel->GetLinkManager() : 0; @@ -264,6 +265,7 @@ void SdrGraphicLink::DataChanged( const String& rMimeType, pGrafObj->BroadcastObjectChange(); } } + return SUCCESS; } // ----------------------------------------------------------------------------- @@ -331,7 +333,6 @@ SdrGrafObj::SdrGrafObj() pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT ); bNoShear = sal_True; - // #111096# mbGrafAnimationAllowed = sal_True; // #i25616# @@ -354,7 +355,6 @@ SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect) pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT ); bNoShear = sal_True; - // #111096# mbGrafAnimationAllowed = sal_True; // #i25616# @@ -377,7 +377,6 @@ SdrGrafObj::SdrGrafObj( const Graphic& rGrf ) pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT ); bNoShear = sal_True; - // #111096# mbGrafAnimationAllowed = sal_True; // #i25616# @@ -449,7 +448,7 @@ const Graphic& SdrGrafObj::GetGraphic() const Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const { - // #107947# Refactored most of the code to GraphicObject, where + // Refactored most of the code to GraphicObject, where // everybody can use e.g. the cropping functionality GraphicType eType = GetGraphicType(); @@ -459,7 +458,7 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const const sal_Bool bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) && ( aGeo.nDrehWink && aGeo.nDrehWink != 18000 ) && ( GRAPHIC_NONE != eType ); - // #104115# Need cropping info earlier + // Need cropping info earlier ( (SdrGrafObj*) this )->ImpSetAttrToGrafInfo(); GraphicAttr aActAttr; @@ -473,8 +472,8 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const if( bMirror ) { sal_uInt16 nMirrorCase = ( aGeo.nDrehWink == 18000 ) ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 ); - FASTBOOL bHMirr = nMirrorCase == 2 || nMirrorCase == 4; - FASTBOOL bVMirr = nMirrorCase == 3 || nMirrorCase == 4; + bool bHMirr = nMirrorCase == 2 || nMirrorCase == 4; + bool bVMirr = nMirrorCase == 3 || nMirrorCase == 4; aActAttr.SetMirrorFlags( ( bHMirr ? BMP_MIRROR_HORZ : 0 ) | ( bVMirr ? BMP_MIRROR_VERT : 0 ) ); } @@ -483,7 +482,7 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const aActAttr.SetRotation( sal_uInt16(aGeo.nDrehWink / 10) ); } - // #107947# Delegate to moved code in GraphicObject + // Delegate to moved code in GraphicObject return GetGraphicObject().GetTransformedGraphic( aDestSize, aDestMap, aActAttr ); } @@ -650,7 +649,7 @@ void SdrGrafObj::SetGraphicLink( const String& rFileName, const String& rFilterN ImpLinkAnmeldung(); pGraphic->SetUserData(); - // #92205# A linked graphic is per definition swapped out (has to be loaded) + // A linked graphic is per definition swapped out (has to be loaded) pGraphic->SetSwapState(); } @@ -667,9 +666,9 @@ void SdrGrafObj::ReleaseGraphicLink() void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - FASTBOOL bAnim = pGraphic->IsAnimated(); - FASTBOOL bRenderGraphic = pGraphic->HasRenderGraphic(); - FASTBOOL bNoPresGrf = ( pGraphic->GetType() != GRAPHIC_NONE ) && !bEmptyPresObj; + bool bAnim = pGraphic->IsAnimated(); + bool bRenderGraphic = pGraphic->HasRenderGraphic(); + bool bNoPresGrf = ( pGraphic->GetType() != GRAPHIC_NONE ) && !bEmptyPresObj; rInfo.bResizeFreeAllowed = aGeo.nDrehWink % 9000 == 0 || aGeo.nDrehWink % 18000 == 0 || @@ -826,24 +825,30 @@ SdrObject* SdrGrafObj::getFullDragClone() const return pRetval; } -void SdrGrafObj::operator=( const SdrObject& rObj ) +SdrGrafObj* SdrGrafObj::Clone() const { - SdrRectObj::operator=( rObj ); + return CloneHelper< SdrGrafObj >(); +} - const SdrGrafObj& rGraf = (SdrGrafObj&) rObj; +SdrGrafObj& SdrGrafObj::operator=( const SdrGrafObj& rObj ) +{ + if( this == &rObj ) + return *this; + SdrRectObj::operator=( rObj ); - pGraphic->SetGraphic( rGraf.GetGraphic(), &rGraf.GetGraphicObject() ); - aCropRect = rGraf.aCropRect; - aFileName = rGraf.aFileName; - aFilterName = rGraf.aFilterName; - bMirrored = rGraf.bMirrored; + pGraphic->SetGraphic( rObj.GetGraphic(), &rObj.GetGraphicObject() ); + aCropRect = rObj.aCropRect; + aFileName = rObj.aFileName; + aFilterName = rObj.aFilterName; + bMirrored = rObj.bMirrored; - if( rGraf.pGraphicLink != NULL) + if( rObj.pGraphicLink != NULL) { SetGraphicLink( aFileName, aFilterName ); } ImpSetAttrToGrafInfo(); + return *this; } // ----------------------------------------------------------------------------- @@ -895,8 +900,8 @@ void SdrGrafObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract { SdrRectObj::NbcResize( rRef, xFact, yFact ); - FASTBOOL bMirrX = xFact.GetNumerator() < 0; - FASTBOOL bMirrY = yFact.GetNumerator() < 0; + bool bMirrX = xFact.GetNumerator() < 0; + bool bMirrY = yFact.GetNumerator() < 0; if( bMirrX != bMirrY ) bMirrored = !bMirrored; @@ -919,7 +924,7 @@ void SdrGrafObj::NbcMirror(const Point& rRef1, const Point& rRef2) // ----------------------------------------------------------------------------- -void SdrGrafObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SdrGrafObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { SdrRectObj::NbcRotate( rRef, nWink, tn, bVShear ); } @@ -935,7 +940,6 @@ void SdrGrafObj::NbcSetSnapRect(const Rectangle& rRect) void SdrGrafObj::NbcSetLogicRect( const Rectangle& rRect) { - //int bChg=rRect.GetSize()!=aRect.GetSize(); SdrRectObj::NbcSetLogicRect(rRect); } @@ -959,9 +963,6 @@ void SdrGrafObj::SaveGeoData(SdrObjGeoData& rGeo) const void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo) { - //long nDrehMerk = aGeo.nDrehWink; - //long nShearMerk = aGeo.nShearWink; - //int bMirrMerk = bMirrored; Size aSizMerk( aRect.GetSize() ); SdrRectObj::RestGeoData(rGeo); @@ -973,8 +974,8 @@ void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo) void SdrGrafObj::SetPage( SdrPage* pNewPage ) { - FASTBOOL bRemove = pNewPage == NULL && pPage != NULL; - FASTBOOL bInsert = pNewPage != NULL && pPage == NULL; + bool bRemove = pNewPage == NULL && pPage != NULL; + bool bInsert = pNewPage != NULL && pPage == NULL; if( bRemove ) { @@ -996,7 +997,7 @@ void SdrGrafObj::SetPage( SdrPage* pNewPage ) void SdrGrafObj::SetModel( SdrModel* pNewModel ) { - FASTBOOL bChg = pNewModel != pModel; + bool bChg = pNewModel != pModel; if( bChg ) { @@ -1021,8 +1022,6 @@ void SdrGrafObj::SetModel( SdrModel* pNewModel ) void SdrGrafObj::StartAnimation( OutputDevice* /*pOutDev*/, const Point& /*rPoint*/, const Size& /*rSize*/, long /*nExtraData*/) { - // #111096# - // use new graf animation SetGrafAnimationAllowed(sal_True); } @@ -1030,14 +1029,12 @@ void SdrGrafObj::StartAnimation( OutputDevice* /*pOutDev*/, const Point& /*rPoin void SdrGrafObj::StopAnimation(OutputDevice* /*pOutDev*/, long /*nExtraData*/) { - // #111096# - // use new graf animation SetGrafAnimationAllowed(sal_False); } // ----------------------------------------------------------------------------- -FASTBOOL SdrGrafObj::HasGDIMetaFile() const +bool SdrGrafObj::HasGDIMetaFile() const { return( pGraphic->GetType() == GRAPHIC_GDIMETAFILE ); } @@ -1046,7 +1043,7 @@ FASTBOOL SdrGrafObj::HasGDIMetaFile() const const GDIMetaFile* SdrGrafObj::GetGDIMetaFile() const { - DBG_ERROR( "Invalid return value! Don't use it! (KA)" ); + OSL_FAIL( "Invalid return value! Don't use it! (KA)" ); return &GetGraphic().GetGDIMetaFile(); } @@ -1290,9 +1287,6 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) if(mbInsidePaint && !GetViewContact().HasViewObjectContacts(true)) { -// Rectangle aSnapRect(GetSnapRect()); -// const Rectangle aSnapRectPixel(pOutDev->LogicToPixel(aSnapRect)); - pFilterData = new com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >( 3 ); com::sun::star::awt::Size aPreviewSizeHint( 64, 64 ); @@ -1308,7 +1302,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) mbIsPreview = sal_True; } - if( !GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pStream, + if( !GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW, NULL, 0, pFilterData ) ) { const String aUserData( pGraphic->GetUserData() ); @@ -1316,7 +1310,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) pGraphic->SetGraphic( aGraphic ); pGraphic->SetUserData( aUserData ); - // #142146# Graphic successfully swapped in. + // Graphic successfully swapped in. pRet = GRFMGR_AUTOSWAPSTREAM_LOADED; } delete pFilterData; @@ -1353,8 +1347,6 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) // ----------------------------------------------------------------------------- -// #111096# -// Access to GrafAnimationAllowed flag sal_Bool SdrGrafObj::IsGrafAnimationAllowed() const { return mbGrafAnimationAllowed; @@ -1387,9 +1379,6 @@ Reference< XInputStream > SdrGrafObj::getInputStream() if( pModel ) { -// if( !pGraphic->HasUserData() ) -// pGraphic->SwapOut(); - // kann aus dem original Doc-Stream nachgeladen werden... if( pGraphic->HasUserData() ) { @@ -1434,4 +1423,4 @@ Reference< XInputStream > SdrGrafObj::getInputStream() return xStream; } -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index ede6b35178f9..486a57784e3a 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,7 +51,7 @@ #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 <svx/svdoedge.hxx> // Die Verbinder nach Move nochmal anbroadcasten #include "svx/svdglob.hxx" // StringCache #include "svx/svdstr.hrc" // Objektname @@ -58,23 +59,11 @@ #include <svl/whiter.hxx> #include <svx/svdpool.hxx> #include <svx/sdr/properties/groupproperties.hxx> - -// #110094# #include <svx/sdr/contact/viewcontactofgroup.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@@@ @@@@@ @@@@@@ @@@@ @@@@@ @@@@ @@ @@ @@@@@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@@@ @@ @@ @@@ @@@@@ @@ @@ @@ @@ @@@@@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@@@ @@@@@ @@@@ @@@@@ @@ @@ @@@@ @@@@ @@ -// -//////////////////////////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////////////////////////////// // BaseProperties section @@ -84,7 +73,7 @@ sdr::properties::BaseProperties* SdrObjGroup::CreateObjectSpecificProperties() } ////////////////////////////////////////////////////////////////////////////// -// #110094# DrawContact section +// DrawContact section sdr::contact::ViewContact* SdrObjGroup::CreateObjectSpecificViewContact() { @@ -177,13 +166,13 @@ sal_uInt16 SdrObjGroup::GetObjIdentifier() const SdrLayerID SdrObjGroup::GetLayer() const { - FASTBOOL b1st=sal_True; + bool b1st = true; SdrLayerID nLay=SdrLayerID(SdrObject::GetLayer()); SdrObjList* pOL=pSub; sal_uIntPtr nObjAnz=pOL->GetObjCount(); for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrLayerID nLay1=pOL->GetObj(i)->GetLayer(); - if (b1st) { nLay=nLay1; b1st=sal_False; } + if (b1st) { nLay=nLay1; b1st = false; } else if (nLay1!=nLay) return 0; } return nLay; @@ -245,7 +234,7 @@ void SdrObjGroup::SetModel(SdrModel* pNewModel) } -FASTBOOL SdrObjGroup::HasRefPoint() const +bool SdrObjGroup::HasRefPoint() const { return bRefPoint; } @@ -271,7 +260,6 @@ SdrObjList* SdrObjGroup::GetSubList() const const Rectangle& SdrObjGroup::GetCurrentBoundRect() const { - // --> OD 2007-02-01 #144962# // <aOutRect> has to contain the bounding rectangle if ( pSub->GetObjCount()!=0 ) { @@ -279,13 +267,11 @@ const Rectangle& SdrObjGroup::GetCurrentBoundRect() const } return aOutRect; - // <-- } const Rectangle& SdrObjGroup::GetSnapRect() const { - // --> OD 2007-02-01 #144962# // <aOutRect> has to contain the bounding rectangle if ( pSub->GetObjCount()!=0 ) { @@ -295,29 +281,33 @@ const Rectangle& SdrObjGroup::GetSnapRect() const { return aOutRect; } - // <-- } -void SdrObjGroup::operator=(const SdrObject& rObj) +SdrObjGroup* SdrObjGroup::Clone() const { - if(rObj.IsGroupObject()) - { - // copy SdrObject stuff - SdrObject::operator=(rObj); + return CloneHelper< SdrObjGroup >(); +} - // #i36404# - // copy SubList, init model and page first - SdrObjList& rSourceSubList = *rObj.GetSubList(); - pSub->SetPage(rSourceSubList.GetPage()); - pSub->SetModel(rSourceSubList.GetModel()); - pSub->CopyObjects(*rObj.GetSubList()); +SdrObjGroup& SdrObjGroup::operator=(const SdrObjGroup& rObj) +{ + if( this == &rObj ) + return *this; + // copy SdrObject stuff + SdrObject::operator=(rObj); - // copy local paremeters - nDrehWink =((SdrObjGroup&)rObj).nDrehWink; - nShearWink =((SdrObjGroup&)rObj).nShearWink; - aRefPoint =((SdrObjGroup&)rObj).aRefPoint; - bRefPoint =((SdrObjGroup&)rObj).bRefPoint; - } + // #i36404# + // copy SubList, init model and page first + SdrObjList& rSourceSubList = *rObj.GetSubList(); + pSub->SetPage(rSourceSubList.GetPage()); + pSub->SetModel(rSourceSubList.GetModel()); + pSub->CopyObjects(*rObj.GetSubList()); + + // copy local paremeters + nDrehWink = rObj.nDrehWink; + nShearWink = rObj.nShearWink; + aRefPoint = rObj.aRefPoint; + bRefPoint = rObj.bRefPoint; + return *this; } @@ -385,7 +375,7 @@ bool SdrObjGroup::beginSpecialDrag(SdrDragStat& /*rDrag*/) const } -FASTBOOL SdrObjGroup::BegCreate(SdrDragStat& /*rStat*/) +bool SdrObjGroup::BegCreate(SdrDragStat& /*rStat*/) { return sal_False; } @@ -397,7 +387,7 @@ long SdrObjGroup::GetRotateAngle() const } -long SdrObjGroup::GetShearAngle(FASTBOOL /*bVertical*/) const +long SdrObjGroup::GetShearAngle(bool /*bVertical*/) const { return nShearWink; } @@ -448,8 +438,8 @@ void SdrObjGroup::NbcMove(const Size& rSiz) void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); - FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); + bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); + bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); if (bXMirr || bYMirr) { Point aRef1(GetSnapRect().Center()); if (bXMirr) { @@ -509,7 +499,7 @@ void SdrObjGroup::NbcMirror(const Point& rRef1, const Point& rRef2) } -void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { SetGlueReallyAbsolute(sal_True); nShearWink+=nWink; @@ -576,7 +566,7 @@ void SdrObjGroup::Move(const Size& rSiz) Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); MovePoint(aRefPoint,rSiz); if (pSub->GetObjCount()!=0) { - // #32383# Erst die Verbinder verschieben, dann den Rest + // Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; sal_uIntPtr nObjAnz=pOL->GetObjCount(); sal_uIntPtr i; @@ -589,7 +579,6 @@ void SdrObjGroup::Move(const Size& rSiz) if (!pObj->IsEdgeObj()) pObj->Move(rSiz); } } else { - // #110094#-14 SendRepaintBroadcast(); MoveRect(aOutRect,rSiz); SetRectsDirty(); } @@ -604,8 +593,8 @@ void SdrObjGroup::Move(const Size& rSiz) void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { if (xFact.GetNumerator()!=xFact.GetDenominator() || yFact.GetNumerator()!=yFact.GetDenominator()) { - FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); - FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); + bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); + bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); if (bXMirr || bYMirr) { Point aRef1(GetSnapRect().Center()); if (bXMirr) { @@ -622,7 +611,7 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); ResizePoint(aRefPoint,rRef,xFact,yFact); if (pSub->GetObjCount()!=0) { - // #32383# Erst die Verbinder verschieben, dann den Rest + // Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; sal_uIntPtr nObjAnz=pOL->GetObjCount(); sal_uIntPtr i; @@ -635,7 +624,6 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio if (!pObj->IsEdgeObj()) pObj->Resize(rRef,xFact,yFact); } } else { - // #110094#-14 SendRepaintBroadcast(); ResizeRect(aOutRect,rRef,xFact,yFact); SetRectsDirty(); } @@ -654,7 +642,7 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs) Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); nDrehWink=NormAngle360(nDrehWink+nWink); RotatePoint(aRefPoint,rRef,sn,cs); - // #32383# Erst die Verbinder verschieben, dann den Rest + // Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; sal_uIntPtr nObjAnz=pOL->GetObjCount(); sal_uIntPtr i; @@ -680,7 +668,7 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2) SetGlueReallyAbsolute(sal_True); Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); MirrorPoint(aRefPoint,rRef1,rRef2); // fehlende Implementation in SvdEtc !!! - // #32383# Erst die Verbinder verschieben, dann den Rest + // Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; sal_uIntPtr nObjAnz=pOL->GetObjCount(); sal_uIntPtr i; @@ -700,14 +688,14 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2) } -void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, bool bVShear) { if (nWink!=0) { SetGlueReallyAbsolute(sal_True); Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); nShearWink+=nWink; ShearPoint(aRefPoint,rRef,tn); - // #32383# Erst die Verbinder verschieben, dann den Rest + // Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; sal_uIntPtr nObjAnz=pOL->GetObjCount(); sal_uIntPtr i; @@ -731,11 +719,11 @@ void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShe void SdrObjGroup::SetAnchorPos(const Point& rPnt) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - FASTBOOL bChg=aAnchor!=rPnt; + bool bChg=aAnchor!=rPnt; aAnchor=rPnt; Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y()); MovePoint(aRefPoint,aSiz); - // #32383# Erst die Verbinder verschieben, dann den Rest + // Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; sal_uIntPtr nObjAnz=pOL->GetObjCount(); sal_uIntPtr i; @@ -798,4 +786,4 @@ SdrObject* SdrObjGroup::DoConvertToPolyObj(sal_Bool bBezier) const return pGroup; } -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 63d23eb2c72b..f53d09e25941 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,8 +92,6 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe bShowUnit = ((SdrMeasureShowUnitItem&)rSet.Get(SDRATTR_MEASURESHOWUNIT)).GetValue(); sal_Int16 nNumDigits = ((SdrMeasureDecimalPlacesItem&)rSet.Get(SDRATTR_MEASUREDECIMALPLACES)).GetValue(); - //SdrModel* pModel = rObj.pModel; - switch(eMeasureFieldKind) { case SDRMEASUREFIELD_VALUE: @@ -275,17 +274,17 @@ struct ImpMeasureRec : public SdrDragStatUserData long nHelplineDist; long nHelpline1Len; long nHelpline2Len; - FASTBOOL bBelowRefEdge; - FASTBOOL bTextRota90; - FASTBOOL bTextUpsideDown; + bool bBelowRefEdge; + bool bTextRota90; + bool bTextUpsideDown; long nMeasureOverhang; FieldUnit eMeasureUnit; Fraction aMeasureScale; - FASTBOOL bShowUnit; + bool bShowUnit; String aFormatString; - FASTBOOL bTextAutoAngle; + bool bTextAutoAngle; long nTextAutoAngleView; - FASTBOOL bTextIsFixedAngle; + bool bTextIsFixedAngle; long nTextFixedAngle; }; @@ -321,11 +320,11 @@ struct ImpMeasurePoly long nArrow1Wdt; // Breite des 1. Pfeils long nArrow2Wdt; // Breite des 2. Pfeils long nShortLineLen; // Linienlaenge, wenn PfeileAussen - FASTBOOL bArrow1Center; // Pfeil 1 zentriert? - FASTBOOL bArrow2Center; // Pfeil 2 zentriert? - FASTBOOL bAutoUpsideDown; // UpsideDown durch Automatik - FASTBOOL bPfeileAussen; - FASTBOOL bBreakedLine; + bool bArrow1Center; // Pfeil 1 zentriert? + bool bArrow2Center; // Pfeil 2 zentriert? + bool bAutoUpsideDown; // UpsideDown durch Automatik + bool bPfeileAussen; + bool bBreakedLine; }; void SdrMeasureObj::ImpTakeAttr(ImpMeasureRec& rRec) const @@ -389,7 +388,7 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol.nArrow2Wdt=0; long nArrowNeed=0; long nShortLen=0; - FASTBOOL bPfeileAussen=sal_False; + bool bPfeileAussen = false; const SfxItemSet& rSet = GetObjectItemSet(); sal_Int32 nLineWdt = ((XLineWidthItem&)(rSet.Get(XATTR_LINEWIDTH))).GetValue(); // Strichstaerke @@ -413,13 +412,13 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& // nArrowLen ist bei bCenter bereits halbiert // Bei 2 Pfeilen a 4mm ist unter 10mm Schluss. nArrowNeed=nArrow1Len+nArrow2Len+(nArrow1Wdt+nArrow2Wdt)/2; - if (rPol.nLineLen<nArrowNeed) bPfeileAussen=sal_True; + if (rPol.nLineLen<nArrowNeed) bPfeileAussen = true; nShortLen=(nArrow1Len+nArrow1Wdt + nArrow2Len+nArrow2Wdt) /2; rPol.eUsedTextHPos=rRec.eWantTextHPos; rPol.eUsedTextVPos=rRec.eWantTextVPos; if (rPol.eUsedTextVPos==SDRMEASURE_TEXTVAUTO) rPol.eUsedTextVPos=SDRMEASURE_ABOVE; - FASTBOOL bBrkLine=rPol.eUsedTextVPos==SDRMEASURETEXT_BREAKEDLINE; + bool bBrkLine=rPol.eUsedTextVPos==SDRMEASURETEXT_BREAKEDLINE; if (rPol.eUsedTextVPos==SDRMEASURETEXT_VERTICALCENTERED) { OutlinerParaObject* pOutlinerParaObject = SdrTextObj::GetOutlinerParaObject(); @@ -430,18 +429,18 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& } rPol.bBreakedLine=bBrkLine; if (rPol.eUsedTextHPos==SDRMEASURE_TEXTHAUTO) { // bei zu breitem Text diesen eventuell nach aussen schieben - FASTBOOL bOutside=sal_False; + bool bOutside = false; long nNeedSiz=!rRec.bTextRota90 ? rPol.aTextSize.Width() : rPol.aTextSize.Height(); - if (nNeedSiz>rPol.nLineLen) bOutside=sal_True; // Text passt nicht in die Mitte + if (nNeedSiz>rPol.nLineLen) bOutside = true; // Text passt nicht in die Mitte if (bBrkLine) { - if (nNeedSiz+nArrowNeed>rPol.nLineLen) bPfeileAussen=sal_True; // Text passt in die Mitte, wenn die Pfeile nach aussen kommen + if (nNeedSiz+nArrowNeed>rPol.nLineLen) bPfeileAussen = true; // Text passt in die Mitte, wenn die Pfeile nach aussen kommen } else { long nSmallNeed=nArrow1Len+nArrow2Len+(nArrow1Wdt+nArrow2Wdt)/2/4; - if (nNeedSiz+nSmallNeed>rPol.nLineLen) bPfeileAussen=sal_True; // Text passt in die Mitte, wenn die Pfeile nach aussen kommen + if (nNeedSiz+nSmallNeed>rPol.nLineLen) bPfeileAussen = true; // Text passt in die Mitte, wenn die Pfeile nach aussen kommen } rPol.eUsedTextHPos=bOutside ? SDRMEASURE_TEXTLEFTOUTSIDE : SDRMEASURE_TEXTINSIDE; } - if (rPol.eUsedTextHPos!=SDRMEASURE_TEXTINSIDE) bPfeileAussen=sal_True; + if (rPol.eUsedTextHPos!=SDRMEASURE_TEXTINSIDE) bPfeileAussen = true; rPol.nArrow1Wdt=nArrow1Wdt; rPol.nArrow2Wdt=nArrow2Wdt; rPol.nShortLineLen=nShortLen; @@ -581,8 +580,8 @@ basegfx::B2DPolyPolygon SdrMeasureObj::ImpCalcXPoly(const ImpMeasurePoly& rPol) return aRetval; } -FASTBOOL SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, - FASTBOOL bEdit, +bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, + bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, XubString& rRet) const { const SvxFieldData* pField=rField.GetField(); @@ -667,9 +666,9 @@ void SdrMeasureObj::TakeUnrotatedSnapRect(Rectangle& rRect) const } Point aTextPos; - FASTBOOL bRota90=aRec.bTextRota90; - FASTBOOL bUpsideDown=aRec.bTextUpsideDown!=aMPol.bAutoUpsideDown; - FASTBOOL bBelowRefEdge=aRec.bBelowRefEdge; + bool bRota90=aRec.bTextRota90; + bool bUpsideDown=aRec.bTextUpsideDown!=aMPol.bAutoUpsideDown; + bool bBelowRefEdge=aRec.bBelowRefEdge; SdrMeasureTextHPos eMH=aMPol.eUsedTextHPos; SdrMeasureTextVPos eMV=aMPol.eUsedTextVPos; if (!bRota90) { @@ -733,12 +732,9 @@ void SdrMeasureObj::TakeUnrotatedSnapRect(Rectangle& rRect) const } } -void SdrMeasureObj::operator=(const SdrObject& rObj) +SdrMeasureObj* SdrMeasureObj::Clone() const { - SdrTextObj::operator=(rObj); - aPt1=((SdrMeasureObj&)rObj).aPt1; - aPt2=((SdrMeasureObj&)rObj).aPt2; - bTextDirty=((SdrMeasureObj&)rObj).bTextDirty; + return CloneHelper< SdrMeasureObj >(); } void SdrMeasureObj::TakeObjNameSingul(XubString& rName) const @@ -782,7 +778,7 @@ SdrHdl* SdrMeasureObj::GetHdl(sal_uInt32 nHdlNum) const aRec.nHelplineDist=0; ImpCalcGeometrics(aRec,aMPol); Point aPt; - //SdrHdlKind eHdl=HDL_POLY; + switch (nHdlNum) { case 0: aPt=aMPol.aHelpline1.aP1; break; case 1: aPt=aMPol.aHelpline2.aP1; break; @@ -910,9 +906,9 @@ void SdrMeasureObj::ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) c const SdrHdl* pHdl=rDrag.GetHdl(); sal_uInt32 nHdlNum(pHdl->GetObjHdlNum()); - FASTBOOL bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho(); - FASTBOOL bBigOrtho=bOrtho && rDrag.GetView()->IsBigOrtho(); - FASTBOOL bBelow=rRec.bBelowRefEdge; + bool bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho(); + bool bBigOrtho=bOrtho && rDrag.GetView()->IsBigOrtho(); + bool bBelow=rRec.bBelowRefEdge; Point aPt(rDrag.GetNow()); switch (nHdlNum) { @@ -929,22 +925,22 @@ void SdrMeasureObj::ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) c if (bOrtho) rRec.nHelpline1Len=rRec.nHelpline2Len; } break; case 2: case 3: { - FASTBOOL bAnf=nHdlNum==2; + bool bAnf=nHdlNum==2; Point& rMov=bAnf ? rRec.aPt1 : rRec.aPt2; Point aMov(rMov); Point aFix(bAnf ? rRec.aPt2 : rRec.aPt1); if (bOrtho) { long ndx0=aMov.X()-aFix.X(); long ndy0=aMov.Y()-aFix.Y(); - FASTBOOL bHLin=ndy0==0; - FASTBOOL bVLin=ndx0==0; + bool bHLin=ndy0==0; + bool bVLin=ndx0==0; if (!bHLin || !bVLin) { // sonst ist aPt1==aPt2 long ndx=aPt.X()-aFix.X(); long ndy=aPt.Y()-aFix.Y(); double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0; double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0; - FASTBOOL bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho); - FASTBOOL bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho); + bool bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho); + bool bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho); if (bHor) ndy=long(ndy0*nXFact); if (bVer) ndx=long(ndx0*nYFact); aPt=aFix; @@ -971,7 +967,7 @@ void SdrMeasureObj::ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) c //////////////////////////////////////////////////////////////////////////////////////////////////// -FASTBOOL SdrMeasureObj::BegCreate(SdrDragStat& rStat) +bool SdrMeasureObj::BegCreate(SdrDragStat& rStat) { rStat.SetOrtho8Possible(); aPt1=rStat.GetStart(); @@ -980,7 +976,7 @@ FASTBOOL SdrMeasureObj::BegCreate(SdrDragStat& rStat) return sal_True; } -FASTBOOL SdrMeasureObj::MovCreate(SdrDragStat& rStat) +bool SdrMeasureObj::MovCreate(SdrDragStat& rStat) { SdrView* pView=rStat.GetView(); aPt1=rStat.GetStart(); @@ -995,16 +991,16 @@ FASTBOOL SdrMeasureObj::MovCreate(SdrDragStat& rStat) return sal_True; } -FASTBOOL SdrMeasureObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +bool SdrMeasureObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { SetTextDirty(); SetRectsDirty(); return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointAnz()>=2); } -FASTBOOL SdrMeasureObj::BckCreate(SdrDragStat& /*rStat*/) +bool SdrMeasureObj::BckCreate(SdrDragStat& /*rStat*/) { - return sal_False; + return false; } void SdrMeasureObj::BrkCreate(SdrDragStat& /*rStat*/) @@ -1073,7 +1069,7 @@ void SdrMeasureObj::NbcMirror(const Point& rRef1, const Point& rRef2) SetRectsDirty(); } -void SdrMeasureObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SdrMeasureObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { SdrTextObj::NbcShear(rRef,nWink,tn,bVShear); ShearPoint(aPt1,rRef,tn,bVShear); @@ -1089,7 +1085,7 @@ long SdrMeasureObj::GetRotateAngle() const void SdrMeasureObj::RecalcSnapRect() { - // #94520# Added correct implementation here. + // Added correct implementation here. ImpMeasureRec aRec; ImpMeasurePoly aMPol; XPolyPolygon aXPP; @@ -1196,7 +1192,6 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier) const { // four lines, middle line with gap, so there are two lines used // which have one arrow each - //sal_Int32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue(); sal_Int32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue(); aSet.Put(XLineEndWidthItem(0L)); @@ -1227,7 +1222,6 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier) const else if(nCount == 5) { // five lines, first two are the outer ones - //sal_Int32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue(); sal_Int32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue(); aSet.Put(XLineEndWidthItem(0L)); @@ -1298,8 +1292,8 @@ void SdrMeasureObj::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) SetTextDirty(); // Text neu berechnen! } -void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, - Rectangle* pAnchorRect, sal_Bool bLineWidth ) const +void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, + Rectangle* pAnchorRect, bool bLineWidth ) const { if (bTextDirty) UndirtyText(); SdrTextObj::TakeTextRect( rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth ); @@ -1329,9 +1323,8 @@ sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const SdrTextVertAdjust eTV=GetTextVerticalAdjust(); SdrMeasureTextHPos eMH=aMPol.eUsedTextHPos; SdrMeasureTextVPos eMV=aMPol.eUsedTextVPos; - FASTBOOL bTextRota90=aRec.bTextRota90; - //int bTextUpsideDown=aRec.bTextUpsideDown; - FASTBOOL bBelowRefEdge=aRec.bBelowRefEdge; + bool bTextRota90=aRec.bTextRota90; + bool bBelowRefEdge=aRec.bBelowRefEdge; // bTextUpsideDown muss hier noch ausgewertet werden!!!! if (!bTextRota90) { @@ -1418,7 +1411,7 @@ sal_Bool SdrMeasureObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegf } default: { - DBG_ERROR("TRGetBaseGeometry: Missing unit translation to 100th mm!"); + OSL_FAIL("TRGetBaseGeometry: Missing unit translation to 100th mm!"); } } } @@ -1453,7 +1446,7 @@ void SdrMeasureObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, cons } default: { - DBG_ERROR("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); + OSL_FAIL("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); } } } @@ -1490,5 +1483,4 @@ void SdrMeasureObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, cons } } -////////////////////////////////////////////////////////////////////////////// -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 26dfb41de180..0001cd518534 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,9 +64,9 @@ SdrMediaObj::~SdrMediaObj() // ------------------------------------------------------------------------------ -FASTBOOL SdrMediaObj::HasTextEdit() const +bool SdrMediaObj::HasTextEdit() const { - return sal_False; + return false; } // ------------------------------------------------------------------------------ @@ -134,17 +135,20 @@ void SdrMediaObj::TakeObjNamePlural(XubString& rName) const // ------------------------------------------------------------------------------ -void SdrMediaObj::operator=(const SdrObject& rObj) +SdrMediaObj* SdrMediaObj::Clone() const { - SdrRectObj::operator=( rObj ); + return CloneHelper< SdrMediaObj >(); +} - if( rObj.ISA( SdrMediaObj ) ) - { - const SdrMediaObj& rMediaObj = static_cast< const SdrMediaObj& >( rObj ); +SdrMediaObj& SdrMediaObj::operator=(const SdrMediaObj& rObj) +{ + if( this == &rObj ) + return *this; + SdrRectObj::operator=( rObj ); - setMediaProperties( rMediaObj.getMediaProperties() ); - setGraphic( rMediaObj.mapGraphic.get() ); - } + setMediaProperties( rObj.getMediaProperties() ); + setGraphic( rObj.mapGraphic.get() ); + return *this; } // ------------------------------------------------------------------------------ @@ -283,3 +287,5 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper if( AVMEDIA_SETMASK_ZOOM & nMaskSet ) maMediaProperties.setZoom( rNewProperties.getZoom() ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 7becaa96e254..0757c2824341 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,7 +73,7 @@ #include <svl/solar.hrc> #include <svl/urihelper.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <svx/svdpagv.hxx> @@ -182,10 +183,6 @@ SdrLightEmbeddedClient_Impl::SdrLightEmbeddedClient_Impl( SdrOle2Obj* pObj ) } Rectangle SdrLightEmbeddedClient_Impl::impl_getScaledRect_nothrow() const { - MapUnit aContainerMapUnit( MAP_100TH_MM ); - uno::Reference< embed::XVisualObject > xParentVis( mpObj->GetParentXModel(), uno::UNO_QUERY ); - if ( xParentVis.is() ) - aContainerMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xParentVis->getMapUnit( mpObj->GetAspect() ) ); Rectangle aLogicRect( mpObj->GetLogicRect() ); // apply scaling to object area and convert to pixels aLogicRect.SetSize( Size( Fraction( aLogicRect.GetWidth() ) * m_aScaleWidth, @@ -201,7 +198,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changingState( const ::com::sun::star void SdrLightEmbeddedClient_Impl::Release() { { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; mpObj = NULL; } @@ -211,7 +208,7 @@ void SdrLightEmbeddedClient_Impl::Release() //-------------------------------------------------------------------- void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const ::com::sun::star::lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( mpObj && nOldState == embed::EmbedStates::LOADED && nNewState == embed::EmbedStates::RUNNING ) { @@ -227,7 +224,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const ::com::sun::star: //-------------------------------------------------------------------- void SAL_CALL SdrLightEmbeddedClient_Impl::disposing( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; GetSdrGlobalData().GetOLEObjCache().RemoveObj(mpObj); } @@ -237,10 +234,10 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObj { // TODO/LATER: when writer uses this implementation the code could be shared with SfxInPlaceClient_Impl - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // the code currently makes sence only in case there is no other client - if ( mpObj && mpObj->GetAspect() != embed::Aspects::MSOLE_ICON && aEvent.EventName.equalsAscii("OnVisAreaChanged") + if ( mpObj && mpObj->GetAspect() != embed::Aspects::MSOLE_ICON && aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnVisAreaChanged")) && mpObj->GetObjRef().is() && mpObj->GetObjRef()->getClientSite() == uno::Reference< embed::XEmbeddedClient >( this ) ) { try @@ -260,13 +257,13 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObj } catch( embed::NoVisualAreaSizeException& ) { - OSL_ENSURE( sal_False, "No visual area size!\n" ); + OSL_FAIL( "No visual area size!\n" ); aSz.Width = 5000; aSz.Height = 5000; } catch( uno::Exception& ) { - OSL_ENSURE( sal_False, "Unexpected exception!\n" ); + OSL_FAIL( "Unexpected exception!\n" ); aSz.Width = 5000; aSz.Height = 5000; } @@ -293,7 +290,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObj } catch( uno::Exception& ) { - OSL_ENSURE( sal_False, "Unexpected exception!\n" ); + OSL_FAIL( "Unexpected exception!\n" ); } } } @@ -309,7 +306,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::saveObject() uno::Reference< util::XModifiable > xModifiable; { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( !mpObj ) throw embed::ObjectSaveVetoException(); @@ -352,7 +349,7 @@ uno::Reference< util::XCloseable > SAL_CALL SdrLightEmbeddedClient_Impl::getComp { uno::Reference< util::XCloseable > xResult; - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( mpObj ) xResult = uno::Reference< util::XCloseable >( mpObj->GetParentXModel(), uno::UNO_QUERY ); @@ -364,7 +361,7 @@ sal_Bool SAL_CALL SdrLightEmbeddedClient_Impl::canInplaceActivate() throw ( uno::RuntimeException ) { sal_Bool bRet = sal_False; - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( mpObj ) { uno::Reference< embed::XEmbeddedObject > xObject = mpObj->GetObjRef(); @@ -388,7 +385,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI() throw ( embed::WrongStateException, uno::RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; uno::Reference < beans::XPropertySet > xFrame( lcl_getFrame_throw(mpObj)); uno::Reference < frame::XFrame > xOwnFrame( xFrame,uno::UNO_QUERY); @@ -426,8 +423,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI() } } } // for(sal_Int32 i = nCount-1 ; i >= 0;--i) - - //m_pClient->GetViewShell()->UIActivating( m_pClient ); } //-------------------------------------------------------------------- @@ -442,7 +437,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI() throw ( embed::WrongStateException, uno::RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager(getLayoutManager()); if ( xLayoutManager.is() ) { @@ -458,11 +453,11 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SdrLightEmbed uno::RuntimeException ) { uno::Reference< ::com::sun::star::frame::XLayoutManager > xMan; - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; uno::Reference < beans::XPropertySet > xFrame( lcl_getFrame_throw(mpObj)); try { - xMan.set(xFrame->getPropertyValue( ::rtl::OUString::createFromAscii("LayoutManager") ),uno::UNO_QUERY); + xMan.set(xFrame->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ),uno::UNO_QUERY); } catch ( uno::Exception& ) { @@ -477,7 +472,7 @@ uno::Reference< frame::XDispatchProvider > SAL_CALL SdrLightEmbeddedClient_Impl: throw ( embed::WrongStateException, uno::RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return uno::Reference < frame::XDispatchProvider >( lcl_getFrame_throw(mpObj), uno::UNO_QUERY_THROW ); } @@ -486,7 +481,7 @@ awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getPlacement() throw ( embed::WrongStateException, uno::RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( !mpObj ) throw uno::RuntimeException(); @@ -528,7 +523,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl uno::Exception, uno::RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( !mpObj ) throw uno::RuntimeException(); @@ -578,9 +573,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl } else mpObj->ActionChanged(); - - // let the window size be recalculated - //SizeHasChanged(); // TODO: OJ } } // XWindowSupplier @@ -588,7 +580,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl uno::Reference< awt::XWindow > SAL_CALL SdrLightEmbeddedClient_Impl::getWindow() throw ( uno::RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; uno::Reference< awt::XWindow > xCurrent = m_xWindow; if ( !xCurrent.is() ) { @@ -615,8 +607,8 @@ public: virtual ~SdrEmbedObjectLink(); virtual void Closed(); - virtual void DataChanged( const String& rMimeType, - const ::com::sun::star::uno::Any & rValue ); + virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( + const String& rMimeType, const ::com::sun::star::uno::Any & rValue ); sal_Bool Connect() { return GetRealObject() != NULL; } }; @@ -638,8 +630,8 @@ SdrEmbedObjectLink::~SdrEmbedObjectLink() // ----------------------------------------------------------------------------- -void SdrEmbedObjectLink::DataChanged( const String& /*rMimeType*/, - const ::com::sun::star::uno::Any & /*rValue*/ ) +::sfx2::SvBaseLink::UpdateResult SdrEmbedObjectLink::DataChanged( + const String& /*rMimeType*/, const ::com::sun::star::uno::Any & /*rValue*/ ) { if ( !pObj->UpdateLinkURL_Impl() ) { @@ -669,6 +661,8 @@ void SdrEmbedObjectLink::DataChanged( const String& /*rMimeType*/, pObj->GetNewReplacement(); pObj->SetChanged(); + + return SUCCESS; } // ----------------------------------------------------------------------------- @@ -689,7 +683,6 @@ public: String aPersistName; // name of object in persist SdrLightEmbeddedClient_Impl* pLightClient; // must be registered as client only using AddOwnLightClient() call - // #107645# // New local var to avoid repeated loading if load of OLE2 fails sal_Bool mbLoadingOLEObjectFailed; sal_Bool mbConnected; @@ -699,7 +692,7 @@ public: SdrOle2ObjImpl() : pGraphicObject( NULL ) - // #107645# + , pLightClient ( NULL ) // init to start situation, loading did not fail , mbLoadingOLEObjectFailed( sal_False ) , mbConnected( sal_False ) @@ -752,7 +745,7 @@ sdr::contact::ViewContact* SdrOle2Obj::CreateObjectSpecificViewContact() TYPEINIT1(SdrOle2Obj,SdrRectObj); DBG_NAME(SdrOle2Obj) -SdrOle2Obj::SdrOle2Obj(FASTBOOL bFrame_) : m_bTypeAsked(false) +SdrOle2Obj::SdrOle2Obj(bool bFrame_) : m_bTypeAsked(false) ,m_bChart(false) { DBG_CTOR( SdrOle2Obj,NULL); @@ -762,7 +755,7 @@ SdrOle2Obj::SdrOle2Obj(FASTBOOL bFrame_) : m_bTypeAsked(false) } // ----------------------------------------------------------------------------- -SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFrame_) +SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, bool bFrame_) : xObjRef( rNewObjRef ) , m_bTypeAsked(false) , m_bChart(false) @@ -776,14 +769,14 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFram if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) ) SetResizeProtect(sal_True); - // #108759# For math objects, set closed state to transparent + // For math objects, set closed state to transparent if( ImplIsMathObj( xObjRef.GetObject() ) ) SetClosedObj( false ); } // ----------------------------------------------------------------------------- -SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, FASTBOOL bFrame_) +SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, bool bFrame_) : xObjRef( rNewObjRef ) , m_bTypeAsked(false) , m_bChart(false) @@ -798,14 +791,14 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubStrin if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) ) SetResizeProtect(sal_True); - // #108759# For math objects, set closed state to transparent + // For math objects, set closed state to transparent if( ImplIsMathObj( xObjRef.GetObject() ) ) SetClosedObj( false ); } // ----------------------------------------------------------------------------- -SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_) +SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, bool bFrame_) : SdrRectObj(rNewRect) , xObjRef( rNewObjRef ) , m_bTypeAsked(false) @@ -821,7 +814,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubStri if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) ) SetResizeProtect(sal_True); - // #108759# For math objects, set closed state to transparent + // For math objects, set closed state to transparent if( ImplIsMathObj( xObjRef.GetObject() ) ) SetClosedObj( false ); } @@ -898,9 +891,6 @@ void SdrOle2Obj::SetGraphic_Impl(const Graphic* pGrf) SetChanged(); BroadcastObjectChange(); - - //if ( ppObjRef->Is() && pGrf ) - // BroadcastObjectChange(); } void SdrOle2Obj::SetGraphic(const Graphic* pGrf) @@ -911,7 +901,7 @@ void SdrOle2Obj::SetGraphic(const Graphic* pGrf) // ----------------------------------------------------------------------------- -FASTBOOL SdrOle2Obj::IsEmpty() const +bool SdrOle2Obj::IsEmpty() const { return !(xObjRef.is()); } @@ -925,9 +915,9 @@ void SdrOle2Obj::Connect() if( mpImpl->mbConnected ) { - // mba: currently there are situations where it seems to be unavoidable to have multiple connects + // currently there are situations where it seems to be unavoidable to have multiple connects // changing this would need a larger code rewrite, so for now I remove the assertion - // DBG_ERROR("Connect() called on connected object!"); + // OSL_FAIL("Connect() called on connected object!"); return; } @@ -976,7 +966,7 @@ sal_Bool SdrOle2Obj::UpdateLinkURL_Impl() catch( ::com::sun::star::uno::Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("SdrOle2Obj::UpdateLinkURL_Impl(), " "exception caught: ") + rtl::OUStringToOString( @@ -1019,7 +1009,7 @@ void SdrOle2Obj::BreakFileLink_Impl() catch( ::com::sun::star::uno::Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("SdrOle2Obj::BreakFileLink_Impl(), " "exception caught: ") + rtl::OUStringToOString( @@ -1071,7 +1061,7 @@ void SdrOle2Obj::CheckFileLink_Impl() catch( ::com::sun::star::uno::Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("SdrOle2Obj::CheckFileLink_Impl(), " "exception caught: ") + rtl::OUStringToOString( @@ -1156,7 +1146,7 @@ void SdrOle2Obj::Connect_Impl() catch( ::com::sun::star::uno::Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("SdrOle2Obj::Connect_Impl(), " "exception caught: ") + rtl::OUStringToOString( @@ -1216,7 +1206,7 @@ void SdrOle2Obj::Disconnect() if( !mpImpl->mbConnected ) { - DBG_ERROR("Disconnect() called on disconnected object!"); + OSL_FAIL("Disconnect() called on disconnected object!"); return; } @@ -1244,7 +1234,7 @@ void SdrOle2Obj::RemoveListeners_Impl() catch( ::com::sun::star::uno::Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("SdrOle2Obj::RemoveListeners_Impl(), " "exception caught: ") + rtl::OUStringToOString( @@ -1327,7 +1317,7 @@ void SdrOle2Obj::Disconnect_Impl() catch( ::com::sun::star::uno::Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("SdrOle2Obj::Disconnect_Impl(), " "exception caught: ") + rtl::OUStringToOString( @@ -1385,7 +1375,7 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel) catch( ::com::sun::star::uno::Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("SdrOle2Obj::SetModel(), " "exception caught: ") + rtl::OUStringToOString( @@ -1419,8 +1409,8 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel) void SdrOle2Obj::SetPage(SdrPage* pNewPage) { - FASTBOOL bRemove=pNewPage==NULL && pPage!=NULL; - FASTBOOL bInsert=pNewPage!=NULL && pPage==NULL; + bool bRemove=pNewPage==NULL && pPage!=NULL; + bool bInsert=pNewPage!=NULL && pPage==NULL; if (bRemove && mpImpl->mbConnected ) Disconnect(); @@ -1439,12 +1429,12 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta if( rNewObjRef == xObjRef.GetObject() ) return; - // MBA: the caller of the method is responsible to control the old object, it will not be closed here + // the caller of the method is responsible to control the old object, it will not be closed here // Otherwise WW8 import crashes because it tranfers control to OLENode by this method if ( xObjRef.GetObject().is() ) xObjRef.Lock( sal_False ); - // MBA: avoid removal of object in Disconnect! It is definitely a HACK to call SetObjRef(0)! + // avoid removal of object in Disconnect! It is definitely a HACK to call SetObjRef(0)! // This call will try to close the objects; so if anybody else wants to keep it, it must be locked by a CloseListener xObjRef.Clear(); @@ -1461,7 +1451,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta if ( (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) ) SetResizeProtect(sal_True); - // #108759# For math objects, set closed state to transparent + // For math objects, set closed state to transparent if( ImplIsMathObj( rNewObjRef ) ) SetClosedObj( false ); @@ -1477,7 +1467,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta void SdrOle2Obj::SetClosedObj( bool bIsClosed ) { // TODO/LATER: do we still need this hack? - // #108759# Allow changes to the closed state of OLE objects + // Allow changes to the closed state of OLE objects bClosedObj = bIsClosed; } @@ -1491,11 +1481,6 @@ SdrObject* SdrOle2Obj::getFullDragClone() const Graphic* pOLEGraphic = GetGraphic(); SdrObject* pClone = 0; - if(Application::GetSettings().GetStyleSettings().GetHighContrastMode()) - { - pOLEGraphic = getEmbeddedObjectRef().GetHCGraphic(); - } - if(pOLEGraphic) { pClone = new SdrGrafObj(*pOLEGraphic, GetSnapRect()); @@ -1606,7 +1591,12 @@ void SdrOle2Obj::TakeObjNamePlural(XubString& rName) const // ----------------------------------------------------------------------------- -void SdrOle2Obj::operator=(const SdrObject& rObj) +SdrOle2Obj* SdrOle2Obj::Clone() const +{ + return CloneHelper< SdrOle2Obj >(); +} + +SdrOle2Obj& SdrOle2Obj::operator=(const SdrOle2Obj& rObj) { //TODO/LATER: who takes over control of my old object?! if( &rObj != this ) @@ -1622,7 +1612,7 @@ void SdrOle2Obj::operator=(const SdrObject& rObj) SdrRectObj::operator=( rObj ); - // #108867# Manually copying bClosedObj attribute + // Manually copying bClosedObj attribute SetClosedObj( rObj.IsClosedObj() ); mpImpl->aPersistName = rOle2Obj.mpImpl->aPersistName; @@ -1660,33 +1650,10 @@ void SdrOle2Obj::operator=(const SdrObject& rObj) } Connect(); - - /* only needed for MSOLE-Objects, now handled inside implementation of Object - if ( xObjRef.is() && rOle2Obj.xObjRef.is() && rOle2Obj.GetAspect() != embed::Aspects::MSOLE_ICON ) - { - try - { - awt::Size aVisSize = rOle2Obj.xObjRef->getVisualAreaSize( rOle2Obj.GetAspect() ); - if( rOle2Obj.xObjRef->getMapUnit( rOle2Obj.GetAspect() ) == xObjRef->getMapUnit( GetAspect() ) ) - xObjRef->setVisualAreaSize( GetAspect(), aVisSize ); - } - catch ( embed::WrongStateException& ) - { - // setting of VisArea not necessary for objects that don't cache it in loaded state - } - catch( embed::NoVisualAreaSizeException& ) - { - // objects my not have visual areas - } - catch( uno::Exception& e ) - { - (void)e; - DBG_ERROR( "SdrOle2Obj::operator=(), unexcpected exception caught!" ); - } - } */ } } } + return *this; } // ----------------------------------------------------------------------------- @@ -1767,7 +1734,7 @@ void SdrOle2Obj::ImpSetVisAreaSize() // make the new object area known to the client // compared to the "else" branch aRect might have been changed by the object and no additional scaling was applied - // OJ: WHY this -> OSL_ASSERT( pClient ); + // WHY this -> OSL_ASSERT( pClient ); if( pClient ) pClient->SetObjArea(aRect); @@ -1966,7 +1933,7 @@ sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xOb catch( ::com::sun::star::uno::Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("SdrOle2Obj::Unload=(), " "exception caught: ") + rtl::OUStringToOString( @@ -2012,7 +1979,6 @@ void SdrOle2Obj::GetObjRef_Impl() { if ( !xObjRef.is() && mpImpl->aPersistName.Len() && pModel && pModel->GetPersist() ) { - // #107645# // Only try loading if it did not went wrong up to now if(!mpImpl->mbLoadingOLEObjectFailed) { @@ -2020,7 +1986,6 @@ void SdrOle2Obj::GetObjRef_Impl() m_bTypeAsked = false; CheckFileLink_Impl(); - // #107645# // If loading of OLE object failed, remember that to not invoke a endless // loop trying to load it again and again. if( xObjRef.is() ) @@ -2028,7 +1993,7 @@ void SdrOle2Obj::GetObjRef_Impl() mpImpl->mbLoadingOLEObjectFailed = sal_True; } - // #108759# For math objects, set closed state to transparent + // For math objects, set closed state to transparent if( ImplIsMathObj( xObjRef.GetObject() ) ) SetClosedObj( false ); } @@ -2037,14 +2002,14 @@ void SdrOle2Obj::GetObjRef_Impl() { if( !IsEmptyPresObj() ) { - // #75637# remember modified status of model + // remember modified status of model const sal_Bool bWasChanged(pModel ? pModel->IsChanged() : sal_False); // perhaps preview not valid anymore - // #75637# This line changes the modified state of the model + // This line changes the modified state of the model SetGraphic_Impl( NULL ); - // #75637# if status was not set before, force it back + // if status was not set before, force it back // to not set, so that SetGraphic(0L) above does not // set the modified state of the model. if(!bWasChanged && pModel && pModel->IsChanged()) @@ -2114,7 +2079,6 @@ uno::Reference< frame::XModel > SdrOle2Obj::getXModel() const // ----------------------------------------------------------------------------- -// #109985# sal_Bool SdrOle2Obj::IsChart() const { if ( !m_bTypeAsked ) @@ -2238,5 +2202,4 @@ void SdrOle2Obj::SetWindow(const com::sun::star::uno::Reference < com::sun::star } } -////////////////////////////////////////////////////////////////////////////// -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index 1897d2765678..ddd845e0fe66 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,8 +41,6 @@ #include <svtools/colorcfg.hxx> #include <svl/itemset.hxx> #include <svx/sdr/properties/pageproperties.hxx> - -// #111111# #include <svx/sdr/contact/viewcontactofpageobj.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -102,20 +101,17 @@ SdrPageObj::SdrPageObj(const Rectangle& rRect, SdrPage* pNewPage) SdrPageObj::~SdrPageObj() { - // #111111# if(mpShownPage) { mpShownPage->RemovePageUser(*this); } } -// #111111# SdrPage* SdrPageObj::GetReferencedPage() const { return mpShownPage; } -// #111111# void SdrPageObj::SetReferencedPage(SdrPage* pNewPage) { if(mpShownPage != pNewPage) @@ -167,10 +163,18 @@ void SdrPageObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bCanConvToPolyLineToArea=sal_False; } -void SdrPageObj::operator=(const SdrObject& rObj) +SdrPageObj* SdrPageObj::Clone() const +{ + return CloneHelper< SdrPageObj >(); +} + +SdrPageObj& SdrPageObj::operator=(const SdrPageObj& rObj) { + if( this == &rObj ) + return *this; SdrObject::operator=(rObj); - SetReferencedPage(((const SdrPageObj&)rObj).GetReferencedPage()); + SetReferencedPage( rObj.GetReferencedPage()); + return *this; } void SdrPageObj::TakeObjNameSingul(XubString& rName) const @@ -192,4 +196,4 @@ void SdrPageObj::TakeObjNamePlural(XubString& rName) const rName=ImpGetResStr(STR_ObjNamePluralPAGE); } -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 38784af56936..e907b7103110 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,7 +61,7 @@ #include <svx/sdr/contact/viewcontactofsdrpathobj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -// #104018# replace macros above with type-safe methods +// replace macros above with type-safe methods inline sal_Int32 ImplTwipsToMM(sal_Int32 nVal) { return ((nVal * 127 + 36) / 72); } inline sal_Int32 ImplMMToTwips(sal_Int32 nVal) { return ((nVal * 72 + 63) / 127); } inline sal_Int64 ImplTwipsToMM(sal_Int64 nVal) { return ((nVal * 127 + 36) / 72); } @@ -80,7 +81,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); } using namespace sdr; -inline sal_uInt16 GetPrevPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, FASTBOOL bClosed) +inline sal_uInt16 GetPrevPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, bool bClosed) { if (nPnt>0) { nPnt--; @@ -91,7 +92,7 @@ inline sal_uInt16 GetPrevPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, FASTBOOL bClos return nPnt; } -inline sal_uInt16 GetNextPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, FASTBOOL bClosed) +inline sal_uInt16 GetNextPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, bool bClosed) { nPnt++; if (nPnt>nPntMax || (bClosed && nPnt>=nPntMax)) nPnt=0; @@ -101,33 +102,32 @@ inline sal_uInt16 GetNextPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, FASTBOOL bClos struct ImpSdrPathDragData : public SdrDragStatUserData { XPolygon aXP; // Ausschnitt aud dem Originalpolygon - FASTBOOL bValid; // sal_False = zu wenig Punkte - FASTBOOL bClosed; // geschlossenes Objekt? + bool bValid; // FALSE = zu wenig Punkte + bool bClosed; // geschlossenes Objekt? sal_uInt16 nPoly; // Nummer des Polygons im PolyPolygon sal_uInt16 nPnt; // Punktnummer innerhalb des obigen Polygons sal_uInt16 nPntAnz; // Punktanzahl des Polygons sal_uInt16 nPntMax; // Maximaler Index - FASTBOOL bBegPnt; // Gedraggter Punkt ist der Anfangspunkt einer Polyline - FASTBOOL bEndPnt; // Gedraggter Punkt ist der Endpunkt einer Polyline + bool bBegPnt; // Gedraggter Punkt ist der Anfangspunkt einer Polyline + bool bEndPnt; // Gedraggter Punkt ist der Endpunkt einer Polyline sal_uInt16 nPrevPnt; // Index des vorherigen Punkts sal_uInt16 nNextPnt; // Index des naechsten Punkts - FASTBOOL bPrevIsBegPnt; // Vorheriger Punkt ist Anfangspunkt einer Polyline - FASTBOOL bNextIsEndPnt; // Folgepunkt ist Endpunkt einer Polyline + bool bPrevIsBegPnt; // Vorheriger Punkt ist Anfangspunkt einer Polyline + bool bNextIsEndPnt; // Folgepunkt ist Endpunkt einer Polyline sal_uInt16 nPrevPrevPnt; // Index des vorvorherigen Punkts sal_uInt16 nNextNextPnt; // Index des uebernaechsten Punkts - FASTBOOL bControl; // Punkt ist ein Kontrollpunkt - FASTBOOL bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt - FASTBOOL bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt - FASTBOOL bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt - FASTBOOL bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt + bool bControl; // Punkt ist ein Kontrollpunkt + bool bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt + bool bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt + bool bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt + bool bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt sal_uInt16 nPrevPrevPnt0; sal_uInt16 nPrevPnt0; sal_uInt16 nPnt0; sal_uInt16 nNextPnt0; sal_uInt16 nNextNextPnt0; - FASTBOOL bEliminate; // Punkt loeschen? (wird von MovDrag gesetzt) + bool bEliminate; // Punkt loeschen? (wird von MovDrag gesetzt) - // ## sal_Bool mbMultiPointDrag; const XPolyPolygon maOrig; XPolyPolygon maMove; @@ -249,15 +249,15 @@ struct ImpPathCreateUser : public SdrDragStatUserData long nCircRadius; long nCircStWink; long nCircRelWink; - FASTBOOL bBezier; - FASTBOOL bBezHasCtrl0; - FASTBOOL bCurve; - FASTBOOL bCircle; - FASTBOOL bAngleSnap; - FASTBOOL bLine; - FASTBOOL bLine90; - FASTBOOL bRect; - FASTBOOL bMixedCreate; + bool bBezier; + bool bBezHasCtrl0; + bool bCurve; + bool bCircle; + bool bAngleSnap; + bool bLine; + bool bLine90; + bool bRect; + bool bMixedCreate; sal_uInt16 nBezierStartPoint; SdrObjKind eStartKind; SdrObjKind eAktKind; @@ -268,18 +268,17 @@ public: bMixedCreate(sal_False),nBezierStartPoint(0),eStartKind(OBJ_NONE),eAktKind(OBJ_NONE) { } void ResetFormFlags() { bBezier=sal_False; bCurve=sal_False; bCircle=sal_False; bLine=sal_False; bRect=sal_False; } - FASTBOOL IsFormFlag() const { return bBezier || bCurve || bCircle || bLine || bRect; } + bool IsFormFlag() const { return bBezier || bCurve || bCircle || bLine || bRect; } XPolygon GetFormPoly() const; - FASTBOOL CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, FASTBOOL bMouseDown); + bool CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, bool bMouseDown); XPolygon GetBezierPoly() const; - //int CalcCurve(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { return sal_False; } XPolygon GetCurvePoly() const { return XPolygon(); } - FASTBOOL CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); + bool CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); XPolygon GetCirclePoly() const; - FASTBOOL CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); + bool CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); Point CalcLine(const Point& rCsr, long nDirX, long nDirY, SdrView* pView) const; XPolygon GetLinePoly() const; - FASTBOOL CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); + bool CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); XPolygon GetRectPoly() const; }; @@ -293,9 +292,9 @@ XPolygon ImpPathCreateUser::GetFormPoly() const return XPolygon(); } -FASTBOOL ImpPathCreateUser::CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, FASTBOOL bMouseDown) +bool ImpPathCreateUser::CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, bool bMouseDown) { - FASTBOOL bRet=sal_True; + bool bRet = true; aBezStart=rP1; aBezCtrl1=rP1+rDir; aBezCtrl2=rP2; @@ -318,7 +317,7 @@ XPolygon ImpPathCreateUser::GetBezierPoly() const return aXP; } -FASTBOOL ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) +bool ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { long nTangAngle=GetAngle(rDir); aCircStart=rP1; @@ -329,7 +328,7 @@ FASTBOOL ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const long dAngle=GetAngle(Point(dx,dy))-nTangAngle; dAngle=NormAngle360(dAngle); long nTmpAngle=NormAngle360(9000-dAngle); - FASTBOOL bRet=nTmpAngle!=9000 && nTmpAngle!=27000; + bool bRet=nTmpAngle!=9000 && nTmpAngle!=27000; long nRad=0; if (bRet) { double cs=cos(nTmpAngle*nPi180); @@ -351,7 +350,7 @@ FASTBOOL ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const if (bAngleSnap) { long nSA=pView->GetSnapAngle(); if (nSA!=0) { // Winkelfang - FASTBOOL bNeg=nCircRelWink<0; + bool bNeg=nCircRelWink<0; if (bNeg) nCircRelWink=-nCircRelWink; nCircRelWink+=nSA/2; nCircRelWink/=nSA; @@ -395,8 +394,8 @@ Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, Sdr { long x=aCsr.X(),x1=x,x2=x; long y=aCsr.Y(),y1=y,y2=y; - FASTBOOL bHLin=nDirY==0; - FASTBOOL bVLin=nDirX==0; + bool bHLin=nDirY==0; + bool bVLin=nDirX==0; if (bHLin) y=0; else if (bVLin) x=0; else { @@ -413,7 +412,7 @@ Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, Sdr return Point(x,y); } -FASTBOOL ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) +bool ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { aLineStart=rP1; aLineEnd=rP2; @@ -443,7 +442,7 @@ XPolygon ImpPathCreateUser::GetLinePoly() const return aXP; } -FASTBOOL ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) +bool ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { aRectP1=rP1; aRectP2=rP1; @@ -454,8 +453,8 @@ FASTBOOL ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const P long nDirY=rDir.Y(); long x=aTmpPt.X(); long y=aTmpPt.Y(); - FASTBOOL bHLin=nDirY==0; - FASTBOOL bVLin=nDirX==0; + bool bHLin=nDirY==0; + bool bVLin=nDirX==0; if (bHLin) y=0; else if (bVLin) x=0; else { @@ -477,7 +476,7 @@ FASTBOOL ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const P long dy1=aRectP2.Y()-aRectP1.Y(); long dy1a=Abs(dy1); long dx2=aRectP3.X()-aRectP2.X(); long dx2a=Abs(dx2); long dy2=aRectP3.Y()-aRectP2.Y(); long dy2a=Abs(dy2); - FASTBOOL b1MoreThan2=dx1a+dy1a>dx2a+dy2a; + bool b1MoreThan2=dx1a+dy1a>dx2a+dy2a; if (b1MoreThan2 != pView->IsBigOrtho()) { long xtemp=dy2a-dx1a; if (dx1<0) xtemp=-xtemp; long ytemp=dx2a-dy1a; if (dy1<0) ytemp=-ytemp; @@ -528,10 +527,10 @@ public: basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const; // create stuff - FASTBOOL BegCreate(SdrDragStat& rStat); - FASTBOOL MovCreate(SdrDragStat& rStat); - FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - FASTBOOL BckCreate(SdrDragStat& rStat); + bool BegCreate(SdrDragStat& rStat); + bool MovCreate(SdrDragStat& rStat); + bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + bool BckCreate(SdrDragStat& rStat); void BrkCreate(SdrDragStat& rStat); Pointer GetCreatePointer() const; @@ -601,7 +600,7 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const if(!mpSdrPathDragData || !mpSdrPathDragData->bValid) { - DBG_ERROR("ImpPathForDragAndCreate::BegDrag(): ImpSdrPathDragData ist ungueltig"); + OSL_FAIL("ImpPathForDragAndCreate::BegDrag(): ImpSdrPathDragData ist ungueltig"); delete mpSdrPathDragData; ((ImpPathForDragAndCreate*)this)->mpSdrPathDragData = 0; return false; @@ -614,7 +613,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const { if(!mpSdrPathDragData || !mpSdrPathDragData->bValid) { - DBG_ERROR("ImpPathForDragAndCreate::MovDrag(): ImpSdrPathDragData ist ungueltig"); + OSL_FAIL("ImpPathForDragAndCreate::MovDrag(): ImpSdrPathDragData ist ungueltig"); return false; } @@ -669,30 +668,29 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const mpSdrPathDragData->ResetPoly(mrSdrPathObject); // Div. Daten lokal Kopieren fuer weniger Code und schnelleren Zugriff - FASTBOOL bClosed =mpSdrPathDragData->bClosed ; // geschlossenes Objekt? + bool bClosed =mpSdrPathDragData->bClosed ; // geschlossenes Objekt? sal_uInt16 nPnt =mpSdrPathDragData->nPnt ; // Punktnummer innerhalb des obigen Polygons - FASTBOOL bBegPnt =mpSdrPathDragData->bBegPnt ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline - FASTBOOL bEndPnt =mpSdrPathDragData->bEndPnt ; // Gedraggter Punkt ist der Endpunkt einer Polyline + bool bBegPnt =mpSdrPathDragData->bBegPnt ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline + bool bEndPnt =mpSdrPathDragData->bEndPnt ; // Gedraggter Punkt ist der Endpunkt einer Polyline sal_uInt16 nPrevPnt =mpSdrPathDragData->nPrevPnt ; // Index des vorherigen Punkts sal_uInt16 nNextPnt =mpSdrPathDragData->nNextPnt ; // Index des naechsten Punkts - FASTBOOL bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline - FASTBOOL bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline + bool bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline + bool bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline sal_uInt16 nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ; // Index des vorvorherigen Punkts sal_uInt16 nNextNextPnt =mpSdrPathDragData->nNextNextPnt ; // Index des uebernaechsten Punkts - FASTBOOL bControl =mpSdrPathDragData->bControl ; // Punkt ist ein Kontrollpunkt - //int bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt - FASTBOOL bIsNextControl=mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt - FASTBOOL bPrevIsControl=mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt - FASTBOOL bNextIsControl=mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt + bool bControl =mpSdrPathDragData->bControl ; // Punkt ist ein Kontrollpunkt + bool bIsNextControl =mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt + bool bPrevIsControl =mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt + bool bNextIsControl =mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt // Ortho bei Linien/Polygonen = Winkel beibehalten if (!bControl && rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho()) { - FASTBOOL bBigOrtho=rDrag.GetView()->IsBigOrtho(); + bool bBigOrtho=rDrag.GetView()->IsBigOrtho(); Point aPos(rDrag.GetNow()); // die aktuelle Position Point aPnt(mpSdrPathDragData->aXP[nPnt]); // der gedraggte Punkt sal_uInt16 nPnt1=0xFFFF,nPnt2=0xFFFF; // seine Nachbarpunkte Point aNeuPos1,aNeuPos2; // die neuen Alternativen fuer aPos - FASTBOOL bPnt1=sal_False,bPnt2=sal_False; // die neuen Alternativen gueltig? + bool bPnt1 = false, bPnt2 = false; // die neuen Alternativen gueltig? if (!bClosed && mpSdrPathDragData->nPntAnz>=2) { // Mind. 2 Pt bei Linien if (!bBegPnt) nPnt1=nPrevPnt; if (!bEndPnt) nPnt2=nNextPnt; @@ -705,16 +703,16 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const Point aPnt1=mpSdrPathDragData->aXP[nPnt1]; long ndx0=aPnt.X()-aPnt1.X(); long ndy0=aPnt.Y()-aPnt1.Y(); - FASTBOOL bHLin=ndy0==0; - FASTBOOL bVLin=ndx0==0; + bool bHLin=ndy0==0; + bool bVLin=ndx0==0; if (!bHLin || !bVLin) { long ndx=aPos.X()-aPnt1.X(); long ndy=aPos.Y()-aPnt1.Y(); bPnt1=sal_True; double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0; double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0; - FASTBOOL bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho); - FASTBOOL bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho); + bool bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho); + bool bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho); if (bHor) ndy=long(ndy0*nXFact); if (bVer) ndx=long(ndx0*nYFact); aNeuPos1=aPnt1; @@ -726,16 +724,16 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const Point aPnt2=mpSdrPathDragData->aXP[nPnt2]; long ndx0=aPnt.X()-aPnt2.X(); long ndy0=aPnt.Y()-aPnt2.Y(); - FASTBOOL bHLin=ndy0==0; - FASTBOOL bVLin=ndx0==0; + bool bHLin=ndy0==0; + bool bVLin=ndx0==0; if (!bHLin || !bVLin) { long ndx=aPos.X()-aPnt2.X(); long ndy=aPos.Y()-aPnt2.Y(); bPnt2=sal_True; double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0; double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0; - FASTBOOL bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho); - FASTBOOL bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho); + bool bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho); + bool bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho); if (bHor) ndy=long(ndy0*nXFact); if (bVer) ndx=long(ndx0*nYFact); aNeuPos2=aPnt2; @@ -859,7 +857,7 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat& rDrag) if(!mpSdrPathDragData || !mpSdrPathDragData->bValid) { - DBG_ERROR("ImpPathForDragAndCreate::MovDrag(): ImpSdrPathDragData ist ungueltig"); + OSL_FAIL("ImpPathForDragAndCreate::MovDrag(): ImpSdrPathDragData ist ungueltig"); return false; } @@ -909,11 +907,11 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat& rDrag) // Winkel anpassen fuer Text an einfacher Linie if (bLineGlueMirror) - { // #40549# + { Point aLinePt1_(aPathPolygon[0][0]); Point aLinePt2_(aPathPolygon[0][1]); - FASTBOOL bXMirr=(aLinePt1_.X()>aLinePt2_.X())!=(aLinePt1.X()>aLinePt2.X()); - FASTBOOL bYMirr=(aLinePt1_.Y()>aLinePt2_.Y())!=(aLinePt1.Y()>aLinePt2.Y()); + bool bXMirr=(aLinePt1_.X()>aLinePt2_.X())!=(aLinePt1.X()>aLinePt2.X()); + bool bYMirr=(aLinePt1_.Y()>aLinePt2_.Y())!=(aLinePt1.Y()>aLinePt2.Y()); if (bXMirr || bYMirr) { Point aRef1(mrSdrPathObject.GetSnapRect().Center()); if (bXMirr) { @@ -936,14 +934,6 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat& rDrag) return true; } -/*void ImpPathForDragAndCreate::cancelSpecialDrag( SdrDragStat& rDrag ) const -{ - ImpSdrPathDragData* pID=(ImpSdrPathDragData*)rDrag.GetUser(); - if (pID!=NULL) { - delete pID; - rDrag.SetUser(NULL); - } -}*/ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) const { @@ -1023,7 +1013,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) if(!pDragData) { - DBG_ERROR("ImpPathForDragAndCreate::MovDrag(): ImpSdrPathDragData ist ungueltig"); + OSL_FAIL("ImpPathForDragAndCreate::MovDrag(): ImpSdrPathDragData ist ungueltig"); return String(); } @@ -1042,8 +1032,8 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) } // dx=0.00 dy=0.00 // Beide Seiten Bezier - // dx=0.00 dy=0.00 l=0.00 0.00 // Anfang oder Ende oder eine Seite Bezier bzw. Hebel - // dx=0.00 dy=0.00 l=0.00 0.00 / l=0.00 0.00 // Mittendrin + // dx=0.00 dy=0.00 l=0.00 0.00� // Anfang oder Ende oder eine Seite Bezier bzw. Hebel + // dx=0.00 dy=0.00 l=0.00 0.00� / l=0.00 0.00� // Mittendrin XubString aMetr; Point aBeg(rDrag.GetStart()); Point aNow(rDrag.GetNow()); @@ -1168,7 +1158,7 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra { if(!mpSdrPathDragData || !mpSdrPathDragData->bValid) { - DBG_ERROR("ImpPathForDragAndCreate::MovDrag(): ImpSdrPathDragData ist ungueltig"); + OSL_FAIL("ImpPathForDragAndCreate::MovDrag(): ImpSdrPathDragData ist ungueltig"); return basegfx::B2DPolyPolygon(); } @@ -1181,29 +1171,28 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra else { const XPolygon& rXP=aPathPolygon[(sal_uInt16)rDrag.GetHdl()->GetPolyNum()]; - if (rXP.GetPointCount()<=2) { //|| rXPoly.GetFlags(1)==XPOLY_CONTROL && rXPoly.GetPointCount()<=4 + if (rXP.GetPointCount()<=2) { XPolygon aXPoly(rXP); aXPoly[(sal_uInt16)rDrag.GetHdl()->GetPointNum()]=rDrag.GetNow(); aRetval.Insert(aXPoly); return aRetval.getB2DPolyPolygon(); } // Div. Daten lokal Kopieren fuer weniger Code und schnelleren Zugriff - FASTBOOL bClosed =mpSdrPathDragData->bClosed ; // geschlossenes Objekt? + bool bClosed =mpSdrPathDragData->bClosed ; // geschlossenes Objekt? sal_uInt16 nPntAnz =mpSdrPathDragData->nPntAnz ; // Punktanzahl sal_uInt16 nPnt =mpSdrPathDragData->nPnt ; // Punktnummer innerhalb des Polygons - FASTBOOL bBegPnt =mpSdrPathDragData->bBegPnt ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline - FASTBOOL bEndPnt =mpSdrPathDragData->bEndPnt ; // Gedraggter Punkt ist der Endpunkt einer Polyline + bool bBegPnt =mpSdrPathDragData->bBegPnt ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline + bool bEndPnt =mpSdrPathDragData->bEndPnt ; // Gedraggter Punkt ist der Endpunkt einer Polyline sal_uInt16 nPrevPnt =mpSdrPathDragData->nPrevPnt ; // Index des vorherigen Punkts sal_uInt16 nNextPnt =mpSdrPathDragData->nNextPnt ; // Index des naechsten Punkts - FASTBOOL bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline - FASTBOOL bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline + bool bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline + bool bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline sal_uInt16 nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ; // Index des vorvorherigen Punkts sal_uInt16 nNextNextPnt =mpSdrPathDragData->nNextNextPnt ; // Index des uebernaechsten Punkts - FASTBOOL bControl =mpSdrPathDragData->bControl ; // Punkt ist ein Kontrollpunkt - //int bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt - FASTBOOL bIsNextControl=mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt - FASTBOOL bPrevIsControl=mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt - FASTBOOL bNextIsControl=mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt + bool bControl =mpSdrPathDragData->bControl ; // Punkt ist ein Kontrollpunkt + bool bIsNextControl =mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt + bool bPrevIsControl =mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt + bool bNextIsControl =mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt XPolygon aXPoly(mpSdrPathDragData->aXP); XPolygon aLine1(2); XPolygon aLine2(2); @@ -1281,18 +1270,18 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra return aRetval.getB2DPolyPolygon(); } -FASTBOOL ImpPathForDragAndCreate::BegCreate(SdrDragStat& rStat) +bool ImpPathForDragAndCreate::BegCreate(SdrDragStat& rStat) { bool bFreeHand(IsFreeHand(meObjectKind)); rStat.SetNoSnap(bFreeHand); rStat.SetOrtho8Possible(); aPathPolygon.Clear(); mbCreating=sal_True; - FASTBOOL bMakeStartPoint=sal_True; + bool bMakeStartPoint = true; SdrView* pView=rStat.GetView(); if (pView!=NULL && pView->IsUseIncompatiblePathCreateInterface() && (meObjectKind==OBJ_POLY || meObjectKind==OBJ_PLIN || meObjectKind==OBJ_PATHLINE || meObjectKind==OBJ_PATHFILL)) { - bMakeStartPoint=sal_False; + bMakeStartPoint = false; } aPathPolygon.Insert(XPolygon()); aPathPolygon[0][0]=rStat.GetStart(); @@ -1303,10 +1292,10 @@ FASTBOOL ImpPathForDragAndCreate::BegCreate(SdrDragStat& rStat) pU->eStartKind=meObjectKind; pU->eAktKind=meObjectKind; rStat.SetUser(pU); - return sal_True; + return true; } -FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) +bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) { ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser(); SdrView* pView=rStat.GetView(); @@ -1343,8 +1332,8 @@ FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) if (nActPoint==0) { rXPoly[0]=rStat.GetPos0(); } else nActPoint--; - FASTBOOL bFreeHand=IsFreeHand(pU->eAktKind); - rStat.SetNoSnap(bFreeHand /*|| (pU->bMixed && pU->eAktKind==OBJ_LINE)*/); + bool bFreeHand=IsFreeHand(pU->eAktKind); + rStat.SetNoSnap(bFreeHand); rStat.SetOrtho8Possible(pU->eAktKind!=OBJ_CARC && pU->eAktKind!=OBJ_RECT && (!pU->bMixedCreate || pU->eAktKind!=OBJ_LINE)); Point aActMerk(rXPoly[nActPoint]); rXPoly[nActPoint]=rStat.Now(); @@ -1356,7 +1345,7 @@ FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) } rXPoly[0]=aPt; } - OutputDevice* pOut=pView==NULL ? NULL : pView->GetFirstOutputDevice(); // GetWin(0); + OutputDevice* pOut=pView==NULL ? NULL : pView->GetFirstOutputDevice(); if (bFreeHand) { if (pU->nBezierStartPoint>nActPoint) pU->nBezierStartPoint=nActPoint; if (rStat.IsMouseDown() && nActPoint>0) { @@ -1410,24 +1399,24 @@ FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) pU->CalcRect(rXPoly[nActPoint-1],rXPoly[nActPoint],rXPoly[nActPoint-1]-rXPoly[nActPoint-2],pView); } - return sal_True; + return true; } -FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser(); - FASTBOOL bRet=sal_False; + bool bRet = false; SdrView* pView=rStat.GetView(); - FASTBOOL bIncomp=pView!=NULL && pView->IsUseIncompatiblePathCreateInterface(); + bool bIncomp=pView!=NULL && pView->IsUseIncompatiblePathCreateInterface(); XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1]; sal_uInt16 nActPoint=rXPoly.GetPointCount()-1; Point aAktMerk(rXPoly[nActPoint]); rXPoly[nActPoint]=rStat.Now(); if (!pU->bMixedCreate && pU->eStartKind==OBJ_LINE) { if (rStat.GetPointAnz()>=2) eCmd=SDRCREATE_FORCEEND; - bRet=eCmd==SDRCREATE_FORCEEND; + bRet = eCmd==SDRCREATE_FORCEEND; if (bRet) { - mbCreating=sal_False; + mbCreating = sal_False; delete pU; rStat.SetUser(NULL); } @@ -1529,7 +1518,7 @@ FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCm return bRet; } -FASTBOOL ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat) +bool ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat) { ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser(); if (aPathPolygon.Count()>0) { @@ -1734,7 +1723,7 @@ void SdrPathObj::ImpForceLineWink() aGeo.RecalcSinCos(); aGeo.RecalcTan(); - // #101412# for SdrTextObj, keep aRect up to date + // for SdrTextObj, keep aRect up to date aRect = Rectangle(aPoint0, aPoint1); aRect.Justify(); } @@ -1778,7 +1767,7 @@ void SdrPathObj::ImpForceKind() } else { - // #i10659#, similar to #101412# but for polys with more than 2 points. + // #i10659#, for polys with more than 2 points. // // Here i again need to fix something, because when Path-Polys are Copy-Pasted // between Apps with different measurements (e.g. 100TH_MM and TWIPS) there is @@ -1867,8 +1856,8 @@ void SdrPathObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { rInfo.bNoContortion=sal_False; - FASTBOOL bCanConv = !HasText() || ImpCanConvTextToCurve(); - FASTBOOL bIsPath = IsBezier() || IsSpline(); + bool bCanConv = !HasText() || ImpCanConvTextToCurve(); + bool bIsPath = IsBezier() || IsSpline(); rInfo.bEdgeRadiusAllowed = sal_False; rInfo.bCanConvToPath = bCanConv && !bIsPath; @@ -1881,11 +1870,18 @@ sal_uInt16 SdrPathObj::GetObjIdentifier() const return sal_uInt16(meKind); } -void SdrPathObj::operator=(const SdrObject& rObj) +SdrPathObj* SdrPathObj::Clone() const { + return CloneHelper< SdrPathObj >(); +} + +SdrPathObj& SdrPathObj::operator=(const SdrPathObj& rObj) +{ + if( this == &rObj ) + return *this; SdrTextObj::operator=(rObj); - SdrPathObj& rPath=(SdrPathObj&)rObj; - maPathPolygon=rPath.GetPathPoly(); + maPathPolygon=rObj.GetPathPoly(); + return *this; } void SdrPathObj::TakeObjNameSingul(XubString& rName) const @@ -2038,7 +2034,7 @@ SdrHdl* SdrPathObj::GetHdl(sal_uInt32 nHdlNum) const { // #i73248# // Warn the user that this is ineffective and show alternatives. Should not be used at all. - OSL_ENSURE(false, "SdrPathObj::GetHdl(): ineffective, use AddToHdlList instead (!)"); + OSL_FAIL("SdrPathObj::GetHdl(): ineffective, use AddToHdlList instead (!)"); // to have an alternative, get single handle using the ineffective way SdrHdl* pRetval = 0; @@ -2061,7 +2057,7 @@ void SdrPathObj::AddToHdlList(SdrHdlList& rHdlList) const // keep old stuff to be able to keep old SdrHdl stuff, too const XPolyPolygon aOldPathPolygon(GetPathPoly()); sal_uInt16 nPolyCnt=aOldPathPolygon.Count(); - FASTBOOL bClosed=IsClosed(); + bool bClosed=IsClosed(); sal_uInt16 nIdx=0; for (sal_uInt16 i=0; i<nPolyCnt; i++) { @@ -2241,20 +2237,20 @@ basegfx::B2DPolyPolygon SdrPathObj::getSpecialDragPoly(const SdrDragStat& rDrag) //////////////////////////////////////////////////////////////////////////////////////////////////// -FASTBOOL SdrPathObj::BegCreate(SdrDragStat& rStat) +bool SdrPathObj::BegCreate(SdrDragStat& rStat) { impDeleteDAC(); return impGetDAC().BegCreate(rStat); } -FASTBOOL SdrPathObj::MovCreate(SdrDragStat& rStat) +bool SdrPathObj::MovCreate(SdrDragStat& rStat) { return impGetDAC().MovCreate(rStat); } -FASTBOOL SdrPathObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +bool SdrPathObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { - FASTBOOL bRetval(impGetDAC().EndCreate(rStat, eCmd)); + bool bRetval(impGetDAC().EndCreate(rStat, eCmd)); if(bRetval && mpDAC) { @@ -2299,7 +2295,7 @@ FASTBOOL SdrPathObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) return bRetval; } -FASTBOOL SdrPathObj::BckCreate(SdrDragStat& rStat) +bool SdrPathObj::BckCreate(SdrDragStat& rStat) { return impGetDAC().BckCreate(rStat); } @@ -2382,7 +2378,7 @@ void SdrPathObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs) SdrTextObj::NbcRotate(rRef,nWink,sn,cs); } -void SdrPathObj::NbcShear(const Point& rRefPnt, long nAngle, double fTan, FASTBOOL bVShear) +void SdrPathObj::NbcShear(const Point& rRefPnt, long nAngle, double fTan, bool bVShear) { basegfx::B2DHomMatrix aTrans(basegfx::tools::createTranslateB2DHomMatrix(-rRefPnt.X(), -rRefPnt.Y())); @@ -2415,7 +2411,7 @@ void SdrPathObj::NbcMirror(const Point& rRefPnt1, const Point& rRefPnt2) aTrans.translate(rRefPnt1.X(), rRefPnt1.Y()); maPathPolygon.transform(aTrans); - // #97538# Do Joe's special handling for lines when mirroring, too + // Do Joe's special handling for lines when mirroring, too ImpForceKind(); // #i19871# first modify locally, then call parent (to get correct SnapRect with GluePoints) @@ -2452,12 +2448,12 @@ void SdrPathObj::NbcSetSnapRect(const Rectangle& rRect) { Rectangle aOld(GetSnapRect()); - // #95736# Take RECT_EMPTY into account when calculating scale factors + // Take RECT_EMPTY into account when calculating scale factors long nMulX = (RECT_EMPTY == rRect.Right()) ? 0 : rRect.Right() - rRect.Left(); long nDivX = aOld.Right() - aOld.Left(); - // #95736# Take RECT_EMPTY into account when calculating scale factors + // Take RECT_EMPTY into account when calculating scale factors long nMulY = (RECT_EMPTY == rRect.Bottom()) ? 0 : rRect.Bottom() - rRect.Top(); long nDivY = aOld.Bottom() - aOld.Top(); @@ -2822,7 +2818,7 @@ void SdrPathObj::SetPathPoly(const basegfx::B2DPolyPolygon& rPathPoly) } } -void SdrPathObj::ToggleClosed() // long nOpenDistance) +void SdrPathObj::ToggleClosed() { Rectangle aBoundRect0; if(pUserCall != NULL) @@ -2984,7 +2980,7 @@ sal_Bool SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx:: } default: { - DBG_ERROR("TRGetBaseGeometry: Missing unit translation to 100th mm!"); + OSL_FAIL("TRGetBaseGeometry: Missing unit translation to 100th mm!"); } } } @@ -3054,7 +3050,7 @@ void SdrPathObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b } default: { - DBG_ERROR("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); + OSL_FAIL("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); } } } @@ -3114,5 +3110,4 @@ void SdrPathObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b SetPathPoly(aNewPolyPolygon); } -////////////////////////////////////////////////////////////////////////////// -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index c6202b825561..e6ecaee1a2bb 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -136,9 +137,9 @@ void SdrRectObj::SetXPolyDirty() } } -FASTBOOL SdrRectObj::PaintNeedsXPoly(long nEckRad) const +bool SdrRectObj::PaintNeedsXPoly(long nEckRad) const { - FASTBOOL bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || nEckRad!=0; + bool bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || nEckRad!=0; return bNeed; } @@ -183,7 +184,7 @@ const XPolygon& SdrRectObj::GetXPoly() const void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - FASTBOOL bNoTextFrame=!IsTextFrame(); + bool bNoTextFrame=!IsTextFrame(); rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0; rInfo.bResizePropAllowed=sal_True; rInfo.bRotateFreeAllowed=sal_True; @@ -202,7 +203,7 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bShearAllowed =bNoTextFrame; rInfo.bEdgeRadiusAllowed=sal_True; - FASTBOOL bCanConv=!HasText() || ImpCanConvTextToCurve(); + bool bCanConv=!HasText() || ImpCanConvTextToCurve(); if (bCanConv && !bNoTextFrame && !HasText()) { bCanConv=HasFill() || HasLine(); } @@ -280,9 +281,9 @@ void SdrRectObj::TakeObjNamePlural(XubString& rName) const } } -void SdrRectObj::operator=(const SdrObject& rObj) +SdrRectObj* SdrRectObj::Clone() const { - SdrTextObj::operator=(rObj); + return CloneHelper< SdrRectObj >(); } basegfx::B2DPolyPolygon SdrRectObj::TakeXorPoly() const @@ -509,7 +510,7 @@ void SdrRectObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs) SetXPolyDirty(); } -void SdrRectObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SdrRectObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { SdrTextObj::NbcShear(rRef,nWink,tn,bVShear); SetXPolyDirty(); @@ -521,7 +522,7 @@ void SdrRectObj::NbcMirror(const Point& rRef1, const Point& rRef2) SetXPolyDirty(); } -FASTBOOL SdrRectObj::DoMacro(const SdrObjMacroHitRec& rRec) +bool SdrRectObj::DoMacro(const SdrObjMacroHitRec& rRec) { return SdrTextObj::DoMacro(rRec); } @@ -586,7 +587,7 @@ SdrGluePoint SdrRectObj::GetCornerGluePoint(sal_uInt16 nPosNum) const SdrObject* SdrRectObj::DoConvertToPolyObj(sal_Bool bBezier) const { XPolygon aXP(ImpCalcXPoly(aRect,GetEckenradius())); - { // #40608# Nur Uebergangsweise bis zum neuen TakeContour() + { // Nur Uebergangsweise bis zum neuen TakeContour() aXP.Remove(0,1); aXP[aXP.GetPointCount()-1]=aXP[0]; } @@ -617,4 +618,4 @@ void SdrRectObj::RestGeoData(const SdrObjGeoData& rGeo) SetXPolyDirty(); } -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 7c0d7e6568af..b6d2d1c613c4 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,21 +74,10 @@ using namespace com::sun::star; ////////////////////////////////////////////////////////////////////////////// -// #104018# replace macros above with type-safe methods +// replace macros above with type-safe methods inline double ImplTwipsToMM(double fVal) { return (fVal * (127.0 / 72.0)); } inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); } -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@@@@@ @@@@@ @@ @@ @@@@@@ @@@@ @@@@@ @@@@@@ -// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@ -// @@ @@@@ @@@ @@ @@ @@ @@@@@ @@ -// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@@@@ @@ @@ @@ @@@@ @@@@@ @@@@ -// -//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// // BaseProperties section @@ -123,20 +113,14 @@ SdrTextObj::SdrTextObj() bNoMirror=sal_False; bDisableAutoWidthOnDragging=sal_False; - // #101684# mbInEditMode = sal_False; - - // #111096# mbTextHidden = sal_False; - - // #111096# mbTextAnimationAllowed = sal_True; - - // #108784# maTextEditOffset = Point(0, 0); // #i25616# mbSupportTextIndentingOnLineWidthChange = sal_True; + mbInDownScale = sal_False; } SdrTextObj::SdrTextObj(const Rectangle& rNewRect) @@ -154,16 +138,10 @@ SdrTextObj::SdrTextObj(const Rectangle& rNewRect) bDisableAutoWidthOnDragging=sal_False; ImpJustifyRect(aRect); - // #101684# mbInEditMode = sal_False; - - // #111096# mbTextHidden = sal_False; - - // #111096# mbTextAnimationAllowed = sal_True; - - // #108784# + mbInDownScale = sal_False; maTextEditOffset = Point(0, 0); // #i25616# @@ -184,16 +162,10 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind) bNoMirror=sal_True; bDisableAutoWidthOnDragging=sal_False; - // #101684# mbInEditMode = sal_False; - - // #111096# mbTextHidden = sal_False; - - // #111096# mbTextAnimationAllowed = sal_True; - - // #108784# + mbInDownScale = sal_False; maTextEditOffset = Point(0, 0); // #i25616# @@ -216,16 +188,10 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect) bDisableAutoWidthOnDragging=sal_False; ImpJustifyRect(aRect); - // #101684# mbInEditMode = sal_False; - - // #111096# mbTextHidden = sal_False; - - // #111096# mbTextAnimationAllowed = sal_True; - - // #108784# + mbInDownScale = sal_False; maTextEditOffset = Point(0, 0); // #i25616# @@ -250,16 +216,10 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStr NbcSetText(rInput, rBaseURL, eFormat); - // #101684# mbInEditMode = sal_False; - - // #111096# mbTextHidden = sal_False; - - // #111096# mbTextAnimationAllowed = sal_True; - - // #108784# + mbInDownScale = sal_False; maTextEditOffset = Point(0, 0); // #i25616# @@ -315,12 +275,10 @@ void SdrTextObj::NbcSetText(const XubString& rStr) { SdrOutliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetStyleSheet( 0, GetStyleSheet()); - //OutputDevice* pRef1=rOutliner.GetRefDevice(); rOutliner.SetUpdateMode(sal_True); rOutliner.SetText(rStr,rOutliner.GetParagraph( 0 )); OutlinerParaObject* pNewText=rOutliner.CreateParaObject(); Size aSiz(rOutliner.CalcTextSize()); - //OutputDevice* pRef2=rOutliner.GetRefDevice(); rOutliner.Clear(); NbcSetOutlinerParaObject(pNewText); aTextSize=aSiz; @@ -330,14 +288,10 @@ void SdrTextObj::NbcSetText(const XubString& rStr) void SdrTextObj::SetText(const XubString& rStr) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcSetText(rStr); SetChanged(); BroadcastObjectChange(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); - //if (GetBoundRect()!=aBoundRect0) { - // SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); - //} } void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat) @@ -357,7 +311,6 @@ void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 void SdrTextObj::SetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcSetText(rInput,rBaseURL,eFormat); SetChanged(); BroadcastObjectChange(); @@ -385,7 +338,7 @@ const Size& SdrTextObj::GetTextSize() const return aTextSize; } -FASTBOOL SdrTextObj::IsAutoGrowHeight() const +bool SdrTextObj::IsAutoGrowHeight() const { if(!bTextFrame) return sal_False; // AutoGrow nur bei TextFrames @@ -410,7 +363,7 @@ FASTBOOL SdrTextObj::IsAutoGrowHeight() const return bRet; } -FASTBOOL SdrTextObj::IsAutoGrowWidth() const +bool SdrTextObj::IsAutoGrowWidth() const { if(!bTextFrame) return sal_False; // AutoGrow nur bei TextFrames @@ -418,7 +371,6 @@ FASTBOOL SdrTextObj::IsAutoGrowWidth() const const SfxItemSet& rSet = GetObjectItemSet(); sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue(); - // #101684# sal_Bool bInEditMOde = IsInEditMode(); if(!bInEditMOde && bRet) @@ -450,7 +402,6 @@ SdrTextHorzAdjust SdrTextObj::GetTextHorizontalAdjust(const SfxItemSet& rSet) co SdrTextHorzAdjust eRet = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue(); - // #101684# sal_Bool bInEditMode = IsInEditMode(); if(!bInEditMode && eRet == SDRTEXTHORZADJUST_BLOCK) @@ -481,11 +432,11 @@ SdrTextVertAdjust SdrTextObj::GetTextVerticalAdjust(const SfxItemSet& rSet) cons if(IsContourTextFrame()) return SDRTEXTVERTADJUST_TOP; - // #103516# Take care for vertical text animation here + // Take care for vertical text animation here SdrTextVertAdjust eRet = ((SdrTextVertAdjustItem&)(rSet.Get(SDRATTR_TEXT_VERTADJUST))).GetValue(); sal_Bool bInEditMode = IsInEditMode(); - // #103516# Take care for vertical text animation here + // Take care for vertical text animation here if(!bInEditMode && eRet == SDRTEXTVERTADJUST_BLOCK) { SdrTextAniKind eAniKind = ((SdrTextAniKindItem&)(rSet.Get(SDRATTR_TEXT_ANIKIND))).GetValue(); @@ -523,7 +474,7 @@ void SdrTextObj::ImpCheckShear() void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - FASTBOOL bNoTextFrame=!IsTextFrame(); + bool bNoTextFrame=!IsTextFrame(); rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0; rInfo.bResizePropAllowed=sal_True; rInfo.bRotateFreeAllowed=sal_True; @@ -540,7 +491,7 @@ void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT); rInfo.bShearAllowed =bNoTextFrame; rInfo.bEdgeRadiusAllowed=sal_True; - FASTBOOL bCanConv=ImpCanConvTextToCurve(); + bool bCanConv=ImpCanConvTextToCurve(); rInfo.bCanConvToPath =bCanConv; rInfo.bCanConvToPoly =bCanConv; rInfo.bCanConvToPathLineToArea=bCanConv; @@ -577,16 +528,16 @@ bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner ) return bRet; } -FASTBOOL SdrTextObj::HasEditText() const +bool SdrTextObj::HasEditText() const { return HasTextImpl( pEdtOutl ); } void SdrTextObj::SetPage(SdrPage* pNewPage) { - FASTBOOL bRemove=pNewPage==NULL && pPage!=NULL; - FASTBOOL bInsert=pNewPage!=NULL && pPage==NULL; - FASTBOOL bLinked=IsLinkedText(); + bool bRemove=pNewPage==NULL && pPage!=NULL; + bool bInsert=pNewPage!=NULL && pPage==NULL; + bool bLinked=IsLinkedText(); if (bLinked && bRemove) { ImpLinkAbmeldung(); @@ -632,29 +583,29 @@ void SdrTextObj::SetModel(SdrModel* pNewModel) } } -FASTBOOL SdrTextObj::NbcSetEckenradius(long nRad) +bool SdrTextObj::NbcSetEckenradius(long nRad) { SetObjectItem(SdrEckenradiusItem(nRad)); - return sal_True; + return true; } -FASTBOOL SdrTextObj::NbcSetAutoGrowHeight(bool bAuto) +bool SdrTextObj::NbcSetAutoGrowHeight(bool bAuto) { if(bTextFrame) { SetObjectItem(SdrTextAutoGrowHeightItem(bAuto)); - return sal_True; + return true; } - return sal_False; + return false; } -FASTBOOL SdrTextObj::NbcSetMinTextFrameHeight(long nHgt) +bool SdrTextObj::NbcSetMinTextFrameHeight(long nHgt) { - if( bTextFrame && ( !pModel || !pModel->isLocked() ) ) // SJ: #i44922# + if( bTextFrame && ( !pModel || !pModel->isLocked() ) ) // #i44922# { SetObjectItem(SdrTextMinFrameHeightItem(nHgt)); - // #84974# use bDisableAutoWidthOnDragging as + // use bDisableAutoWidthOnDragging as // bDisableAutoHeightOnDragging if vertical. if(IsVerticalWriting() && bDisableAutoWidthOnDragging) { @@ -662,38 +613,38 @@ FASTBOOL SdrTextObj::NbcSetMinTextFrameHeight(long nHgt) SetObjectItem(SdrTextAutoGrowHeightItem(sal_False)); } - return sal_True; + return true; } - return sal_False; + return false; } -FASTBOOL SdrTextObj::NbcSetMaxTextFrameHeight(long nHgt) +bool SdrTextObj::NbcSetMaxTextFrameHeight(long nHgt) { if(bTextFrame) { SetObjectItem(SdrTextMaxFrameHeightItem(nHgt)); - return sal_True; + return true; } - return sal_False; + return false; } -FASTBOOL SdrTextObj::NbcSetAutoGrowWidth(bool bAuto) +bool SdrTextObj::NbcSetAutoGrowWidth(bool bAuto) { if(bTextFrame) { SetObjectItem(SdrTextAutoGrowWidthItem(bAuto)); - return sal_True; + return true; } - return sal_False; + return false; } -FASTBOOL SdrTextObj::NbcSetMinTextFrameWidth(long nWdt) +bool SdrTextObj::NbcSetMinTextFrameWidth(long nWdt) { - if( bTextFrame && ( !pModel || !pModel->isLocked() ) ) // SJ: #i44922# + if( bTextFrame && ( !pModel || !pModel->isLocked() ) ) // #i44922# { SetObjectItem(SdrTextMinFrameWidthItem(nWdt)); - // #84974# use bDisableAutoWidthOnDragging only + // use bDisableAutoWidthOnDragging only // when not vertical. if(!IsVerticalWriting() && bDisableAutoWidthOnDragging) { @@ -701,29 +652,29 @@ FASTBOOL SdrTextObj::NbcSetMinTextFrameWidth(long nWdt) SetObjectItem(SdrTextAutoGrowWidthItem(sal_False)); } - return sal_True; + return true; } - return sal_False; + return false; } -FASTBOOL SdrTextObj::NbcSetMaxTextFrameWidth(long nWdt) +bool SdrTextObj::NbcSetMaxTextFrameWidth(long nWdt) { if(bTextFrame) { SetObjectItem(SdrTextMaxFrameWidthItem(nWdt)); - return sal_True; + return true; } - return sal_False; + return false; } -FASTBOOL SdrTextObj::NbcSetFitToSize(SdrFitToSizeType eFit) +bool SdrTextObj::NbcSetFitToSize(SdrFitToSizeType eFit) { if(bTextFrame) { SetObjectItem(SdrTextFitToSizeTypeItem(eFit)); - return sal_True; + return true; } - return sal_False; + return false; } void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const @@ -747,7 +698,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho // Beim Hittest muss das unterbleiben (Performance!) pContourPolyPolygon = new basegfx::B2DPolyPolygon(); - // #86258# test if shadow needs to be avoided for TakeContour() + // test if shadow needs to be avoided for TakeContour() const SfxItemSet& rSet = GetObjectItemSet(); sal_Bool bShadowOn = ((SdrShadowItem&)(rSet.Get(SDRATTR_SHADOW))).GetValue(); @@ -759,7 +710,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho if(bShadowOn) { - // #86258# force shadow off + // force shadow off SdrObject* pCopy = Clone(); pCopy->SetMergedItem(SdrShadowItem(sal_False)); *pContourPolyPolygon = pCopy->TakeContour(); @@ -795,7 +746,7 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const long nUpperDist=GetTextUpperDistance(); long nLowerDist=GetTextLowerDistance(); Rectangle aAnkRect(aRect); // Rect innerhalb dem geankert wird - FASTBOOL bFrame=IsTextFrame(); + bool bFrame=IsTextFrame(); if (!bFrame) { TakeUnrotatedSnapRect(aAnkRect); } @@ -805,7 +756,6 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const aAnkRect.Right()-=nRightDist; aAnkRect.Bottom()-=nLowerDist; - // #108816# // Since sizes may be bigger than the object bounds it is necessary to // justify the rect now. ImpJustifyRect(aAnkRect); @@ -824,8 +774,8 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const rAnchorRect=aAnkRect; } -void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, - Rectangle* pAnchorRect, sal_Bool bLineWidth ) const +void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, + Rectangle* pAnchorRect, bool bLineWidth ) const { Rectangle aAnkRect; // Rect innerhalb dem geankert wird TakeTextAnchorRect(aAnkRect); @@ -834,11 +784,10 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS SdrTextAniKind eAniKind=GetTextAniKind(); SdrTextAniDirection eAniDirection=GetTextAniDirection(); - SdrFitToSizeType eFit=GetFitToSize(); - FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); - FASTBOOL bContourFrame=IsContourTextFrame(); + bool bFitToSize(IsFitToSize()); + bool bContourFrame=IsContourTextFrame(); - FASTBOOL bFrame=IsTextFrame(); + bool bFrame=IsTextFrame(); sal_uIntPtr nStat0=rOutliner.GetControlWord(); Size aNullSize; if (!bContourFrame) @@ -857,7 +806,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS long nWdt=nAnkWdt; long nHgt=nAnkHgt; - // #101684# sal_Bool bInEditMode = IsInEditMode(); if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE)) @@ -869,7 +817,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS rOutliner.SetMaxAutoPaperSize(Size(nWdt,nHgt)); } - // #103516# New try with _BLOCK for hor and ver after completely + // New try with _BLOCK for hor and ver after completely // supporting full width for vertical text. if(SDRTEXTHORZADJUST_BLOCK == eHAdj && !IsVerticalWriting()) { @@ -928,7 +876,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS Point aTextPos(aAnkRect.TopLeft()); Size aTextSiz(rOutliner.GetPaperSize()); // GetPaperSize() hat etwas Toleranz drauf, oder? - // #106653# // For draw objects containing text correct hor/ver alignment if text is bigger // than the object itself. Without that correction, the text would always be // formatted to the left edge (or top edge when vertical) of the draw object. @@ -936,7 +883,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS { if(aAnkRect.GetWidth() < aTextSiz.Width() && !IsVerticalWriting()) { - // #110129# // Horizontal case here. Correct only if eHAdj == SDRTEXTHORZADJUST_BLOCK, // else the alignment is wanted. if(SDRTEXTHORZADJUST_BLOCK == eHAdj) @@ -947,7 +893,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS if(aAnkRect.GetHeight() < aTextSiz.Height() && IsVerticalWriting()) { - // #110129# // Vertical case here. Correct only if eHAdj == SDRTEXTVERTADJUST_BLOCK, // else the alignment is wanted. if(SDRTEXTVERTADJUST_BLOCK == eVAdj) @@ -996,14 +941,14 @@ OutlinerParaObject* SdrTextObj::GetEditOutlinerParaObject() const return pPara; } -void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& rTextRect, const Rectangle& rAnchorRect, Fraction& rFitXKorreg) const +void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg) const { OutputDevice* pOut = rOutliner.GetRefDevice(); sal_Bool bNoStretching(sal_False); if(pOut && pOut->GetOutDevType() == OUTDEV_PRINTER) { - // #35762#: Checken ob CharStretching ueberhaupt moeglich + // Checken ob CharStretching ueberhaupt moeglich GDIMetaFile* pMtf = pOut->GetConnectMetaFile(); UniString aTestString(sal_Unicode('J')); @@ -1030,7 +975,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& r bNoStretching = (aSize1 == aSize2); #ifdef WNT - // #35762# Windows vergroessert bei Size(100,500) den Font proportional + // Windows vergroessert bei Size(100,500) den Font proportional // Und das finden wir nicht so schoen. if(aSize2.Height() >= aSize1.Height() * 2) { @@ -1039,14 +984,14 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& r #endif } unsigned nLoopCount=0; - FASTBOOL bNoMoreLoop=sal_False; + bool bNoMoreLoop = false; long nXDiff0=0x7FFFFFFF; - long nWantWdt=rAnchorRect.Right()-rAnchorRect.Left(); - long nIsWdt=rTextRect.Right()-rTextRect.Left(); + long nWantWdt=rShapeSize.Width(); + long nIsWdt=rTextSize.Width(); if (nIsWdt==0) nIsWdt=1; - long nWantHgt=rAnchorRect.Bottom()-rAnchorRect.Top(); - long nIsHgt=rTextRect.Bottom()-rTextRect.Top(); + long nWantHgt=rShapeSize.Height(); + long nIsHgt=rTextSize.Height(); if (nIsHgt==0) nIsHgt=1; long nXTolPl=nWantWdt/100; // Toleranz +1% @@ -1055,34 +1000,33 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& r long nX=(nWantWdt*100) /nIsWdt; // X-Stretching berechnen long nY=(nWantHgt*100) /nIsHgt; // Y-Stretching berechnen - FASTBOOL bChkX=sal_True; - FASTBOOL bChkY=sal_True; - if (bNoStretching) { // #35762# evtl. nur proportional moeglich + bool bChkX = true; + if (bNoStretching) { // evtl. nur proportional moeglich if (nX>nY) { nX=nY; bChkX=sal_False; } - else { nY=nX; bChkY=sal_False; } + else { nY=nX; } } while (nLoopCount<5 && !bNoMoreLoop) { if (nX<0) nX=-nX; - if (nX<1) { nX=1; bNoMoreLoop=sal_True; } - if (nX>65535) { nX=65535; bNoMoreLoop=sal_True; } + if (nX<1) { nX=1; bNoMoreLoop = true; } + if (nX>65535) { nX=65535; bNoMoreLoop = true; } if (nY<0) nY=-nY; - if (nY<1) { nY=1; bNoMoreLoop=sal_True; } - if (nY>65535) { nY=65535; bNoMoreLoop=sal_True; } + if (nY<1) { nY=1; bNoMoreLoop = true; } + if (nY>65535) { nY=65535; bNoMoreLoop = true; } // exception, there is no text yet (horizontal case) if(nIsWdt <= 1) { nX = nY; - bNoMoreLoop = sal_True; + bNoMoreLoop = true; } - // #87877# exception, there is no text yet (vertical case) + // exception, there is no text yet (vertical case) if(nIsHgt <= 1) { nY = nX; - bNoMoreLoop = sal_True; + bNoMoreLoop = true; } rOutliner.SetGlobalCharStretching((sal_uInt16)nX,(sal_uInt16)nY); @@ -1090,8 +1034,8 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& r Size aSiz(rOutliner.CalcTextSize()); long nXDiff=aSiz.Width()-nWantWdt; rFitXKorreg=Fraction(nWantWdt,aSiz.Width()); - if (((nXDiff>=nXTolMi || !bChkX) && nXDiff<=nXTolPl) || nXDiff==nXDiff0/*&& Abs(nYDiff)<=nYTol*/) { - bNoMoreLoop=sal_True; + if (((nXDiff>=nXTolMi || !bChkX) && nXDiff<=nXTolPl) || nXDiff==nXDiff0) { + bNoMoreLoop = true; } else { // Stretchingfaktoren korregieren long nMul=nWantWdt; @@ -1109,14 +1053,12 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& r void SdrTextObj::StartTextAnimation(OutputDevice* /*pOutDev*/, const Point& /*rOffset*/, long /*nExtraData*/) { - // #111096# // use new text animation SetTextAnimationAllowed(sal_True); } void SdrTextObj::StopTextAnimation(OutputDevice* /*pOutDev*/, long /*nExtraData*/) { - // #111096# // use new text animation SetTextAnimationAllowed(sal_False); } @@ -1156,11 +1098,11 @@ void SdrTextObj::TakeObjNameSingul(XubString& rName) const XubString aStr2(pOutlinerParaObject->GetTextObject().GetText(0)); aStr2.EraseLeadingChars(); - // #69446# avoid non expanded text portions in object name + // avoid non expanded text portions in object name // (second condition is new) if(aStr2.Len() && aStr2.Search(sal_Unicode(255)) == STRING_NOTFOUND) { - // #76681# space between ResStr and content text + // space between ResStr and content text aStr += sal_Unicode(' '); aStr += sal_Unicode('\''); @@ -1204,47 +1146,51 @@ void SdrTextObj::TakeObjNamePlural(XubString& rName) const } // switch } -void SdrTextObj::operator=(const SdrObject& rObj) +SdrTextObj* SdrTextObj::Clone() const { + return CloneHelper< SdrTextObj >(); +} + +SdrTextObj& SdrTextObj::operator=(const SdrTextObj& rObj) +{ + if( this == &rObj ) + return *this; // call parent SdrObject::operator=(rObj); - const SdrTextObj* pTextObj = dynamic_cast< const SdrTextObj* >( &rObj ); - if (pTextObj!=NULL) - { - aRect =pTextObj->aRect; - aGeo =pTextObj->aGeo; - eTextKind =pTextObj->eTextKind; - bTextFrame=pTextObj->bTextFrame; - aTextSize=pTextObj->aTextSize; - bTextSizeDirty=pTextObj->bTextSizeDirty; + aRect =rObj.aRect; + aGeo =rObj.aGeo; + eTextKind =rObj.eTextKind; + bTextFrame=rObj.bTextFrame; + aTextSize=rObj.aTextSize; + bTextSizeDirty=rObj.bTextSizeDirty; - // #101776# Not all of the necessary parameters were copied yet. - bNoShear = pTextObj->bNoShear; - bNoRotate = pTextObj->bNoRotate; - bNoMirror = pTextObj->bNoMirror; - bDisableAutoWidthOnDragging = pTextObj->bDisableAutoWidthOnDragging; + // Not all of the necessary parameters were copied yet. + bNoShear = rObj.bNoShear; + bNoRotate = rObj.bNoRotate; + bNoMirror = rObj.bNoMirror; + bDisableAutoWidthOnDragging = rObj.bDisableAutoWidthOnDragging; - OutlinerParaObject* pNewOutlinerParaObject = 0; + OutlinerParaObject* pNewOutlinerParaObject = 0; - SdrText* pText = getActiveText(); + SdrText* pText = getActiveText(); - if( pText && pTextObj->HasText() ) + if( pText && rObj.HasText() ) + { + const Outliner* pEO=rObj.pEdtOutl; + if (pEO!=NULL) { - const Outliner* pEO=pTextObj->pEdtOutl; - if (pEO!=NULL) - { - pNewOutlinerParaObject = pEO->CreateParaObject(); - } - else - { - pNewOutlinerParaObject = new OutlinerParaObject(*pTextObj->getActiveText()->GetOutlinerParaObject()); - } + pNewOutlinerParaObject = pEO->CreateParaObject(); + } + else + { + pNewOutlinerParaObject = new OutlinerParaObject(*rObj.getActiveText()->GetOutlinerParaObject()); } - - mpText->SetOutlinerParaObject( pNewOutlinerParaObject ); - ImpSetTextStyleSheetListeners(); } + + mpText->SetOutlinerParaObject( pNewOutlinerParaObject ); + ImpSetTextStyleSheetListeners(); + return *this; } basegfx::B2DPolyPolygon SdrTextObj::TakeXorPoly() const @@ -1265,7 +1211,7 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeContour() const // und nun noch ggf. das BoundRect des Textes dazu if ( pModel && GetOutlinerParaObject() && !IsFontwork() && !IsContourTextFrame() ) { - // #80328# using Clone()-Paint() strategy inside TakeContour() leaves a destroyed + // using Clone()-Paint() strategy inside TakeContour() leaves a destroyed // SdrObject as pointer in DrawOutliner. Set *this again in fetching the outliner // in every case SdrOutliner& rOutliner=ImpGetDrawOutliner(); @@ -1274,8 +1220,7 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeContour() const Rectangle aR; TakeTextRect(rOutliner,aR,sal_False,&aAnchor2); rOutliner.Clear(); - SdrFitToSizeType eFit=GetFitToSize(); - FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); + bool bFitToSize(IsFitToSize()); if (bFitToSize) aR=aAnchor2; Polygon aPol(aR); if (aGeo.nDrehWink!=0) RotatePoly(aPol,aR.TopLeft(),aGeo.nSin,aGeo.nCos); @@ -1343,7 +1288,7 @@ void SdrTextObj::ImpCheckMasterCachable() } } -// #101029#: Extracted from ImpGetDrawOutliner() +// Extracted from ImpGetDrawOutliner() void SdrTextObj::ImpInitDrawOutliner( SdrOutliner& rOutl ) const { rOutl.SetUpdateMode(sal_False); @@ -1368,7 +1313,7 @@ SdrOutliner& SdrTextObj::ImpGetDrawOutliner() const { SdrOutliner& rOutl=pModel->GetDrawOutliner(this); - // #101029#: Code extracted to ImpInitDrawOutliner() + // Code extracted to ImpInitDrawOutliner() ImpInitDrawOutliner( rOutl ); return rOutl; @@ -1381,8 +1326,8 @@ boost::shared_ptr< SdrOutliner > SdrTextObj::CreateDrawOutliner() return xDrawOutliner; } -// #101029#: Extracted from Paint() -void SdrTextObj::ImpSetupDrawOutlinerForPaint( FASTBOOL bContourFrame, +// Extracted from Paint() +void SdrTextObj::ImpSetupDrawOutlinerForPaint( bool bContourFrame, SdrOutliner& rOutliner, Rectangle& rTextRect, Rectangle& rAnchorRect, @@ -1392,8 +1337,7 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( FASTBOOL bContourFrame, if (!bContourFrame) { // FitToSize erstmal nicht mit ContourFrame - SdrFitToSizeType eFit=GetFitToSize(); - if (eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES) + if (IsFitToSize() || IsAutoFit()) { sal_uIntPtr nStat=rOutliner.GetControlWord(); nStat|=EE_CNTRL_STRETCHING|EE_CNTRL_AUTOPAGESIZE; @@ -1407,13 +1351,73 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( FASTBOOL bContourFrame, if (!bContourFrame) { // FitToSize erstmal nicht mit ContourFrame - SdrFitToSizeType eFit=GetFitToSize(); - if (eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES) + if (IsFitToSize()) { - ImpSetCharStretching(rOutliner,rTextRect,rAnchorRect,rFitXKorreg); + ImpSetCharStretching(rOutliner,rTextRect.GetSize(),rAnchorRect.GetSize(),rFitXKorreg); rPaintRect=rAnchorRect; } + else if (IsAutoFit()) + { + ImpAutoFitText(rOutliner); + } + } +} + +void SdrTextObj::ImpAutoFitText( SdrOutliner& rOutliner ) const +{ + const Size aShapeSize=GetSnapRect().GetSize(); + ImpAutoFitText( rOutliner, + Size(aShapeSize.Width()-GetTextLeftDistance()-GetTextRightDistance(), + aShapeSize.Height()-GetTextUpperDistance()-GetTextLowerDistance()), + IsVerticalWriting() ); +} + +void SdrTextObj::ImpAutoFitText( SdrOutliner& rOutliner, const Size& rTextSize, bool bIsVerticalWriting ) +{ + // EditEngine formatting is unstable enough for + // line-breaking text that we need some more samples + + // loop early-exits if we detect an already attained value + sal_uInt16 nMinStretchX=0, nMinStretchY=0; + sal_uInt16 aOldStretchXVals[]={0,0,0,0,0,0,0,0,0,0}; + const size_t aStretchArySize=sizeof(aOldStretchXVals)/sizeof(*aOldStretchXVals); + for(unsigned int i=0; i<aStretchArySize; ++i) + { + const Size aCurrTextSize = rOutliner.CalcTextSizeNTP(); + double fFactor(1.0); + if( bIsVerticalWriting ) + fFactor = double(rTextSize.Width())/aCurrTextSize.Width(); + else + fFactor = double(rTextSize.Height())/aCurrTextSize.Height(); + + sal_uInt16 nCurrStretchX, nCurrStretchY; + rOutliner.GetGlobalCharStretching(nCurrStretchX, nCurrStretchY); + + if (fFactor >= 1.0 ) + { + // resulting text area fits into available shape rect - + // err on the larger streching, to optimally fill area + nMinStretchX = std::max(nMinStretchX,nCurrStretchX); + nMinStretchY = std::max(nMinStretchY,nCurrStretchY); + } + + aOldStretchXVals[i] = nCurrStretchX; + if( std::find(aOldStretchXVals, aOldStretchXVals+i, nCurrStretchX) != aOldStretchXVals+i ) + break; // same value already attained once; algo is looping, exit + + if (fFactor < 1.0 || (fFactor >= 1.0 && nCurrStretchX != 100)) + { + nCurrStretchX = sal::static_int_cast<sal_uInt16>(nCurrStretchX*fFactor); + nCurrStretchY = sal::static_int_cast<sal_uInt16>(nCurrStretchY*fFactor); + rOutliner.SetGlobalCharStretching(std::min(sal_uInt16(100),nCurrStretchX), + std::min(sal_uInt16(100),nCurrStretchY)); + OSL_TRACE("SdrTextObj::onEditOutlinerStatusEvent(): zoom is %d", nCurrStretchX); + } } + + OSL_TRACE("---- SdrTextObj::onEditOutlinerStatusEvent(): final zoom is %d ----", nMinStretchX); + rOutliner.SetGlobalCharStretching(std::min(sal_uInt16(100),nMinStretchX), + std::min(sal_uInt16(100),nMinStretchY)); } void SdrTextObj::SetupOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaintRect ) const @@ -1428,7 +1432,7 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaint Rectangle aAnchorRect; Fraction aFitXKorreg(1,1); - FASTBOOL bContourFrame=IsContourTextFrame(); + bool bContourFrame=IsContourTextFrame(); if( GetModel() ) { @@ -1516,7 +1520,7 @@ void SdrTextObj::NbcReformatText() } SetTextSizeDirty(); ActionChanged(); - // FME, AW: i22396 + // i22396 // Necessary here since we have no compare operator at the outliner // para object which may detect changes regarding the combination // of outliner para data and configuration (e.g., change of @@ -1533,7 +1537,6 @@ void SdrTextObj::ReformatText() if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcReformatText(); SetChanged(); BroadcastObjectChange(); @@ -1588,7 +1591,6 @@ void SdrTextObj::ForceOutlinerParaObject() sal_Bool SdrTextObj::IsVerticalWriting() const { - // #89459# if(pEdtOutl) { return pEdtOutl->IsVertical(); @@ -1621,7 +1623,7 @@ void SdrTextObj::SetVerticalWriting(sal_Bool bVertical) sal_Bool bAutoGrowWidth = ((SdrTextAutoGrowWidthItem&)rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue(); sal_Bool bAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT)).GetValue(); - // #103516# Also exchange hor/ver adjust items + // Also exchange hor/ver adjust items SdrTextHorzAdjust eHorz = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue(); SdrTextVertAdjust eVert = ((SdrTextVertAdjustItem&)(rSet.Get(SDRATTR_TEXT_VERTADJUST))).GetValue(); @@ -1631,7 +1633,7 @@ void SdrTextObj::SetVerticalWriting(sal_Bool bVertical) // prepare ItemSet to set exchanged width and height items SfxItemSet aNewSet(*rSet.GetPool(), SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT, - // #103516# Expanded item ranges to also support hor and ver adjust. + // Expanded item ranges to also support hor and ver adjust. SDRATTR_TEXT_VERTADJUST, SDRATTR_TEXT_VERTADJUST, SDRATTR_TEXT_AUTOGROWWIDTH, SDRATTR_TEXT_HORZADJUST, 0, 0); @@ -1640,7 +1642,7 @@ void SdrTextObj::SetVerticalWriting(sal_Bool bVertical) aNewSet.Put(SdrTextAutoGrowWidthItem(bAutoGrowHeight)); aNewSet.Put(SdrTextAutoGrowHeightItem(bAutoGrowWidth)); - // #103516# Exchange horz and vert adjusts + // Exchange horz and vert adjusts switch(eVert) { case SDRTEXTVERTADJUST_TOP: aNewSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); break; @@ -1722,7 +1724,7 @@ sal_Bool SdrTextObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx:: } default: { - DBG_ERROR("TRGetBaseGeometry: Missing unit translation to 100th mm!"); + OSL_FAIL("TRGetBaseGeometry: Missing unit translation to 100th mm!"); } } } @@ -1784,7 +1786,7 @@ void SdrTextObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b } default: { - DBG_ERROR("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); + OSL_FAIL("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); } } } @@ -1866,21 +1868,21 @@ long SdrTextObj::GetMaxTextFrameWidth() const return ((SdrTextMaxFrameWidthItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MAXFRAMEWIDTH))).GetValue(); } -FASTBOOL SdrTextObj::IsFontwork() const +bool SdrTextObj::IsFontwork() const { - return (bTextFrame) ? sal_False // Default ist FALSE + return (bTextFrame) ? false // Default ist FALSE : ((XFormTextStyleItem&)(GetObjectItemSet().Get(XATTR_FORMTXTSTYLE))).GetValue()!=XFT_NONE; } -FASTBOOL SdrTextObj::IsHideContour() const +bool SdrTextObj::IsHideContour() const { - return (bTextFrame) ? sal_False // Default ist: Nein, kein HideContour; HideContour nicht bei TextFrames + return (bTextFrame) ? false // Default ist: Nein, kein HideContour; HideContour nicht bei TextFrames : ((XFormTextHideFormItem&)(GetObjectItemSet().Get(XATTR_FORMTXTHIDEFORM))).GetValue(); } -FASTBOOL SdrTextObj::IsContourTextFrame() const +bool SdrTextObj::IsContourTextFrame() const { - return (bTextFrame) ? sal_False // ContourFrame nicht bei normalen TextFrames + return (bTextFrame) ? false // ContourFrame nicht bei normalen TextFrames : ((SdrTextContourFrameItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_CONTOURFRAME))).GetValue(); } @@ -1914,7 +1916,6 @@ SdrTextAniDirection SdrTextObj::GetTextAniDirection() const return ((SdrTextAniDirectionItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_ANIDIRECTION))).GetValue(); } -// #111096# // Access to thext hidden flag sal_Bool SdrTextObj::GetTextHidden() const { @@ -1929,7 +1930,6 @@ void SdrTextObj::NbcSetTextHidden(sal_Bool bNew) } } -// #111096# // Get necessary data for text scroll animation. ATM base it on a Text-Metafile and a // painting rectangle. Rotation is excluded from the returned values. GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle( @@ -1985,13 +1985,23 @@ GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle( return pRetval; } -// #111096# // Access to TextAnimationAllowed flag bool SdrTextObj::IsTextAnimationAllowed() const { return mbTextAnimationAllowed; } +bool SdrTextObj::IsAutoFit() const +{ + return GetFitToSize()==SDRTEXTFIT_AUTOFIT; +} + +bool SdrTextObj::IsFitToSize() const +{ + const SdrFitToSizeType eFit=GetFitToSize(); + return (eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); +} + void SdrTextObj::SetTextAnimationAllowed(sal_Bool bNew) { if(mbTextAnimationAllowed != bNew) @@ -2009,13 +2019,21 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus ) const bool bGrowY=(nStat & EE_STAT_TEXTHEIGHTCHANGED) !=0; if(bTextFrame && (bGrowX || bGrowY)) { - const bool bAutoGrowHgt= bTextFrame && IsAutoGrowHeight(); - const bool bAutoGrowWdt= bTextFrame && IsAutoGrowWidth(); - - if ((bGrowX && bAutoGrowWdt) || (bGrowY && bAutoGrowHgt)) + if ((bGrowX && IsAutoGrowWidth()) || (bGrowY && IsAutoGrowHeight())) { AdjustTextFrameWidthAndHeight(); } + else if (IsAutoFit() && !mbInDownScale) + { + OSL_ASSERT(pEdtOutl); + mbInDownScale = sal_True; + + // sucks that we cannot disable paints via + // pEdtOutl->SetUpdateMode(FALSE) - but EditEngine skips + // formatting as well, then. + ImpAutoFitText(*pEdtOutl); + mbInDownScale = sal_False; + } } } @@ -2130,3 +2148,4 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) // ///////////////////////////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 9bc3bbb4958c..7a47c14d254e 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,7 +91,7 @@ namespace // the visible area for contour text decomposition basegfx::B2DVector maScale; - // #SJ# ClipRange for BlockText decomposition; only text portions completely + // ClipRange for BlockText decomposition; only text portions completely // inside are to be accepted, so this is different from geometric clipping // (which would allow e.g. upper parts of portions to remain). Only used for // BlockText (see there) @@ -370,7 +371,9 @@ namespace aDXArray, aFontAttribute, rInfo.mpLocale ? *rInfo.mpLocale : ::com::sun::star::lang::Locale(), - aBFontColor); + aBFontColor, + rInfo.mbFilled, + rInfo.mnWidthToFill); } if(rInfo.mbEndOfBullet) @@ -573,7 +576,7 @@ namespace { if(pInfo) { - // #SJ# Is clipping wanted? This is text clipping; only accept a portion + // Is clipping wanted? This is text clipping; only accept a portion // if it's completely in the range if(!maClipRange.isEmpty()) { @@ -727,6 +730,140 @@ void SdrTextObj::impDecomposeContourTextPrimitive( rTarget = aConverter.getPrimitive2DSequence(); } +void SdrTextObj::impDecomposeAutoFitTextPrimitive( + drawinglayer::primitive2d::Primitive2DSequence& rTarget, + const drawinglayer::primitive2d::SdrAutoFitTextPrimitive2D& rSdrAutofitTextPrimitive, + const drawinglayer::geometry::ViewInformation2D& aViewInformation) const +{ + // decompose matrix to have position and size of text + basegfx::B2DVector aScale, aTranslate; + double fRotate, fShearX; + rSdrAutofitTextPrimitive.getTextRangeTransform().decompose(aScale, aTranslate, fRotate, fShearX); + + // use B2DRange aAnchorTextRange for calculations + basegfx::B2DRange aAnchorTextRange(aTranslate); + aAnchorTextRange.expand(aTranslate + aScale); + + // prepare outliner + const SfxItemSet& rTextItemSet = rSdrAutofitTextPrimitive.getSdrText()->GetItemSet(); + SdrOutliner& rOutliner = ImpGetDrawOutliner(); + SdrTextVertAdjust eVAdj = GetTextVerticalAdjust(rTextItemSet); + SdrTextHorzAdjust eHAdj = GetTextHorizontalAdjust(rTextItemSet); + const sal_uInt32 nOriginalControlWord(rOutliner.GetControlWord()); + const Size aNullSize; + + // set visualizing page at Outliner; needed e.g. for PageNumberField decomposition + rOutliner.setVisualizedPage(GetSdrPageFromXDrawPage(aViewInformation.getVisualizedPage())); + + rOutliner.SetControlWord(nOriginalControlWord|EE_CNTRL_AUTOPAGESIZE|EE_CNTRL_STRETCHING); + rOutliner.SetMinAutoPaperSize(aNullSize); + rOutliner.SetMaxAutoPaperSize(Size(1000000,1000000)); + + // add one to rage sizes to get back to the old Rectangle and outliner measurements + const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1L)); + const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 1L)); + const OutlinerParaObject* pOutlinerParaObject = rSdrAutofitTextPrimitive.getSdrText()->GetOutlinerParaObject(); + OSL_ENSURE(pOutlinerParaObject, "impDecomposeBlockTextPrimitive used with no OutlinerParaObject (!)"); + const bool bVerticalWritintg(pOutlinerParaObject->IsVertical()); + const Size aAnchorTextSize(Size(nAnchorTextWidth, nAnchorTextHeight)); + + if((rSdrAutofitTextPrimitive.getWordWrap() || IsTextFrame())) + { + rOutliner.SetMaxAutoPaperSize(aAnchorTextSize); + } + + if(SDRTEXTHORZADJUST_BLOCK == eHAdj && !bVerticalWritintg) + { + rOutliner.SetMinAutoPaperSize(Size(nAnchorTextWidth, 0)); + } + + if(SDRTEXTVERTADJUST_BLOCK == eVAdj && bVerticalWritintg) + { + rOutliner.SetMinAutoPaperSize(Size(0, nAnchorTextHeight)); + } + + rOutliner.SetPaperSize(aNullSize); + rOutliner.SetUpdateMode(true); + rOutliner.SetText(*pOutlinerParaObject); + ImpAutoFitText(rOutliner,aAnchorTextSize,bVerticalWritintg); + + // set visualizing page at Outliner; needed e.g. for PageNumberField decomposition + rOutliner.setVisualizedPage(GetSdrPageFromXDrawPage(aViewInformation.getVisualizedPage())); + + // now get back the layouted text size from outliner + const Size aOutlinerTextSiz(rOutliner.GetPaperSize()); + const basegfx::B2DVector aOutlinerScale(aOutlinerTextSiz.Width(), aOutlinerTextSiz.Height()); + basegfx::B2DVector aAdjustTranslate(0.0, 0.0); + + // correct horizontal translation using the now known text size + if(SDRTEXTHORZADJUST_CENTER == eHAdj || SDRTEXTHORZADJUST_RIGHT == eHAdj) + { + const double fFree(aAnchorTextRange.getWidth() - aOutlinerScale.getX()); + + if(SDRTEXTHORZADJUST_CENTER == eHAdj) + { + aAdjustTranslate.setX(fFree / 2.0); + } + + if(SDRTEXTHORZADJUST_RIGHT == eHAdj) + { + aAdjustTranslate.setX(fFree); + } + } + + // correct vertical translation using the now known text size + if(SDRTEXTVERTADJUST_CENTER == eVAdj || SDRTEXTVERTADJUST_BOTTOM == eVAdj) + { + const double fFree(aAnchorTextRange.getHeight() - aOutlinerScale.getY()); + + if(SDRTEXTVERTADJUST_CENTER == eVAdj) + { + aAdjustTranslate.setY(fFree / 2.0); + } + + if(SDRTEXTVERTADJUST_BOTTOM == eVAdj) + { + aAdjustTranslate.setY(fFree); + } + } + + // prepare matrices to apply to newly created primitives. aNewTransformA + // will get coordinates in aOutlinerScale size and positive in X, Y. + basegfx::B2DHomMatrix aNewTransformA; + basegfx::B2DHomMatrix aNewTransformB; + + // translate relative to given primitive to get same rotation and shear + // as the master shape we are working on. For vertical, use the top-right + // corner + const double fStartInX(bVerticalWritintg ? aAdjustTranslate.getX() + aOutlinerScale.getX() : aAdjustTranslate.getX()); + aNewTransformA.translate(fStartInX, aAdjustTranslate.getY()); + + // mirroring. We are now in aAnchorTextRange sizes. When mirroring in X and Y, + // move the null point which was top left to bottom right. + const bool bMirrorX(basegfx::fTools::less(aScale.getX(), 0.0)); + const bool bMirrorY(basegfx::fTools::less(aScale.getY(), 0.0)); + aNewTransformB.scale(bMirrorX ? -1.0 : 1.0, bMirrorY ? -1.0 : 1.0); + + // in-between the translations of the single primitives will take place. Afterwards, + // the object's transformations need to be applied + aNewTransformB.shearX(fShearX); + aNewTransformB.rotate(fRotate); + aNewTransformB.translate(aTranslate.getX(), aTranslate.getY()); + + basegfx::B2DRange aClipRange; + + // now break up text primitives. + impTextBreakupHandler aConverter(rOutliner); + aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB, aClipRange); + + // cleanup outliner + rOutliner.Clear(); + rOutliner.setVisualizedPage(0); + rOutliner.SetControlWord(nOriginalControlWord); + + rTarget = aConverter.getPrimitive2DSequence(); +} + void SdrTextObj::impDecomposeBlockTextPrimitive( drawinglayer::primitive2d::Primitive2DSequence& rTarget, const drawinglayer::primitive2d::SdrBlockTextPrimitive2D& rSdrBlockTextPrimitive, @@ -918,7 +1055,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive( bMirrorX ? -1.0 : 1.0, bMirrorY ? -1.0 : 1.0, fShearX, fRotate, aTranslate.getX(), aTranslate.getY())); - // #SJ# create ClipRange (if needed) + // create ClipRange (if needed) basegfx::B2DRange aClipRange; if(rSdrBlockTextPrimitive.getClipOnBounds()) @@ -1254,5 +1391,5 @@ void SdrTextObj::impGetScrollTextTiming(drawinglayer::animation::AnimationEntryL } } -////////////////////////////////////////////////////////////////////////////// -// eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 72de016703bd..e6f99a2bc65a 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -273,7 +274,7 @@ namespace { // prepare BreakIterator Reference < XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); - Reference < XInterface > xInterface = xMSF->createInstance(::rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator")); + Reference < XInterface > xInterface = xMSF->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator"))); if(xInterface.is()) { @@ -592,7 +593,7 @@ namespace const drawinglayer::attribute::StrokeAttribute& rStrokeAttribute, std::vector< drawinglayer::primitive2d::BasePrimitive2D* >& rTarget) { - for(basegfx::B2DPolyPolygonVector::const_iterator aPolygon(rB2DPolyPolyVector.begin()); aPolygon != rB2DPolyPolyVector.end(); aPolygon++) + for(basegfx::B2DPolyPolygonVector::const_iterator aPolygon(rB2DPolyPolyVector.begin()); aPolygon != rB2DPolyPolyVector.end(); ++aPolygon) { // prepare PolyPolygons basegfx::B2DPolyPolygon aB2DPolyPolygon = *aPolygon; @@ -820,5 +821,5 @@ void SdrTextObj::impDecomposePathTextPrimitive( drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(rTarget, aRetvalB); } -////////////////////////////////////////////////////////////////////////////// -// eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 6a903b75ae92..94b6727eedbf 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,33 +62,19 @@ #include <editeng/editeng.hxx> #include <editeng/postitem.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@@@@@ @@@@@ @@ @@ @@@@@@ @@@@ @@@@@ @@@@@@ -// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@ -// @@ @@@@ @@@ @@ @@ @@ @@@@@ @@ -// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@@@@ @@ @@ @@ @@@@ @@@@@ @@@@ -// -// Attribute, StyleSheets und AutoGrow -// -//////////////////////////////////////////////////////////////////////////////////////////////////// - -FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt, FASTBOOL bWdt) const + +bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bWdt) const { if (bTextFrame && pModel!=NULL && !rR.IsEmpty()) { - SdrFitToSizeType eFit=GetFitToSize(); - FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); - FASTBOOL bWdtGrow=bWdt && IsAutoGrowWidth(); - FASTBOOL bHgtGrow=bHgt && IsAutoGrowHeight(); + bool bFitToSize(IsFitToSize()); + bool bWdtGrow=bWdt && IsAutoGrowWidth(); + bool bHgtGrow=bHgt && IsAutoGrowHeight(); SdrTextAniKind eAniKind=GetTextAniKind(); SdrTextAniDirection eAniDir=GetTextAniDirection(); - FASTBOOL bScroll=eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE; - FASTBOOL bHScroll=bScroll && (eAniDir==SDRTEXTANI_LEFT || eAniDir==SDRTEXTANI_RIGHT); - FASTBOOL bVScroll=bScroll && (eAniDir==SDRTEXTANI_UP || eAniDir==SDRTEXTANI_DOWN); + bool bScroll=eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE; + bool bHScroll=bScroll && (eAniDir==SDRTEXTANI_LEFT || eAniDir==SDRTEXTANI_RIGHT); + bool bVScroll=bScroll && (eAniDir==SDRTEXTANI_UP || eAniDir==SDRTEXTANI_DOWN); if (!bFitToSize && (bWdtGrow || bHgtGrow)) { Rectangle aR0(rR); @@ -121,7 +108,6 @@ FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt, if (aSiz.Width()<2) aSiz.Width()=2; // Mindestgroesse 2 if (aSiz.Height()<2) aSiz.Height()=2; // Mindestgroesse 2 - // #101684# sal_Bool bInEditMode = IsInEditMode(); if(!bInEditMode) @@ -210,9 +196,9 @@ FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt, return sal_False; } -FASTBOOL SdrTextObj::NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt) +bool SdrTextObj::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) { - FASTBOOL bRet=AdjustTextFrameWidthAndHeight(aRect,bHgt,bWdt); + bool bRet=AdjustTextFrameWidthAndHeight(aRect,bHgt,bWdt); if (bRet) { SetRectsDirty(); if (HAS_BASE(SdrRectObj,this)) { // mal wieder 'nen Hack @@ -225,13 +211,12 @@ FASTBOOL SdrTextObj::NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bW return bRet; } -FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt) +bool SdrTextObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) { Rectangle aNeuRect(aRect); - FASTBOOL bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt); + bool bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt); if (bRet) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); aRect=aNeuRect; SetRectsDirty(); if (HAS_BASE(SdrRectObj,this)) { // mal wieder 'nen Hack @@ -397,9 +382,9 @@ void SdrTextObj::NbcResizeTextAttributes(const Fraction& xFact, const Fraction& } } -/** #103836# iterates over the paragraphs of a given SdrObject and removes all - hard set character attributes with the which ids contained in the - given vector +/** iterates over the paragraphs of a given SdrObject and removes all + hard set character attributes with the which ids contained in the + given vector */ void SdrTextObj::RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>& rCharWhichIds ) { @@ -460,3 +445,5 @@ bool SdrTextObj::HasText() const return bHasText; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx index 845df672d834..eeab6dccc527 100644 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,19 +42,6 @@ #include <basegfx/range/b2drange.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@@@@@ @@@@@ @@ @@ @@@@@@ @@@@ @@@@@ @@@@@@ -// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@ -// @@ @@@@ @@@ @@ @@ @@ @@@@@ @@ -// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@@@@ @@ @@ @@ @@@@ @@@@@ @@@@ -// -// Dragging, Handles, Create -// -//////////////////////////////////////////////////////////////////////////////////////////////////// sal_uInt32 SdrTextObj::GetHdlCount() const { @@ -97,19 +85,19 @@ Rectangle SdrTextObj::ImpDragCalcRect(const SdrDragStat& rDrag) const Rectangle aTmpRect(aRect); const SdrHdl* pHdl=rDrag.GetHdl(); SdrHdlKind eHdl=pHdl==NULL ? HDL_MOVE : pHdl->GetKind(); - FASTBOOL bEcke=(eHdl==HDL_UPLFT || eHdl==HDL_UPRGT || eHdl==HDL_LWLFT || eHdl==HDL_LWRGT); - FASTBOOL bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho(); - FASTBOOL bBigOrtho=bEcke && bOrtho && rDrag.GetView()->IsBigOrtho(); + bool bEcke=(eHdl==HDL_UPLFT || eHdl==HDL_UPRGT || eHdl==HDL_LWLFT || eHdl==HDL_LWRGT); + bool bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho(); + bool bBigOrtho=bEcke && bOrtho && rDrag.GetView()->IsBigOrtho(); Point aPos(rDrag.GetNow()); // Unrotate: if (aGeo.nDrehWink!=0) RotatePoint(aPos,aTmpRect.TopLeft(),-aGeo.nSin,aGeo.nCos); // Unshear: if (aGeo.nShearWink!=0) ShearPoint(aPos,aTmpRect.TopLeft(),-aGeo.nTan); // - FASTBOOL bLft=(eHdl==HDL_UPLFT || eHdl==HDL_LEFT || eHdl==HDL_LWLFT); - FASTBOOL bRgt=(eHdl==HDL_UPRGT || eHdl==HDL_RIGHT || eHdl==HDL_LWRGT); - FASTBOOL bTop=(eHdl==HDL_UPRGT || eHdl==HDL_UPPER || eHdl==HDL_UPLFT); - FASTBOOL bBtm=(eHdl==HDL_LWRGT || eHdl==HDL_LOWER || eHdl==HDL_LWLFT); + bool bLft=(eHdl==HDL_UPLFT || eHdl==HDL_LEFT || eHdl==HDL_LWLFT); + bool bRgt=(eHdl==HDL_UPRGT || eHdl==HDL_RIGHT || eHdl==HDL_LWRGT); + bool bTop=(eHdl==HDL_UPRGT || eHdl==HDL_UPPER || eHdl==HDL_UPLFT); + bool bBtm=(eHdl==HDL_LWRGT || eHdl==HDL_LOWER || eHdl==HDL_LWLFT); if (bLft) aTmpRect.Left() =aPos.X(); if (bRgt) aTmpRect.Right() =aPos.X(); if (bTop) aTmpRect.Top() =aPos.Y(); @@ -121,8 +109,8 @@ Rectangle SdrTextObj::ImpDragCalcRect(const SdrDragStat& rDrag) const long nYMul=aTmpRect.Bottom()-aTmpRect.Top(); long nXDiv=nWdt0; long nYDiv=nHgt0; - FASTBOOL bXNeg=(nXMul<0)!=(nXDiv<0); - FASTBOOL bYNeg=(nYMul<0)!=(nYDiv<0); + bool bXNeg=(nXMul<0)!=(nXDiv<0); + bool bYNeg=(nYMul<0)!=(nYDiv<0); nXMul=Abs(nXMul); nYMul=Abs(nYMul); nXDiv=Abs(nXDiv); @@ -134,7 +122,7 @@ Rectangle SdrTextObj::ImpDragCalcRect(const SdrDragStat& rDrag) const nXDiv=aXFact.GetDenominator(); nYDiv=aYFact.GetDenominator(); if (bEcke) { // Eckpunkthandles - FASTBOOL bUseX=(aXFact<aYFact) != bBigOrtho; + bool bUseX=(aXFact<aYFact) != bBigOrtho; if (bUseX) { long nNeed=long(BigInt(nHgt0)*BigInt(nXMul)/BigInt(nXDiv)); if (bYNeg) nNeed=-nNeed; @@ -204,17 +192,17 @@ String SdrTextObj::getSpecialDragComment(const SdrDragStat& /*rDrag*/) const //////////////////////////////////////////////////////////////////////////////////////////////////// // Create -FASTBOOL SdrTextObj::BegCreate(SdrDragStat& rStat) +bool SdrTextObj::BegCreate(SdrDragStat& rStat) { rStat.SetOrtho4Possible(); Rectangle aRect1(rStat.GetStart(), rStat.GetNow()); aRect1.Justify(); rStat.SetActionRect(aRect1); aRect = aRect1; - return sal_True; + return true; } -FASTBOOL SdrTextObj::MovCreate(SdrDragStat& rStat) +bool SdrTextObj::MovCreate(SdrDragStat& rStat) { Rectangle aRect1; rStat.TakeCreateRect(aRect1); @@ -226,10 +214,10 @@ FASTBOOL SdrTextObj::MovCreate(SdrDragStat& rStat) if (HAS_BASE(SdrRectObj,this)) { ((SdrRectObj*)this)->SetXPolyDirty(); } - return sal_True; + return true; } -FASTBOOL SdrTextObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +bool SdrTextObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { rStat.TakeCreateRect(aRect); ImpJustifyRect(aRect); @@ -260,9 +248,9 @@ void SdrTextObj::BrkCreate(SdrDragStat& /*rStat*/) { } -FASTBOOL SdrTextObj::BckCreate(SdrDragStat& /*rStat*/) +bool SdrTextObj::BckCreate(SdrDragStat& /*rStat*/) { - return sal_True; + return true; } basegfx::B2DPolyPolygon SdrTextObj::TakeCreatePoly(const SdrDragStat& rDrag) const @@ -283,3 +271,4 @@ Pointer SdrTextObj::GetCreatePointer() const return Pointer(POINTER_CROSS); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index af53a36f133c..94f8f473f141 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,25 +39,12 @@ #include <editeng/eeitem.hxx> #include <svx/sdtfchim.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@@@@@ @@@@@ @@ @@ @@@@@@ @@@@ @@@@@ @@@@@@ -// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@ -// @@ @@@@ @@@ @@ @@ @@ @@@@@ @@ -// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@@@@ @@ @@ @@ @@@@ @@@@@ @@@@ -// -// TextEdit -// -//////////////////////////////////////////////////////////////////////////////////////////////////// - -FASTBOOL SdrTextObj::HasTextEdit() const + +bool SdrTextObj::HasTextEdit() const { // lt. Anweisung von MB duerfen gelinkte Textobjekte nun doch // geaendert werden (kein automatisches Reload) - return sal_True; + return true; } sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) @@ -64,7 +52,6 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) if (pEdtOutl!=NULL) return sal_False; // Textedit laeuft evtl. schon an einer anderen View! pEdtOutl=&rOutl; - // #101684# mbInEditMode = sal_True; sal_uInt16 nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT; @@ -73,15 +60,17 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) rOutl.Init( nOutlinerMode ); rOutl.SetRefDevice( pModel->GetRefDevice() ); - SdrFitToSizeType eFit=GetFitToSize(); - FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); - FASTBOOL bContourFrame=IsContourTextFrame(); + bool bFitToSize(IsFitToSize()); + bool bContourFrame=IsContourTextFrame(); ImpSetTextEditParams(); if (!bContourFrame) { sal_uIntPtr nStat=rOutl.GetControlWord(); nStat|=EE_CNTRL_AUTOPAGESIZE; - if (bFitToSize) nStat|=EE_CNTRL_STRETCHING; else nStat&=~EE_CNTRL_STRETCHING; + if (bFitToSize || IsAutoFit()) + nStat|=EE_CNTRL_STRETCHING; + else + nStat&=~EE_CNTRL_STRETCHING; rOutl.SetControlWord(nStat); } @@ -106,7 +95,6 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) // der Parent pOutlAttr (=die Vorlage) temporaer entfernt // werden, da sonst bei SetParaAttribs() auch alle in diesem // Parent enthaltenen Items hart am Absatz attributiert werden. - // -> BugID 22467 const SfxItemSet& rSet = GetObjectItemSet(); SfxItemSet aFilteredSet(*rSet.GetPool(), EE_ITEMS_START, EE_ITEMS_END); aFilteredSet.Put(rSet); @@ -117,23 +105,20 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) Rectangle aAnchorRect; Rectangle aTextRect; TakeTextRect(rOutl, aTextRect, sal_False, - &aAnchorRect/* #97097# give sal_True here, not sal_False */); + &aAnchorRect); Fraction aFitXKorreg(1,1); - ImpSetCharStretching(rOutl,aTextRect,aAnchorRect,aFitXKorreg); + ImpSetCharStretching(rOutl,aTextRect.GetSize(),aAnchorRect.GetSize(),aFitXKorreg); + } + else if (IsAutoFit()) + { + ImpAutoFitText(rOutl); } if(pOutlinerParaObject) { - // #78476# also repaint when animated text is put to edit mode - // to not make appear the text double - // #111096# should now repaint automatically. - // sal_Bool bIsAnimated(pPlusData && pPlusData->pAnimator); - - if(aGeo.nDrehWink || IsFontwork() /*|| bIsAnimated*/) + if(aGeo.nDrehWink || IsFontwork()) { // only repaint here, no real objectchange - -// ActionChanged(); BroadcastObjectChange(); } } @@ -146,8 +131,7 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const { - SdrFitToSizeType eFit=GetFitToSize(); - FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); + bool bFitToSize(IsFitToSize()); Size aPaperMin,aPaperMax; Rectangle aViewInit; TakeTextAnchorRect(aViewInit); @@ -168,7 +152,6 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p if (aTmpSiz.Height()!=0) aMaxSiz.Height()=aTmpSiz.Height(); } - // #106879# // Done earlier since used in else tree below SdrTextHorzAdjust eHAdj(GetTextHorizontalAdjust()); SdrTextVertAdjust eVAdj(GetTextVerticalAdjust()); @@ -189,7 +172,6 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p SdrTextAniKind eAniKind=GetTextAniKind(); SdrTextAniDirection eAniDirection=GetTextAniDirection(); - // #101684# sal_Bool bInEditMode = IsInEditMode(); if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE)) @@ -208,7 +190,6 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p } else { - // #106879# // aPaperMin needs to be set to object's size if full width is activated // for hor or ver writing respectively if((SDRTEXTHORZADJUST_BLOCK == eHAdj && !IsVerticalWriting()) @@ -235,17 +216,16 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p } // Die PaperSize soll in den meisten Faellen von selbst wachsen - // #89459# if(IsVerticalWriting()) aPaperMin.Width() = 0; else - aPaperMin.Height() = 0; // #33102# + aPaperMin.Height() = 0; if(eHAdj!=SDRTEXTHORZADJUST_BLOCK || bFitToSize) { aPaperMin.Width()=0; } - // #103516# For complete ver adjust support, set paper min height to 0, here. + // For complete ver adjust support, set paper min height to 0, here. if(SDRTEXTVERTADJUST_BLOCK != eVAdj || bFitToSize) { aPaperMin.Height() = 0; @@ -284,7 +264,6 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl) nStat &= ~EE_CNTRL_AUTOPAGESIZE; rOutl.SetControlWord(nStat); - // #101684# mbInEditMode = sal_False; } @@ -325,17 +304,13 @@ sal_uInt16 SdrTextObj::GetOutlinerViewAnchorMode() const void SdrTextObj::ImpSetTextEditParams() const { if (pEdtOutl!=NULL) { - FASTBOOL bUpdMerk=pEdtOutl->GetUpdateMode(); + bool bUpdMerk=pEdtOutl->GetUpdateMode(); if (bUpdMerk) pEdtOutl->SetUpdateMode(sal_False); Size aPaperMin; Size aPaperMax; Rectangle aEditArea; TakeTextEditArea(&aPaperMin,&aPaperMax,&aEditArea,NULL); - //SdrFitToSizeType eFit=GetFitToSize(); - //FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); - FASTBOOL bContourFrame=IsContourTextFrame(); - //EVAnchorMode eAM=(EVAnchorMode)GetOutlinerViewAnchorMode(); - //sal_uIntPtr nViewAnz=pEdtOutl->GetViewCount(); + bool bContourFrame=IsContourTextFrame(); pEdtOutl->SetMinAutoPaperSize(aPaperMin); pEdtOutl->SetMaxAutoPaperSize(aPaperMax); pEdtOutl->SetPaperSize(Size()); @@ -348,3 +323,4 @@ void SdrTextObj::ImpSetTextEditParams() const } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx index 444796adb30c..4053313d75c0 100644 --- a/svx/source/svdraw/svdotxfl.cxx +++ b/svx/source/svdraw/svdotxfl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,9 +51,10 @@ void SdrRegisterFieldClasses() ///////////////////////////////////////////////////////////////////////////////////////////////// */ -FASTBOOL SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, - FASTBOOL /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, XubString& /*rRet*/) const +bool SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, + bool /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, XubString& /*rRet*/) const { return sal_False; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index d36b73ae0a1b..2d2d7256eeee 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,27 +42,8 @@ #include <sfx2/linkmgr.hxx> #include <tools/urlobj.hxx> #include <svl/urihelper.hxx> - -// #90477# #include <tools/tenccvt.hxx> -#ifndef SVX_LIGHT -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@@@ @@@@@ @@@@@@ @@@@@@ @@@@@@ @@ @@ @@@@@@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ @@@@ @@ @@ @@ @@@ @@ @@ @@ -// @@ @@ @@@@@ @@ @@ @@@@@ @@ @@ @@ @@ @@@@@@ @@@@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@@@ @@ @@ @@ @@ @@@ @@ @@ -// @@@@ @@@@@ @@@@ @@ @@@@@@ @@ @@ @@ @@@@@ @@ @@ @@ @@ @@ -// -// ImpSdrObjTextLink zur Verbindung von SdrTextObj und LinkManager -// -// Einem solchen Link merke ich mir als SdrObjUserData am Objekt. Im Gegensatz -// zum Grafik-Link werden die ObjektDaten jedoch kopiert (fuer Paint, etc.). -// Die Information ob das Objekt ein Link ist besteht genau darin, dass dem -// Objekt ein entsprechender UserData-Record angehaengt ist oder nicht. -// -//////////////////////////////////////////////////////////////////////////////////////////////////// class ImpSdrObjTextLink: public ::sfx2::SvBaseLink { @@ -75,8 +57,8 @@ public: virtual ~ImpSdrObjTextLink(); virtual void Closed(); - virtual void DataChanged( const String& rMimeType, - const ::com::sun::star::uno::Any & rValue ); + virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( + const String& rMimeType, const ::com::sun::star::uno::Any & rValue ); sal_Bool Connect() { return 0 != SvBaseLink::GetRealObject(); } }; @@ -98,10 +80,10 @@ void ImpSdrObjTextLink::Closed() } -void ImpSdrObjTextLink::DataChanged( const String& /*rMimeType*/, - const ::com::sun::star::uno::Any & /*rValue */) +::sfx2::SvBaseLink::UpdateResult ImpSdrObjTextLink::DataChanged( + const String& /*rMimeType*/, const ::com::sun::star::uno::Any & /*rValue */) { - FASTBOOL bForceReload=sal_False; + bool bForceReload = false; SdrModel* pModel = pSdrObj ? pSdrObj->GetModel() : 0; sfx2::LinkManager* pLinkManager= pModel ? pModel->GetLinkManager() : 0; if( pLinkManager ) @@ -119,24 +101,16 @@ void ImpSdrObjTextLink::DataChanged( const String& /*rMimeType*/, pData->aFileName = aFile; pData->aFilterName = aFilter; pSdrObj->SetChanged(); - bForceReload = sal_True; + bForceReload = true; } } } if (pSdrObj ) pSdrObj->ReloadLinkedText( bForceReload ); + + return SUCCESS; } -#endif // SVX_LIGHT - -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@ @@ @@ @@ @@ @@ @@ @@ @@@@@ @@@@@@ @@@@@ @@@@@ @@@@ @@@@@@ @@@@ -// @@ @@ @@@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@@@@ @@@@ @@ @@ @@@@ @@@@@ @@@@@ @@ @@ @@@@@@ @@ @@@@@@ -// @@ @@ @@ @@@ @@@@@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@@@@ @@ @@ @@ @@ @@ @@@@ @@@@@ @@@@@@ @@ @@ @@@@@ @@ @@ @@ @@ @@ -// -//////////////////////////////////////////////////////////////////////////////////////////////////// + TYPEINIT1(ImpSdrObjTextLinkUserData,SdrObjUserData); @@ -150,9 +124,7 @@ ImpSdrObjTextLinkUserData::ImpSdrObjTextLinkUserData(SdrTextObj* pObj1): ImpSdrObjTextLinkUserData::~ImpSdrObjTextLinkUserData() { -#ifndef SVX_LIGHT delete pLink; -#endif } SdrObjUserData* ImpSdrObjTextLinkUserData::Clone(SdrObject* pObj1) const @@ -166,17 +138,6 @@ SdrObjUserData* ImpSdrObjTextLinkUserData::Clone(SdrObject* pObj1) const return pData; } -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@@@@@ @@@@@ @@ @@ @@@@@@ @@@@ @@@@@ @@@@@@ -// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@ -// @@ @@@@ @@@ @@ @@ @@ @@@@@ @@ -// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@@@@ @@ @@ @@ @@@@ @@@@@ @@@@ -// -//////////////////////////////////////////////////////////////////////////////////////////////////// void SdrTextObj::SetTextLink(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet) { @@ -208,10 +169,10 @@ void SdrTextObj::ReleaseTextLink() } } -FASTBOOL SdrTextObj::ReloadLinkedText( FASTBOOL bForceLoad) +bool SdrTextObj::ReloadLinkedText( bool bForceLoad) { ImpSdrObjTextLinkUserData* pData = GetLinkUserData(); - FASTBOOL bRet = sal_True; + bool bRet = true; if( pData ) { @@ -260,7 +221,7 @@ FASTBOOL SdrTextObj::ReloadLinkedText( FASTBOOL bForceLoad) return bRet; } -FASTBOOL SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/, rtl_TextEncoding eCharSet) +bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/, rtl_TextEncoding eCharSet) { INetURLObject aFileURL( rFileName ); sal_Bool bRet = sal_False; @@ -281,7 +242,6 @@ FASTBOOL SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterNa if( pIStm ) { - // #90477# pIStm->SetStreamCharSet( eCharSet ); pIStm->SetStreamCharSet(GetSOLoadTextEncoding(eCharSet, (sal_uInt16)pIStm->GetVersion())); char cRTF[5]; @@ -348,3 +308,4 @@ void SdrTextObj::ImpLinkAbmeldung() } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index 6f129affcbba..94f7f1187f8b 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,19 +49,6 @@ #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@@@@@ @@@@@ @@ @@ @@@@@@ @@@@ @@@@@ @@@@@@ -// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@ -// @@ @@@@ @@@ @@ @@ @@ @@@@@ @@ -// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@@@@ @@ @@ @@ @@@@ @@@@@ @@@@ -// -// Transformationen -// -//////////////////////////////////////////////////////////////////////////////////////////////////// void SdrTextObj::NbcSetSnapRect(const Rectangle& rRect) { @@ -84,9 +72,6 @@ void SdrTextObj::NbcSetSnapRect(const Rectangle& rRect) if (bTextFrame && (pModel==NULL || !pModel->IsPasteResize())) { // #51139# if (nTWdt0!=nTWdt1 && IsAutoGrowWidth() ) NbcSetMinTextFrameWidth(nTWdt1); if (nTHgt0!=nTHgt1 && IsAutoGrowHeight()) NbcSetMinTextFrameHeight(nTHgt1); - if (GetFitToSize()==SDRTEXTFIT_RESIZEATTR) { - NbcResizeTextAttributes(Fraction(nTWdt1,nTWdt0),Fraction(nTHgt1,nTHgt0)); - } NbcAdjustTextFrameWidthAndHeight(); } ImpCheckShear(); @@ -112,9 +97,6 @@ void SdrTextObj::NbcSetLogicRect(const Rectangle& rRect) if (bTextFrame) { if (nTWdt0!=nTWdt1 && IsAutoGrowWidth() ) NbcSetMinTextFrameWidth(nTWdt1); if (nTHgt0!=nTHgt1 && IsAutoGrowHeight()) NbcSetMinTextFrameHeight(nTHgt1); - if (GetFitToSize()==SDRTEXTFIT_RESIZEATTR) { - NbcResizeTextAttributes(Fraction(nTWdt1,nTWdt0),Fraction(nTHgt1,nTHgt0)); - } NbcAdjustTextFrameWidthAndHeight(); } SetRectsDirty(); @@ -125,7 +107,7 @@ long SdrTextObj::GetRotateAngle() const return aGeo.nDrehWink; } -long SdrTextObj::GetShearAngle(FASTBOOL /*bVertical*/) const +long SdrTextObj::GetShearAngle(bool /*bVertical*/) const { return aGeo.nShearWink; } @@ -140,14 +122,14 @@ void SdrTextObj::NbcMove(const Size& rSiz) void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - FASTBOOL bNoShearMerk=aGeo.nShearWink==0; - FASTBOOL bRota90Merk=bNoShearMerk && aGeo.nDrehWink % 9000 ==0; + bool bNoShearMerk=aGeo.nShearWink==0; + bool bRota90Merk=bNoShearMerk && aGeo.nDrehWink % 9000 ==0; long nHDist=GetTextLeftDistance()+GetTextRightDistance(); long nVDist=GetTextUpperDistance()+GetTextLowerDistance(); long nTWdt0=aRect.GetWidth ()-1-nHDist; if (nTWdt0<0) nTWdt0=0; long nTHgt0=aRect.GetHeight()-1-nVDist; if (nTHgt0<0) nTHgt0=0; - FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); - FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); + bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); + bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); if (bXMirr || bYMirr) { Point aRef1(GetSnapRect().Center()); if (bXMirr) { @@ -173,15 +155,6 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract } else { - // #100663# aRect is NOT initialized for lines (polgon objects with two - // exceptionally handled points). Thus, after this call the text rotaion is - // gone. This error must be present since day one of this old drawing layer. - // It's astonishing that noone discovered it earlier. - // Polygon aPol(Rect2Poly(aRect,aGeo)); - // Polygon aPol(Rect2Poly(GetSnapRect(), aGeo)); - - // #101412# go back to old method, side effects are impossible - // to calculate. Polygon aPol(Rect2Poly(aRect,aGeo)); for(sal_uInt16 a(0); a < aPol.GetSize(); a++) @@ -205,7 +178,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract } if (bRota90Merk) { - FASTBOOL bRota90=aGeo.nDrehWink % 9000 ==0; + bool bRota90=aGeo.nDrehWink % 9000 ==0; if (!bRota90) { // Scheinbar Rundungsfehler: Korregieren long a=NormAngle360(aGeo.nDrehWink); if (a<4500) a=0; @@ -228,9 +201,6 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract if (bTextFrame && (pModel==NULL || !pModel->IsPasteResize())) { // #51139# if (nTWdt0!=nTWdt1 && IsAutoGrowWidth() ) NbcSetMinTextFrameWidth(nTWdt1); if (nTHgt0!=nTHgt1 && IsAutoGrowHeight()) NbcSetMinTextFrameHeight(nTHgt1); - if (GetFitToSize()==SDRTEXTFIT_RESIZEATTR) { - NbcResizeTextAttributes(Fraction(nTWdt1,nTWdt0),Fraction(nTHgt1,nTHgt0)); - } NbcAdjustTextFrameWidthAndHeight(); } ImpCheckShear(); @@ -261,11 +231,11 @@ void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs) SetGlueReallyAbsolute(sal_False); } -void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { SetGlueReallyAbsolute(sal_True); - // #75889# when this is a SdrPathObj aRect maybe not initialized + // when this is a SdrPathObj aRect maybe not initialized Polygon aPol(Rect2Poly(aRect.IsEmpty() ? GetSnapRect() : aRect, aGeo)); sal_uInt16 nPointCount=aPol.GetSize(); @@ -286,8 +256,8 @@ void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVS void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) { SetGlueReallyAbsolute(sal_True); - FASTBOOL bNoShearMerk=aGeo.nShearWink==0; - FASTBOOL bRota90Merk=sal_False; + bool bNoShearMerk=aGeo.nShearWink==0; + bool bRota90Merk = false; if (bNoShearMerk && (rRef1.X()==rRef2.X() || rRef1.Y()==rRef2.Y() || Abs(rRef1.X()-rRef2.X())==Abs(rRef1.Y()-rRef2.Y()))) { @@ -309,7 +279,7 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) Poly2Rect(aPol,aRect,aGeo); if (bRota90Merk) { - FASTBOOL bRota90=aGeo.nDrehWink % 9000 ==0; + bool bRota90=aGeo.nDrehWink % 9000 ==0; if (bRota90Merk && !bRota90) { // Scheinbar Rundungsfehler: Korregieren long a=NormAngle360(aGeo.nDrehWink); if (a<4500) a=0; @@ -515,7 +485,7 @@ SdrObject* SdrTextObj::ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPol return pPathObj; } -SdrObject* SdrTextObj::ImpConvertAddText(SdrObject* pObj, FASTBOOL bBezier) const +SdrObject* SdrTextObj::ImpConvertAddText(SdrObject* pObj, bool bBezier) const { if(!ImpCanConvTextToCurve()) { @@ -554,5 +524,4 @@ SdrObject* SdrTextObj::ImpConvertAddText(SdrObject* pObj, FASTBOOL bBezier) cons } } -////////////////////////////////////////////////////////////////////////////// -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index cd32145c191d..d6bc6d54f1bc 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -210,7 +211,7 @@ SdrUnoObj::~SdrUnoObj() } catch( const uno::Exception& ) { - OSL_ENSURE( sal_False, "SdrUnoObj::~SdrUnoObj: caught an exception!" ); + OSL_FAIL( "SdrUnoObj::~SdrUnoObj: caught an exception!" ); } delete m_pImpl; } @@ -269,12 +270,7 @@ void SdrUnoObj::SetContextWritingMode( const sal_Int16 _nContextWritingMode ) namespace { /** helper class to restore graphics at <awt::XView> object after <SdrUnoObj::Paint> - - OD 08.05.2003 #109432# - Restoration of graphics necessary to assure that paint on a window - - @author OD - */ + Restoration of graphics necessary to assure that paint on a window */ class RestoreXViewGraphics { private: @@ -313,20 +309,25 @@ void SdrUnoObj::TakeObjNamePlural(XubString& rName) const rName = ImpGetResStr(STR_ObjNamePluralUno); } -void SdrUnoObj::operator = (const SdrObject& rObj) +SdrUnoObj* SdrUnoObj::Clone() const +{ + return CloneHelper< SdrUnoObj >(); +} + +SdrUnoObj& SdrUnoObj::operator= (const SdrUnoObj& rObj) { - SdrRectObj::operator = (rObj); + if( this == &rObj ) + return *this; + SdrRectObj::operator= (rObj); // release the reference to the current control model SetUnoControlModel( NULL ); - const SdrUnoObj& rUnoObj = dynamic_cast< const SdrUnoObj& >( rObj ); - - aUnoControlModelTypeName = rUnoObj.aUnoControlModelTypeName; - aUnoControlTypeName = rUnoObj.aUnoControlTypeName; + aUnoControlModelTypeName = rObj.aUnoControlModelTypeName; + aUnoControlTypeName = rObj.aUnoControlTypeName; // copy the uno control model - const uno::Reference< awt::XControlModel > xSourceControlModel( rUnoObj.GetUnoControlModel(), uno::UNO_QUERY ); + const uno::Reference< awt::XControlModel > xSourceControlModel( rObj.GetUnoControlModel(), uno::UNO_QUERY ); if ( xSourceControlModel.is() ) { try @@ -344,7 +345,7 @@ void SdrUnoObj::operator = (const SdrObject& rObj) uno::Reference< beans::XPropertySet > xSet(xUnoControlModel, uno::UNO_QUERY); if (xSet.is()) { - uno::Any aValue( xSet->getPropertyValue( rtl::OUString::createFromAscii("DefaultControl")) ); + uno::Any aValue( xSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultControl"))) ); ::rtl::OUString aStr; if( aValue >>= aStr ) @@ -354,6 +355,7 @@ void SdrUnoObj::operator = (const SdrObject& rObj) uno::Reference< lang::XComponent > xComp(xUnoControlModel, uno::UNO_QUERY); if (xComp.is()) m_pImpl->pEventListener->StartListening(xComp); + return *this; } void SdrUnoObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) @@ -431,7 +433,6 @@ void SdrUnoObj::NbcSetLayer( SdrLayerID _nLayer ) // (relative to a layer. Remember that the visibility of a layer is a view attribute // - the same layer can be visible in one view, and invisible in another view, at the // same time) - // 2003-06-03 - #110592# - fs@openoffice.org // collect all views in which our old layer is visible ::std::set< SdrView* > aPreviouslyVisible; @@ -618,5 +619,5 @@ bool SdrUnoObj::impl_getViewContact( ViewContactOfUnoControl*& _out_rpContact ) return new ::sdr::contact::ViewContactOfUnoControl( *this ); } -// ----------------------------------------------------------------------------- -// eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx index 22c28b7808d4..32b1ceaf2a32 100644 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,11 +37,7 @@ #include <svl/itempool.hxx> DBG_NAME(SdrOutliner) -/************************************************************************* -|* -|* Ctor -|* -\************************************************************************/ + SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode ) : Outliner( pItemPool, nMode ), //mpPaintInfoRec( NULL ) @@ -50,22 +47,12 @@ SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode ) } -/************************************************************************* -|* -|* Dtor -|* -\************************************************************************/ SdrOutliner::~SdrOutliner() { DBG_DTOR(SdrOutliner,NULL); } -/************************************************************************* -|* -|* -|* -\************************************************************************/ void SdrOutliner::SetTextObj( const SdrTextObj* pObj ) { if( pObj && pObj != mpTextObj.get() ) @@ -93,25 +80,15 @@ void SdrOutliner::SetTextObj( const SdrTextObj* pObj ) mpTextObj.reset( const_cast< SdrTextObj* >(pObj) ); } -/************************************************************************* -|* -|* -|* -\************************************************************************/ void SdrOutliner::SetTextObjNoInit( const SdrTextObj* pObj ) { mpTextObj.reset( const_cast< SdrTextObj* >(pObj) ); } -/************************************************************************* -|* -|* -|* -\************************************************************************/ XubString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor) { - FASTBOOL bOk = sal_False; + bool bOk = false; XubString aRet; if(mpTextObj.is()) @@ -130,3 +107,5 @@ const SdrTextObj* SdrOutliner::GetTextObj() const else return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdoutlinercache.cxx b/svx/source/svdraw/svdoutlinercache.cxx index afa2a23bb93d..c14658149071 100644 --- a/svx/source/svdraw/svdoutlinercache.cxx +++ b/svx/source/svdraw/svdoutlinercache.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,7 +94,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner ) pOutliner->Clear(); pOutliner->SetVertical( false ); - // #101088# Deregister on outliner, might be reused from outliner cache + // Deregister on outliner, might be reused from outliner cache pOutliner->SetNotifyHdl( Link() ); } else if( (OUTLINERMODE_TEXTOBJECT == nOutlMode) && (NULL == mpModeText) ) @@ -102,7 +103,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner ) pOutliner->Clear(); pOutliner->SetVertical( false ); - // #101088# Deregister on outliner, might be reused from outliner cache + // Deregister on outliner, might be reused from outliner cache pOutliner->SetNotifyHdl( Link() ); } else @@ -113,3 +114,4 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index c6703f2305df..9e9dd91e8dea 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,7 +48,7 @@ sdr::properties::BaseProperties& SdrVirtObj::GetProperties() const } //////////////////////////////////////////////////////////////////////////////////////////////////// -// AW, OD 2004-05-03 #i27224# +// #i27224# sdr::contact::ViewContact* SdrVirtObj::CreateObjectSpecificViewContact() { return new sdr::contact::ViewContactOfVirtObj(*this); @@ -91,14 +92,13 @@ SdrObject& SdrVirtObj::ReferencedObj() return rRefObj; } -void __EXPORT SdrVirtObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/) +void SdrVirtObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/) { bClosedObj=rRefObj.IsClosedObj(); SetRectsDirty(); // hier noch Optimieren. // Only a repaint here, rRefObj may have changed and broadcasts ActionChanged(); - // BroadcastObjectChange(); } void SdrVirtObj::NbcSetAnchorPos(const Point& rAnchorPos) @@ -159,16 +159,16 @@ void SdrVirtObj::SetChanged() SdrObject::SetChanged(); } -SdrObject* SdrVirtObj::Clone() const +SdrVirtObj* SdrVirtObj::Clone() const { - SdrObject* pObj=new SdrVirtObj(((SdrVirtObj*)this)->rRefObj); // Nur eine weitere Referenz - return pObj; + return new SdrVirtObj(this->rRefObj); // Nur eine weitere Referenz } -void SdrVirtObj::operator=(const SdrObject& rObj) +SdrVirtObj& SdrVirtObj::operator=(const SdrVirtObj& rObj) { // ???anderes Objekt referenzieren??? SdrObject::operator=(rObj); - aAnchor=((SdrVirtObj&)rObj).aAnchor; + aAnchor=rObj.aAnchor; + return *this; } void SdrVirtObj::TakeObjNameSingul(XubString& rName) const @@ -347,22 +347,22 @@ String SdrVirtObj::getSpecialDragComment(const SdrDragStat& rDrag) const //////////////////////////////////////////////////////////////////////////////////////////////////// -FASTBOOL SdrVirtObj::BegCreate(SdrDragStat& rStat) +bool SdrVirtObj::BegCreate(SdrDragStat& rStat) { return rRefObj.BegCreate(rStat); } -FASTBOOL SdrVirtObj::MovCreate(SdrDragStat& rStat) +bool SdrVirtObj::MovCreate(SdrDragStat& rStat) { return rRefObj.MovCreate(rStat); } -FASTBOOL SdrVirtObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +bool SdrVirtObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { return rRefObj.EndCreate(rStat,eCmd); } -FASTBOOL SdrVirtObj::BckCreate(SdrDragStat& rStat) +bool SdrVirtObj::BckCreate(SdrDragStat& rStat) { return rRefObj.BckCreate(rStat); } @@ -404,7 +404,7 @@ void SdrVirtObj::NbcMirror(const Point& rRef1, const Point& rRef2) SetRectsDirty(); } -void SdrVirtObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SdrVirtObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { rRefObj.NbcShear(rRef-aAnchor,nWink,tn,bVShear); SetRectsDirty(); @@ -416,7 +416,6 @@ void SdrVirtObj::Move(const Size& rSiz) { if (rSiz.Width()!=0 || rSiz.Height()!=0) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - // #110094#-14 SendRepaintBroadcast(); NbcMove(rSiz); SetChanged(); BroadcastObjectChange(); @@ -452,7 +451,7 @@ void SdrVirtObj::Mirror(const Point& rRef1, const Point& rRef2) SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); } -void SdrVirtObj::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SdrVirtObj::Shear(const Point& rRef, long nWink, double tn, bool bVShear) { if (nWink!=0) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); @@ -531,7 +530,7 @@ long SdrVirtObj::GetRotateAngle() const return rRefObj.GetRotateAngle(); } -long SdrVirtObj::GetShearAngle(FASTBOOL bVertical) const +long SdrVirtObj::GetShearAngle(bool bVertical) const { return rRefObj.GetShearAngle(bVertical); } @@ -620,7 +619,7 @@ void SdrVirtObj::ReformatText() //////////////////////////////////////////////////////////////////////////////////////////////////// -FASTBOOL SdrVirtObj::HasMacro() const +bool SdrVirtObj::HasMacro() const { return rRefObj.HasMacro(); } @@ -640,7 +639,7 @@ void SdrVirtObj::PaintMacro(OutputDevice& rOut, const Rectangle& rDirtyRect, con rRefObj.PaintMacro(rOut,rDirtyRect,rRec); // Todo: Positionsversatz } -FASTBOOL SdrVirtObj::DoMacro(const SdrObjMacroHitRec& rRec) +bool SdrVirtObj::DoMacro(const SdrObjMacroHitRec& rRec) { return rRefObj.DoMacro(rRec); // Todo: Positionsversatz } @@ -657,3 +656,5 @@ const Point SdrVirtObj::GetOffset() const } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 7fdc35ae7545..eb48bfa0edfe 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -138,7 +139,6 @@ SdrObjList::~SdrObjList() { DBG_DTOR(SdrObjList,NULL); - // #111111# // To avoid that the Clear() method will broadcast changes when in destruction // which would call virtual methos (not allowed in destructor), the model is set // to NULL here. @@ -166,8 +166,6 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) for (no=0; no<nAnz; no++) { SdrObject* pSO=rSrcList.GetObj(no); - // #116235# - //SdrObject* pDO=pSO->Clone(pPage,pModel); SdrObject* pDO = pSO->Clone(); pDO->SetModel(pModel); pDO->SetPage(pPage); @@ -178,13 +176,14 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) nCloneErrCnt++; } } - // und nun zu den Konnektoren - // Die neuen Objekte werden auf die der rSrcList abgebildet - // und so die Objektverbindungen hergestellt. - // Aehnliche Implementation an folgenden Stellen: + + // and now for the Connectors + // The new objects would be shown in the rSrcList + // and then the object connections are made. + // Similar implementation are setup as the following: // void SdrObjList::CopyObjects(const SdrObjList& rSrcList) // SdrModel* SdrExchangeView::GetMarkedObjModel() const - // FASTBOOL SdrExchangeView::Paste(const SdrModel& rMod,...) + // BOOL SdrExchangeView::Paste(const SdrModel& rMod,...) // void SdrEditView::CopyMarked() if (nCloneErrCnt==0) { for (no=0; no<nAnz; no++) { @@ -205,7 +204,7 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) if (pDstNode1!=NULL) { // Sonst grober Fehler! pDstEdge->ConnectToNode(sal_True,pDstNode1); } else { - DBG_ERROR("SdrObjList::operator=(): pDstNode1==NULL!"); + OSL_FAIL("SdrObjList::operator=(): pDstNode1==NULL!"); } } if (pSrcNode2!=NULL) { @@ -214,11 +213,11 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) if (pDstNode2!=NULL) { // Node war sonst wohl nicht markiert pDstEdge->ConnectToNode(sal_False,pDstNode2); } else { - DBG_ERROR("SdrObjList::operator=(): pDstNode2==NULL!"); + OSL_FAIL("SdrObjList::operator=(): pDstNode2==NULL!"); } } } else { - DBG_ERROR("SdrObjList::operator=(): pDstEdge==NULL!"); + OSL_FAIL("SdrObjList::operator=(): pDstEdge==NULL!"); } } } @@ -240,7 +239,7 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) aStr += " Objektverbindungen werden nicht mitkopiert."; - DBG_ERROR(aStr.GetBuffer()); + OSL_FAIL(aStr.GetBuffer()); #endif } } @@ -372,7 +371,7 @@ void SdrObjList::NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrIns pObj->SetObjList(this); pObj->SetPage(pPage); - // #110094# Inform the parent about change to allow invalidations at + // Inform the parent about change to allow invalidations at // evtl. existing parent visualisations impChildInserted(*pObj); @@ -390,7 +389,7 @@ void SdrObjList::InsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsert if(pObj) { - // #69055# if anchor is used, reset it before grouping + // if anchor is used, reset it before grouping if(GetOwnerObj()) { const Point& rAnchorPos = pObj->GetAnchorPos(); @@ -531,7 +530,7 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum) pNewObj->SetObjList(this); pNewObj->SetPage(pPage); - // #110094# Inform the parent about change to allow invalidations at + // Inform the parent about change to allow invalidations at // evtl. existing parent visualisations impChildInserted(*pNewObj); @@ -578,7 +577,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum) pNewObj->SetObjList(this); pNewObj->SetPage(pPage); - // #110094# Inform the parent about change to allow invalidations at + // Inform the parent about change to allow invalidations at // evtl. existing parent visualisations impChildInserted(*pNewObj); @@ -615,7 +614,7 @@ SdrObject* SdrObjList::NbcSetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nN InsertObjectIntoContainer(*pObj,nNewObjNum); - // #110094# No need to delete visualisation data since same object + // No need to delete visualisation data since same object // gets inserted again. Also a single ActionChanged is enough pObj->ActionChanged(); @@ -642,7 +641,7 @@ SdrObject* SdrObjList::SetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewO RemoveObjectFromContainer(nOldObjNum); InsertObjectIntoContainer(*pObj,nNewObjNum); - // #110094#No need to delete visualisation data since same object + // No need to delete visualisation data since same object // gets inserted again. Also a single ActionChanged is enough pObj->ActionChanged(); @@ -687,30 +686,9 @@ void SdrObjList::NbcReformatAllTextObjects() sal_uIntPtr nAnz=GetObjCount(); sal_uIntPtr nNum=0; - Printer* pPrinter = NULL; - - if (pModel) - { - if (pModel->GetRefDevice() && pModel->GetRefDevice()->GetOutDevType() == OUTDEV_PRINTER) - { - // Kein RefDevice oder RefDevice kein Printer - pPrinter = (Printer*) pModel->GetRefDevice(); - } - } - while (nNum<nAnz) { SdrObject* pObj = GetObj(nNum); - if (pPrinter && - pObj->GetObjInventor() == SdrInventor && - pObj->GetObjIdentifier() == OBJ_OLE2 && - !( (SdrOle2Obj*) pObj )->IsEmpty() ) - { - //const SvInPlaceObjectRef& xObjRef = ((SdrOle2Obj*) pObj)->GetObjRef(); - //TODO/LATER: PrinterChangeNotification needed - //if( xObjRef.Is() && ( xObjRef->GetMiscStatus() & SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE ) ) - // xObjRef->OnDocumentPrinterChanged(pPrinter); - } pObj->NbcReformatText(); nAnz=GetObjCount(); // ReformatText may delete an object @@ -727,7 +705,6 @@ void SdrObjList::ReformatAllTextObjects() /** steps over all available objects and reformats all edge objects that are connected to other objects so that they may reposition itselfs. - #103122# */ void SdrObjList::ReformatAllEdgeObjects() { @@ -772,9 +749,9 @@ SdrObject* SdrObjList::GetObj(sal_uIntPtr nNum) const -FASTBOOL SdrObjList::IsReadOnly() const +bool SdrObjList::IsReadOnly() const { - FASTBOOL bRet=sal_False; + bool bRet = false; if (pPage!=NULL && pPage!=this) bRet=pPage->IsReadOnly(); return bRet; } @@ -839,7 +816,6 @@ void SdrObjList::UnGroupObj( sal_uIntPtr nObjNum ) if( pUngroupObj ) { SdrObjList* pSrcLst = pUngroupObj->GetSubList(); - //sal_Int32 nCount( 0 ); if( pUngroupObj->ISA( SdrObjGroup ) && pSrcLst ) { SdrObjGroup* pUngroupGroup = static_cast< SdrObjGroup* > (pUngroupObj); @@ -867,7 +843,7 @@ void SdrObjList::UnGroupObj( sal_uIntPtr nObjNum ) } #ifdef DBG_UTIL else - DBG_ERROR("SdrObjList::UnGroupObj: object index invalid"); + OSL_FAIL("SdrObjList::UnGroupObj: object index invalid"); #endif } @@ -979,8 +955,6 @@ void SdrObjList::ClearObjectNavigationOrder (void) bool SdrObjList::RecalcNavigationPositions (void) { - bool bUpToDate (false); - if (mbIsNavigationOrderDirty) { if (mpNavigationOrder.get() != NULL) @@ -992,8 +966,6 @@ bool SdrObjList::RecalcNavigationPositions (void) sal_uInt32 nIndex (0); for (iObject=mpNavigationOrder->begin(); iObject!=iEnd; ++iObject,++nIndex) (*iObject)->SetNavigationPosition(nIndex); - - bUpToDate = true; } } @@ -1138,7 +1110,7 @@ void SdrPageGridFrameList::Clear() } ////////////////////////////////////////////////////////////////////////////// -// #111111# PageUser section +// PageUser section void SdrPage::AddPageUser(sdr::PageUser& rNewUser) { @@ -1155,7 +1127,7 @@ void SdrPage::RemovePageUser(sdr::PageUser& rOldUser) } ////////////////////////////////////////////////////////////////////////////// -// #110094# DrawContact section +// DrawContact section sdr::contact::ViewContact* SdrPage::CreateObjectSpecificViewContact() { @@ -1387,7 +1359,6 @@ SdrPage::~SdrPage() DBG_UNHANDLED_EXCEPTION(); } - // #111111# // tell all the registered PageUsers that the page is in destruction // This causes some (all?) PageUsers to remove themselves from the list // of page users. Therefore we have to use a copy of the list for the @@ -1400,7 +1371,6 @@ SdrPage::~SdrPage() pPageUser->PageInDestruction(*this); } - // #111111# // Clear the vector. This means that user do not need to call RemovePageUser() // when they get called from PageInDestruction(). maPageUsers.clear(); @@ -1409,7 +1379,6 @@ SdrPage::~SdrPage() TRG_ClearMasterPage(); - // #110094# if(mpViewContact) { delete mpViewContact; @@ -1424,8 +1393,10 @@ SdrPage::~SdrPage() DBG_DTOR(SdrPage,NULL); } -void SdrPage::operator=(const SdrPage& rSrcPage) +SdrPage& SdrPage::operator=(const SdrPage& rSrcPage) { + if( this == &rSrcPage ) + return *this; if(mpViewContact) { delete mpViewContact; @@ -1461,7 +1432,6 @@ void SdrPage::operator=(const SdrPage& rSrcPage) { TRG_ClearMasterPage(); } - //aMasters = rSrcPage.aMasters; mbObjectsNotPersistent = rSrcPage.mbObjectsNotPersistent; @@ -1492,6 +1462,7 @@ void SdrPage::operator=(const SdrPage& rSrcPage) // Now copy the contained obejcts (by cloning them) SdrObjList::operator=(rSrcPage); + return *this; } SdrPage* SdrPage::Clone() const @@ -1726,7 +1697,6 @@ sal_uInt16 SdrPage::GetPageNum() const void SdrPage::SetChanged() { - // #110094#-11 // For test purposes, use the new ViewContact for change // notification now. ActionChanged(); @@ -1790,7 +1760,7 @@ sdr::contact::ViewContact& SdrPage::TRG_GetMasterPageDescriptorViewContact() con return mpMasterPageDescriptor->GetViewContact(); } -// #115423# used from SdrModel::RemoveMasterPage +// used from SdrModel::RemoveMasterPage void SdrPage::TRG_ImpMasterPageRemoved(const SdrPage& rRemovedPage) { if(TRG_HasMasterPage()) @@ -1809,7 +1779,6 @@ const SdrPageGridFrameList* SdrPage::GetGridFrameList(const SdrPageView* /*pPV*/ XubString SdrPage::GetLayoutName() const { - // Die wollte Dieter haben. return String(); } @@ -1859,13 +1828,13 @@ SfxStyleSheet* SdrPage::GetTextStyleSheetForObject( SdrObject* pObj ) const return pObj->GetStyleSheet(); } -FASTBOOL SdrPage::HasTransparentObjects( sal_Bool bCheckForAlphaChannel ) const +bool SdrPage::HasTransparentObjects( bool bCheckForAlphaChannel ) const { - FASTBOOL bRet = sal_False; + bool bRet = false; for( sal_uIntPtr n = 0, nCount = GetObjCount(); ( n < nCount ) && !bRet; n++ ) if( GetObj( n )->IsTransparent( bCheckForAlphaChannel ) ) - bRet = sal_True; + bRet = true; return bRet; } @@ -1922,7 +1891,7 @@ bool SdrPage::checkVisibility( return true; } -// #110094# DrawContact support: Methods for handling Page changes +// DrawContact support: Methods for handling Page changes void SdrPage::ActionChanged() const { // Do necessary ViewContact actions @@ -1935,13 +1904,13 @@ void SdrPage::ActionChanged() const } } -// NYI: Dummy implementations for declarations in svdpage.hxx -Bitmap SdrPage::GetBitmap(const SetOfByte& /*rVisibleLayers*/, FASTBOOL /*bTrimBorders*/) const +// Dummy implementations for declarations in svdpage.hxx +Bitmap SdrPage::GetBitmap(const SetOfByte& /*rVisibleLayers*/, bool /*bTrimBorders*/) const { DBG_ASSERT(0, "SdrPage::GetBitmap(): not yet implemented."); return Bitmap(); } -GDIMetaFile SdrPage::GetMetaFile(const SetOfByte& /*rVisibleLayers*/, FASTBOOL /*bTrimBorders*/) +GDIMetaFile SdrPage::GetMetaFile(const SetOfByte& /*rVisibleLayers*/, bool /*bTrimBorders*/) { DBG_ASSERT(0, "SdrPage::GetMetaFile(): not yet implemented."); return GDIMetaFile(); @@ -2028,5 +1997,5 @@ drawinglayer::primitive2d::Primitive2DSequence StandardCheckVisisbilityRedirecto } } -////////////////////////////////////////////////////////////////////////////// -// eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 65a72cc915be..1392ab9ffe9a 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,7 +55,6 @@ #include <svx/svdotext.hxx> // fuer PaintOutlinerView #include <svx/svdoole2.hxx> -// #110094# #include <svx/sdr/contact/objectcontactofpageview.hxx> #include <svx/svdogrp.hxx> #include <svx/sdr/contact/viewobjectcontactredirector.hxx> @@ -76,7 +76,7 @@ DBG_NAME(SdrPageView); SdrPageWindow* SdrPageView::FindPageWindow(SdrPaintWindow& rPaintWindow) const { - for(SdrPageWindowVector::const_iterator a = maPageWindows.begin(); a != maPageWindows.end(); a++) + for(SdrPageWindowVector::const_iterator a = maPageWindows.begin(); a != maPageWindows.end(); ++a) { if(&((*a)->GetPaintWindow()) == &rPaintWindow) { @@ -107,7 +107,7 @@ const SdrPageWindow* SdrPageView::FindPatchedPageWindow( const OutputDevice& _rO SdrPageWindow* SdrPageView::FindPageWindow(const OutputDevice& rOutDev) const { - for(SdrPageWindowVector::const_iterator a = maPageWindows.begin(); a != maPageWindows.end(); a++) + for(SdrPageWindowVector::const_iterator a = maPageWindows.begin(); a != maPageWindows.end(); ++a) { if(&((*a)->GetPaintWindow().GetOutputDevice()) == &rOutDev) { @@ -120,7 +120,6 @@ SdrPageWindow* SdrPageView::FindPageWindow(const OutputDevice& rOutDev) const SdrPageWindow* SdrPageView::GetPageWindow(sal_uInt32 nIndex) const { - // #126416# if(nIndex < maPageWindows.size()) { return maPageWindows[nIndex]; @@ -131,8 +130,7 @@ SdrPageWindow* SdrPageView::GetPageWindow(sal_uInt32 nIndex) const void SdrPageView::ClearPageWindows() { - // #126416# - for(SdrPageWindowVector::const_iterator a = maPageWindows.begin(); a != maPageWindows.end(); a++) + for(SdrPageWindowVector::const_iterator a = maPageWindows.begin(); a != maPageWindows.end(); ++a) { delete *a; } @@ -150,7 +148,7 @@ SdrPageWindow* SdrPageView::RemovePageWindow(sal_uInt32 nPos) if(nPos < maPageWindows.size()) { SdrPageWindowVector::iterator aAccess = maPageWindows.begin() + nPos; - // #114376# remember return value + // remember return value SdrPageWindow* pErasedSdrPageWindow = *aAccess; maPageWindows.erase(aAccess); return pErasedSdrPageWindow; @@ -165,7 +163,7 @@ SdrPageWindow* SdrPageView::RemovePageWindow(SdrPageWindow& rOld) if(aFindResult != maPageWindows.end()) { - // #114376# remember return value + // remember return value SdrPageWindow* pSdrPageWindow = *aFindResult; maPageWindows.erase(aFindResult); return pSdrPageWindow; @@ -178,7 +176,7 @@ SdrPageWindow* SdrPageView::RemovePageWindow(SdrPageWindow& rOld) SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView) : mrView(rNewView), - // #103911# col_auto color lets the view takes the default SvxColorConfig entry + // col_auto color lets the view takes the default SvxColorConfig entry maDocumentColor( COL_AUTO ), maBackgroundColor(COL_AUTO ), // #i48367# also react on autocolor mpPreparedPageWindow(0) // #i72752# @@ -218,10 +216,6 @@ SdrPageView::~SdrPageView() SdrPageWindow& SdrPageView::CreateNewPageWindowEntry(SdrPaintWindow& rPaintWindow) { - // MIB 3.7.08: Das WinRec muss sofort in die Liste eingetragen werden, - // weil sich das InsertControlContainer darauf verlaesst - //SdrPageViewWinRec* pRec = new SdrPageViewWinRec( *this, pOut ); - //pWinList->Insert(pRec); SdrPageWindow& rWindow = *(new SdrPageWindow(*this, rPaintWindow)); AppendPageWindow(rWindow); @@ -262,7 +256,7 @@ void SdrPageView::RemovePaintWindowFromPageView(SdrPaintWindow& rPaintWindow) return xReturn; } -void __EXPORT SdrPageView::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/) +void SdrPageView::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/) { // not really interested in } @@ -328,9 +322,6 @@ void SdrPageView::InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix) void SdrPageView::PaintOutlinerView(OutputDevice* pOut, const Rectangle& rRect) const { if (GetView().pTextEditOutliner==NULL) return; - //const SdrObject* pTextObjTmp=GetView().GetTextEditObject(); - //const SdrTextObj* pText=PTR_CAST(SdrTextObj,pTextObjTmp); - //FASTBOOL bTextFrame=pText!=NULL && pText->IsTextFrame(); sal_uIntPtr nViewAnz=GetView().pTextEditOutliner->GetViewCount(); for (sal_uIntPtr i=0; i<nViewAnz; i++) { OutlinerView* pOLV=GetView().pTextEditOutliner->GetView(i); @@ -450,7 +441,7 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::con } else { - OSL_ENSURE(false, "SdrPageView::DrawLayer: Creating temporary SdrPageWindow (ObjectContact), this should never be needed (!)"); + OSL_FAIL("SdrPageView::DrawLayer: Creating temporary SdrPageWindow (ObjectContact), this should never be needed (!)"); // None of the known OutputDevices is the target of this paint, use // a temporary SdrPageWindow for this Redraw. @@ -496,10 +487,6 @@ void SdrPageView::SetDesignMode( bool _bDesignMode ) const //////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef OS2 -#define RGBCOLOR(r,g,b) ((sal_uIntPtr)(((sal_uInt8)(b) | ((sal_uInt16)(g)<<8)) | (((sal_uIntPtr)(sal_uInt8)(r))<<16))) -#endif - void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor) { if (GetPage()==NULL) @@ -525,10 +512,7 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C { // no more global output size, use window size instead to decide grid sizes long nScreenWdt = rOut.GetOutputSizePixel().Width(); - // old: long nScreenWdt=System::GetDesktopRectPixel().GetWidth(); - // Grid bei kleinen Zoomstufen etwas erweitern - //Size a1PixSiz(rOut.PixelToLogic(Size(1,1))); long nMinDotPix=2; long nMinLinPix=4; @@ -548,10 +532,9 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C nMinLinPix=4; } Size aMinDotDist(rOut.PixelToLogic(Size(nMinDotPix,nMinDotPix))); - //Size a3PixSiz(rOut.PixelToLogic(Size(2,2))); Size aMinLinDist(rOut.PixelToLogic(Size(nMinLinPix,nMinLinPix))); - FASTBOOL bHoriSolid=nx2<aMinDotDist.Width(); - FASTBOOL bVertSolid=ny2<aMinDotDist.Height(); + bool bHoriSolid=nx2<aMinDotDist.Width(); + bool bVertSolid=ny2<aMinDotDist.Height(); // Linienabstand vergroessern (mind. 4 Pixel) // Vergroesserung: *2 *5 *10 *20 *50 *100 ... int nTgl=0; @@ -582,14 +565,11 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C if (nTgl>=3) nTgl=0; } - // Keine Zwischenpunkte, wenn... - //if (nx2<a2PixSiz.Width()) nx2=nx1; - //if (ny2<a2PixSiz.Height()) ny2=ny1; - FASTBOOL bHoriFine=nx2<nx1; - FASTBOOL bVertFine=ny2<ny1; - FASTBOOL bHoriLines=bHoriSolid || bHoriFine || !bVertFine; - FASTBOOL bVertLines=bVertSolid || bVertFine; + bool bHoriFine=nx2<nx1; + bool bVertFine=ny2<ny1; + bool bHoriLines=bHoriSolid || bHoriFine || !bVertFine; + bool bVertLines=bVertSolid || bVertFine; Color aColorMerk( rOut.GetLineColor() ); rOut.SetLineColor( aColor ); @@ -604,8 +584,7 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C long y1=GetPage()->GetUppBorder()+1+nWrX; long y2=GetPage()->GetHgt()-GetPage()->GetLwrBorder()-1+nWrY; const SdrPageGridFrameList* pFrames=GetPage()->GetGridFrameList(this,NULL); - //sal_uInt16 nBufSiz=1024; // 4k Buffer = max. 512 Punkte - // #90353# long* pBuf = NULL; + sal_uInt16 nGridPaintAnz=1; if (pFrames!=NULL) nGridPaintAnz=pFrames->GetCount(); for (sal_uInt16 nGridPaintNum=0; nGridPaintNum<nGridPaintAnz; nGridPaintNum++) { @@ -695,8 +674,6 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C nPointOffset++; } } - - // rOut.DrawGrid( Rectangle( xo + xBigOrg, yo + yFinOrg, x2, y2 ), Size( nx1, ny2 ), nGridFlags ); } } } @@ -771,7 +748,6 @@ sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const return sal_False; } - // #112440# if(pObj->ISA(SdrObjGroup)) { // If object is a Group object, visibility depends evtl. on @@ -856,11 +832,11 @@ void SdrPageView::SetHelpLines(const SdrHelpLineList& rHLL) void SdrPageView::SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine) { if (nNum<aHelpLines.GetCount() && aHelpLines[nNum]!=rNewHelpLine) { - FASTBOOL bNeedRedraw=sal_True; + bool bNeedRedraw = true; if (aHelpLines[nNum].GetKind()==rNewHelpLine.GetKind()) { switch (rNewHelpLine.GetKind()) { - case SDRHELPLINE_VERTICAL : if (aHelpLines[nNum].GetPos().X()==rNewHelpLine.GetPos().X()) bNeedRedraw=sal_False; break; - case SDRHELPLINE_HORIZONTAL: if (aHelpLines[nNum].GetPos().Y()==rNewHelpLine.GetPos().Y()) bNeedRedraw=sal_False; break; + case SDRHELPLINE_VERTICAL : if (aHelpLines[nNum].GetPos().X()==rNewHelpLine.GetPos().X()) bNeedRedraw = false; break; + case SDRHELPLINE_HORIZONTAL: if (aHelpLines[nNum].GetPos().Y()==rNewHelpLine.GetPos().Y()) bNeedRedraw = false; break; default: break; } // switch } @@ -880,16 +856,11 @@ void SdrPageView::DeleteHelpLine(sal_uInt16 nNum) void SdrPageView::InsertHelpLine(const SdrHelpLine& rHL, sal_uInt16 nNum) { - if (nNum>aHelpLines.GetCount()) nNum=aHelpLines.GetCount(); + if (nNum > aHelpLines.GetCount()) + nNum = aHelpLines.GetCount(); aHelpLines.Insert(rHL,nNum); - if (GetView().IsHlplVisible()) { - if (GetView().IsHlplFront()) { - // Hier optimieren ... - ImpInvalidateHelpLineArea(nNum); - } else { - ImpInvalidateHelpLineArea(nNum); - } - } + if (GetView().IsHlplVisible()) + ImpInvalidateHelpLineArea(nNum); } // Betretene Gruppe und Liste setzen @@ -1106,19 +1077,18 @@ void SdrPageView::CheckAktGroup() } } -// #103834# Set background color for svx at SdrPageViews +// Set background color for svx at SdrPageViews void SdrPageView::SetApplicationBackgroundColor(Color aBackgroundColor) { maBackgroundColor = aBackgroundColor; } -// #109585# Color SdrPageView::GetApplicationBackgroundColor() const { return maBackgroundColor; } -// #103911# Set document color for svx at SdrPageViews +// Set document color for svx at SdrPageViews void SdrPageView::SetApplicationDocumentColor(Color aDocumentColor) { maDocumentColor = aDocumentColor; @@ -1129,5 +1099,5 @@ Color SdrPageView::GetApplicationDocumentColor() const return maDocumentColor; } -//////////////////////////////////////////////////////////////////////////////////////////////////// -// eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index aaa83ed5f1fe..b452f4ea43c9 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,7 +84,6 @@ using namespace ::rtl; using namespace ::com::sun::star; //////////////////////////////////////////////////////////////////////////////////////////////////// -// #114409#-3 Migrate Encirclement class ImplEncirclementOverlay { // The OverlayObjects @@ -145,7 +145,7 @@ void ImplEncirclementOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPos SdrPaintWindow* SdrPaintView::FindPaintWindow(const OutputDevice& rOut) const { - for(SdrPaintWindowVector::const_iterator a = maPaintWindows.begin(); a != maPaintWindows.end(); a++) + for(SdrPaintWindowVector::const_iterator a = maPaintWindows.begin(); a != maPaintWindows.end(); ++a) { if(&((*a)->GetOutputDevice()) == &rOut) { @@ -314,13 +314,12 @@ SdrPaintView::~SdrPaintView() maPaintWindows.pop_back(); } - // #114409#-3 Migrate HelpLine BrkEncirclement(); } //////////////////////////////////////////////////////////////////////////////////////////////////// -void __EXPORT SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) +void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { //If the stylesheet has been destroyed if (&rBC == pDefaultStyleSheet) @@ -963,47 +962,7 @@ SdrPaintWindow* SdrPaintView::BeginDrawLayers(OutputDevice* pOut, const Region& if(pKnownTarget) { - // #i74769# check if pOut is a win and has a ClipRegion. If Yes, the Region - // rReg may be made more granular (fine) with using it. Normally, rReg - // does come from Window::Paint() anyways and thus is based on a single - // rectangle which was derived from exactly that repaint region - Region aOptimizedRepaintRegion(rReg); - - // #i76114# Intersecting the region with the Window's paint region is disabled - // for print preview in Calc, because the intersection can be empty (if the paint - // region is outside of the table area of the page), and then no clip region - // would be set. - if(pOut && OUTDEV_WINDOW == pOut->GetOutDevType() && !bDisableIntersect) - { - Window* pWindow = (Window*)pOut; - - if(pWindow->IsInPaint()) - { - if(!pWindow->GetPaintRegion().IsEmpty()) - { - aOptimizedRepaintRegion.Intersect(pWindow->GetPaintRegion()); - -#ifdef DBG_UTIL - // #i74769# test-paint repaint region - static bool bDoPaintForVisualControl(false); - if(bDoPaintForVisualControl) - { - RegionHandle aRegionHandle(aOptimizedRepaintRegion.BeginEnumRects()); - Rectangle aRegionRectangle; - - while(aOptimizedRepaintRegion.GetEnumRects(aRegionHandle, aRegionRectangle)) - { - pWindow->SetLineColor(COL_LIGHTGREEN); - pWindow->SetFillColor(); - pWindow->DrawRect(aRegionRectangle); - } - - aOptimizedRepaintRegion.EndEnumRects(aRegionHandle); - } -#endif - } - } - } + Region aOptimizedRepaintRegion = OptimizeDrawLayersRegion( pOut, rReg, bDisableIntersect ); // prepare redraw pKnownTarget->PrepareRedraw(aOptimizedRepaintRegion); @@ -1028,6 +987,70 @@ void SdrPaintView::EndDrawLayers(SdrPaintWindow& rPaintWindow, bool bPaintFormLa } } +void SdrPaintView::UpdateDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect) +{ + SdrPaintWindow* pPaintWindow = FindPaintWindow(*pOut); + OSL_ENSURE(pPaintWindow, "SdrPaintView::UpdateDrawLayersRegion: No SdrPaintWindow (!)"); + + if(mpPageView) + { + SdrPageWindow* pKnownTarget = mpPageView->FindPageWindow(*pPaintWindow); + + if(pKnownTarget) + { + Region aOptimizedRepaintRegion = OptimizeDrawLayersRegion( pOut, rReg, bDisableIntersect ); + pKnownTarget->GetPaintWindow().SetRedrawRegion(aOptimizedRepaintRegion); + mpPageView->setPreparedPageWindow(pKnownTarget); // already set actually + } + } +} + +Region SdrPaintView::OptimizeDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect) +{ + // #i74769# check if pOut is a win and has a ClipRegion. If Yes, the Region + // rReg may be made more granular (fine) with using it. Normally, rReg + // does come from Window::Paint() anyways and thus is based on a single + // rectangle which was derived from exactly that repaint region + Region aOptimizedRepaintRegion(rReg); + + // #i76114# Intersecting the region with the Window's paint region is disabled + // for print preview in Calc, because the intersection can be empty (if the paint + // region is outside of the table area of the page), and then no clip region + // would be set. + if(pOut && OUTDEV_WINDOW == pOut->GetOutDevType() && !bDisableIntersect) + { + Window* pWindow = (Window*)pOut; + + if(pWindow->IsInPaint()) + { + if(!pWindow->GetPaintRegion().IsEmpty()) + { + aOptimizedRepaintRegion.Intersect(pWindow->GetPaintRegion()); + +#ifdef DBG_UTIL + // #i74769# test-paint repaint region + static bool bDoPaintForVisualControl(false); + if(bDoPaintForVisualControl) + { + RegionHandle aRegionHandle(aOptimizedRepaintRegion.BeginEnumRects()); + Rectangle aRegionRectangle; + + while(aOptimizedRepaintRegion.GetEnumRects(aRegionHandle, aRegionRectangle)) + { + pWindow->SetLineColor(COL_LIGHTGREEN); + pWindow->SetFillColor(); + pWindow->DrawRect(aRegionRectangle); + } + + aOptimizedRepaintRegion.EndEnumRects(aRegionHandle); + } +#endif + } + } + } + return aOptimizedRepaintRegion; +} + //////////////////////////////////////////////////////////////////////////////////////////////////// void SdrPaintView::ImpTextEditDrawing(SdrPaintWindow& rPaintWindow) const @@ -1155,14 +1178,12 @@ void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix) void SdrPaintView::InvalidateOneWin(Window& rWin) { - // #111096# // do not erase background, that causes flicker (!) rWin.Invalidate(INVALIDATE_NOERASE); } void SdrPaintView::InvalidateOneWin(Window& rWin, const Rectangle& rRect) { - // #111096# // do not erase background, that causes flicker (!) rWin.Invalidate(rRect, INVALIDATE_NOERASE); } @@ -1278,7 +1299,6 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDo #endif } -/* new interface src537 */ sal_Bool SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const { if(bOnlyHardAttr || !pDefaultStyleSheet) @@ -1301,9 +1321,8 @@ sal_Bool SdrPaintView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAl return sal_True; } -SfxStyleSheet* SdrPaintView::GetStyleSheet() const // SfxStyleSheet* SdrPaintView::GetStyleSheet(sal_Bool& rOk) const +SfxStyleSheet* SdrPaintView::GetStyleSheet() const { - //rOk=sal_True; return GetDefaultStyleSheet(); } @@ -1470,7 +1489,7 @@ Color SdrPaintView::GetGridColor() const return maGridColor; } -// #103834# Set background color for svx at SdrPageViews +// Set background color for svx at SdrPageViews void SdrPaintView::SetApplicationBackgroundColor(Color aBackgroundColor) { if(mpPageView) @@ -1479,7 +1498,7 @@ void SdrPaintView::SetApplicationBackgroundColor(Color aBackgroundColor) } } -// #103911# Set document color for svx at SdrPageViews +// Set document color for svx at SdrPageViews void SdrPaintView::SetApplicationDocumentColor(Color aDocumentColor) { if(mpPageView) @@ -1488,13 +1507,11 @@ void SdrPaintView::SetApplicationDocumentColor(Color aDocumentColor) } } -// #114898# bool SdrPaintView::IsBufferedOutputAllowed() const { return (mbBufferedOutputAllowed && maDrawinglayerOpt.IsPaintBuffer()); } -// #114898# void SdrPaintView::SetBufferedOutputAllowed(bool bNew) { if(bNew != (bool)mbBufferedOutputAllowed) @@ -1545,4 +1562,4 @@ void SdrPaintView::SetAnimationTimer(sal_uInt32 nTime) } } -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index 75be5919b114..a5cdd406a46d 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -383,7 +384,6 @@ void SdrPolyEditView::RipUpAtMarkedPoints() if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); sal_Bool bKorregFlag(sal_False); - sal_Bool bInsAny(sal_False); sal_uInt32 nMarkPtsAnz(pPts->GetCount()); sal_uInt32 nMax(pObj->GetHdlCount()); @@ -395,7 +395,6 @@ void SdrPolyEditView::RipUpAtMarkedPoints() if(pNeuObj) { - bInsAny = sal_True; SdrInsertReason aReason(SDRREASON_VIEWCALL, pObj); pM->GetPageView()->GetObjList()->InsertObject(pNeuObj, pObj->GetOrdNum() + 1, &aReason); if( bUndo ) @@ -570,7 +569,7 @@ void SdrPolyEditView::CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen) // , SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); sal_Bool bClosed=pO->IsClosedObj(); - if (pO->IsPolyObj() && (bClosed==bOpen) || bToggle) + if ((pO->IsPolyObj() && (bClosed==bOpen)) || bToggle) { if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO)); @@ -742,4 +741,4 @@ void SdrPolyEditView::RotateMarkedPoints(const Point& rRef, long nWink, bool bCo AdjustMarkHdl(); } -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index d44be3d6bab0..40f7c6a9be8a 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,7 +45,6 @@ #include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// -// #114409#-1 Migrate PageOrigin class ImplPageOriginOverlay { // The OverlayObjects @@ -107,7 +107,6 @@ void ImplPageOriginOverlay::SetPosition(const basegfx::B2DPoint& rNewPosition) } //////////////////////////////////////////////////////////////////////////////////////////////////// -// #114409#-2 Migrate HelpLine class ImplHelpLineOverlay { // The OverlayObjects @@ -186,19 +185,6 @@ void ImplHelpLineOverlay::SetPosition(const basegfx::B2DPoint& rNewPosition) } } -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@@@ @@ @@ @@@@ @@@@@ @@ @@ @@ @@@@@ @@ @@ -// @@ @@ @@@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@@@@@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @ @@ -// @@@@ @@@@@@ @@@@@@ @@@@@ @@@@@ @@ @@@@ @@@@@@@ -// @@ @@ @@@ @@ @@ @@ @@@ @@ @@ @@@@@@@ -// @@ @@ @@ @@ @@ @@ @@ @@@ @@ @@ @@@ @@@ -// @@@@ @@ @@ @@ @@ @@ @ @@ @@@@@ @@ @@ -// -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// void SdrSnapView::ClearVars() { @@ -228,30 +214,21 @@ void SdrSnapView::ClearVars() bEliminatePolyPoints=sal_False; nEliminatePolyPointLimitAngle=0; - // #114409#-1 Migrate PageOrigin BrkSetPageOrg(); - - // #114409#-2 Migrate HelpLine BrkDragHelpLine(); } SdrSnapView::SdrSnapView(SdrModel* pModel1, OutputDevice* pOut): SdrPaintView(pModel1,pOut), - // #114409#-1 Migrate PageOrigin mpPageOriginOverlay(0L), - // #114409#-2 Migrate HelpLine mpHelpLineOverlay(0L) { ClearVars(); } -// #114409#-1 Migrate PageOrigin SdrSnapView::~SdrSnapView() { - // #114409#-1 Migrate PageOrigin BrkSetPageOrg(); - - // #114409#-2 Migrate HelpLine BrkDragHelpLine(); } @@ -320,11 +297,9 @@ Point SdrSnapView::GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const { if (!bSnapEnab) return SDRSNAP_NOTSNAPPED; - sal_Bool bPVOfs=sal_False; long x=rPnt.X(); long y=rPnt.Y(); if (pPV==NULL) { - bPVOfs=sal_True; pPV=GetSdrPageView(); if (pPV==NULL) return SDRSNAP_NOTSNAPPED; } @@ -380,12 +355,12 @@ sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const a=y ; if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // linke Papierkante a=y- ys ; if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // rechte Papierkante } - if (bOFrmSnap || bOPntSnap /*|| (bConnVisible && bOConSnap)*/) { + if (bOFrmSnap || bOPntSnap) { sal_uIntPtr nMaxPointSnapCount=200; sal_uIntPtr nMaxFrameSnapCount=200; - // #97981# go back to IM_DEEPNOGROUPS runthrough for snap to object comparisons - SdrObjListIter aIter(*pPV->GetPage(),/*IM_FLAT*/IM_DEEPNOGROUPS,sal_True); + // go back to IM_DEEPNOGROUPS runthrough for snap to object comparisons + SdrObjListIter aIter(*pPV->GetPage(),IM_DEEPNOGROUPS,sal_True); while (aIter.IsMore() && (nMaxPointSnapCount>0 || nMaxFrameSnapCount>0)) { SdrObject* pO=aIter.Next(); @@ -607,7 +582,7 @@ sal_Bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV) { const SdrHelpLineList& rHelpLines = pPV->GetHelpLines(); const SdrHelpLine& rHelpLine = rHelpLines[nHelpLineNum]; - Point aHelpLinePos = rHelpLine.GetPos(); // + pPV->GetOffset(); + Point aHelpLinePos = rHelpLine.GetPos(); basegfx::B2DPoint aStartPos(aHelpLinePos.X(), aHelpLinePos.Y()); DBG_ASSERT(0L == mpHelpLineOverlay, "SdrSnapView::BegDragHelpLine: There exists a ImplHelpLineOverlay (!)"); @@ -727,4 +702,4 @@ void SdrSnapView::BrkDragHelpLine() } } -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src index 6c80ba2c383a..e68f68100b9d 100644 --- a/svx/source/svdraw/svdstr.src +++ b/svx/source/svdraw/svdstr.src @@ -311,36 +311,6 @@ String STR_ObjNamePluralTEXTLNK { Text [ en-US ] = "Linked text frames" ; }; - //String STR_ObjNameSingulXTXT { - // Text="Textfortsetzungsrahmen"; - // Text[ENGLISH]="drawobject"; - // Text[norwegian]="Tegneobjekt"; - // Text[italian]="Disegna oggetto"; - // Text[portuguese_brazilian]="Desenhar objeto"; - // Text[portuguese]="Desenhar objecto"; - // Text[finnish]="Piirto-objekti"; - // Text[danish]="Tegneobjekt"; - // Text[french]="Drawobject"; - // Text[swedish]="Ritobjekt"; - // Text[dutch]="Tekenobject"; - // Text[spanish]="Objeto de dibujo"; - // Text[english_us]="drawobject"; - //}; - //String STR_ObjNamePluralXTXT { - // Text="Textfortsetzungsrahmen"; - // Text[ENGLISH]="drawobjects"; - // Text[norwegian]="Tegneobjektr"; - // Text[italian]="Disegna oggetti"; - // Text[portuguese_brazilian]="Desenhar objetos"; - // Text[portuguese]="Desenhar objectos"; - // Text[finnish]="Piirto-objektit"; - // Text[danish]="Tegneobjekter"; - // Text[french]="Drawobjects"; - // Text[swedish]="Ritobjekt"; - // Text[dutch]="Tekenobjecten"; - // Text[spanish]="Objetos de dibujo"; - // Text[english_us]="drawobjects"; - //}; String STR_ObjNameSingulFITTEXT { Text [ en-US ] = "Fit-to-size text object" ; @@ -1124,7 +1094,7 @@ String STR_UndoMovLayer { Text [ en-US ] = "Change order of layers" ; }; -// --> OD 2009-07-09 #i73249# +// Undo/Redo for setting object's name (#i73249#) String STR_UndoObjName { Text [ en-US ] = "Change object name of %1 to" ; @@ -1137,7 +1107,6 @@ String STR_UndoObjDescription { Text [ en-US ] = "Change object description of %1" ; }; -// <-- String STR_StandardLayerName { Text [ en-US ] = "Standard" ; @@ -1600,8 +1569,8 @@ String STR_ItemNam_SHEARANGLE // Ende der gecachten Strings // und hier noch Bitmaps -Bitmap BMAP_GrafikEi { File = "grafikei.bmp" ; }; -Bitmap BMAP_GrafikDe { File = "grafikde.bmp" ; }; +Bitmap BMAP_GrafikEi { File = "grafikei.png" ; }; +Bitmap BMAP_GrafikDe { File = "grafikde.png" ; }; // Strings fuer den Vorlagen-Dialog String SIP_UNKNOWN_ATTR @@ -2753,24 +2722,17 @@ Bitmap SIP_SA_PAGESHADOW35X35 Bitmap SIP_SA_MARKERS { - File = "markers.bmp"; + File = "markers.png"; }; Bitmap SIP_SA_FINE_MARKERS { - File = "markers2.bmp"; + File = "markers2.png"; }; -// #100499# Bitmap BMP_SVXOLEOBJ { - File = "oleobj.bmp" ; -}; - -// #101928# -Bitmap SIP_SA_ACCESSIBILITY_MARKERS -{ - File = "markersACC.bmp"; + File = "oleobj.png" ; }; String STR_ObjNameSingulMEDIA @@ -2852,20 +2814,14 @@ String STR_ObjNamePluralTable Bitmap SIP_SA_CROP_MARKERS { - File = "cropmarkers.bmp"; + File = "cropmarkers.png"; }; Bitmap SIP_SA_CROP_FINE_MARKERS { - File = "cropmarkers2.bmp"; -}; - -Bitmap SIP_SA_ACCESSIBILITY_CROP_MARKERS -{ - File = "cropmarkersACC.bmp"; + File = "cropmarkers2.png"; }; -//IAccessibility2 Implementation 2009----- String STR_ObjNameSingulFONTWORK { Text [ en-US ] = "font work" ; @@ -2874,5 +2830,4 @@ String STR_ObjNamePluralFONTWORK { Text [ en-US ] = "font works" ; }; -//-----IAccessibility2 Implementation 2009 diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx index cc65d71f8e05..bfc84a75f3d6 100644 --- a/svx/source/svdraw/svdtext.cxx +++ b/svx/source/svdraw/svdtext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -144,7 +145,7 @@ void SdrText::SetModel( SdrModel* pNewModel ) MapUnit aOldUnit(pOldModel->GetScaleUnit()); MapUnit aNewUnit(pNewModel->GetScaleUnit()); - FASTBOOL bScaleUnitChanged=aNewUnit!=aOldUnit; + bool bScaleUnitChanged=aNewUnit!=aOldUnit; // und nun dem OutlinerParaObject einen neuen Pool verpassen // !!! Hier muss noch DefTab und RefDevice der beiden Models // !!! verglichen werden und dann ggf. AutoGrow zuschlagen !!! @@ -154,7 +155,7 @@ void SdrText::SetModel( SdrModel* pNewModel ) sal_Bool bDefHgtChanged=nNewFontHgt!=nOldFontHgt; sal_Bool bSetHgtItem=bDefHgtChanged && !bHgtSet; if (bSetHgtItem) - { // #32665# + { // zunaechst das HeightItem festklopfen, damit // 1. Es eben bestehen bleibt und // 2. DoStretchChars vom richtigen Wert ausgeht @@ -182,7 +183,7 @@ void SdrText::SetModel( SdrModel* pNewModel ) SetObjectItem(SvxFontHeightItem(nOldFontHgt, 100, EE_CHAR_FONTHEIGHT)); } } - SetOutlinerParaObject(rOutliner.CreateParaObject()); // #34494# + SetOutlinerParaObject(rOutliner.CreateParaObject()); mpOutlinerParaObject->ClearPortionInfo(); mbPortionInfoChecked=sal_False; rOutliner.Clear(); @@ -222,3 +223,5 @@ SfxStyleSheet* SdrText::GetStyleSheet() const { return mrObject.GetStyleSheet(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index 5559b3a9df03..180e967571bf 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,11 +52,10 @@ void MoveXPoly(XPolyPolygon& rPoly, const Size& S) //////////////////////////////////////////////////////////////////////////////////////////////////// -void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, const Fraction& ryFact, FASTBOOL bNoJustify) +void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, const Fraction& ryFact, bool bNoJustify) { Fraction xFact(rxFact); Fraction yFact(ryFact); - //long nHgt=rRect.Bottom()-rRect.Top(); { if (xFact.GetDenominator()==0) { @@ -159,7 +159,7 @@ void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs) //////////////////////////////////////////////////////////////////////////////////////////////////// -void MirrorRect(Rectangle& rRect, const Point& /*rRef1*/, const Point& /*rRef2*/, FASTBOOL bNoJustify) +void MirrorRect(Rectangle& rRect, const Point& /*rRef1*/, const Point& /*rRef2*/, bool bNoJustify) { // !!! fehlende Implementation !!! if (!bNoJustify) rRect.Justify(); @@ -234,7 +234,7 @@ void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2) //////////////////////////////////////////////////////////////////////////////////////////////////// -void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear) +void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, bool bVShear) { sal_uInt16 nAnz=rPoly.GetSize(); for (sal_uInt16 i=0; i<nAnz; i++) { @@ -242,7 +242,7 @@ void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear) } } -void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear) +void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear) { sal_uInt16 nAnz=rPoly.GetPointCount(); for (sal_uInt16 i=0; i<nAnz; i++) { @@ -250,7 +250,7 @@ void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear) } } -void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear) +void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear) { sal_uInt16 nAnz=rPoly.Count(); for (sal_uInt16 i=0; i<nAnz; i++) { @@ -258,7 +258,7 @@ void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShea } } -void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear) +void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear) { sal_uInt16 nAnz=rPoly.Count(); for (sal_uInt16 i=0; i<nAnz; i++) { @@ -267,22 +267,12 @@ void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVSh } //////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@@@ @@@@@ @@@@ @@@@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@@@@ @@ @@ @@ @@ @@@@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@@@ @@ @@ @@@@ @@@@ @@ @@ -// -//////////////////////////////////////////////////////////////////////////////////////////////////// double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter, - const Point& rRad, double& rSin, double& rCos, FASTBOOL bVert) + const Point& rRad, double& rSin, double& rCos, bool bVert) { - FASTBOOL bC1=pC1!=NULL; - FASTBOOL bC2=pC2!=NULL; + bool bC1=pC1!=NULL; + bool bC2=pC2!=NULL; long x0=rPnt.X(); long y0=rPnt.Y(); long cx=rCenter.X(); @@ -333,10 +323,10 @@ double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCent } double CrookSlantXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter, - const Point& rRad, double& rSin, double& rCos, FASTBOOL bVert) + const Point& rRad, double& rSin, double& rCos, bool bVert) { - FASTBOOL bC1=pC1!=NULL; - FASTBOOL bC2=pC2!=NULL; + bool bC1=pC1!=NULL; + bool bC2=pC2!=NULL; long x0=rPnt.X(); long y0=rPnt.Y(); long dx1=0,dy1=0; @@ -388,22 +378,17 @@ double CrookSlantXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCente } double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter, - const Point& rRad, double& rSin, double& rCos, FASTBOOL bVert, + const Point& rRad, double& rSin, double& rCos, bool bVert, const Rectangle rRefRect) { - //FASTBOOL bC1=pC1!=NULL; - //FASTBOOL bC2=pC2!=NULL; - //long x0=rPnt.X(); long y0=rPnt.Y(); CrookSlantXPoint(rPnt,pC1,pC2,rCenter,rRad,rSin,rCos,bVert); if (bVert) { } else { - //long nBase=rCenter.Y()-rRad.Y(); long nTop=rRefRect.Top(); long nBtm=rRefRect.Bottom(); long nHgt=nBtm-nTop; long dy=rPnt.Y()-y0; - //FASTBOOL bOben=rRad.Y()<0; double a=((double)(y0-nTop))/nHgt; a*=dy; rPnt.Y()=y0+Round(a); @@ -412,7 +397,7 @@ double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCen //////////////////////////////////////////////////////////////////////////////////////////////////// -void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert) +void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { double nSin,nCos; sal_uInt16 nPointAnz=rPoly.GetPointCount(); @@ -435,7 +420,7 @@ void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, F } } -void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert) +void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { double nSin,nCos; sal_uInt16 nPointAnz=rPoly.GetPointCount(); @@ -458,7 +443,7 @@ void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FA } } -void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert, const Rectangle rRefRect) +void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle rRefRect) { double nSin,nCos; sal_uInt16 nPointAnz=rPoly.GetPointCount(); @@ -483,7 +468,7 @@ void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, //////////////////////////////////////////////////////////////////////////////////////////////////// -void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert) +void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { sal_uInt16 nPolyAnz=rPoly.Count(); for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { @@ -491,7 +476,7 @@ void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRa } } -void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert) +void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { sal_uInt16 nPolyAnz=rPoly.Count(); for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { @@ -499,7 +484,7 @@ void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad } } -void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert, const Rectangle rRefRect) +void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle rRefRect) { sal_uInt16 nPolyAnz=rPoly.Count(); for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { @@ -627,24 +612,12 @@ void Poly2Rect(const Polygon& rPol, Rectangle& rRect, GeoStat& rGeo) if (rGeo.nDrehWink!=0) RotatePoint(aPt3,Point(0,0),-rGeo.nSin,rGeo.nCos); // -Sin fuer Rueckdrehung long nHgt=aPt3.Y(); - if(aPt3.X()) - { - // #i74358# the axes are not orthogonal, so for getting the correct height, - // calculate the length of aPt3 - - // #i74358# this change was wrong, in the field of the old geometry stuff - // it is not an error. The new height always is the same as before; shear - // does not change object height at all. This is different from the interactions, - // but obviously wanted in the old versions. - // - // nHgt = static_cast< long >(sqrt(static_cast< double >(aPt3.X() * aPt3.X() + aPt3.Y() * aPt3.Y()))); - } long nShW=GetAngle(aPt3); nShW-=27000; // ShearWink wird zur Senkrechten gemessen nShW=-nShW; // Negieren, denn '+' ist Rechtskursivierung - FASTBOOL bMirr=aPt3.Y()<0; + bool bMirr=aPt3.Y()<0; if (bMirr) { // "Punktetausch" bei Spiegelung nHgt=-nHgt; nShW+=18000; @@ -666,7 +639,7 @@ void Poly2Rect(const Polygon& rPol, Rectangle& rRect, GeoStat& rGeo) //////////////////////////////////////////////////////////////////////////////////////////////////// -void OrthoDistance8(const Point& rPt0, Point& rPt, FASTBOOL bBigOrtho) +void OrthoDistance8(const Point& rPt0, Point& rPt, bool bBigOrtho) { long dx=rPt.X()-rPt0.X(); long dy=rPt.Y()-rPt0.Y(); @@ -682,7 +655,7 @@ void OrthoDistance8(const Point& rPt0, Point& rPt, FASTBOOL bBigOrtho) } } -void OrthoDistance4(const Point& rPt0, Point& rPt, FASTBOOL bBigOrtho) +void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho) { long dx=rPt.X()-rPt0.X(); long dy=rPt.Y()-rPt0.Y(); @@ -718,7 +691,7 @@ void Kuerzen(Fraction& rF, unsigned nDigits) { sal_Int32 nMul=rF.GetNumerator(); sal_Int32 nDiv=rF.GetDenominator(); - FASTBOOL bNeg=sal_False; + bool bNeg = false; if (nMul<0) { nMul=-nMul; bNeg=!bNeg; } if (nDiv<0) { nDiv=-nDiv; bNeg=!bNeg; } if (nMul==0 || nDiv==0) return; @@ -809,8 +782,8 @@ FrPair GetMapFactor(MapUnit eS, MapUnit eD) if (eS==eD) return FrPair(1,1,1,1); FrPair aS(GetInchOrMM(eS)); FrPair aD(GetInchOrMM(eD)); - FASTBOOL bSInch=IsInch(eS); - FASTBOOL bDInch=IsInch(eD); + bool bSInch=IsInch(eS); + bool bDInch=IsInch(eD); FrPair aRet(aD.X()/aS.X(),aD.Y()/aS.Y()); if (bSInch && !bDInch) { aRet.X()*=Fraction(127,5); aRet.Y()*=Fraction(127,5); } if (!bSInch && bDInch) { aRet.X()*=Fraction(5,127); aRet.Y()*=Fraction(5,127); } @@ -821,8 +794,8 @@ FrPair GetMapFactor(MapUnit eS, FieldUnit eD) { FrPair aS(GetInchOrMM(eS)); FrPair aD(GetInchOrMM(eD)); - FASTBOOL bSInch=IsInch(eS); - FASTBOOL bDInch=IsInch(eD); + bool bSInch=IsInch(eS); + bool bDInch=IsInch(eD); FrPair aRet(aD.X()/aS.X(),aD.Y()/aS.Y()); if (bSInch && !bDInch) { aRet.X()*=Fraction(127,5); aRet.Y()*=Fraction(127,5); } if (!bSInch && bDInch) { aRet.X()*=Fraction(5,127); aRet.Y()*=Fraction(5,127); } @@ -833,8 +806,8 @@ FrPair GetMapFactor(FieldUnit eS, MapUnit eD) { FrPair aS(GetInchOrMM(eS)); FrPair aD(GetInchOrMM(eD)); - FASTBOOL bSInch=IsInch(eS); - FASTBOOL bDInch=IsInch(eD); + bool bSInch=IsInch(eS); + bool bDInch=IsInch(eD); FrPair aRet(aD.X()/aS.X(),aD.Y()/aS.Y()); if (bSInch && !bDInch) { aRet.X()*=Fraction(127,5); aRet.Y()*=Fraction(127,5); } if (!bSInch && bDInch) { aRet.X()*=Fraction(5,127); aRet.Y()*=Fraction(5,127); } @@ -846,8 +819,8 @@ FrPair GetMapFactor(FieldUnit eS, FieldUnit eD) if (eS==eD) return FrPair(1,1,1,1); FrPair aS(GetInchOrMM(eS)); FrPair aD(GetInchOrMM(eD)); - FASTBOOL bSInch=IsInch(eS); - FASTBOOL bDInch=IsInch(eD); + bool bSInch=IsInch(eS); + bool bDInch=IsInch(eD); FrPair aRet(aD.X()/aS.X(),aD.Y()/aS.Y()); if (bSInch && !bDInch) { aRet.X()*=Fraction(127,5); aRet.Y()*=Fraction(127,5); } if (!bSInch && bDInch) { aRet.X()*=Fraction(5,127); aRet.Y()*=Fraction(5,127); } @@ -863,24 +836,24 @@ FrPair GetMapFactor(FieldUnit eS, FieldUnit eD) // 1 yd = 3 ft = 36" = 914,4mm // 1 ft = 12 " = 1" = 304,8mm -void GetMeterOrInch(MapUnit eMU, short& rnKomma, long& rnMul, long& rnDiv, int& rbMetr, int& rbInch) +void GetMeterOrInch(MapUnit eMU, short& rnKomma, long& rnMul, long& rnDiv, bool& rbMetr, bool& rbInch) { rnMul=1; rnDiv=1; short nKomma=0; - FASTBOOL bMetr=sal_False,bInch=sal_False; + bool bMetr = false, bInch = false; switch (eMU) { // Metrisch - case MAP_100TH_MM : bMetr=sal_True; nKomma=5; break; - case MAP_10TH_MM : bMetr=sal_True; nKomma=4; break; - case MAP_MM : bMetr=sal_True; nKomma=3; break; - case MAP_CM : bMetr=sal_True; nKomma=2; break; + case MAP_100TH_MM : bMetr = true; nKomma=5; break; + case MAP_10TH_MM : bMetr = true; nKomma=4; break; + case MAP_MM : bMetr = true; nKomma=3; break; + case MAP_CM : bMetr = true; nKomma=2; break; // Inch - case MAP_1000TH_INCH: bInch=sal_True; nKomma=3; break; - case MAP_100TH_INCH : bInch=sal_True; nKomma=2; break; - case MAP_10TH_INCH : bInch=sal_True; nKomma=1; break; - case MAP_INCH : bInch=sal_True; nKomma=0; break; - case MAP_POINT : bInch=sal_True; rnDiv=72; break; // 1Pt = 1/72" - case MAP_TWIP : bInch=sal_True; rnDiv=144; nKomma=1; break; // 1Twip = 1/1440" + case MAP_1000TH_INCH: bInch = true; nKomma=3; break; + case MAP_100TH_INCH : bInch = true; nKomma=2; break; + case MAP_10TH_INCH : bInch = true; nKomma=1; break; + case MAP_INCH : bInch = true; nKomma=0; break; + case MAP_POINT : bInch = true; rnDiv=72; break; // 1Pt = 1/72" + case MAP_TWIP : bInch = true; rnDiv=144; nKomma=1; break; // 1Twip = 1/1440" // Sonstiges case MAP_PIXEL : break; case MAP_SYSFONT : break; @@ -893,29 +866,32 @@ void GetMeterOrInch(MapUnit eMU, short& rnKomma, long& rnMul, long& rnDiv, int& rbInch=bInch; } -void GetMeterOrInch(FieldUnit eFU, short& rnKomma, long& rnMul, long& rnDiv, int& rbMetr, int& rbInch) +void GetMeterOrInch(FieldUnit eFU, short& rnKomma, long& rnMul, long& rnDiv, bool& rbMetr, bool& rbInch) { rnMul=1; rnDiv=1; short nKomma=0; - FASTBOOL bMetr=sal_False,bInch=sal_False; + bool bMetr = false, bInch = false; switch (eFU) { case FUNIT_NONE : break; // Metrisch - case FUNIT_100TH_MM : bMetr=sal_True; nKomma=5; break; - case FUNIT_MM : bMetr=sal_True; nKomma=3; break; - case FUNIT_CM : bMetr=sal_True; nKomma=2; break; - case FUNIT_M : bMetr=sal_True; nKomma=0; break; - case FUNIT_KM : bMetr=sal_True; nKomma=-3; break; + case FUNIT_100TH_MM : bMetr = true; nKomma=5; break; + case FUNIT_MM : bMetr = true; nKomma=3; break; + case FUNIT_CM : bMetr = true; nKomma=2; break; + case FUNIT_M : bMetr = true; nKomma=0; break; + case FUNIT_KM : bMetr = true; nKomma=-3; break; // Inch - case FUNIT_TWIP : bInch=sal_True; rnDiv=144; nKomma=1; break; // 1Twip = 1/1440" - case FUNIT_POINT : bInch=sal_True; rnDiv=72; break; // 1Pt = 1/72" - case FUNIT_PICA : bInch=sal_True; rnDiv=6; break; // 1Pica = 1/6" ? - case FUNIT_INCH : bInch=sal_True; break; // 1" = 1" - case FUNIT_FOOT : bInch=sal_True; rnMul=12; break; // 1Ft = 12" - case FUNIT_MILE : bInch=sal_True; rnMul=6336; nKomma=-1; break; // 1mile = 63360" + case FUNIT_TWIP : bInch = true; rnDiv=144; nKomma=1; break; // 1Twip = 1/1440" + case FUNIT_POINT : bInch = true; rnDiv=72; break; // 1Pt = 1/72" + case FUNIT_PICA : bInch = true; rnDiv=6; break; // 1Pica = 1/6" ? + case FUNIT_INCH : bInch = true; break; // 1" = 1" + case FUNIT_FOOT : bInch = true; rnMul=12; break; // 1Ft = 12" + case FUNIT_MILE : bInch = true; rnMul=6336; nKomma=-1; break; // 1mile = 63360" // sonstiges case FUNIT_CUSTOM : break; case FUNIT_PERCENT : nKomma=2; break; + // TODO: Add code to handle the following (added to remove warning) + case FUNIT_CHAR : break; + case FUNIT_LINE : break; } // switch rnKomma=nKomma; rbMetr=bMetr; @@ -925,7 +901,7 @@ void GetMeterOrInch(FieldUnit eFU, short& rnKomma, long& rnMul, long& rnDiv, int void SdrFormatter::Undirty() { if (aScale.GetNumerator()==0 || aScale.GetDenominator()==0) aScale=Fraction(1,1); - FASTBOOL bSrcMetr,bSrcInch,bDstMetr,bDstInch; + bool bSrcMetr,bSrcInch,bDstMetr,bDstInch; long nMul1,nDiv1,nMul2,nDiv2; short nKomma1,nKomma2; // Zunaechst normalisieren auf m bzw. " @@ -1084,46 +1060,39 @@ void SdrFormatter::TakeUnitStr(MapUnit eUnit, XubString& rStr) // Metrisch case MAP_100TH_MM : { - sal_Char aText[] = "/100mm"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("/100mm")); break; } case MAP_10TH_MM : { - sal_Char aText[] = "/10mm"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("/10mm")); break; } case MAP_MM : { - sal_Char aText[] = "mm"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("mm")); break; } case MAP_CM : { - sal_Char aText[] = "cm"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("cm")); break; } // Inch case MAP_1000TH_INCH: { - sal_Char aText[] = "/1000\""; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("/1000\"")); break; } case MAP_100TH_INCH : { - sal_Char aText[] = "/100\""; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("/100\"")); break; } case MAP_10TH_INCH : { - sal_Char aText[] = "/10\""; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("/10\"")); break; } case MAP_INCH : @@ -1134,34 +1103,29 @@ void SdrFormatter::TakeUnitStr(MapUnit eUnit, XubString& rStr) } case MAP_POINT : { - sal_Char aText[] = "pt"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("pt")); break; } case MAP_TWIP : { - sal_Char aText[] = "twip"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("twip")); break; } // Sonstiges case MAP_PIXEL : { - sal_Char aText[] = "pixel"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("pixel")); break; } case MAP_SYSFONT : { - sal_Char aText[] = "sysfont"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("sysfont")); break; } case MAP_APPFONT : { - sal_Char aText[] = "appfont"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("appfont")); break; } case MAP_RELATIVE : @@ -1189,20 +1153,17 @@ void SdrFormatter::TakeUnitStr(FieldUnit eUnit, XubString& rStr) // Metrisch case FUNIT_100TH_MM: { - sal_Char aText[] = "/100mm"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("/100mm")); break; } case FUNIT_MM : { - sal_Char aText[] = "mm"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("mm")); break; } case FUNIT_CM : { - sal_Char aText[] = "cm"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("cm")); break; } case FUNIT_M : @@ -1213,28 +1174,24 @@ void SdrFormatter::TakeUnitStr(FieldUnit eUnit, XubString& rStr) } case FUNIT_KM : { - sal_Char aText[] = "km"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("km")); break; } // Inch case FUNIT_TWIP : { - sal_Char aText[] = "twip"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("twip")); break; } case FUNIT_POINT : { - sal_Char aText[] = "pt"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("pt")); break; } case FUNIT_PICA : { - sal_Char aText[] = "pica"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("pica")); break; } case FUNIT_INCH : @@ -1245,14 +1202,12 @@ void SdrFormatter::TakeUnitStr(FieldUnit eUnit, XubString& rStr) } case FUNIT_FOOT : { - sal_Char aText[] = "ft"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("ft")); break; } case FUNIT_MILE : { - sal_Char aText[] = "mile(s)"; - rStr = UniString(aText, sizeof(aText-1)); + rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("mile(s)")); break; } @@ -1269,3 +1224,4 @@ void SdrFormatter::TakeUnitStr(FieldUnit eUnit, XubString& rStr) //////////////////////////////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index e1d5d7f9b054..b746813faff5 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,7 +106,7 @@ XubString SdrUndoAction::GetSdrRepeatComment(SdrView& /*rView*/) const SdrUndoGroup::SdrUndoGroup(SdrModel& rNewMod) : SdrUndoAction(rNewMod), aBuf(1024,32,32), - eFunction(SDRREPFUNC_OBJ_NONE) /*#72642#*/ + eFunction(SDRREPFUNC_OBJ_NONE) {} SdrUndoGroup::SdrUndoGroup(SdrModel& rNewMod,const String& rStr) @@ -159,8 +160,8 @@ void SdrUndoGroup::Redo() XubString SdrUndoGroup::GetComment() const { XubString aRet(aComment); - sal_Char aSearchText[] = "%1"; - String aSearchString(aSearchText, sizeof(aSearchText-1)); + + String aSearchString(RTL_CONSTASCII_USTRINGPARAM("%1")); aRet.SearchAndReplace(aSearchString, aObjDescription); @@ -217,39 +218,25 @@ void SdrUndoGroup::SdrRepeat(SdrView& rView) XubString SdrUndoGroup::GetSdrRepeatComment(SdrView& /*rView*/) const { XubString aRet(aComment); - sal_Char aSearchText[] = "%1"; - String aSearchString(aSearchText, sizeof(aSearchText-1)); + + String aSearchString(RTL_CONSTASCII_USTRINGPARAM("%1")); aRet.SearchAndReplace(aSearchString, ImpGetResStr(STR_ObjNameSingulPlural)); return aRet; } -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@@@ @@@@@ @@@@@@ @@@@@ @@@@ @@@@@@ @@@@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@@@@ @@ @@@@ @@ @@ @@@@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@@@ @@@@@ @@@@ @@@@@ @@@@ @@ @@@@ -// -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// - SdrUndoObj::SdrUndoObj(SdrObject& rNewObj): SdrUndoAction(*rNewObj.GetModel()), pObj(&rNewObj) { } -void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, FASTBOOL bRepeat ) +void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, bool bRepeat ) { rStr = ImpGetResStr(nStrCacheID); - sal_Char aSearchText[] = "%1"; - String aSearchString(aSearchText, sizeof(aSearchText-1)); + + String aSearchString(RTL_CONSTASCII_USTRINGPARAM("%1")); xub_StrLen nPos = rStr.Search(aSearchString); @@ -271,14 +258,13 @@ void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, sa } } -void SdrUndoObj::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, FASTBOOL bRepeat) const +void SdrUndoObj::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, bool bRepeat) const { if ( pObj ) GetDescriptionStringForObject( *pObj, nStrCacheID, rStr, bRepeat ); } -// #94278# common call method for evtl. page change when UNDO/REDO -// is triggered +// common call method for evtl. page change when UNDO/REDO is triggered void SdrUndoObj::ImpShowPageOfThisObject() { if(pObj && pObj->IsInserted() && pObj->GetPage() && pObj->GetModel()) @@ -294,7 +280,7 @@ void SdrUndoObj::ImpShowPageOfThisObject() //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1, FASTBOOL bSaveText) +SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1, bool bSaveText) : SdrUndoObj(rNewObj), pUndoSet(NULL), pRedoSet(NULL), @@ -381,7 +367,7 @@ void SdrUndoAttrObj::Undo() E3DModifySceneSnapRectUpdater aUpdater(pObj); sal_Bool bIs3DScene(pObj && pObj->ISA(E3dScene)); - // #94278# Trigger PageChangeCall + // Trigger PageChangeCall ImpShowPageOfThisObject(); if(!pUndoGroup || bIs3DScene) @@ -418,7 +404,7 @@ void SdrUndoAttrObj::Undo() sdr::properties::ItemChangeBroadcaster aItemChange(*pObj); - // #105122# Since ClearItem sets back everything to normal + // Since ClearItem sets back everything to normal // it also sets fit-to-size text to non-fit-to-size text and // switches on autogrowheight (the default). That may lead to // loosing the geometry size info for the object when it is @@ -428,7 +414,6 @@ void SdrUndoAttrObj::Undo() if(pUndoSet) { - // #109587# if(pObj->ISA(SdrCaptionObj)) { // do a more smooth item deletion here, else the text @@ -457,7 +442,7 @@ void SdrUndoAttrObj::Undo() pObj->SetMergedItemSet(*pUndoSet); } - // #105122# Restore prev size here when it was changed. + // Restore prev size here when it was changed. if(aSnapRect != pObj->GetSnapRect()) { pObj->NbcSetSnapRect(aSnapRect); @@ -492,12 +477,10 @@ void SdrUndoAttrObj::Redo() sdr::properties::ItemChangeBroadcaster aItemChange(*pObj); - // #105122# const Rectangle aSnapRect = pObj->GetSnapRect(); if(pRedoSet) { - // #109587# if(pObj->ISA(SdrCaptionObj)) { // do a more smooth item deletion here, else the text @@ -526,7 +509,7 @@ void SdrUndoAttrObj::Redo() pObj->SetMergedItemSet(*pRedoSet); } - // #105122# Restore prev size here when it was changed. + // Restore prev size here when it was changed. if(aSnapRect != pObj->GetSnapRect()) { pObj->NbcSetSnapRect(aSnapRect); @@ -546,7 +529,7 @@ void SdrUndoAttrObj::Redo() pUndoGroup->Redo(); } - // #94278# Trigger PageChangeCall + // Trigger PageChangeCall ImpShowPageOfThisObject(); } @@ -599,7 +582,7 @@ XubString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& /*rView*/) const void SdrUndoMoveObj::Undo() { - // #94278# Trigger PageChangeCall + // Trigger PageChangeCall ImpShowPageOfThisObject(); pObj->Move(Size(-aDistance.Width(),-aDistance.Height())); @@ -609,7 +592,7 @@ void SdrUndoMoveObj::Redo() { pObj->Move(Size(aDistance.Width(),aDistance.Height())); - // #94278# Trigger PageChangeCall + // Trigger PageChangeCall ImpShowPageOfThisObject(); } @@ -649,7 +632,7 @@ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj): if (pOL!=NULL && pOL->GetObjCount() && !rNewObj.ISA(E3dScene)) { // Aha, Gruppenobjekt - // AW: Aber keine 3D-Szene, dann nur fuer die Szene selbst den Undo anlegen + // Aber keine 3D-Szene, dann nur fuer die Szene selbst den Undo anlegen pUndoGroup=new SdrUndoGroup(*pObj->GetModel()); sal_uIntPtr nObjAnz=pOL->GetObjCount(); for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) { @@ -669,14 +652,13 @@ SdrUndoGeoObj::~SdrUndoGeoObj() void SdrUndoGeoObj::Undo() { - // #94278# Trigger PageChangeCall + // Trigger PageChangeCall ImpShowPageOfThisObject(); if(pUndoGroup) { pUndoGroup->Undo(); - // #97172# // only repaint, no objectchange pObj->ActionChanged(); } @@ -694,7 +676,6 @@ void SdrUndoGeoObj::Redo() { pUndoGroup->Redo(); - // #97172# // only repaint, no objectchange pObj->ActionChanged(); } @@ -705,7 +686,7 @@ void SdrUndoGeoObj::Redo() pObj->SetGeoData(*pRedoGeo); } - // #94278# Trigger PageChangeCall + // Trigger PageChangeCall ImpShowPageOfThisObject(); } @@ -753,7 +734,7 @@ void SdrUndoObjList::SetOwner(bool bNew) void SdrUndoRemoveObj::Undo() { - // #94278# Trigger PageChangeCall + // Trigger PageChangeCall ImpShowPageOfThisObject(); DBG_ASSERT(!pObj->IsInserted(),"UndoRemoveObj: pObj ist bereits Inserted"); @@ -793,7 +774,7 @@ void SdrUndoRemoveObj::Redo() pObjList->RemoveObject(nOrdNum); } - // #94278# Trigger PageChangeCall + // Trigger PageChangeCall ImpShowPageOfThisObject(); } @@ -801,7 +782,7 @@ void SdrUndoRemoveObj::Redo() void SdrUndoInsertObj::Undo() { - // #94278# Trigger PageChangeCall + // Trigger PageChangeCall ImpShowPageOfThisObject(); DBG_ASSERT(pObj->IsInserted(),"UndoInsertObj: pObj ist nicht Inserted"); @@ -822,9 +803,9 @@ void SdrUndoInsertObj::Redo() DBG_ASSERT(!pObj->IsInserted(),"RedoInsertObj: pObj ist bereits Inserted"); if (!pObj->IsInserted()) { - // --> OD 2005-05-10 #i45952# - restore anchor position of an object, + // Restore anchor position of an object, // which becomes a member of a group, because its cleared in method - // <InsertObject(..)>. Needed for correct ReDo in Writer. + // <InsertObject(..)>. Needed for correct ReDo in Writer. (#i45952#) Point aAnchorPos( 0, 0 ); if ( pObjList && pObjList->GetOwnerObj() && @@ -832,20 +813,18 @@ void SdrUndoInsertObj::Redo() { aAnchorPos = pObj->GetAnchorPos(); } - // <-- SdrInsertReason aReason(SDRREASON_UNDO); pObjList->InsertObject(pObj,nOrdNum,&aReason); - // --> OD 2005-05-10 #i45952# + // Arcs lose position when grouped (#i45952#) if ( aAnchorPos.X() || aAnchorPos.Y() ) { pObj->NbcSetAnchorPos( aAnchorPos ); } - // <-- } - // #94278# Trigger PageChangeCall + // Trigger PageChangeCall ImpShowPageOfThisObject(); } @@ -957,7 +936,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj() void SdrUndoReplaceObj::Undo() { - // #94278# Trigger PageChangeCall + // Trigger PageChangeCall ImpShowPageOfThisObject(); if (IsOldOwner() && !IsNewOwner()) @@ -972,7 +951,7 @@ void SdrUndoReplaceObj::Undo() } else { - DBG_ERROR("SdrUndoReplaceObj::Undo(): IsMine-Flags stehen verkehrt. Doppelter Undo-Aufruf?"); + OSL_FAIL("SdrUndoReplaceObj::Undo(): IsMine-Flags stehen verkehrt. Doppelter Undo-Aufruf?"); } } @@ -991,10 +970,10 @@ void SdrUndoReplaceObj::Redo() } else { - DBG_ERROR("SdrUndoReplaceObj::Redo(): IsMine-Flags stehen verkehrt. Doppelter Redo-Aufruf?"); + OSL_FAIL("SdrUndoReplaceObj::Redo(): IsMine-Flags stehen verkehrt. Doppelter Redo-Aufruf?"); } - // #94278# Trigger PageChangeCall + // Trigger PageChangeCall ImpShowPageOfThisObject(); } @@ -1050,12 +1029,12 @@ SdrUndoObjOrdNum::SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, s void SdrUndoObjOrdNum::Undo() { - // #94278# Trigger PageChangeCall + // Trigger PageChangeCall ImpShowPageOfThisObject(); SdrObjList* pOL=pObj->GetObjList(); if (pOL==NULL) { - DBG_ERROR("UndoObjOrdNum: pObj hat keine ObjList"); + OSL_FAIL("UndoObjOrdNum: pObj hat keine ObjList"); return; } pOL->SetObjectOrdNum(nNewOrdNum,nOldOrdNum); @@ -1065,12 +1044,12 @@ void SdrUndoObjOrdNum::Redo() { SdrObjList* pOL=pObj->GetObjList(); if (pOL==NULL) { - DBG_ERROR("RedoObjOrdNum: pObj hat keine ObjList"); + OSL_FAIL("RedoObjOrdNum: pObj hat keine ObjList"); return; } pOL->SetObjectOrdNum(nOldOrdNum,nNewOrdNum); - // #94278# Trigger PageChangeCall + // Trigger PageChangeCall ImpShowPageOfThisObject(); } @@ -1119,7 +1098,7 @@ void SdrUndoObjSetText::AfterSetText() void SdrUndoObjSetText::Undo() { - // #94278# Trigger PageChangeCall + // Trigger PageChangeCall ImpShowPageOfThisObject(); // alten Text sichern fuer Redo @@ -1153,7 +1132,7 @@ void SdrUndoObjSetText::Redo() pObj->ActionChanged(); - // #94278# Trigger PageChangeCall + // Trigger PageChangeCall ImpShowPageOfThisObject(); } @@ -1209,14 +1188,14 @@ void SdrUndoObjSetText::SdrRepeat(SdrView& rView) bool SdrUndoObjSetText::CanSdrRepeat(SdrView& rView) const { - bool bOk=sal_False; + bool bOk = false; if (bNewTextAvailable && rView.AreObjectsMarked()) { bOk=sal_True; } return bOk; } -// --> OD 2009-07-09 #i73249# +// Undo/Redo for setting object's name (#i73249#) SdrUndoObjStrAttr::SdrUndoObjStrAttr( SdrObject& rNewObj, const ObjStrAttrType eObjStrAttr, const String& sOldStr, @@ -1305,19 +1284,6 @@ String SdrUndoObjStrAttr::GetComment() const return aStr; } -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@ @@@@ @@ @@ @@@@@ @@@@@ -// @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@@@@@ @@@@ @@@@ @@@@@ -// @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ -// @@@@@ @@ @@ @@ @@@@@ @@ @@ -// -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// SdrUndoLayer::SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel): SdrUndoAction(rNewModel), @@ -1412,19 +1378,6 @@ XubString SdrUndoMoveLayer::GetComment() const return ImpGetResStr(STR_UndoMovLayer); } -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@@@@ @@@@ @@@@ @@@@@ @@@@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ -// @@@@@ @@@@@@ @@ @@@ @@@@ @@@@ -// @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@@@@ @@@@@ @@@@ -// -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// SdrUndoPage::SdrUndoPage(SdrPage& rNewPg) : SdrUndoAction(*rNewPg.GetModel()), @@ -1455,6 +1408,7 @@ void SdrUndoPage::ImpRemovePage(sal_uInt16 nNum) pChkPg=rMod.RemovePage(nNum); } DBG_ASSERT(pChkPg==&mrPage,"SdrUndoPage::ImpRemovePage(): RemovePage!=&mrPage"); + (void)pChkPg; } } @@ -1470,7 +1424,7 @@ void SdrUndoPage::ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum) } } -void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 /*n*/, FASTBOOL /*bRepeat*/) const +void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 /*n*/, bool /*bRepeat*/) const { rStr=ImpGetResStr(nStrCacheID); } @@ -1572,7 +1526,7 @@ void SdrUndoDelPage::SdrRepeat(SdrView& /*rView*/) bool SdrUndoDelPage::CanSdrRepeat(SdrView& /*rView*/) const { - return sal_False; + return false; } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1621,7 +1575,7 @@ void SdrUndoCopyPage::SdrRepeat(SdrView& /*rView*/) bool SdrUndoCopyPage::CanSdrRepeat(SdrView& /*rView*/) const { - return sal_False; + return false; } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1643,18 +1597,6 @@ XubString SdrUndoSetPageNum::GetComment() const return aStr; } -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@ @@ @@@@ @@@@ @@@@@@ @@@@@ @@@@@ @@@@@ @@@@ @@@@ @@@@@ @@@@ -// @@@ @@@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@@@@@@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@@@@@@ @@@@@@ @@@@ @@ @@@@ @@@@@ @@@@@ @@@@@@ @@ @@@ @@@@ @@@@ -// @@ @ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@ @@@@ @@ @@@@@ @@ @@ @@ @@ @@ @@@@@ @@@@@ @@@@ -// -//////////////////////////////////////////////////////////////////////////////////////////////////// - SdrUndoPageMasterPage::SdrUndoPageMasterPage(SdrPage& rChangedPage) : SdrUndoPage(rChangedPage), mbOldHadMasterPage(mrPage.TRG_HasMasterPage()) @@ -1868,4 +1810,5 @@ SdrUndoAction* SdrUndoFactory::CreateUndoPageChangeMasterPage(SdrPage& rChangedP return new SdrUndoPageChangeMasterPage(rChangedPage); } -// eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index acfaf12ae8d6..13cc43029f37 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -157,19 +158,6 @@ SdrDropMarkerOverlay::~SdrDropMarkerOverlay() // OverlayManager and deletes them. } -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// -// -// @@ @@ @@ @@@@@ @@ @@ -// @@ @@ @@ @@ @@ @@ -// @@ @@ @@ @@ @@ @ @@ -// @@@@@ @@ @@@@ @@@@@@@ -// @@@ @@ @@ @@@@@@@ -// @@@ @@ @@ @@@ @@@ -// @ @@ @@@@@ @@ @@ -// -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// TYPEINIT1(SdrView,SdrCreateView); @@ -273,9 +261,6 @@ sal_Bool SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin) if (DoMouseEvent(aVEvt)) bRet=sal_True; } - // #87792# Removed code which did let the mouse snap on object - // points - return bRet; } @@ -286,7 +271,6 @@ sal_Bool SdrView::Command(const CommandEvent& rCEvt, Window* pWin) return bRet; } -/* new interface src537 */ sal_Bool SdrView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const { return SdrCreateView::GetAttributes(rTargetSet, bOnlyHardAttr); @@ -294,8 +278,7 @@ sal_Bool SdrView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) SfxStyleSheet* SdrView::GetStyleSheet() const { - //sal_Bool bOk=sal_False; - return SdrCreateView::GetStyleSheet(); //bOk); + return SdrCreateView::GetStyleSheet(); } SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, sal_uInt16 nEventKind, SdrViewEvent& rVEvt) const @@ -309,7 +292,6 @@ SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, sal_uInt16 nEventKind, if (pOut==NULL) { pOut = GetFirstOutputDevice(); - //pOut=GetWin(0); } Point aPnt(rMEvt.GetPosPixel()); if (pOut!=NULL) aPnt=pOut->PixelToLogic(aPnt); @@ -346,7 +328,6 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co if (pOut==NULL) { pOut = GetFirstOutputDevice(); - //pOut=GetWin(0); } // #i73628# Use a non-changeable copy of he logic pos @@ -371,7 +352,6 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co sal_uInt16 nHitPassNum=0; sal_uInt16 nHlplIdx=0; sal_uInt16 nGlueId=0; - sal_Bool bUnmarkedObjHit=sal_False; if (bTextEditHit || bTextEditSel) { eHit=SDRHIT_TEXTEDIT; @@ -409,7 +389,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co } } } - else if (PickObj(aLocalLogicPosition,nHitTolLog,pHitObj,pPV,SDRSEARCH_DEEP|/*SDRSEARCH_TESTMARKABLE|*/SDRSEARCH_ALSOONMASTER|SDRSEARCH_WHOLEPAGE,&pObj,NULL,&nHitPassNum)) + else if (PickObj(aLocalLogicPosition,nHitTolLog,pHitObj,pPV,SDRSEARCH_DEEP|SDRSEARCH_ALSOONMASTER|SDRSEARCH_WHOLEPAGE,&pObj,NULL,&nHitPassNum)) { // MasterPages und WholePage fuer Macro und URL eHit=SDRHIT_UNMARKEDOBJECT; @@ -429,7 +409,6 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co break; } } - bUnmarkedObjHit=sal_True; } else if (bEditMode && IsHlplVisible() && !IsHlplFront() && pOut!=NULL && PickHelpLine(aLocalLogicPosition,nHitTolLog,*pOut,nHlplIdx,pPV)) { @@ -502,8 +481,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co Point aTemporaryTextRelativePosition(aLocalLogicPosition - aTextRect.TopLeft()); // FitToSize berueksichtigen - SdrFitToSizeType eFit=pTextObj->GetFitToSize(); - sal_Bool bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); + bool bFitToSize(pTextObj->IsFitToSize()); if (bFitToSize) { Fraction aX(aTextRect.GetWidth()-1,aAnchor.GetWidth()-1); Fraction aY(aTextRect.GetHeight()-1,aAnchor.GetHeight()-1); @@ -538,14 +516,12 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co // Ringsum die TextEditArea ein Rand zum Selektieren ohne Textedit Rectangle aBoundRect(pHitObj->GetCurrentBoundRect()); - // #105130# Force to SnapRect when Fontwork + // Force to SnapRect when Fontwork if(pHitObj->ISA(SdrTextObj) && ((SdrTextObj*)pHitObj)->IsFontwork()) { aBoundRect = pHitObj->GetSnapRect(); } - // #105130# Old test for hit on BoundRect is completely wrong - // and never worked, doing it new here. sal_Int32 nTolerance(nHitTolLog); sal_Bool bBoundRectHit(sal_False); @@ -662,7 +638,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co eEvent=SDREVENT_BEGDRAGOBJ; // Mark+Drag,AddMark+Drag,DeepMark+Drag,Unmark sal_Bool bGlue=pHdl->GetKind()==HDL_GLUE; sal_Bool bPoly=!bGlue && IsPointMarkable(*pHdl); - sal_Bool bMarked=bGlue || bPoly && pHdl->IsSelected(); + sal_Bool bMarked=bGlue || (bPoly && pHdl->IsSelected()); if (bGlue || bPoly) { eEvent=bGlue ? SDREVENT_MARKGLUEPOINT : SDREVENT_MARKPOINT; @@ -773,7 +749,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co #ifdef DGB_UTIL if (rVEvt.pRootObj!=NULL) { if (rVEvt.pRootObj->GetObjList()!=rVEvt.pPV->GetObjList()) { - DBG_ERROR("SdrView::PickAnything(): pRootObj->GetObjList()!=pPV->GetObjList() !"); + OSL_FAIL("SdrView::PickAnything(): pRootObj->GetObjList()!=pPV->GetObjList() !"); } } #endif @@ -790,7 +766,6 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) sal_Bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0; sal_Bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0; sal_Bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0; - //sal_Bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0; sal_Bool bMouseDown=rVEvt.bMouseDown; sal_Bool bMouseUp=rVEvt.bMouseUp; if (bMouseDown) { @@ -1003,7 +978,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* aHitRec.bDown=bMacroDown; return pMacroObj->GetMacroPointer(aHitRec); } - //sal_uInt16 nTol=nHitTolLog; + // TextEdit, ObjEdit, Macro if (IsTextEdit() && (IsTextEditInSelectionMode() || IsTextEditHit(rMousePos,0/*nTol*/))) { @@ -1106,13 +1081,11 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* // Sind 3D-Objekte selektiert? sal_Bool b3DObjSelected = sal_False; -#ifndef SVX_LIGHT for (sal_uInt32 a=0; !b3DObjSelected && a<GetMarkedObjectCount(); a++) { SdrObject* pObj = GetMarkedObjectByIndex(a); if(pObj && pObj->ISA(E3dObject)) b3DObjSelected = sal_True; } -#endif // Falls es um ein 3D-Objekt geht, muss trotz !IsShearAllowed // weitergemacht werden, da es sich um eine Rotation statt um // einen Shear handelt @@ -1601,4 +1574,6 @@ void SdrView::SetMasterPagePaintCaching(sal_Bool bOn) } } } -// eof + + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index c33b4d8c84b3..5b64a8272946 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -349,3 +350,4 @@ Window* SdrViewIter::NextWindow() //////////////////////////////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index dd7275f9cfdc..e815fa9c0e2a 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,7 +59,6 @@ #include <clonelist.hxx> #include <vcl/virdev.hxx> -// b4967543 #include <svl/style.hxx> // #i72535# @@ -222,7 +222,7 @@ sal_Bool SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObj SdrRectObj* pObj=new SdrRectObj(OBJ_TEXT,aTextRect); pObj->SetModel(pMod); pObj->SetLayer(nLayer); - pObj->NbcSetText(rStr); // #32424# SetText vor SetAttr, weil SetAttr sonst unwirksam! + pObj->NbcSetText(rStr); // SetText vor SetAttr, weil SetAttr sonst unwirksam! if (pDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(pDefaultStyleSheet, sal_False); pObj->SetMergedItemSet(aDefaultAttr); @@ -355,14 +355,13 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL { const SdrPage* pSrcPg=pSrcMod->GetPage(nPg); - // #104148# Use SnapRect, not BoundRect here + // Use SnapRect, not BoundRect here Rectangle aR=pSrcPg->GetAllObjSnapRect(); if (bResize) ResizeRect(aR,aPt0,xResize,yResize); Point aDist(aPos-aR.Center()); Size aSiz(aDist.X(),aDist.Y()); - //sal_uIntPtr nDstObjAnz0=pDstLst->GetObjCount(); sal_uIntPtr nCloneErrCnt=0; sal_uIntPtr nOb,nObAnz=pSrcPg->GetObjCount(); sal_Bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0; @@ -375,16 +374,15 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL { const SdrObject* pSrcOb=pSrcPg->GetObj(nOb); - // #116235# SdrObject* pNeuObj = pSrcOb->Clone(); if (pNeuObj!=NULL) { if(bResize) { - pNeuObj->GetModel()->SetPasteResize(sal_True); // #51139# + pNeuObj->GetModel()->SetPasteResize(sal_True); pNeuObj->NbcResize(aPt0,xResize,yResize); - pNeuObj->GetModel()->SetPasteResize(sal_False); // #51139# + pNeuObj->GetModel()->SetPasteResize(sal_False); } // #i39861# @@ -462,7 +460,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL aStr += " Objektverbindungen werden nicht mitkopiert."; - DBG_ERROR(aStr.GetBuffer()); + OSL_FAIL(aStr.GetBuffer()); #endif } } @@ -602,7 +600,7 @@ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( sal_Bool bNoVDevIfOneMtfMarke } } - if( !aMtf.GetActionCount() ) + if( !aMtf.GetActionSize() ) { VirtualDevice aOut; Size aDummySize( 2, 2 ); @@ -669,7 +667,7 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* if(pSdrGrafObj) { - // #110981# Make behaviour coherent with metafile + // Make behaviour coherent with metafile // recording below (which of course also takes // view-transformed objects) aRet = pSdrGrafObj->GetTransformedGraphic(); @@ -707,7 +705,7 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* aMtf.SetPrefMapMode( aMap ); aMtf.SetPrefSize( aBoundRect.GetSize() ); - if( aMtf.GetActionCount() ) + if( aMtf.GetActionSize() ) aRet = aMtf; } } @@ -806,8 +804,6 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const } else { - // #116235# - // pNeuObj = pObj->Clone( pNeuPag, pNeuMod ); pNeuObj = pObj->Clone(); pNeuObj->SetPage( pNeuPag ); pNeuObj->SetModel( pNeuMod ); @@ -848,7 +844,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const aStr += " Objektverbindungen werden nicht mitkopiert."; - DBG_ERROR(aStr.GetBuffer()); + OSL_FAIL(aStr.GetBuffer()); #endif } } @@ -859,7 +855,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const sal_Bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */) { - DBG_ERROR( "SdrExchangeView::Cut: Not supported anymore" ); + OSL_FAIL( "SdrExchangeView::Cut: Not supported anymore" ); return sal_False; } @@ -867,14 +863,14 @@ sal_Bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */) void SdrExchangeView::CutMarked( sal_uIntPtr /*nFormat */) { - DBG_ERROR( "SdrExchangeView::CutMarked: Not supported anymore" ); + OSL_FAIL( "SdrExchangeView::CutMarked: Not supported anymore" ); } // ----------------------------------------------------------------------------- sal_Bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/) { - DBG_ERROR( "SdrExchangeView::Yank: Not supported anymore" ); + OSL_FAIL( "SdrExchangeView::Yank: Not supported anymore" ); return sal_False; } @@ -882,13 +878,15 @@ sal_Bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/) void SdrExchangeView::YankMarked(sal_uIntPtr /*nFormat*/) { - DBG_ERROR( "YankMarked: Not supported anymore" ); + OSL_FAIL( "YankMarked: Not supported anymore" ); } // ----------------------------------------------------------------------------- sal_Bool SdrExchangeView::Paste(Window* /*pWin*/, sal_uIntPtr /*nFormat*/) { - DBG_ERROR( "SdrExchangeView::Paste: Not supported anymore" ); + OSL_FAIL( "SdrExchangeView::Paste: Not supported anymore" ); return sal_False; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index ce04c9f6307a..4b9cbb508fbe 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -194,7 +195,7 @@ void SAL_CALL AccessibleCell::release( ) throw () */ sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ThrowIfDisposed (); return mpText != NULL ? mpText->GetChildCount () : 0; } @@ -206,7 +207,7 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() throw (::com::sun:: */ Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nIndex) throw (IndexOutOfBoundsException, RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ThrowIfDisposed (); // todo: does GetChild throw IndexOutOfBoundsException? @@ -223,7 +224,7 @@ Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nI */ Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet (void) throw (RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); Reference<XAccessibleStateSet> xStateSet; @@ -275,7 +276,7 @@ sal_Bool SAL_CALL AccessibleCell::containsPoint( const ::com::sun::star::awt::Po */ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const ::com::sun::star::awt::Point& aPoint) throw(RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); sal_Int32 nChildCount = getAccessibleChildCount (); @@ -306,7 +307,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : ::com::sun::star::awt::Rectangle SAL_CALL AccessibleCell::getBounds(void) throw(RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed (); @@ -465,7 +466,7 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException) void SAL_CALL AccessibleCell::addEventListener( const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -485,7 +486,7 @@ void SAL_CALL AccessibleCell::addEventListener( const Reference<XAccessibleEvent void SAL_CALL AccessibleCell::removeEventListener( const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; AccessibleContextBase::removeEventListener(rxListener); if (mpText != NULL) mpText->RemoveEventListener (rxListener); @@ -539,7 +540,7 @@ void AccessibleCell::ViewForwarderChanged (ChangeType /*aChangeType*/, const IAc void AccessibleCell::disposing (void) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); // Make sure to send an event that this object looses the focus in the @@ -573,7 +574,7 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent (void) throw (Runt ::rtl::OUString SAL_CALL AccessibleCell::getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) { ThrowIfDisposed (); - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; if( mxCell.is() ) return mxCell->getName(); @@ -582,3 +583,5 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent (void) throw (Runt } } // end of namespace accessibility + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index 9d7a3deef5f4..fe2fdfaf6bc1 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -147,3 +148,5 @@ private: } // end of namespace accessibility #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 4dd7a4b58b47..0fbb214e6170 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <comphelper/accessiblewrapper.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/debug.hxx> #include <vcl/svapp.hxx> @@ -71,7 +72,7 @@ struct hash } }; -typedef std::hash_map< Reference< XCell >, rtl::Reference< AccessibleCell >, hash > AccessibleCellMap; +typedef boost::unordered_map< Reference< XCell >, rtl::Reference< AccessibleCell >, hash > AccessibleCellMap; //----------------------------------------------------------------------------- // AccessibleTableShapeImpl @@ -228,14 +229,14 @@ void SAL_CALL AccessibleTableShapeImpl::modified( const EventObject& /*aEvent*/ // all accessible cell instances still left in aTempChildMap must be disposed // as they are no longer part of the table - for( AccessibleCellMap::iterator iter( aTempChildMap.begin() ); iter != aTempChildMap.end(); iter++ ) + for( AccessibleCellMap::iterator iter( aTempChildMap.begin() ); iter != aTempChildMap.end(); ++iter ) { (*iter).second->dispose(); } } catch( Exception& ) { - DBG_ERROR("svx::AccessibleTableShape::modified(), exception caught!"); + OSL_FAIL("svx::AccessibleTableShape::modified(), exception caught!"); } } @@ -276,7 +277,7 @@ void AccessibleTableShape::Init() } catch( Exception& ) { - DBG_ERROR("AccessibleTableShape::init(), exception caught?"); + OSL_FAIL("AccessibleTableShape::init(), exception caught?"); } AccessibleTableShape_Base::Init(); @@ -342,14 +343,14 @@ OUString AccessibleTableShape::CreateAccessibleBaseName(void) throw (RuntimeExce sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleChildCount( ) throw(RuntimeException) { - ::vos::OGuard aSolarGuard(::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; return mxImpl->mxTable.is() ? mxImpl->mxTable->getRowCount() * mxImpl->mxTable->getColumnCount() : 0; } //-------------------------------------------------------------------- Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleChild( sal_Int32 i ) throw(IndexOutOfBoundsException, RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ThrowIfDisposed(); return mxImpl->getAccessibleChild( i ); @@ -384,7 +385,7 @@ void SAL_CALL AccessibleTableShape::disposing (void) sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowCount() throw (RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; return mxImpl->mxTable.is() ? mxImpl->mxTable->getRowCount() : 0; } @@ -392,7 +393,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowCount() throw (RuntimeE sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnCount( ) throw (RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; return mxImpl->mxTable.is() ? mxImpl->mxTable->getColumnCount() : 0; } @@ -408,7 +409,7 @@ OUString SAL_CALL AccessibleTableShape::getAccessibleRowDescription( sal_Int32 n OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; checkCellPosition( nColumn, 0 ); return OUString(); } @@ -417,7 +418,7 @@ OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int3 sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; checkCellPosition( nColumn, nRow ); if( mxImpl->mxTable.is() ) { @@ -432,7 +433,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRo sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; checkCellPosition( nColumn, nRow ); if( mxImpl->mxTable.is() ) { @@ -479,7 +480,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumn sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; checkCellPosition( 0, nRow ); return sal_False; } @@ -488,7 +489,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; checkCellPosition( nColumn, 0 ); return sal_False; } @@ -497,7 +498,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nC Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; checkCellPosition( nColumn, nRow ); sal_Int32 nChildIndex = 0; @@ -527,7 +528,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleSummary( ) sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; checkCellPosition( nColumn, nRow ); SvxTableController* pController = getTableController(); @@ -546,7 +547,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sa sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; checkCellPosition( nColumn, nRow ); return mxImpl->mxTable.is() ? (nRow * mxImpl->mxTable->getColumnCount() + nColumn) : 0; } @@ -555,7 +556,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; sal_Int32 nColumn = 0, nRow = 0; mxImpl->getColumnAndRow( nChildIndex, nColumn, nRow ); return nRow; @@ -565,7 +566,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; sal_Int32 nColumn = 0, nRow = 0; mxImpl->getColumnAndRow( nChildIndex, nColumn, nRow ); return nChildIndex; @@ -577,7 +578,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIn void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException ) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; CellPos aPos; mxImpl->getColumnAndRow( nChildIndex, aPos.mnCol, aPos.mnRow ); @@ -603,7 +604,7 @@ void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException ) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; CellPos aPos; mxImpl->getColumnAndRow( nChildIndex, aPos.mnCol, aPos.mnRow ); @@ -614,7 +615,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nCh void SAL_CALL AccessibleTableShape::clearAccessibleSelection() throw ( RuntimeException ) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; SvxTableController* pController = getTableController(); if( pController ) @@ -624,7 +625,7 @@ void SAL_CALL AccessibleTableShape::clearAccessibleSelection() throw ( RuntimeEx void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() throw ( RuntimeException ) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; // todo: force selection of shape? SvxTableController* pController = getTableController(); @@ -636,7 +637,7 @@ void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() throw ( Runtim sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() throw ( RuntimeException ) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; SvxTableController* pController = getTableController(); if( pController && pController->hasSelectedCells() ) @@ -656,7 +657,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() throw Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; SvxTableController* pController = getTableController(); if( pController && pController->hasSelectedCells() ) @@ -685,7 +686,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChi void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException ) { - ::vos::OGuard aSolarGuard (::Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; CellPos aPos; mxImpl->getColumnAndRow( nChildIndex, aPos.mnCol, aPos.mnRow ); @@ -721,3 +722,5 @@ void AccessibleTableShape::checkCellPosition( sal_Int32 nCol, sal_Int32 nRow ) t } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index f6540e304bfc..4d26e69e2396 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,12 +33,13 @@ #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/table/TableBorder.hpp> +#include <com/sun/star/table/BorderLine2.hpp> #include <cppuhelper/typeprovider.hxx> #include <svl/style.hxx> #include <svl/itemset.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include "svx/sdr/properties/textproperties.hxx" @@ -63,8 +65,8 @@ // ----------------------------------------------------------------------------- +using ::editeng::SvxBorderLine; using ::rtl::OUString; -using ::vos::OGuard; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; @@ -181,7 +183,7 @@ namespace sdr BaseProperties& CellProperties::Clone(SdrObject& rObj) const { - DBG_ERROR("CellProperties::Clone(), does not work yet!"); + OSL_FAIL("CellProperties::Clone(), does not work yet!"); return *(new CellProperties(*this, rObj,0)); } @@ -333,7 +335,7 @@ void Cell::dispose() } catch( Exception& ) { - DBG_ERROR("Cell::dispose(), exception caught!"); + OSL_FAIL("Cell::dispose(), exception caught!"); } mxTable.clear(); } @@ -553,7 +555,7 @@ const SfxItemSet& Cell::GetObjectItemSet() } else { - DBG_ERROR("Cell::GetObjectItemSet(), called without properties!"); + OSL_FAIL("Cell::GetObjectItemSet(), called without properties!"); return GetObject().GetObjectItemSet(); } } @@ -976,7 +978,7 @@ Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMa } else { - DBG_ERROR("GetAnyForItem() Returnvalue has wrong Type!" ); + OSL_FAIL("GetAnyForItem() Returnvalue has wrong Type!" ); } } @@ -992,7 +994,7 @@ Reference< XPropertySetInfo > SAL_CALL Cell::getPropertySetInfo() throw(RuntimeE void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( (mpProperties == 0) || (GetModel() == 0) ) throw DisposedException(); @@ -1137,7 +1139,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( (mpProperties == 0) || (GetModel() == 0) ) throw DisposedException(); @@ -1253,7 +1255,7 @@ void SAL_CALL Cell::removeVetoableChangeListener( const OUString& /*PropertyName void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { - OGuard aSolarGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aSolarGuard; if( (mpProperties == 0) || (GetModel() == 0) ) throw DisposedException(); @@ -1271,11 +1273,11 @@ void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyName } catch( UnknownPropertyException& ) { - DBG_ERROR("svx::Cell::setPropertyValues(), unknown property!" ); + OSL_FAIL("svx::Cell::setPropertyValues(), unknown property!" ); } catch( Exception& ) { - DBG_ERROR("svx::Cell::setPropertyValues(), Exception caught!" ); + OSL_FAIL("svx::Cell::setPropertyValues(), Exception caught!" ); } } } @@ -1284,7 +1286,7 @@ void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyName Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException) { - OGuard aSolarGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aSolarGuard; if( (mpProperties == 0) || (GetModel() == 0) ) throw DisposedException(); @@ -1303,11 +1305,11 @@ Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aP } catch( UnknownPropertyException& ) { - DBG_ERROR("svx::Cell::setPropertyValues(), unknown property!" ); + OSL_FAIL("svx::Cell::setPropertyValues(), unknown property!" ); } catch( Exception& ) { - DBG_ERROR( "svx::Cell::getPropertyValues(), Exception caught!" ); + OSL_FAIL( "svx::Cell::getPropertyValues(), Exception caught!" ); } } @@ -1338,7 +1340,7 @@ void SAL_CALL Cell::firePropertiesChangeEvent( const Sequence< OUString >& /*aPr PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( (mpProperties == 0) || (GetModel() == 0) ) throw DisposedException(); @@ -1450,7 +1452,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( (mpProperties == 0) || (GetModel() == 0) ) throw DisposedException(); @@ -1481,7 +1483,7 @@ Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUSt void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( (mpProperties == 0) || (GetModel() == 0) ) throw DisposedException(); @@ -1524,7 +1526,7 @@ void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(U Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( (mpProperties == 0) || (GetModel() == 0) ) throw DisposedException(); @@ -1807,3 +1809,4 @@ OUString Cell::getName() } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index 9bd2e9440d8c..be22b33f1aad 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -242,3 +243,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index 7fb3a7ffcf70..071d6de2edbb 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -249,7 +250,7 @@ bool CellCursor::GetMergedSelection( CellPos& rStart, CellPos& rEnd ) } catch( Exception& ) { - DBG_ERROR("sdr::table::SvmxTableController::GetMergedSelection(), exception caught!"); + OSL_FAIL("sdr::table::SvmxTableController::GetMergedSelection(), exception caught!"); } return false; } @@ -279,7 +280,7 @@ void SAL_CALL CellCursor::merge( ) throw (NoSupportException, RuntimeException) } catch( Exception& ) { - DBG_ERROR("sdr::table::CellCursor::merge(), exception caught!"); + OSL_FAIL("sdr::table::CellCursor::merge(), exception caught!"); } if( bUndo ) @@ -549,7 +550,7 @@ void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (No } catch( Exception& ) { - DBG_ERROR("sdr::table::CellCursor::split(), exception caught!"); + OSL_FAIL("sdr::table::CellCursor::split(), exception caught!"); throw NoSupportException(); } @@ -588,3 +589,5 @@ sal_Bool SAL_CALL CellCursor::isUnmergeable( ) throw (RuntimeException) // ----------------------------------------------------------------------------- } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx index 39b5a082416c..0b10468705ba 100644 --- a/svx/source/table/cellcursor.hxx +++ b/svx/source/table/cellcursor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,3 +82,5 @@ protected: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx index e979816fcb8d..f9e53fe54a70 100644 --- a/svx/source/table/celleditsource.cxx +++ b/svx/source/table/celleditsource.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,7 +33,7 @@ #include <rtl/ref.hxx> #include <osl/mutex.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <comphelper/processfactory.hxx> #include <svl/lstner.hxx> @@ -61,7 +62,6 @@ using ::rtl::OUString; using namespace ::osl; -using namespace ::vos; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::linguistic2; @@ -938,7 +938,7 @@ CellEditSource::CellEditSource( CellEditSourceImpl* pImpl ) //------------------------------------------------------------------------ CellEditSource::~CellEditSource() { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; mpImpl->release(); } @@ -1054,3 +1054,5 @@ void CellEditSource::ChangeModel( SdrModel* pNewModel ) //------------------------------------------------------------------------ } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/celleditsource.hxx b/svx/source/table/celleditsource.hxx index 4d5ccbd43e55..014180a3e4c0 100644 --- a/svx/source/table/celleditsource.hxx +++ b/svx/source/table/celleditsource.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/cellrange.cxx b/svx/source/table/cellrange.cxx index 29fc043090a3..3a46b38582ef 100644 --- a/svx/source/table/cellrange.cxx +++ b/svx/source/table/cellrange.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,3 +131,5 @@ Reference< XCellRange > SAL_CALL CellRange::getCellRangeByName( const OUString& // ----------------------------------------------------------------------------- } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx index 8932bc735ff7..354245de63a8 100644 --- a/svx/source/table/cellrange.hxx +++ b/svx/source/table/cellrange.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ protected: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/celltypes.hxx b/svx/source/table/celltypes.hxx index 78ef7b617968..dd4aa43ac7b1 100644 --- a/svx/source/table/celltypes.hxx +++ b/svx/source/table/celltypes.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,3 +108,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx index f5297afc770d..be3460966511 100644 --- a/svx/source/table/propertyset.cxx +++ b/svx/source/table/propertyset.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -257,3 +258,5 @@ void SAL_CALL FastPropertySet::firePropertiesChangeEvent( const Sequence< OUStri } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx index 241395272889..31cce8511a78 100644 --- a/svx/source/table/propertyset.hxx +++ b/svx/source/table/propertyset.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ #include <com/sun/star/beans/XFastPropertySet.hpp> #include <rtl/ref.hxx> #include <functional> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include <cppuhelper/implbase1.hxx> @@ -44,7 +45,7 @@ namespace comphelper { // ----------------------------------------------------------------------------- typedef std::vector< ::com::sun::star::beans::Property > PropertyVector; -typedef std::hash_map< ::rtl::OUString, ::sal_uInt32, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > PropertyMap; +typedef boost::unordered_map< ::rtl::OUString, ::sal_uInt32, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > PropertyMap; // ----------------------------------------------------------------------------- @@ -107,3 +108,5 @@ private: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 9ac652f5e025..2731ed462326 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -270,6 +271,7 @@ public: SdrTableObjImpl::SdrTableObjImpl() : mpTableObj( 0 ) , mpLayouter( 0 ) +, mbModifyPending( false ) { } @@ -355,7 +357,7 @@ void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel) } catch( Exception& ) { - DBG_ERROR("svx::SdrTableObjImpl::SetModel(), exception caught!"); + OSL_FAIL("svx::SdrTableObjImpl::SetModel(), exception caught!"); } mxTableStyle = xNewTableStyle; @@ -522,7 +524,7 @@ void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset } catch( Exception& ) { - DBG_ERROR( "svx::SdrTableObjImpl::DragEdge(), exception caught!" ); + OSL_FAIL( "svx::SdrTableObjImpl::DragEdge(), exception caught!" ); } } @@ -627,7 +629,7 @@ CellRef SdrTableObjImpl::getCell( const CellPos& rPos ) const } catch( Exception& ) { - DBG_ERROR( "svx::SdrTableObjImpl::getCell(), exception caught!" ); + OSL_FAIL( "svx::SdrTableObjImpl::getCell(), exception caught!" ); } return xCell; } @@ -1167,7 +1169,7 @@ void SdrTableObj::InsertRows( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ ) } catch( Exception& ) { - DBG_ERROR("SdrTableObj::InsertRows(), exception caught!"); + OSL_FAIL("SdrTableObj::InsertRows(), exception caught!"); } } @@ -1182,7 +1184,7 @@ void SdrTableObj::InsertColumns( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ ) } catch( Exception& ) { - DBG_ERROR("SdrTableObj::InsertColumns(), exception caught!"); + OSL_FAIL("SdrTableObj::InsertColumns(), exception caught!"); } } @@ -1197,7 +1199,7 @@ void SdrTableObj::DeleteRows( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ ) } catch( Exception& ) { - DBG_ERROR("SdrTableObj::DeleteRows(), exception caught!"); + OSL_FAIL("SdrTableObj::DeleteRows(), exception caught!"); } } @@ -1212,7 +1214,7 @@ void SdrTableObj::DeleteColumns( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ ) } catch( Exception& ) { - DBG_ERROR("SdrTableObj::DeleteColumns(), exception caught!"); + OSL_FAIL("SdrTableObj::DeleteColumns(), exception caught!"); } } @@ -1351,16 +1353,16 @@ void SdrTableObj::FitFrameToTextSize() // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::IsAutoGrowHeight() const +bool SdrTableObj::IsAutoGrowHeight() const { - return sal_True; + return true; } // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::IsAutoGrowWidth() const +bool SdrTableObj::IsAutoGrowWidth() const { - return sal_True; + return true; } // -------------------------------------------------------------------- @@ -1460,7 +1462,7 @@ void SdrTableObj::SetModel(SdrModel* pNewModel) // -------------------------------------------------------------------- -void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, Rectangle* pAnchorRect, sal_Bool bLineWidth ) const +void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool bLineWidth ) const { if( mpImpl ) TakeTextRect( mpImpl->maEditPos, rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth ); @@ -1468,7 +1470,7 @@ void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FA // -------------------------------------------------------------------- -void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, Rectangle* pAnchorRect, sal_Bool /*bLineWidth*/ ) const +void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool /*bLineWidth*/ ) const { if( !mpImpl ) return; @@ -1616,7 +1618,7 @@ void SdrTableObj::setActiveCell( const CellPos& rPos ) } catch( Exception& ) { - DBG_ERROR("SdrTableObj::setActiveCell(), exception caught!"); + OSL_FAIL("SdrTableObj::setActiveCell(), exception caught!"); } } @@ -1849,84 +1851,6 @@ struct ImplTableShadowPaintInfo // -------------------------------------------------------------------- -void lcl_VertLineEnds( OutputDevice& rDev, const Point& rTop, const Point& rBottom, - const Color& rColor, long nXOffs, long nWidth, - const svx::frame::Style& rTopLine, const svx::frame::Style& rBottomLine ) -{ - rDev.SetLineColor(rColor); // PEN_NULL ??? - rDev.SetFillColor(rColor); - - // Position oben/unten muss unabhaengig von der Liniendicke sein, - // damit der Winkel stimmt (oder X-Position auch anpassen) - long nTopPos = rTop.Y(); - long nBotPos = rBottom.Y(); - - long nTopLeft = rTop.X() + nXOffs; - long nTopRight = nTopLeft + nWidth - 1; - - long nBotLeft = rBottom.X() + nXOffs; - long nBotRight = nBotLeft + nWidth - 1; - - // oben abschliessen - - if ( rTopLine.Prim() ) - { - long nLineW = rTopLine.GetWidth(); - if (nLineW >= 2) - { - Point aTriangle[3]; - aTriangle[0] = Point( nTopLeft, nTopPos ); // wie aPoints[0] - aTriangle[1] = Point( nTopRight, nTopPos ); // wie aPoints[1] - aTriangle[2] = Point( rTop.X(), nTopPos - (nLineW - 1) / 2 ); - Polygon aTriPoly( 3, aTriangle ); - rDev.DrawPolygon( aTriPoly ); - } - } - - // unten abschliessen - - if ( rBottomLine.Prim() ) - { - long nLineW = rBottomLine.GetWidth(); - if (nLineW >= 2) - { - Point aTriangle[3]; - aTriangle[0] = Point( nBotLeft, nBotPos ); // wie aPoints[3] - aTriangle[1] = Point( nBotRight, nBotPos ); // wie aPoints[2] - aTriangle[2] = Point( rBottom.X(), nBotPos - (nLineW - 1) / 2 + nLineW - 1 ); - Polygon aTriPoly( 3, aTriangle ); - rDev.DrawPolygon( aTriPoly ); - } - } -} - -void lcl_VertLine( OutputDevice& rDev, const Point& rTop, const Point& rBottom, - const svx::frame::Style& rLine, - const svx::frame::Style& rTopLine, const svx::frame::Style& rBottomLine, - const Color* pForceColor ) -{ - if( rLine.Prim() ) - { - svx::frame::DrawVerFrameBorderSlanted( rDev, rTop, rBottom, rLine, pForceColor ); - - svx::frame::Style aScaled( rLine ); - aScaled.ScaleSelf( 1.0 / cos( svx::frame::GetVerDiagAngle( rTop, rBottom ) ) ); - if( pForceColor ) - aScaled.SetColor( *pForceColor ); - - long nXOffs = (aScaled.GetWidth() - 1) / -2L; - - lcl_VertLineEnds( rDev, rTop, rBottom, aScaled.GetColor(), - nXOffs, aScaled.Prim(), rTopLine, rBottomLine ); - - if( aScaled.Secn() ) - lcl_VertLineEnds( rDev, rTop, rBottom, aScaled.GetColor(), - nXOffs + aScaled.Prim() + aScaled.Dist(), aScaled.Secn(), rTopLine, rBottomLine ); - } -} - -// -------------------------------------------------------------------- - void SdrTableObj::TakeObjNameSingul(XubString& rName) const { rName = ImpGetResStr(STR_ObjNameSingulTable); @@ -1950,31 +1874,35 @@ void SdrTableObj::TakeObjNamePlural(XubString& rName) const // -------------------------------------------------------------------- -void SdrTableObj::operator=(const SdrObject& rObj) +SdrTableObj* SdrTableObj::Clone() const +{ + return CloneHelper< SdrTableObj >(); +} + +SdrTableObj& SdrTableObj::operator=(const SdrTableObj& rObj) { + if( this == &rObj ) + return *this; // call parent SdrObject::operator=(rObj); - const SdrTableObj* pTableObj = dynamic_cast< const SdrTableObj* >( &rObj ); - if (pTableObj!=NULL) - { - TableModelNotifyGuard aGuard( mpImpl ? mpImpl->mxTable.get() : 0 ); - - maLogicRect = pTableObj->maLogicRect; - aRect = pTableObj->aRect; - aGeo = pTableObj->aGeo; - eTextKind = pTableObj->eTextKind; - bTextFrame = pTableObj->bTextFrame; - aTextSize = pTableObj->aTextSize; - bTextSizeDirty = pTableObj->bTextSizeDirty; - bNoShear = pTableObj->bNoShear; - bNoRotate = pTableObj->bNoRotate; - bNoMirror = pTableObj->bNoMirror; - bDisableAutoWidthOnDragging = pTableObj->bDisableAutoWidthOnDragging; - - if( pTableObj->mpImpl ) - *mpImpl = *pTableObj->mpImpl; - } + TableModelNotifyGuard aGuard( mpImpl ? mpImpl->mxTable.get() : 0 ); + + maLogicRect = rObj.maLogicRect; + aRect = rObj.aRect; + aGeo = rObj.aGeo; + eTextKind = rObj.eTextKind; + bTextFrame = rObj.bTextFrame; + aTextSize = rObj.aTextSize; + bTextSizeDirty = rObj.bTextSizeDirty; + bNoShear = rObj.bNoShear; + bNoRotate = rObj.bNoRotate; + bNoMirror = rObj.bNoMirror; + bDisableAutoWidthOnDragging = rObj.bDisableAutoWidthOnDragging; + + if( rObj.mpImpl ) + *mpImpl = *rObj.mpImpl; + return *this; } // -------------------------------------------------------------------- @@ -2050,7 +1978,7 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) rOutl.SetRefDevice( pModel->GetRefDevice() ); // -- - FASTBOOL bUpdMerk=rOutl.GetUpdateMode(); + bool bUpdMerk=rOutl.GetUpdateMode(); if (bUpdMerk) rOutl.SetUpdateMode(sal_False); Size aPaperMin; Size aPaperMax; @@ -2212,10 +2140,10 @@ void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Frac // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt) +bool SdrTableObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) { Rectangle aNeuRect(maLogicRect); - FASTBOOL bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt); + bool bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt); if (bRet) { Rectangle aBoundRect0; @@ -2232,7 +2160,7 @@ FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHeight, FASTBOOL bWidth) const +bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, bool bWidth) const { if((pModel == NULL) || rR.IsEmpty() || !mpImpl || !mpImpl->mxTable.is() ) return sal_False; @@ -2328,9 +2256,9 @@ bool SdrTableObj::IsRealyEdited() const // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::IsFontwork() const +bool SdrTableObj::IsFontwork() const { - return sal_False; + return false; } // -------------------------------------------------------------------- @@ -2450,7 +2378,7 @@ SdrHdl* SdrTableObj::GetHdl(sal_uInt32 nHdlNum) const { // #i73248# // Warn the user that this is ineffective and show alternatives. Should not be used at all. - OSL_ENSURE(false, "SdrTableObj::GetHdl(): ineffective, use AddToHdlList instead (!)"); + OSL_FAIL("SdrTableObj::GetHdl(): ineffective, use AddToHdlList instead (!)"); // to have an alternative, get single handle using the ineffective way SdrHdl* pRetval = 0; @@ -2599,19 +2527,19 @@ basegfx::B2DPolyPolygon SdrTableObj::getSpecialDragPoly(const SdrDragStat& rDrag // Create // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::BegCreate(SdrDragStat& rStat) +bool SdrTableObj::BegCreate(SdrDragStat& rStat) { rStat.SetOrtho4Possible(); Rectangle aRect1(rStat.GetStart(), rStat.GetNow()); aRect1.Justify(); rStat.SetActionRect(aRect1); aRect = aRect1; - return sal_True; + return true; } // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::MovCreate(SdrDragStat& rStat) +bool SdrTableObj::MovCreate(SdrDragStat& rStat) { Rectangle aRect1; rStat.TakeCreateRect(aRect1); @@ -2620,12 +2548,12 @@ FASTBOOL SdrTableObj::MovCreate(SdrDragStat& rStat) aRect=aRect1; // fuer ObjName SetBoundRectDirty(); bSnapRectDirty=sal_True; - return sal_True; + return true; } // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +bool SdrTableObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { rStat.TakeCreateRect(aRect); ImpJustifyRect(aRect); @@ -2638,9 +2566,9 @@ void SdrTableObj::BrkCreate(SdrDragStat& /*rStat*/) // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::BckCreate(SdrDragStat& /*rStat*/) +bool SdrTableObj::BckCreate(SdrDragStat& /*rStat*/) { - return sal_True; + return true; } // -------------------------------------------------------------------- @@ -2734,7 +2662,7 @@ SdrTableObj* SdrTableObj::CloneRange( const CellPos& rStart, const CellPos& rEnd } catch( Exception& ) { - DBG_ERROR( "svx::SvxTableController::GetMarkedObjModel(), exception caught!" ); + OSL_FAIL( "svx::SvxTableController::GetMarkedObjModel(), exception caught!" ); } } @@ -2818,3 +2746,5 @@ void SdrTableObj::uno_unlock() } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index 9c0df0e77664..dc71a4ee365c 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,6 +98,8 @@ TableColumn& TableColumn::operator=( const TableColumn& r ) mbOptimalWidth = r.mbOptimalWidth; mbIsVisible = r.mbIsVisible; mbIsStartOfNewPage = r.mbIsStartOfNewPage; + maName = r.maName; + mnColumn = r.mnColumn; return *this; } @@ -303,3 +306,5 @@ rtl::Reference< ::comphelper::FastPropertySetInfo > TableColumn::getStaticProper // ----------------------------------------------------------------------------- } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx index e020354fe1a7..ccc15eb162aa 100644 --- a/svx/source/table/tablecolumn.hxx +++ b/svx/source/table/tablecolumn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx index 7d0e89a252cd..794de442e586 100644 --- a/svx/source/table/tablecolumns.cxx +++ b/svx/source/table/tablecolumns.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -139,3 +140,5 @@ sal_Bool SAL_CALL TableColumns::hasElements() throw (RuntimeException) // ----------------------------------------------------------------------------- } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx index 2a7be2851141..362f963bbb5e 100644 --- a/svx/source/table/tablecolumns.hxx +++ b/svx/source/table/tablecolumns.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 9452420901a7..41725d5e8470 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,6 +73,7 @@ #include "tableundo.hxx" #include "tablelayouter.hxx" +using ::editeng::SvxBorderLine; using ::rtl::OUString; using namespace ::sdr::table; using namespace ::com::sun::star; @@ -612,7 +614,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) catch( Exception& e ) { (void)e; - DBG_ERROR("svx::SvxTableController::onInsert(), exception caught!"); + OSL_FAIL("svx::SvxTableController::onInsert(), exception caught!"); } } @@ -903,7 +905,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs ) catch( Exception& e ) { (void)e; - DBG_ERROR( "svx::SvxTableController::SetTableStyle(), exception caught!" ); + OSL_FAIL( "svx::SvxTableController::SetTableStyle(), exception caught!" ); } } @@ -914,7 +916,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs ) catch( Exception& e ) { (void)e; - DBG_ERROR( "svx::SvxTableController::SetTableStyle(), exception caught!" ); + OSL_FAIL( "svx::SvxTableController::SetTableStyle(), exception caught!" ); } } @@ -1640,7 +1642,7 @@ void SvxTableController::checkCell( CellPos& rPos ) catch( Exception& e ) { (void)e; - DBG_ERROR("sdr::table::SvxTableController::checkCell(), exception caught!" ); + OSL_FAIL("sdr::table::SvxTableController::checkCell(), exception caught!" ); } } @@ -1659,7 +1661,7 @@ void SvxTableController::findMergeOrigin( CellPos& rPos ) catch( Exception& e ) { (void)e; - DBG_ERROR("sdr::table::SvxTableController::findMergeOrigin(), exception caught!" ); + OSL_FAIL("sdr::table::SvxTableController::findMergeOrigin(), exception caught!" ); } } @@ -2429,7 +2431,7 @@ bool SvxTableController::GetMarkedObjModel( SdrPage* pNewPage ) } catch( Exception& ) { - DBG_ERROR( "svx::SvxTableController::GetMarkedObjModel(), exception caught!" ); + OSL_FAIL( "svx::SvxTableController::GetMarkedObjModel(), exception caught!" ); } return false; } @@ -2616,3 +2618,5 @@ IMPL_LINK( SvxTableController, UpdateHdl, void *, EMPTYARG ) } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablecontroller.hxx b/svx/source/table/tablecontroller.hxx index 40f22ef8ea09..944d120b4f9f 100644 --- a/svx/source/table/tablecontroller.hxx +++ b/svx/source/table/tablecontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -168,3 +169,4 @@ private: #endif // _SVX_TABLECONTROLLER_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index e952425e5c30..eee5a7c2c929 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,7 +41,7 @@ #include <comphelper/serviceinfohelper.hxx> #include <osl/mutex.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <cppuhelper/basemutex.hxx> @@ -70,7 +71,6 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::container; using ::rtl::OUString; -using ::vos::OGuard; using ::osl::MutexGuard; using ::osl::ClearableMutexGuard; using ::cppu::OInterfaceContainerHelper; @@ -313,7 +313,7 @@ void SAL_CALL TableDesignStyle::setName( const OUString& rName ) throw (RuntimeE Any SAL_CALL TableDesignStyle::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; const CellStyleNameMap& rMap = getCellStyleNameMap(); @@ -328,7 +328,7 @@ Any SAL_CALL TableDesignStyle::getByName( const OUString& rName ) throw(NoSuchEl Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() throw(RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; const CellStyleNameMap& rMap = getCellStyleNameMap(); Sequence< OUString > aRet( rMap.size() ); @@ -345,7 +345,7 @@ Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() throw(RuntimeE sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName ) throw(RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; const CellStyleNameMap& rMap = getCellStyleNameMap(); @@ -382,7 +382,7 @@ sal_Int32 SAL_CALL TableDesignStyle::getCount() throw(RuntimeException) Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( (Index < 0) || (Index >= style_count) ) throw IndexOutOfBoundsException(); @@ -396,7 +396,7 @@ Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index ) throw(IndexOutOfBou void SAL_CALL TableDesignStyle::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; const CellStyleNameMap& rMap = getCellStyleNameMap(); CellStyleNameMap::const_iterator iter = rMap.find( rName ); @@ -546,7 +546,7 @@ void SAL_CALL TableDesignFamily::setName( const OUString& ) throw (RuntimeExcept Any SAL_CALL TableDesignFamily::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; for( TableDesignStyleVector::iterator iter( maDesigns.begin() ); iter != maDesigns.end(); iter++ ) { @@ -561,7 +561,7 @@ Any SAL_CALL TableDesignFamily::getByName( const OUString& rName ) throw(NoSuchE Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() throw(RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Sequence< OUString > aRet( maDesigns.size() ); OUString* pNames = aRet.getArray(); @@ -576,7 +576,7 @@ Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() throw(Runtime sal_Bool SAL_CALL TableDesignFamily::hasByName( const OUString& aName ) throw(RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; for( TableDesignStyleVector::iterator iter( maDesigns.begin() ); iter != maDesigns.end(); iter++ ) if( (*iter)->getName() == aName ) @@ -598,7 +598,7 @@ Type SAL_CALL TableDesignFamily::getElementType() throw(RuntimeException) sal_Bool SAL_CALL TableDesignFamily::hasElements() throw(RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return maDesigns.empty() ? sal_False : sal_True; } @@ -609,7 +609,7 @@ sal_Bool SAL_CALL TableDesignFamily::hasElements() throw(RuntimeException) sal_Int32 SAL_CALL TableDesignFamily::getCount() throw(RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return sal::static_int_cast< sal_Int32 >( maDesigns.size() ); } @@ -618,7 +618,7 @@ sal_Int32 SAL_CALL TableDesignFamily::getCount() throw(RuntimeException) Any SAL_CALL TableDesignFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( (Index >= 0) && (Index < sal::static_int_cast< sal_Int32 >( maDesigns.size() ) ) ) return Any( maDesigns[Index] ); @@ -632,7 +632,7 @@ Any SAL_CALL TableDesignFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBo void SAL_CALL TableDesignFamily::insertByName( const OUString& rName, const Any& rElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< XStyle > xStyle( rElement, UNO_QUERY ); if( !xStyle.is() ) @@ -650,7 +650,7 @@ void SAL_CALL TableDesignFamily::insertByName( const OUString& rName, const Any& void SAL_CALL TableDesignFamily::removeByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; for( TableDesignStyleVector::iterator iter( maDesigns.begin() ); iter != maDesigns.end(); iter++ ) { @@ -671,7 +671,7 @@ void SAL_CALL TableDesignFamily::removeByName( const OUString& rName ) throw(NoS void SAL_CALL TableDesignFamily::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< XStyle > xStyle( aElement, UNO_QUERY ); if( !xStyle.is() ) @@ -696,7 +696,7 @@ void SAL_CALL TableDesignFamily::replaceByName( const OUString& rName, const Any Reference< XInterface > SAL_CALL TableDesignFamily::createInstance() throw(Exception, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return Reference< XInterface >( static_cast< XStyle* >( new TableDesignStyle ) ); } @@ -717,7 +717,7 @@ void SAL_CALL TableDesignFamily::dispose( ) throw (RuntimeException) TableDesignStyleVector aDesigns; aDesigns.swap( maDesigns ); - for( TableDesignStyleVector::iterator iter( aDesigns.begin() ); iter != aDesigns.end(); iter++ ) + for( TableDesignStyleVector::iterator iter( aDesigns.begin() ); iter != aDesigns.end(); ++iter ) { Reference< XComponent > xComp( (*iter), UNO_QUERY ); if( xComp.is() ) @@ -743,7 +743,7 @@ void SAL_CALL TableDesignFamily::removeEventListener( const Reference< XEventLis Reference<XPropertySetInfo> TableDesignFamily::getPropertySetInfo() throw (RuntimeException) { - OSL_ENSURE( 0, "###unexpected!" ); + OSL_FAIL( "###unexpected!" ); return Reference<XPropertySetInfo>(); } @@ -751,7 +751,7 @@ Reference<XPropertySetInfo> TableDesignFamily::getPropertySetInfo() throw (Runti void TableDesignFamily::setPropertyValue( const OUString& , const Any& ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { - OSL_ENSURE( 0, "###unexpected!" ); + OSL_FAIL( "###unexpected!" ); } // ---------------------------------------------------------- @@ -773,28 +773,28 @@ Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (U void TableDesignFamily::addPropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { - OSL_ENSURE( 0, "###unexpected!" ); + OSL_FAIL( "###unexpected!" ); } // ---------------------------------------------------------- void TableDesignFamily::removePropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { - OSL_ENSURE( 0, "###unexpected!" ); + OSL_FAIL( "###unexpected!" ); } // ---------------------------------------------------------- void TableDesignFamily::addVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { - OSL_ENSURE( 0, "###unexpected!" ); + OSL_FAIL( "###unexpected!" ); } // ---------------------------------------------------------- void TableDesignFamily::removeVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { - OSL_ENSURE( 0, "###unexpected!" ); + OSL_FAIL( "###unexpected!" ); } // -------------------------------------------------------------------- @@ -806,3 +806,5 @@ SVX_DLLPUBLIC Reference< XNameAccess > CreateTableDesignFamily() } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index 46df8c681db5..0da2c9fd6288 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,7 +89,7 @@ void TableEdgeHdl::SetEdge( sal_Int32 nEdge, sal_Int32 nStart, sal_Int32 nEnd, T } else { - OSL_ENSURE( false, "sdr::table::TableEdgeHdl::SetEdge(), invalid edge!" ); + OSL_FAIL( "sdr::table::TableEdgeHdl::SetEdge(), invalid edge!" ); } } @@ -312,3 +313,5 @@ void TableBorderHdl::CreateB2dIAObject() } // end of namespace table } // end of namespace sdr + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablehandles.hxx b/svx/source/table/tablehandles.hxx index 0704e94a84b7..23d3ed844737 100644 --- a/svx/source/table/tablehandles.hxx +++ b/svx/source/table/tablehandles.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,5 @@ private: } // end of namespace sdr #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 643251100cbd..a2548b626247 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,6 +48,7 @@ #include "svx/svdstr.hrc" #include "svx/svdglob.hxx" +using ::editeng::SvxBorderLine; using ::rtl::OUString; using ::com::sun::star::awt::XLayoutConstrains; using namespace ::com::sun::star::uno; @@ -120,7 +122,7 @@ basegfx::B2ITuple TableLayouter::getCellSize( const CellPos& rPos ) const } catch( Exception& ) { - DBG_ERROR( "TableLayouter::getCellSize(), exception caught!" ); + OSL_FAIL( "TableLayouter::getCellSize(), exception caught!" ); } return basegfx::B2ITuple( width, height ); @@ -149,14 +151,13 @@ bool TableLayouter::getCellArea( const CellPos& rPos, basegfx::B2IRectangle& rAr } catch( Exception& ) { - DBG_ERROR( "TableLayouter::getCellSize(), exception caught!" ); + OSL_FAIL( "TableLayouter::getCellSize(), exception caught!" ); } return false; } // ----------------------------------------------------------------------------- - -sal_Int32 TableLayouter::getRowHeight( sal_Int32 nRow ) +sal_Int32 TableLayouter::getRowHeight( sal_Int32 nRow ) const { if( isValidRow(nRow) ) return maRows[nRow].mnSize; @@ -174,13 +175,12 @@ void TableLayouter::setRowHeight( sal_Int32 nRow, sal_Int32 nHeight ) } else { - DBG_ERROR( "TableLayouter::setRowHeight(), row out of range!" ); + OSL_FAIL( "TableLayouter::setRowHeight(), row out of range!" ); } } // ----------------------------------------------------------------------------- - -sal_Int32 TableLayouter::getColumnWidth( sal_Int32 nColumn ) +sal_Int32 TableLayouter::getColumnWidth( sal_Int32 nColumn ) const { if( isValidColumn(nColumn) ) return maColumns[nColumn].mnSize; @@ -195,7 +195,7 @@ void TableLayouter::setColumnWidth( sal_Int32 nColumn, sal_Int32 nWidth ) if( isValidColumn(nColumn) ) maColumns[nColumn].mnSize = nWidth; else - DBG_ERROR( "TableLayouter::setColumnWidth(), column out of range!" ); + OSL_FAIL( "TableLayouter::setColumnWidth(), column out of range!" ); } // ----------------------------------------------------------------------------- @@ -211,7 +211,7 @@ bool TableLayouter::isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHor } else { - OSL_ENSURE( false, "sdr::table::TableLayouter::getBorderLine(), invalid edge!" ); + OSL_FAIL( "sdr::table::TableLayouter::getBorderLine(), invalid edge!" ); } return false; @@ -235,7 +235,7 @@ SvxBorderLine* TableLayouter::getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, } else { - OSL_ENSURE( false, "sdr::table::TableLayouter::getBorderLine(), invalid edge!" ); + OSL_FAIL( "sdr::table::TableLayouter::getBorderLine(), invalid edge!" ); } return pLine; @@ -442,7 +442,7 @@ bool findMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedX, sal_Int32 } catch( Exception& ) { - DBG_ERROR("sdr::table::TableLayouter::findMergeOrigin(), exception caught!"); + OSL_FAIL("sdr::table::TableLayouter::findMergeOrigin(), exception caught!"); } return false; } @@ -457,7 +457,7 @@ sal_Int32 TableLayouter::getMinimumColumnWidth( sal_Int32 nColumn ) } else { - DBG_ERROR( "TableLayouter::getMinimumColumnWidth(), column out of range!" ); + OSL_FAIL( "TableLayouter::getMinimumColumnWidth(), column out of range!" ); return 0; } } @@ -913,7 +913,7 @@ CellRef TableLayouter::getCell( const CellPos& rPos ) const } catch( Exception& ) { - DBG_ERROR( "sdr::table::TableLayouter::getCell(), exception caught!" ); + OSL_FAIL( "sdr::table::TableLayouter::getCell(), exception caught!" ); } return xCell; } @@ -1107,7 +1107,7 @@ void TableLayouter::SetLayoutToModel() } catch( Exception& ) { - DBG_ERROR("sdr::table::TableLayouter::SetLayoutToModel(), exception caught!"); + OSL_FAIL("sdr::table::TableLayouter::SetLayoutToModel(), exception caught!"); } } */ @@ -1146,7 +1146,7 @@ void TableLayouter::DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol, catch( Exception& e ) { (void)e; - DBG_ERROR("sdr::table::TableLayouter::DistributeColumns(), exception caught!"); + OSL_FAIL("sdr::table::TableLayouter::DistributeColumns(), exception caught!"); } } @@ -1198,12 +1198,11 @@ void TableLayouter::DistributeRows( ::Rectangle& rArea, sal_Int32 nFirstRow, sal catch( Exception& e ) { (void)e; - DBG_ERROR("sdr::table::TableLayouter::DistributeRows(), exception caught!"); + OSL_FAIL("sdr::table::TableLayouter::DistributeRows(), exception caught!"); } } // ----------------------------------------------------------------------------- - void TableLayouter::SetWritingMode( com::sun::star::text::WritingMode eWritingMode ) { meWritingMode = eWritingMode; @@ -1288,7 +1287,7 @@ sal_Int32 TableLayouter::detectInsertedOrRemovedRows() catch( Exception& e ) { (void)e; - DBG_ERROR("svx::TableLayouter::detectInsertedOrRemovedRows(), exception caught!"); + OSL_FAIL("svx::TableLayouter::detectInsertedOrRemovedRows(), exception caught!"); } return nHeightChange; @@ -1298,3 +1297,5 @@ sal_Int32 TableLayouter::detectInsertedOrRemovedRows() // ----------------------------------------------------------------------------- } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx index 9c56aafb556f..edbacb83651c 100644 --- a/svx/source/table/tablelayouter.hxx +++ b/svx/source/table/tablelayouter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,7 +43,9 @@ // ----------------------------------------------------------------------------- -class SvxBorderLine; +namespace editeng { + class SvxBorderLine; +} namespace sdr { namespace table { @@ -51,7 +54,7 @@ namespace sdr { namespace table { */ bool findMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedCol, sal_Int32 nMergedRow, sal_Int32& rOriginCol, sal_Int32& rOriginRow ); -typedef std::vector< SvxBorderLine* > BorderLineVector; +typedef std::vector< editeng::SvxBorderLine* > BorderLineVector; typedef std::vector< BorderLineVector > BorderLineMap; // ----------------------------------------------------------------------------- @@ -94,13 +97,12 @@ public: ::sal_Int32 getRowCount() const { return static_cast< ::sal_Int32 >( maRows.size() ); } ::sal_Int32 getColumnCount() const { return static_cast< ::sal_Int32 >( maColumns.size() ); } - - sal_Int32 getRowHeight( sal_Int32 nRow ); + sal_Int32 getRowHeight( sal_Int32 nRow ) const; // sets the layout height of the given row hard, LayoutTable must be called directly after calling this method! */ void setRowHeight( sal_Int32 nRow, sal_Int32 nHeight ); - sal_Int32 getColumnWidth( sal_Int32 nColumn ); + sal_Int32 getColumnWidth( sal_Int32 nColumn ) const; // sets the layout width of the given column hard, LayoutTable must be called directly after calling this method! */ void setColumnWidth( sal_Int32 nColumn, sal_Int32 nWidth ); @@ -116,7 +118,7 @@ public: bool isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal ) const; /** returns the requested borderline in rpBorderLine or a null pointer if there is no border at this edge */ - SvxBorderLine* getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal )const; + editeng::SvxBorderLine* getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal )const; void updateCells( ::Rectangle& rRectangle ); @@ -144,9 +146,9 @@ private: void ResizeBorderLayout(); void ResizeBorderLayout( BorderLineMap& rMap ); - void SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal, const SvxBorderLine* pLine ); + void SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal, const editeng::SvxBorderLine* pLine ); - static bool HasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther ); + static bool HasPriority( const editeng::SvxBorderLine* pThis, const editeng::SvxBorderLine* pOther ); struct Layout { @@ -176,3 +178,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index b62d1187e14c..3abe599d4321 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,7 +35,7 @@ #include <boost/bind.hpp> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "cell.hxx" #include "cellcursor.hxx" @@ -49,11 +50,8 @@ #include "svx/svdstr.hrc" #include "svx/svdglob.hxx" -//#define PLEASE_DEBUG_THE_TABLES 1 - using ::rtl::OUString; using namespace ::osl; -using namespace ::vos; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::table; using namespace ::com::sun::star::lang; @@ -315,7 +313,7 @@ void TableModel::UndoRemoveColumns( sal_Int32 nIndex, ColumnVector& aCols, CellV Reference< XCellCursor > SAL_CALL TableModel::createCursor() throw (RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; return createCursorByRange( Reference< XCellRange >( this ) ); } @@ -323,7 +321,7 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursor() throw (RuntimeExcep Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Reference< XCellRange >& Range ) throw (IllegalArgumentException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; ICellRange* pRange = dynamic_cast< ICellRange* >( Range.get() ); if( (pRange == 0) || (pRange->getTable().get() != this) ) @@ -337,7 +335,7 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Referen sal_Int32 SAL_CALL TableModel::getRowCount() throw (RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; return getRowCountImpl(); } @@ -345,7 +343,7 @@ sal_Int32 SAL_CALL TableModel::getRowCount() throw (RuntimeException) sal_Int32 SAL_CALL TableModel::getColumnCount() throw (RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; return getColumnCountImpl(); } @@ -355,7 +353,7 @@ sal_Int32 SAL_CALL TableModel::getColumnCount() throw (RuntimeException) void TableModel::dispose() throw (RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; TableModelBase::dispose(); } @@ -379,7 +377,7 @@ void SAL_CALL TableModel::removeEventListener( const Reference< XEventListener > sal_Bool SAL_CALL TableModel::isModified( ) throw (RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; return mbModified; } @@ -388,7 +386,7 @@ sal_Bool SAL_CALL TableModel::isModified( ) throw (RuntimeException) void SAL_CALL TableModel::setModified( sal_Bool bModified ) throw (PropertyVetoException, RuntimeException) { { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; mbModified = bModified; } if( bModified ) @@ -417,7 +415,7 @@ void SAL_CALL TableModel::removeModifyListener( const Reference< XModifyListener Reference< XTableColumns > SAL_CALL TableModel::getColumns() throw (RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( !mxTableColumns.is() ) mxTableColumns.set( new TableColumns( this ) ); @@ -428,7 +426,7 @@ Reference< XTableColumns > SAL_CALL TableModel::getColumns() throw (RuntimeExcep Reference< XTableRows > SAL_CALL TableModel::getRows() throw (RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( !mxTableRows.is() ) mxTableRows.set( new TableRows( this ) ); @@ -441,7 +439,7 @@ Reference< XTableRows > SAL_CALL TableModel::getRows() throw (RuntimeException) Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw ( IndexOutOfBoundsException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; CellRef xCell( getCell( nColumn, nRow ) ); if( xCell.is() ) @@ -454,7 +452,7 @@ Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sa Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( (nLeft >= 0) && (nTop >= 0) && (nRight >= nLeft) && (nBottom >= nTop) && (nRight < getColumnCountImpl()) && (nBottom < getRowCountImpl() ) ) { @@ -592,14 +590,14 @@ void TableModel::disposing() void TableModel::lockBroadcasts() throw (RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; ++mnNotifyLock; } // ----------------------------------------------------------------------------- void TableModel::unlockBroadcasts() throw (RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; --mnNotifyLock; if( mnNotifyLock <= 0 ) { @@ -610,10 +608,6 @@ void TableModel::unlockBroadcasts() throw (RuntimeException) } // ----------------------------------------------------------------------------- -#ifdef PLEASE_DEBUG_THE_TABLES -#include <stdio.h> -#endif - void TableModel::notifyModification() { ::osl::MutexGuard guard( m_aMutex ); @@ -633,50 +627,6 @@ void TableModel::notifyModification() { mbNotifyPending = true; } - -#ifdef PLEASE_DEBUG_THE_TABLES - FILE* file = fopen( "c:\\table.xml","w" ); - - const sal_Int32 nColCount = getColumnCountImpl(); - const sal_Int32 nRowCount = getRowCountImpl(); - - fprintf( file, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\r" ); - fprintf( file, "<table columns=\"%ld\" rows=\"%ld\" updated=\"%s\">\n\r", nColCount, nRowCount, mbNotifyPending ? "false" : "true"); - - for( sal_Int32 nCol = 0; nCol < nColCount; ++nCol ) - { - fprintf( file, "<column this=\"%lx\"/>\n\r", maColumns[nCol].get() ); - } - - // first check merged cells before and inside the removed rows - for( sal_Int32 nRow = 0; nRow < nRowCount; ++nRow ) - { - fprintf( file, "<row this=\"%lx\">\n\r", maRows[nRow].get() ); - for( sal_Int32 nCol = 0; nCol < nColCount; ++nCol ) - { - CellRef xCell( getCell( nCol, nRow ) ); - fprintf( file, "<cell this=\"%lx\"", xCell.get() ); - - sal_Int32 nRowSpan = xCell->getRowSpan(); - sal_Int32 nColSpan = xCell->getColumnSpan(); - sal_Bool bMerged = xCell->isMerged(); - - if( nColSpan != 1 ) - fprintf( file, " column-span=\"%ld\"", nColSpan ); - if( nRowSpan != 1 ) - fprintf( file, " row-span=\"%ld\"", nRowSpan ); - - if( bMerged ) - fprintf( file, " merged=\"true\"" ); - - fprintf( file, "/>" ); - } - fprintf( file, "\n\r</row>\n\r" ); - } - - fprintf( file, "</table>\n\r" ); - fclose( file ); -#endif } // ----------------------------------------------------------------------------- @@ -695,26 +645,6 @@ CellRef TableModel::getCell( sal_Int32 nCol, sal_Int32 nRow ) const } // ----------------------------------------------------------------------------- -/* -bool TableModel::getCellPos( const CellRef& xCell, ::sal_Int32& rnCol, ::sal_Int32& rnRow ) const -{ - const sal_Int32 nRowCount = getRowCount(); - const sal_Int32 nColCount = getColumnCount(); - for( rnRow = 0; rnRow < nRowCount; rnRow++ ) - { - for( rnCol = 0; rnCol < nColCount; rnCol++ ) - { - if( maRows[rnRow]->maCells[rnCol] == xCell ) - { - return true; - } - } - } - return false; -} -*/ - -// ----------------------------------------------------------------------------- CellRef TableModel::createCell() { @@ -798,7 +728,7 @@ void TableModel::insertColumns( sal_Int32 nIndex, sal_Int32 nCount ) } catch( Exception& ) { - DBG_ERROR("sdr::table::TableModel::insertColumns(), exception caught!"); + OSL_FAIL("sdr::table::TableModel::insertColumns(), exception caught!"); } updateColumns(); setModified(sal_True); @@ -907,7 +837,7 @@ void TableModel::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) } catch( Exception& ) { - DBG_ERROR("sdr::table::TableModel::removeColumns(), exception caught!"); + OSL_FAIL("sdr::table::TableModel::removeColumns(), exception caught!"); } updateColumns(); @@ -965,7 +895,7 @@ void TableModel::insertRows( sal_Int32 nIndex, sal_Int32 nCount ) } catch( Exception& ) { - DBG_ERROR("sdr::table::TableModel::insertRows(), exception caught!"); + OSL_FAIL("sdr::table::TableModel::insertRows(), exception caught!"); } if( bUndo ) pModel->EndUndo(); @@ -1066,7 +996,7 @@ void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount ) } catch( Exception& ) { - DBG_ERROR("sdr::table::TableModel::removeRows(), exception caught!"); + OSL_FAIL("sdr::table::TableModel::removeRows(), exception caught!"); } updateRows(); @@ -1132,7 +1062,7 @@ void TableModel::optimize() catch( Exception& e ) { (void)e; - DBG_ERROR("svx::TableModel::optimize(), exception caught!"); + OSL_FAIL("svx::TableModel::optimize(), exception caught!"); } removeColumns( nCol, 1 ); @@ -1169,7 +1099,7 @@ void TableModel::optimize() catch( Exception& e ) { (void)e; - DBG_ERROR("svx::TableModel::optimize(), exception caught!"); + OSL_FAIL("svx::TableModel::optimize(), exception caught!"); } removeRows( nRow, 1 ); @@ -1196,7 +1126,7 @@ void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_ if( (nLastRow > getRowCount()) || (nLastCol > getRowCount() ) ) { - DBG_ERROR("TableModel::merge(), merge beyound the table!"); + OSL_FAIL("TableModel::merge(), merge beyound the table!"); } // merge first cell @@ -1256,3 +1186,5 @@ void TableModel::updateColumns() // ----------------------------------------------------------------------------- } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx index a1498c0041a6..5ac3696e87e8 100644 --- a/svx/source/table/tablemodel.hxx +++ b/svx/source/table/tablemodel.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -223,3 +224,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 379d4beb37df..b72c22ab36a5 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,6 +116,7 @@ TableRow& TableRow::operator=( const TableRow& r ) mbIsVisible = r.mbIsVisible; mbIsStartOfNewPage = r.mbIsStartOfNewPage; maName = r.maName; + mnRow = r.mnRow; return *this; } @@ -379,3 +381,5 @@ rtl::Reference< ::comphelper::FastPropertySetInfo > TableRow::getStaticPropertyS } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx index 4d1009c8f6b8..d7901111ff86 100644 --- a/svx/source/table/tablerow.hxx +++ b/svx/source/table/tablerow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx index 2b995dfa896d..42265d599a83 100644 --- a/svx/source/table/tablerows.cxx +++ b/svx/source/table/tablerows.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -134,3 +135,5 @@ sal_Bool SAL_CALL TableRows::hasElements() throw (RuntimeException) // ----------------------------------------------------------------------------- } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx index 47d5b19832f0..967e9dfe76fe 100644 --- a/svx/source/table/tablerows.hxx +++ b/svx/source/table/tablerows.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index 6fdb0f6c8be7..2155d855a3e6 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,7 +51,6 @@ #include "editeng/editeng.hxx" #include "editeng/outlobj.hxx" -//#include <tablertfexporter.hxx> using ::rtl::OUString; using namespace ::com::sun::star::uno; @@ -119,7 +119,7 @@ sal_uLong SdrTableRtfExporter::Write() catch( Exception& e ) { (void)e; - DBG_ERROR("SdrTableRtfExporter::Write(), exception caught!"); + OSL_FAIL("SdrTableRtfExporter::Write(), exception caught!"); } // export rows @@ -134,7 +134,7 @@ sal_uLong SdrTableRtfExporter::Write() catch( Exception& e ) { (void)e; - DBG_ERROR("SdrTableRtfExporter::Write(), exception caught!"); + OSL_FAIL("SdrTableRtfExporter::Write(), exception caught!"); } mrStrm << '}' << RTFOutFuncs::sNewLine; @@ -282,3 +282,4 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow ) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index 530732796c05..b53c5f7785fa 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -308,7 +309,7 @@ void SdrTableRTFParser::FillTable() catch( Exception& e ) { (void)e; - DBG_ERROR("sdr::table::SdrTableRTFParser::InsertCell(), exception caught!" ); + OSL_FAIL("sdr::table::SdrTableRTFParser::InsertCell(), exception caught!" ); } } @@ -445,3 +446,4 @@ void SdrTableObj::ImportAsRTF( SvStream& rStream, SdrTableObj& rObj ) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx index 9b3f5e293070..894a3183512b 100644 --- a/svx/source/table/tableundo.cxx +++ b/svx/source/table/tableundo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -557,3 +558,5 @@ void TableStyleUndo::getData( Data& rData ) } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx index 2e5fee9382d6..cdc762636af6 100644 --- a/svx/source/table/tableundo.hxx +++ b/svx/source/table/tableundo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,7 +76,7 @@ private: ::sal_Int32 mnRowSpan; ::sal_Int32 mnColSpan; - Data() : mpProperties(0), mpOutlinerParaObject(0) {}; + Data() : mpProperties(NULL), mpOutlinerParaObject(NULL), mfValue(0) {}; }; void setDataToCell( const Data& rData ); @@ -257,3 +258,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index 63d1066e7149..158eae13c732 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,6 +55,7 @@ ////////////////////////////////////////////////////////////////////////////// +using editeng::SvxBorderLine; using namespace com::sun::star; ////////////////////////////////////////////////////////////////////////////// @@ -170,6 +172,16 @@ namespace drawinglayer SvxBorderLine maRightLine; SvxBorderLine maTopLine; + // Neighbor cells' borders + SvxBorderLine maLeftFromTLine; + SvxBorderLine maLeftFromBLine; + SvxBorderLine maRightFromTLine; + SvxBorderLine maRightFromBLine; + SvxBorderLine maTopFromLLine; + SvxBorderLine maTopFromRLine; + SvxBorderLine maBottomFromLLine; + SvxBorderLine maBottomFromRLine; + // bitfield unsigned mbLeftIsOutside : 1; unsigned mbBottomIsOutside : 1; @@ -188,6 +200,14 @@ namespace drawinglayer const SvxBorderLine& rBottomLine, const SvxBorderLine& rRightLine, const SvxBorderLine& rTopLine, + const SvxBorderLine& rLeftFromTLine, + const SvxBorderLine& rLeftFromBLine, + const SvxBorderLine& rRightFromTLine, + const SvxBorderLine& rRightFromBLine, + const SvxBorderLine& rTopFromLLine, + const SvxBorderLine& rTopFromRLine, + const SvxBorderLine& rBottomFromLLine, + const SvxBorderLine& rBottomFromRLine, bool bLeftIsOutside, bool bBottomIsOutside, bool bRightIsOutside, @@ -199,6 +219,14 @@ namespace drawinglayer maBottomLine(rBottomLine), maRightLine(rRightLine), maTopLine(rTopLine), + maLeftFromTLine(rLeftFromTLine), + maLeftFromBLine(rLeftFromBLine), + maRightFromTLine(rRightFromTLine), + maRightFromBLine(rRightFromBLine), + maTopFromLLine(rTopFromLLine), + maTopFromRLine(rTopFromRLine), + maBottomFromLLine(rBottomFromLLine), + maBottomFromRLine(rBottomFromRLine), mbLeftIsOutside(bLeftIsOutside), mbBottomIsOutside(bBottomIsOutside), mbRightIsOutside(bRightIsOutside), @@ -207,7 +235,6 @@ namespace drawinglayer { } - // data access const basegfx::B2DHomMatrix& getTransform() const { return maTransform; } const SvxBorderLine& getLeftLine() const { return maLeftLine; } @@ -247,34 +274,20 @@ namespace drawinglayer return getBorderLineOutWidth(rLineA) + getBorderLineDistance(rLineA) + getBorderLineInWidth(rLineA); } - double getInnerExtend(const SvxBorderLine& rLineA, bool bSideToUse) + double getExtend(const SvxBorderLine& rLineSide, const SvxBorderLine& rLineOpposite) { - if(!rLineA.isEmpty()) + double nExtend = 0.0; + if(!rLineSide.isEmpty()) { - if(rLineA.isDouble()) - { - // reduce to inner edge of associated matching line - return -((getBorderLineWidth(rLineA) / 2.0) - (bSideToUse ? getBorderLineOutWidth(rLineA) : getBorderLineInWidth(rLineA))); - } - else - { - // extend to overlap with single line - return getBorderLineWidth(rLineA) / 2.0; - } + // reduce to inner edge of associated matching line + nExtend = -((getBorderLineWidth(rLineSide) / 2.0)); } - - return 0.0; - } - - double getOuterExtend(const SvxBorderLine& rLineA) - { - if(!rLineA.isEmpty()) + else { - // extend to overlap with single line - return getBorderLineWidth(rLineA) / 2.0; + nExtend = ((getBorderLineWidth(rLineOpposite) / 2.0)); } - return 0.0; + return nExtend; } double getChangedValue(sal_uInt16 nValue, bool bChangeToMM) @@ -302,23 +315,10 @@ namespace drawinglayer if(!aStart.equal(aEnd)) { - const double fExtendIS(getInnerExtend(getTopLine(), false)); - const double fExtendIE(getInnerExtend(getBottomLine(), true)); - double fExtendOS(0.0); - double fExtendOE(0.0); - - if(getLeftIsOutside()) - { - if(getTopIsOutside()) - { - fExtendOS = getOuterExtend(getTopLine()); - } - - if(getBottomIsOutside()) - { - fExtendOE = getOuterExtend(getBottomLine()); - } - } + const double fExtendIS(getExtend(getTopLine(), maTopFromLLine)); + const double fExtendIE(getExtend(getBottomLine(), maBottomFromLLine)); + const double fExtendOS(getExtend(maTopFromLLine, getTopLine())); + const double fExtendOE(getExtend(maBottomFromLLine, getBottomLine())); xRetval[nInsert++] = Primitive2DReference(new BorderLinePrimitive2D( aStart, @@ -330,13 +330,15 @@ namespace drawinglayer fExtendIE * fTwipsToMM, fExtendOS * fTwipsToMM, fExtendOE * fTwipsToMM, - true, - getLeftIsOutside(), - getLeftLine().GetColor().getBColor())); + getLeftLine().GetColorOut(true).getBColor(), + getLeftLine().GetColorIn(true).getBColor(), + getLeftLine().GetColorGap().getBColor(), + getLeftLine().HasGapColor(), + getLeftLine().GetStyle())); } } - if(!getBottomLine().isEmpty()) + if(!getBottomLine().isEmpty() && getBottomIsOutside()) { // create bottom line from left to right const basegfx::B2DPoint aStart(getTransform() * basegfx::B2DPoint(0.0, 1.0)); @@ -344,23 +346,10 @@ namespace drawinglayer if(!aStart.equal(aEnd)) { - const double fExtendIS(getInnerExtend(getLeftLine(), true)); - const double fExtendIE(getInnerExtend(getRightLine(), false)); - double fExtendOS(0.0); - double fExtendOE(0.0); - - if(getBottomIsOutside()) - { - if(getLeftIsOutside()) - { - fExtendOS = getOuterExtend(getLeftLine()); - } - - if(getRightIsOutside()) - { - fExtendOE = getOuterExtend(getRightLine()); - } - } + const double fExtendIS(getExtend(getLeftLine(), maLeftFromBLine )); + const double fExtendIE(getExtend(getRightLine(), maRightFromBLine)); + const double fExtendOS(getExtend(maLeftFromBLine, getLeftLine())); + const double fExtendOE(getExtend(maRightFromBLine, getRightLine())); xRetval[nInsert++] = Primitive2DReference(new BorderLinePrimitive2D( aStart, @@ -372,13 +361,15 @@ namespace drawinglayer fExtendIE * fTwipsToMM, fExtendOS * fTwipsToMM, fExtendOE * fTwipsToMM, - true, - getBottomIsOutside(), - getBottomLine().GetColor().getBColor())); + getBottomLine().GetColorOut(false).getBColor(), + getBottomLine().GetColorIn(false).getBColor(), + getBottomLine().GetColorGap().getBColor(), + getBottomLine().HasGapColor(), + getBottomLine().GetStyle())); } } - if(!getRightLine().isEmpty()) + if(!getRightLine().isEmpty() && getRightIsOutside()) { // create right line from top to bottom const basegfx::B2DPoint aStart(getTransform() * basegfx::B2DPoint(1.0, 0.0)); @@ -386,23 +377,10 @@ namespace drawinglayer if(!aStart.equal(aEnd)) { - const double fExtendIS(getInnerExtend(getTopLine(), false)); - const double fExtendIE(getInnerExtend(getBottomLine(), true)); - double fExtendOS(0.0); - double fExtendOE(0.0); - - if(getRightIsOutside()) - { - if(getTopIsOutside()) - { - fExtendOS = getOuterExtend(getTopLine()); - } - - if(getBottomIsOutside()) - { - fExtendOE = getOuterExtend(getBottomLine()); - } - } + const double fExtendIS(getExtend(getTopLine(), maTopFromRLine)); + const double fExtendIE(getExtend(getBottomLine(), maBottomFromRLine)); + const double fExtendOS(getExtend(maTopFromRLine, getTopLine())); + const double fExtendOE(getExtend(maBottomFromRLine, getBottomLine())); xRetval[nInsert++] = Primitive2DReference(new BorderLinePrimitive2D( aStart, @@ -414,9 +392,11 @@ namespace drawinglayer fExtendOE * fTwipsToMM, fExtendIS * fTwipsToMM, fExtendIE * fTwipsToMM, - getRightIsOutside(), - true, - getRightLine().GetColor().getBColor())); + getRightLine().GetColorOut(true).getBColor(), + getRightLine().GetColorIn(true).getBColor(), + getRightLine().GetColorGap().getBColor(), + getRightLine().HasGapColor(), + getRightLine().GetStyle())); } } @@ -428,23 +408,10 @@ namespace drawinglayer if(!aStart.equal(aEnd)) { - const double fExtendIS(getInnerExtend(getLeftLine(), true)); - const double fExtendIE(getInnerExtend(getRightLine(), false)); - double fExtendOS(0.0); - double fExtendOE(0.0); - - if(getTopIsOutside()) - { - if(getLeftIsOutside()) - { - fExtendOS = getOuterExtend(getLeftLine()); - } - - if(getRightIsOutside()) - { - fExtendOE = getOuterExtend(getRightLine()); - } - } + const double fExtendIS(getExtend(getLeftLine(), maLeftFromTLine)); + const double fExtendIE(getExtend(getRightLine(), maRightFromTLine)); + const double fExtendOS(getExtend(maLeftFromTLine, getLeftLine())); + const double fExtendOE(getExtend(maRightFromTLine, getRightLine())); xRetval[nInsert++] = Primitive2DReference(new BorderLinePrimitive2D( aStart, @@ -456,9 +423,11 @@ namespace drawinglayer fExtendOE * fTwipsToMM, fExtendIS * fTwipsToMM, fExtendIE * fTwipsToMM, - getTopIsOutside(), - true, - getTopLine().GetColor().getBColor())); + getTopLine().GetColorOut(false).getBColor(), + getTopLine().GetColorIn(false).getBColor(), + getTopLine().GetColorGap().getBColor(), + getTopLine().HasGapColor(), + getTopLine().GetStyle())); } } @@ -477,6 +446,14 @@ namespace drawinglayer && getBottomLine() == rCompare.getBottomLine() && getRightLine() == rCompare.getRightLine() && getTopLine() == rCompare.getTopLine() + && maLeftFromTLine == rCompare.maLeftFromTLine + && maLeftFromBLine == rCompare.maLeftFromBLine + && maRightFromTLine == rCompare.maRightFromTLine + && maRightFromBLine == rCompare.maRightFromBLine + && maTopFromLLine == rCompare.maTopFromLLine + && maTopFromRLine == rCompare.maTopFromRLine + && maBottomFromLLine == rCompare.maBottomFromLLine + && maBottomFromRLine == rCompare.maBottomFromRLine && getLeftIsOutside() == rCompare.getLeftIsOutside() && getBottomIsOutside() == rCompare.getBottomIsOutside() && getRightIsOutside() == rCompare.getRightIsOutside() @@ -530,8 +507,7 @@ namespace sdr if(bMirror) { - aLine.SetOutWidth(pLine->GetInWidth()); - aLine.SetInWidth(pLine->GetOutWidth()); + aLine.SetMirrorWidths( ); } return; @@ -582,6 +558,15 @@ namespace sdr SvxBorderLine aRightLine; SvxBorderLine aTopLine; + SvxBorderLine aLeftFromTLine; + SvxBorderLine aLeftFromBLine; + SvxBorderLine aRightFromTLine; + SvxBorderLine aRightFromBLine; + SvxBorderLine aTopFromLLine; + SvxBorderLine aTopFromRLine; + SvxBorderLine aBottomFromLLine; + SvxBorderLine aBottomFromRLine; + // create single primitives per cell for(aCellPos.mnRow = 0; aCellPos.mnRow < nRowCount; aCellPos.mnRow++) { @@ -653,6 +638,16 @@ namespace sdr impGetLine(aRightLine, rTableLayouter, nXRight, nY, false, nColCount, nRowCount, bIsRTL); impGetLine(aTopLine, rTableLayouter, nX, nY, true, nColCount, nRowCount, bIsRTL); + // get the neighbor cells' borders + impGetLine(aLeftFromTLine, rTableLayouter, nX, nY - 1, false, nColCount, nRowCount, bIsRTL); + impGetLine(aLeftFromBLine, rTableLayouter, nX, nYBottom + 1, false, nColCount, nRowCount, bIsRTL); + impGetLine(aRightFromTLine, rTableLayouter, nXRight, nY - 1, false, nColCount, nRowCount, bIsRTL); + impGetLine(aRightFromBLine, rTableLayouter, nXRight, nYBottom + 1, false, nColCount, nRowCount, bIsRTL); + impGetLine(aTopFromLLine, rTableLayouter, nX - 1, nY, true, nColCount, nRowCount, bIsRTL); + impGetLine(aTopFromRLine, rTableLayouter, nXRight + 1, nY, true, nColCount, nRowCount, bIsRTL); + impGetLine(aBottomFromLLine, rTableLayouter, nX - 1, nYBottom, true, nColCount, nRowCount, bIsRTL); + impGetLine(aBottomFromRLine, rTableLayouter, nXRight + 1, nYBottom, true, nColCount, nRowCount, bIsRTL); + // create the primtive containing all data for one cell with borders xBorderSequence[nBorderInsert++] = drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::SdrBorderlinePrimitive2D( @@ -661,6 +656,14 @@ namespace sdr aBottomLine, aRightLine, aTopLine, + aLeftFromTLine, + aLeftFromBLine, + aRightFromTLine, + aRightFromBLine, + aTopFromLLine, + aTopFromRLine, + aBottomFromLLine, + aBottomFromRLine, bIsRTL ? nX == nColCount : 0 == nX, nRowCount == nYBottom, bIsRTL ? 0 == nXRight : nXRight == nColCount, @@ -734,3 +737,5 @@ namespace sdr ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/viewcontactoftableobj.hxx b/svx/source/table/viewcontactoftableobj.hxx index 733f28be0d3e..9fcf6b8b17c6 100644 --- a/svx/source/table/viewcontactoftableobj.hxx +++ b/svx/source/table/viewcontactoftableobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ namespace sdr #endif // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index 726d0810aab2..641e3db70ef5 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ //======================================================================== // class SvxColorWindow_Impl -------------------------------------------------- //======================================================================== @@ -18,9 +19,10 @@ class SvxColorWindow_Impl : public SfxPopupWindow using FloatingWindow::StateChanged; private: - const sal_uInt16 theSlotId; - ValueSet aColorSet; - rtl::OUString maCommand; + const sal_uInt16 theSlotId; + ValueSet aColorSet; + rtl::OUString maCommand; + const Color mLastColor; #if _SOLAR__PRIVATE DECL_LINK( SelectHdl, void * ); @@ -35,7 +37,8 @@ public: sal_uInt16 nSlotId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const String& rWndTitle, - Window* pParentWindow ); + Window* pParentWindow, + const Color rLastColor = COL_AUTO); ~SvxColorWindow_Impl(); void StartSelection(); @@ -46,3 +49,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 884a1ac14d3c..29b8b3186932 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,8 +31,6 @@ #include <svx/dialogs.hrc> - -#include <tools/list.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/objsh.hxx> #include <sfx2/dispatch.hxx> @@ -661,3 +660,5 @@ long SvxColorDockingWindow::Notify( NotifyEvent& rNEvt ) return nRet ? nRet : SfxDockingWindow::Notify( rNEvt ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/colrctrl.src b/svx/source/tbxctrls/colrctrl.src index 1fdd6df6a39b..6a65615167cc 100644 --- a/svx/source/tbxctrls/colrctrl.src +++ b/svx/source/tbxctrls/colrctrl.src @@ -24,8 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - // include --------------------------------------------------------------- - //#include "colrctrl.hrc" + #include <svx/dialogs.hrc> #include "helpid.hrc" // pragma ---------------------------------------------------------------- diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index fb68c8768d49..f23f88718d65 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,16 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -// include --------------------------------------------------------------- - -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/awt/XPopupMenuExtended.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svtools/toolbarmenu.hxx> #include <vcl/toolbox.hxx> @@ -56,7 +55,6 @@ #include <svx/dialmgr.hxx> #include "svx/extrusioncolorcontrol.hxx" -//#include "chrtitem.hxx" #include "helpid.hrc" #include "extrusioncontrols.hxx" #include "extrusioncontrols.hrc" @@ -86,15 +84,17 @@ namespace svx static sal_Int32 gSkewList[] = { 135, 90, 45, 180, 0, -360, -135, -90, -45 }; -ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ) -: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DIRECTION )) -, mrController( rController ) -, maImgPerspective( SVX_RES( IMG_PERSPECTIVE ) ) -, maImgPerspectiveH( SVX_RES( IMG_PERSPECTIVE_H ) ) -, maImgParallel( SVX_RES( IMG_PARALLEL ) ) -, maImgParallelH( SVX_RES( IMG_PARALLEL_H ) ) -, msExtrusionDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirection" ) ) -, msExtrusionProjection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionProjection" ) ) +ExtrusionDirectionWindow::ExtrusionDirectionWindow( + svt::ToolboxController& rController, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + Window* pParentWindow +) +: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DIRECTION )) , + mrController( rController ) , + maImgPerspective( SVX_RES( IMG_PERSPECTIVE ) ) , + maImgParallel( SVX_RES( IMG_PARALLEL ) ) , + msExtrusionDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirection" ) ) , + msExtrusionProjection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionProjection" ) ) { SetHelpId( HID_MENU_EXTRUSION_DIRECTION ); @@ -102,7 +102,6 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rCon for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) { maImgDirection[i] = Image( SVX_RES( IMG_DIRECTION + i ) ); - maImgDirectionH[i] = Image( SVX_RES( IMG_DIRECTION_H + i ) ); } SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) ); @@ -113,20 +112,18 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rCon mpDirectionSet->SetColCount( 3 ); mpDirectionSet->EnableFullItemMode( sal_False ); - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) { String aText( SVX_RES( STR_DIRECTION + i ) ); - mpDirectionSet->InsertItem( i+1, bHighContrast ? maImgDirectionH[ i ] : maImgDirection[ i ], aText ); + mpDirectionSet->InsertItem( i+1, maImgDirection[ i ], aText ); } mpDirectionSet->SetOutputSizePixel( Size( 72, 72 ) ); appendEntry( 2, mpDirectionSet ); appendSeparator(); - appendEntry( 0, String( SVX_RES( STR_PERSPECTIVE ) ), bHighContrast ? maImgPerspectiveH : maImgPerspective ); - appendEntry( 1, String( SVX_RES( STR_PARALLEL ) ), bHighContrast ? maImgParallelH : maImgParallel ); + appendEntry( 0, String( SVX_RES( STR_PERSPECTIVE ) ), maImgPerspective ); + appendEntry( 1, String( SVX_RES( STR_PARALLEL ) ), maImgParallel ); SetOutputSizePixel( getMenuSize() ); @@ -142,15 +139,13 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt ) if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - for( sal_uInt16 i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) { - mpDirectionSet->SetItemImage( i+1, bHighContrast ? maImgDirectionH[ i ] : maImgDirection[ i ] ); + mpDirectionSet->SetItemImage( i+1, maImgDirection[ i ] ); } - setEntryImage( 0, bHighContrast ? maImgPerspectiveH : maImgPerspective ); - setEntryImage( 1, bHighContrast ? maImgParallelH : maImgParallel ); + setEntryImage( 0, maImgPerspective ); + setEntryImage( 1, maImgParallel ); } } @@ -191,7 +186,9 @@ void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bE // ----------------------------------------------------------------------- -void SAL_CALL ExtrusionDirectionWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL ExtrusionDirectionWindow::statusChanged( + const ::com::sun::star::frame::FeatureStateEvent& Event +) throw ( ::com::sun::star::uno::RuntimeException ) { if( Event.FeatureURL.Main.equals( msExtrusionDirection ) ) { @@ -257,8 +254,13 @@ IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl ) // ExtrusionDirectionControl // ======================================================================= -ExtrusionDirectionControl::ExtrusionDirectionControl( const Reference< lang::XMultiServiceFactory >& rServiceManager ) -: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) ) +ExtrusionDirectionControl::ExtrusionDirectionControl( + const Reference< lang::XMultiServiceFactory >& rServiceManager +) : svt::PopupWindowController( + rServiceManager, + Reference< frame::XFrame >(), + OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) + ) { } @@ -289,7 +291,9 @@ Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames // -------------------------------------------------------------------- -Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) +Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance( + const Reference< XMultiServiceFactory >& rSMgr +) throw( RuntimeException ) { return *new ExtrusionDirectionControl( rSMgr ); } @@ -331,7 +335,6 @@ ExtrusionDepthDialog::~ExtrusionDepthDialog() double ExtrusionDepthDialog::getDepth() const { -// bool bMetric = IsMetric( meDefaultUnit ); return (double)( maMtrDepth.GetValue( FUNIT_100TH_MM ) ) / 100.0; } @@ -340,38 +343,33 @@ double ExtrusionDepthDialog::getDepth() const double aDepthListInch[] = { 0, 1270,2540,5080,10160 }; double aDepthListMM[] = { 0, 1000, 2500, 5000, 10000 }; -ExtrusionDepthWindow::ExtrusionDepthWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ) -: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DEPTH )) -, mrController( rController ) -, maImgDepth0( SVX_RES( IMG_DEPTH_0 ) ) -, maImgDepth1( SVX_RES( IMG_DEPTH_1 ) ) -, maImgDepth2( SVX_RES( IMG_DEPTH_2 ) ) -, maImgDepth3( SVX_RES( IMG_DEPTH_3 ) ) -, maImgDepth4( SVX_RES( IMG_DEPTH_4 ) ) -, maImgDepthInfinity( SVX_RES( IMG_DEPTH_INFINITY ) ) -, maImgDepth0h( SVX_RES( IMG_DEPTH_0_H ) ) -, maImgDepth1h( SVX_RES( IMG_DEPTH_1_H ) ) -, maImgDepth2h( SVX_RES( IMG_DEPTH_2_H ) ) -, maImgDepth3h( SVX_RES( IMG_DEPTH_3_H ) ) -, maImgDepth4h( SVX_RES( IMG_DEPTH_4_H ) ) -, maImgDepthInfinityh( SVX_RES( IMG_DEPTH_INFINITY_H ) ) -, mfDepth( -1.0 ) -, msExtrusionDepth( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepth" ) ) -, msMetricUnit( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" ) ) +ExtrusionDepthWindow::ExtrusionDepthWindow( + svt::ToolboxController& rController, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + Window* pParentWindow +) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DEPTH )) + , mrController( rController ) + , maImgDepth0( SVX_RES( IMG_DEPTH_0 ) ) + , maImgDepth1( SVX_RES( IMG_DEPTH_1 ) ) + , maImgDepth2( SVX_RES( IMG_DEPTH_2 ) ) + , maImgDepth3( SVX_RES( IMG_DEPTH_3 ) ) + , maImgDepth4( SVX_RES( IMG_DEPTH_4 ) ) + , maImgDepthInfinity( SVX_RES( IMG_DEPTH_INFINITY ) ) + , mfDepth( -1.0 ) + , msExtrusionDepth( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepth" ) ) + , msMetricUnit( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" ) ) { SetHelpId( HID_MENU_EXTRUSION_DEPTH ); SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) ); - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - String aEmpty; - appendEntry( 0, aEmpty, bHighContrast ? maImgDepth0h : maImgDepth0 ); - appendEntry( 1, aEmpty, bHighContrast ? maImgDepth1h : maImgDepth1 ); - appendEntry( 2, aEmpty, bHighContrast ? maImgDepth2h : maImgDepth2 ); - appendEntry( 3, aEmpty, bHighContrast ? maImgDepth3h : maImgDepth3 ); - appendEntry( 4, aEmpty, bHighContrast ? maImgDepth4h : maImgDepth4 ); - appendEntry( 5, String( SVX_RES( STR_INFINITY ) ), bHighContrast ? maImgDepthInfinityh : maImgDepthInfinity ); + appendEntry( 0, aEmpty, maImgDepth0 ); + appendEntry( 1, aEmpty, maImgDepth1 ); + appendEntry( 2, aEmpty, maImgDepth2 ); + appendEntry( 3, aEmpty, maImgDepth3 ); + appendEntry( 4, aEmpty, maImgDepth4 ); + appendEntry( 5, String( SVX_RES( STR_INFINITY ) ), maImgDepthInfinity ); appendEntry( 6, String( SVX_RES( STR_CUSTOM ) ) ); SetOutputSizePixel( getMenuSize() ); @@ -417,7 +415,9 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) // ----------------------------------------------------------------------- -void SAL_CALL ExtrusionDepthWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL ExtrusionDepthWindow::statusChanged( + const ::com::sun::star::frame::FeatureStateEvent& Event +) throw ( ::com::sun::star::uno::RuntimeException ) { if( Event.FeatureURL.Main.equals( msExtrusionDepth ) ) { @@ -455,14 +455,12 @@ void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt ) if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - setEntryImage( 0, bHighContrast ? maImgDepth0h : maImgDepth0 ); - setEntryImage( 1, bHighContrast ? maImgDepth1h : maImgDepth1 ); - setEntryImage( 2, bHighContrast ? maImgDepth2h : maImgDepth2 ); - setEntryImage( 3, bHighContrast ? maImgDepth3h : maImgDepth3 ); - setEntryImage( 4, bHighContrast ? maImgDepth4h : maImgDepth4 ); - setEntryImage( 5, bHighContrast ? maImgDepthInfinityh : maImgDepthInfinity ); + setEntryImage( 0, maImgDepth0 ); + setEntryImage( 1, maImgDepth1 ); + setEntryImage( 2, maImgDepth2 ); + setEntryImage( 3, maImgDepth3 ); + setEntryImage( 4, maImgDepth4 ); + setEntryImage( 5, maImgDepthInfinity ); } } @@ -521,8 +519,13 @@ IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG ) // ExtrusionDirectionControl // ======================================================================= -ExtrusionDepthController::ExtrusionDepthController( const Reference< lang::XMultiServiceFactory >& rServiceManager ) -: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthFloater" ) ) ) +ExtrusionDepthController::ExtrusionDepthController( + const Reference< lang::XMultiServiceFactory >& rServiceManager +) : svt::PopupWindowController( + rServiceManager, + Reference< frame::XFrame >(), + OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthFloater" ) ) + ) { } @@ -583,10 +586,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr , mrController( rController ) , maImgBright( SVX_RES( IMG_LIGHTING_BRIGHT ) ) , maImgNormal( SVX_RES( IMG_LIGHTING_NORMAL ) ) -, maImgDim( SVX_RES( IMG_LIGHTING_DIM ) ) -, maImgBrighth( SVX_RES( IMG_LIGHTING_BRIGHT_H ) ) -, maImgNormalh( SVX_RES( IMG_LIGHTING_NORMAL_H ) ) -, maImgDimh( SVX_RES( IMG_LIGHTING_DIM_H ) ) +, maImgDim( SVX_RES( IMG_LIGHTING_DIM ) ) , mnLevel( 0 ) , mbLevelEnabled( false ) , mnDirection( FROM_FRONT ) @@ -599,13 +599,10 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr { if( i != FROM_FRONT ) { - maImgLightingOff[i] = Image( SVX_RES( IMG_LIGHT_OFF + i ) ); - maImgLightingOn[i] = Image( SVX_RES( IMG_LIGHT_ON + i ) ); - maImgLightingOffh[i] = Image( SVX_RES( IMG_LIGHT_OFF_H + i ) ); - maImgLightingOnh[i] = Image( SVX_RES( IMG_LIGHT_ON_H + i ) ); + maImgLightingOff[ i ] = Image( SVX_RES( IMG_LIGHT_OFF + i ) ); + maImgLightingOn[ i ] = Image( SVX_RES( IMG_LIGHT_ON + i ) ); } maImgLightingPreview[i] = Image( SVX_RES( IMG_LIGHT_PREVIEW + i ) ); - maImgLightingPreviewh[i] = Image( SVX_RES( IMG_LIGHT_PREVIEW_H + i ) ); } SetHelpId( HID_MENU_EXTRUSION_LIGHTING ); @@ -618,26 +615,24 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr mpLightingSet->SetColCount( 3 ); mpLightingSet->EnableFullItemMode( sal_False ); - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ ) { if( i != FROM_FRONT ) { - mpLightingSet->InsertItem( i+1, bHighContrast ? maImgLightingOffh[i] : maImgLightingOff[i] ); + mpLightingSet->InsertItem( i+1, maImgLightingOff[i] ); } else { - mpLightingSet->InsertItem( 5, bHighContrast ? maImgLightingPreviewh[FROM_FRONT] : maImgLightingPreview[FROM_FRONT] ); + mpLightingSet->InsertItem( 5, maImgLightingPreview[FROM_FRONT] ); } } mpLightingSet->SetOutputSizePixel( Size( 72, 72 ) ); appendEntry( 3, mpLightingSet ); appendSeparator(); - appendEntry( 0, String( SVX_RES( STR_BRIGHT ) ), bHighContrast ? maImgBrighth : maImgBright ); - appendEntry( 1, String( SVX_RES( STR_NORMAL ) ), bHighContrast ? maImgNormalh : maImgNormal ); - appendEntry( 2, String( SVX_RES( STR_DIM ) ), bHighContrast ? maImgDimh : maImgDim ); + appendEntry( 0, String( SVX_RES( STR_BRIGHT ) ), maImgBright ); + appendEntry( 1, String( SVX_RES( STR_NORMAL ) ), maImgNormal ); + appendEntry( 2, String( SVX_RES( STR_DIM ) ), maImgDim ); SetOutputSizePixel( getMenuSize() ); @@ -668,8 +663,6 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) mnDirection = nDirection; mbDirectionEnabled = bEnabled; - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - if( !bEnabled ) nDirection = FROM_FRONT; @@ -678,18 +671,14 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) { if( nItemId == FROM_FRONT ) { - mpLightingSet->SetItemImage( nItemId + 1, bHighContrast ? maImgLightingPreviewh[ nDirection ] : maImgLightingPreview[ nDirection ] ); + mpLightingSet->SetItemImage( nItemId + 1, maImgLightingPreview[ nDirection ] ); } else { - if( bHighContrast ) - { - mpLightingSet->SetItemImage( nItemId + 1, (sal_uInt16)nDirection == nItemId ? maImgLightingOnh[nItemId] : maImgLightingOffh[nItemId] ); - } - else - { - mpLightingSet->SetItemImage( nItemId + 1, (sal_uInt16)nDirection == nItemId ? maImgLightingOn[nItemId] : maImgLightingOff[nItemId] ); - } + mpLightingSet->SetItemImage( + nItemId + 1, + (sal_uInt16)nDirection == nItemId ? maImgLightingOn[nItemId] : maImgLightingOff[nItemId] + ); } } @@ -698,7 +687,9 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) // ----------------------------------------------------------------------- -void SAL_CALL ExtrusionLightingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL ExtrusionLightingWindow::statusChanged( + const ::com::sun::star::frame::FeatureStateEvent& Event +) throw ( ::com::sun::star::uno::RuntimeException ) { if( Event.FeatureURL.Main.equals( msExtrusionLightingIntensity ) ) { @@ -736,12 +727,10 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt ) if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - implSetDirection( mnDirection, mbDirectionEnabled ); - setEntryImage( 0, bHighContrast ? maImgBrighth : maImgBright ); - setEntryImage( 1, bHighContrast ? maImgNormalh : maImgNormal ); - setEntryImage( 2, bHighContrast ? maImgDimh : maImgDim ); + setEntryImage( 0, maImgBright ); + setEntryImage( 1, maImgNormal ); + setEntryImage( 2, maImgDim ); } } @@ -793,8 +782,12 @@ IMPL_LINK( ExtrusionLightingWindow, SelectHdl, void *, pControl ) // ======================================================================== -ExtrusionLightingControl::ExtrusionLightingControl( const Reference< lang::XMultiServiceFactory >& rServiceManager ) -: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) ) +ExtrusionLightingControl::ExtrusionLightingControl( + const Reference< lang::XMultiServiceFactory >& rServiceManager +) : svt::PopupWindowController( rServiceManager, + Reference< frame::XFrame >(), + OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) + ) { } @@ -825,7 +818,9 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames( // -------------------------------------------------------------------- -Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) +Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance( + const Reference< XMultiServiceFactory >& rSMgr +) throw( RuntimeException ) { return *new ExtrusionLightingControl( rSMgr ); } @@ -846,28 +841,25 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames // #################################################################### -ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ) -: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_SURFACE )) -, mrController( rController ) -, maImgSurface1( SVX_RES( IMG_WIRE_FRAME ) ) -, maImgSurface2( SVX_RES( IMG_MATTE ) ) -, maImgSurface3( SVX_RES( IMG_PLASTIC ) ) -, maImgSurface4( SVX_RES( IMG_METAL ) ) -, maImgSurface1h( SVX_RES( IMG_WIRE_FRAME_H ) ) -, maImgSurface2h( SVX_RES( IMG_MATTE_H ) ) -, maImgSurface3h( SVX_RES( IMG_PLASTIC_H ) ) -, maImgSurface4h( SVX_RES( IMG_METAL_H ) ) -, msExtrusionSurface( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurface" )) +ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( + svt::ToolboxController& rController, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + Window* pParentWindow +) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_SURFACE ) ) + , mrController( rController ) + , maImgSurface1( SVX_RES( IMG_WIRE_FRAME ) ) + , maImgSurface2( SVX_RES( IMG_MATTE ) ) + , maImgSurface3( SVX_RES( IMG_PLASTIC ) ) + , maImgSurface4( SVX_RES( IMG_METAL ) ) + , msExtrusionSurface( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurface" ) ) { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - SetHelpId( HID_MENU_EXTRUSION_SURFACE ); SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) ); - appendEntry( 0, String( SVX_RES( STR_WIREFRAME ) ), bHighContrast ? maImgSurface1h : maImgSurface1 ); - appendEntry( 1, String( SVX_RES( STR_MATTE ) ), bHighContrast ? maImgSurface2h : maImgSurface2 ); - appendEntry( 2, String( SVX_RES( STR_PLASTIC ) ), bHighContrast ? maImgSurface3h : maImgSurface3 ); - appendEntry( 3, String( SVX_RES( STR_METAL ) ), bHighContrast ? maImgSurface4h : maImgSurface4 ); + appendEntry( 0, String( SVX_RES( STR_WIREFRAME ) ), maImgSurface1 ); + appendEntry( 1, String( SVX_RES( STR_MATTE ) ), maImgSurface2 ); + appendEntry( 2, String( SVX_RES( STR_PLASTIC ) ), maImgSurface3 ); + appendEntry( 3, String( SVX_RES( STR_METAL ) ), maImgSurface4 ); SetOutputSizePixel( getMenuSize() ); @@ -880,20 +872,19 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( svt::ToolboxController& rControl void ExtrusionSurfaceWindow::implSetSurface( int nSurface, bool bEnabled ) { -// if( mpMenu ) + int i; + for( i = 0; i < 4; i++ ) { - int i; - for( i = 0; i < 4; i++ ) - { - checkEntry( i, (i == nSurface) && bEnabled ); - enableEntry( i, bEnabled ); - } + checkEntry( i, (i == nSurface) && bEnabled ); + enableEntry( i, bEnabled ); } } // ----------------------------------------------------------------------- -void SAL_CALL ExtrusionSurfaceWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL ExtrusionSurfaceWindow::statusChanged( + const ::com::sun::star::frame::FeatureStateEvent& Event +) throw ( ::com::sun::star::uno::RuntimeException ) { if( Event.FeatureURL.Main.equals( msExtrusionSurface ) ) { @@ -934,8 +925,14 @@ IMPL_LINK( ExtrusionSurfaceWindow, SelectHdl, void *, EMPTYARG ) // ======================================================================== -ExtrusionSurfaceControl::ExtrusionSurfaceControl( const Reference< lang::XMultiServiceFactory >& rServiceManager ) -: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurfaceFloater" ) ) ) +ExtrusionSurfaceControl::ExtrusionSurfaceControl( + const Reference< lang::XMultiServiceFactory >& rServiceManager +) +: svt::PopupWindowController( + rServiceManager, + Reference< frame::XFrame >(), + OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurfaceFloater" ) ) + ) { } @@ -966,7 +963,9 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() // -------------------------------------------------------------------- -Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) +Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance( + const Reference< XMultiServiceFactory >& rSMgr +) throw( RuntimeException ) { return *new ExtrusionSurfaceControl( rSMgr ); } @@ -991,7 +990,8 @@ SFX_IMPL_TOOLBOX_CONTROL( ExtrusionColorControl, SvxColorItem ); ExtrusionColorControl::ExtrusionColorControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) -: SfxToolBoxControl ( nSlotId, nId, rTbx ) +: SfxToolBoxControl ( nSlotId, nId, rTbx ), + mLastColor( COL_AUTO ) { rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); mpBtnUpdater = new ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox(), TBX_UPDATER_MODE_CHAR_COLOR_NEW ); @@ -1020,7 +1020,8 @@ SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow() SID_EXTRUSION_3D_COLOR, m_xFrame, SVX_RESSTR( RID_SVXSTR_EXTRUSION_COLOR ), - &GetToolBox() ); + &GetToolBox(), + mLastColor ); pColorWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF ); pColorWin->StartSelection(); SetPopupWindow( pColorWin ); @@ -1042,7 +1043,10 @@ void ExtrusionColorControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, pItem = PTR_CAST( SvxColorItem, pState ); if ( pItem ) + { mpBtnUpdater->Update( pItem->GetValue()); + mLastColor = pItem->GetValue(); + } } rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); @@ -1050,3 +1054,5 @@ void ExtrusionColorControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/extrusioncontrols.hrc b/svx/source/tbxctrls/extrusioncontrols.hrc index 705381cb68a6..9ae43248a499 100644..100755 --- a/svx/source/tbxctrls/extrusioncontrols.hrc +++ b/svx/source/tbxctrls/extrusioncontrols.hrc @@ -64,7 +64,6 @@ #define STR_DIRECTION 30 // needs 10 resource ids #define IMG_DIRECTION 1 // needs 10 resource ids -#define IMG_DIRECTION_H 10 // needs 10 resource ids #define IMG_DEPTH_0 19 #define IMG_DEPTH_1 20 @@ -73,48 +72,24 @@ #define IMG_DEPTH_4 23 #define IMG_DEPTH_INFINITY 24 -#define IMG_DEPTH_0_H 25 -#define IMG_DEPTH_1_H 26 -#define IMG_DEPTH_2_H 27 -#define IMG_DEPTH_3_H 28 -#define IMG_DEPTH_4_H 29 -#define IMG_DEPTH_INFINITY_H 30 - #define IMG_PERSPECTIVE 31 -#define IMG_PERSPECTIVE_H 32 #define IMG_PARALLEL 33 -#define IMG_PARALLEL_H 34 #define IMG_WIRE_FRAME 35 #define IMG_MATTE 36 #define IMG_PLASTIC 37 #define IMG_METAL 38 -#define IMG_WIRE_FRAME_H 39 -#define IMG_MATTE_H 40 -#define IMG_PLASTIC_H 41 -#define IMG_METAL_H 42 - #define IMG_LIGHT_OFF 50 // needs 10 resource ids #define IMG_LIGHT_ON 60 // needs 10 resource ids #define IMG_LIGHT_PREVIEW 70 // needs 10 resource ids -#define IMG_LIGHT_OFF_H 80 // needs 10 resource ids -#define IMG_LIGHT_ON_H 90 // needs 10 resource ids -#define IMG_LIGHT_PREVIEW_H 100 // needs 10 resource ids - #define IMG_LIGHTING_BRIGHT 110 #define IMG_LIGHTING_NORMAL 111 #define IMG_LIGHTING_DIM 112 -#define IMG_LIGHTING_BRIGHT_H 113 -#define IMG_LIGHTING_NORMAL_H 114 -#define IMG_LIGHTING_DIM_H 115 - #define FL_DEPTH 1 #define MTR_DEPTH 2 #define BTN_OK 3 #define BTN_CANCEL 4 #define BTN_HELP 5 - -// diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index 3dd8272b6940..35993c461beb 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,12 +63,8 @@ private: ValueSet* mpDirectionSet; Image maImgDirection[9]; - Image maImgDirectionH[9]; - Image maImgPerspective; - Image maImgPerspectiveH; Image maImgParallel; - Image maImgParallelH; const rtl::OUString msExtrusionDirection; const rtl::OUString msExtrusionProjection; @@ -110,13 +107,6 @@ private: Image maImgDepth4; Image maImgDepthInfinity; - Image maImgDepth0h; - Image maImgDepth1h; - Image maImgDepth2h; - Image maImgDepth3h; - Image maImgDepth4h; - Image maImgDepthInfinityh; - FieldUnit meUnit; double mfDepth; @@ -163,16 +153,9 @@ private: Image maImgLightingOn[9]; Image maImgLightingPreview[9]; - Image maImgLightingOffh[9]; - Image maImgLightingOnh[9]; - Image maImgLightingPreviewh[9]; - Image maImgBright; Image maImgNormal; Image maImgDim; - Image maImgBrighth; - Image maImgNormalh; - Image maImgDimh; int mnLevel; bool mbLevelEnabled; @@ -220,10 +203,6 @@ private: Image maImgSurface2; Image maImgSurface3; Image maImgSurface4; - Image maImgSurface1h; - Image maImgSurface2h; - Image maImgSurface3h; - Image maImgSurface4h; const rtl::OUString msExtrusionSurface; @@ -258,3 +237,4 @@ public: } #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src index c7655b9576af..17044b681d34 100644 --- a/svx/source/tbxctrls/extrusioncontrols.src +++ b/svx/source/tbxctrls/extrusioncontrols.src @@ -48,111 +48,56 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION ImageBitmap = Bitmap { File = "directionnorthwest_22.bmp" ; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_NW - { - ImageBitmap = Bitmap { File = "directionnorthwest_22_h.bmp" ; }; - MASKCOLOR - }; Image IMG_DIRECTION + DIRECTION_N { ImageBitmap = Bitmap { File = "directionnorth_22.bmp" ; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_N - { - ImageBitmap = Bitmap { File = "directionnorth_22_h.bmp"; }; - MASKCOLOR - }; Image IMG_DIRECTION + DIRECTION_NE { ImageBitmap = Bitmap { File = "directionnortheast_22.bmp"; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_NE - { - ImageBitmap = Bitmap { File = "directionnortheast_22_h.bmp"; }; - MASKCOLOR - }; Image IMG_DIRECTION + DIRECTION_W { ImageBitmap = Bitmap { File = "directionwest_22.bmp"; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_W - { - ImageBitmap = Bitmap { File = "directionwest_22_h.bmp"; }; - MASKCOLOR - }; Image IMG_DIRECTION + DIRECTION_NONE { ImageBitmap = Bitmap { File = "directionstraight_22.bmp"; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_NONE - { - ImageBitmap = Bitmap { File = "directionstraight_22_h.bmp"; }; - MASKCOLOR - }; Image IMG_DIRECTION + DIRECTION_E { ImageBitmap = Bitmap { File = "directioneast_22.bmp"; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_E - { - ImageBitmap = Bitmap { File = "directioneast_22_h.bmp"; }; - MASKCOLOR - }; Image IMG_DIRECTION + DIRECTION_SW { ImageBitmap = Bitmap { File = "directionsouthwest_22.bmp"; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_SW - { - ImageBitmap = Bitmap { File = "directionsouthwest_22_h.bmp"; }; - MASKCOLOR - }; Image IMG_DIRECTION + DIRECTION_S { ImageBitmap = Bitmap { File = "directionsouth_22.bmp"; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_S - { - ImageBitmap = Bitmap { File = "directionsouth_22_h.bmp"; }; - MASKCOLOR - }; Image IMG_DIRECTION + DIRECTION_SE { ImageBitmap = Bitmap { File = "directionsoutheast_22.bmp"; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_SE - { - ImageBitmap = Bitmap { File = "directionsoutheast_22_h.bmp"; }; - MASKCOLOR - }; Image IMG_PERSPECTIVE { ImageBitmap = Bitmap { File = "perspective_16.bmp"; }; MASKCOLOR }; - Image IMG_PERSPECTIVE_H - { - ImageBitmap = Bitmap { File = "perspective_16_h.bmp"; }; - MASKCOLOR - }; Image IMG_PARALLEL { ImageBitmap = Bitmap { File = "parallel_16.bmp"; }; MASKCOLOR }; - Image IMG_PARALLEL_H - { - ImageBitmap = Bitmap { File = "parallel_16_h.bmp"; }; - MASKCOLOR - }; String STR_PERSPECTIVE { @@ -229,66 +174,36 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH ImageBitmap = Bitmap { File = "extrusion0inch_16.bmp"; }; MASKCOLOR }; - Image IMG_DEPTH_0_H - { - ImageBitmap = Bitmap { File = "extrusion0inch_16_h.bmp"; }; - MASKCOLOR - }; Image IMG_DEPTH_1 { ImageBitmap = Bitmap { File = "extrusion05inch_16.bmp"; }; MASKCOLOR }; - Image IMG_DEPTH_1_H - { - ImageBitmap = Bitmap { File = "extrusion05inch_16_h.bmp"; }; - MASKCOLOR - }; Image IMG_DEPTH_2 { ImageBitmap = Bitmap { File = "extrusion1inch_16.bmp"; }; MASKCOLOR }; - Image IMG_DEPTH_2_H - { - ImageBitmap = Bitmap { File = "extrusion1inch_16_h.bmp"; }; - MASKCOLOR - }; Image IMG_DEPTH_3 { ImageBitmap = Bitmap { File = "extrusion2inch_16.bmp"; }; MASKCOLOR }; - Image IMG_DEPTH_3_H - { - ImageBitmap = Bitmap { File = "extrusion2inch_16_h.bmp"; }; - MASKCOLOR - }; Image IMG_DEPTH_4 { ImageBitmap = Bitmap { File = "extrusion4inch_16.bmp"; }; MASKCOLOR }; - Image IMG_DEPTH_4_H - { - ImageBitmap = Bitmap { File = "extrusion4inch_16_h.bmp"; }; - MASKCOLOR - }; Image IMG_DEPTH_INFINITY { ImageBitmap = Bitmap { File = "extrusioninfinity_16.bmp"; }; MASKCOLOR }; - Image IMG_DEPTH_INFINITY_H - { - ImageBitmap = Bitmap { File = "extrusioninfinity_16_h.bmp"; }; - MASKCOLOR - }; }; @@ -346,47 +261,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING MASKCOLOR }; - Image IMG_LIGHT_OFF_H + FROM_TOP_LEFT - { - ImageBitmap = Bitmap { File = "lightofffromtopleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_OFF_H + FROM_TOP - { - ImageBitmap = Bitmap { File = "lightofffromtop_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_OFF_H + FROM_TOP_RIGHT - { - ImageBitmap = Bitmap { File = "lightofffromtopright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_OFF_H + FROM_LEFT - { - ImageBitmap = Bitmap { File = "lightofffromleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_OFF_H + FROM_RIGHT - { - ImageBitmap = Bitmap { File = "lightofffromright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_OFF_H + FROM_BOTTOM_LEFT - { - ImageBitmap = Bitmap { File = "lightofffrombottomleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_OFF_H + FROM_BOTTOM - { - ImageBitmap = Bitmap { File = "lightofffrombottom_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_OFF_H + FROM_BOTTOM_RIGHT - { - ImageBitmap = Bitmap { File = "lightofffrombottomright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_ON + FROM_TOP_LEFT { ImageBitmap = Bitmap { File = "lightonfromtopleft_22.bmp"; }; @@ -428,47 +302,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING MASKCOLOR }; - Image IMG_LIGHT_ON_H + FROM_TOP_LEFT - { - ImageBitmap = Bitmap { File = "lightonfromtopleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_ON_H + FROM_TOP - { - ImageBitmap = Bitmap { File = "lightonfromtop_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_ON_H + FROM_TOP_RIGHT - { - ImageBitmap = Bitmap { File = "lightonfromtopright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_ON_H + FROM_LEFT - { - ImageBitmap = Bitmap { File = "lightonfromleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_ON_H + FROM_RIGHT - { - ImageBitmap = Bitmap { File = "lightonfromright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_ON_H + FROM_BOTTOM_LEFT - { - ImageBitmap = Bitmap { File = "lightonfrombottomleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_ON_H + FROM_BOTTOM - { - ImageBitmap = Bitmap { File = "lightonfrombottom_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_ON_H + FROM_BOTTOM_RIGHT - { - ImageBitmap = Bitmap { File = "lightonfrombottomright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW + FROM_TOP_LEFT { ImageBitmap = Bitmap { File = "lightfromtopleft_22.bmp"; }; @@ -515,52 +348,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING MASKCOLOR }; - Image IMG_LIGHT_PREVIEW_H + FROM_TOP_LEFT - { - ImageBitmap = Bitmap { File = "lightfromtopleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW_H + FROM_TOP - { - ImageBitmap = Bitmap { File = "lightfromtop_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW_H + FROM_TOP_RIGHT - { - ImageBitmap = Bitmap { File = "lightfromtopright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW_H + FROM_LEFT - { - ImageBitmap = Bitmap { File = "lightfromleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW_H + FROM_RIGHT - { - ImageBitmap = Bitmap { File = "lightfromright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW_H + FROM_FRONT - { - ImageBitmap = Bitmap { File = "lightfromfront_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW_H + FROM_BOTTOM_LEFT - { - ImageBitmap = Bitmap { File = "lightfrombottomleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW_H + FROM_BOTTOM - { - ImageBitmap = Bitmap { File = "lightfrombottom_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW_H + FROM_BOTTOM_RIGHT - { - ImageBitmap = Bitmap { File = "lightfrombottomright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHTING_BRIGHT { ImageBitmap = Bitmap { File = "brightlit_16.bmp"; }; @@ -577,22 +364,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING MASKCOLOR }; - Image IMG_LIGHTING_BRIGHT_H - { - ImageBitmap = Bitmap { File = "brightlit_16_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHTING_NORMAL_H - { - ImageBitmap = Bitmap { File = "normallit_16_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHTING_DIM_H - { - ImageBitmap = Bitmap { File = "dimlit_16_h.bmp"; }; - MASKCOLOR - }; - String STR_BRIGHT { Text [ en-US ] = "~Bright"; @@ -647,42 +418,24 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE ImageBitmap = Bitmap { File = "wireframe_16.bmp"; }; MASKCOLOR }; - Image IMG_WIRE_FRAME_H - { - ImageBitmap = Bitmap { File = "wireframe_16_h.bmp"; }; - MASKCOLOR - }; + Image IMG_MATTE { ImageBitmap = Bitmap { File = "matte_16.bmp"; }; MASKCOLOR }; - Image IMG_MATTE_H - { - ImageBitmap = Bitmap { File = "matte_16_h.bmp"; }; - MASKCOLOR - }; + Image IMG_PLASTIC { ImageBitmap = Bitmap { File = "plastic_16.bmp"; }; MASKCOLOR }; - Image IMG_PLASTIC_H - { - ImageBitmap = Bitmap { File = "plastic_16_h.bmp"; }; - MASKCOLOR - }; + Image IMG_METAL { ImageBitmap = Bitmap { File = "metal_16.bmp"; }; MASKCOLOR }; - Image IMG_METAL_H - { - ImageBitmap = Bitmap { File = "metal_16_h.bmp"; }; - MASKCOLOR - }; - }; #define WIDTH 140 @@ -708,7 +461,6 @@ ModalDialog RID_SVX_MDLG_EXTRUSION_DEPTH }; MetricField MTR_DEPTH { - //HelpId = HID_SD_CTL_FAVORITES ; Border = FALSE ; Pos = MAP_APPFONT ( 3 , 14 ) ; Size = MAP_APPFONT ( WIDTH - 50 - 12, 12 ) ; diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index eb10f11060d4..98efd9bfe7d4 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,7 @@ // include --------------------------------------------------------------- -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> @@ -109,7 +110,7 @@ void SvxFillToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - bool bEnableControls = sal_False; + bool bEnableControls = false; if ( bIgnoreStatusUpdate ) return; @@ -152,7 +153,7 @@ void SvxFillToolBoxControl::StateChanged( pColorItem = (XFillColorItem*) pState->Clone(); if( eXFS == XFILL_SOLID ) - bEnableControls = sal_True; + bEnableControls = true; } else if( nSID == SID_ATTR_FILL_GRADIENT ) { @@ -160,7 +161,7 @@ void SvxFillToolBoxControl::StateChanged( pGradientItem = (XFillGradientItem*) pState->Clone(); if( eXFS == XFILL_GRADIENT ) - bEnableControls = sal_True; + bEnableControls = true; } else if( nSID == SID_ATTR_FILL_HATCH ) { @@ -168,7 +169,7 @@ void SvxFillToolBoxControl::StateChanged( pHatchItem = (XFillHatchItem*) pState->Clone(); if( eXFS == XFILL_HATCH ) - bEnableControls = sal_True; + bEnableControls = true; } else if( nSID == SID_ATTR_FILL_BITMAP ) { @@ -176,7 +177,7 @@ void SvxFillToolBoxControl::StateChanged( pBitmapItem = (XFillBitmapItem*) pState->Clone(); if( eXFS == XFILL_BITMAP ) - bEnableControls = sal_True; + bEnableControls = true; } } if( bEnableControls ) @@ -445,7 +446,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) break; default: - DBG_ERROR( "Nicht unterstuetzter Flaechentyp" ); + OSL_FAIL( "Nicht unterstuetzter Flaechentyp" ); break; } } @@ -819,9 +820,6 @@ void FillControl::Resize() pLbFillType->SetSizePixel( Size( nW * 2 - nSep, nH ) ); pLbFillAttr->SetPosSizePixel( Point( nW * 2 + nSep, 0 ), Size( nW * 3 - nSep, nH ) ); } -/* -----------------------------08.03.2002 15:04------------------------------ - - ---------------------------------------------------------------------------*/ void FillControl::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -844,3 +842,4 @@ void FillControl::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 403ef97f6319..bd3cd0e30c6b 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -363,11 +364,6 @@ private: Image maImgAlgin3; Image maImgAlgin4; Image maImgAlgin5; - Image maImgAlgin1h; - Image maImgAlgin2h; - Image maImgAlgin3h; - Image maImgAlgin4h; - Image maImgAlgin5h; const rtl::OUString msFontworkAlignment; @@ -379,28 +375,21 @@ private: FontWorkAlignmentWindow::FontWorkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_ALIGNMENT )) , mrController( rController ) -, maImgAlgin1( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16 ) ) -, maImgAlgin2( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16 ) ) -, maImgAlgin3( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16 ) ) -, maImgAlgin4( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16 ) ) +, maImgAlgin1( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16 ) ) +, maImgAlgin2( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16 ) ) +, maImgAlgin3( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16 ) ) +, maImgAlgin4( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16 ) ) , maImgAlgin5( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16 ) ) -, maImgAlgin1h( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16_H ) ) -, maImgAlgin2h( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16_H ) ) -, maImgAlgin3h( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16_H ) ) -, maImgAlgin4h( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16_H ) ) -, maImgAlgin5h( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16_H ) ) , msFontworkAlignment( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkAlignment" ) ) { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - SetHelpId( HID_POPUP_FONTWORK_ALIGN ); SetSelectHdl( LINK( this, FontWorkAlignmentWindow, SelectHdl ) ); - appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 ); - appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), bHighContrast ? maImgAlgin2h : maImgAlgin2 ); - appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), bHighContrast ? maImgAlgin3h : maImgAlgin3 ); - appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), bHighContrast ? maImgAlgin4h : maImgAlgin4 ); - appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), bHighContrast ? maImgAlgin5h : maImgAlgin5 ); + appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), maImgAlgin1 ); + appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), maImgAlgin2 ); + appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), maImgAlgin3 ); + appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), maImgAlgin4 ); + appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), maImgAlgin5 ); SetOutputSizePixel( getMenuSize() ); @@ -448,13 +437,11 @@ void FontWorkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt ) if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 ); - appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), bHighContrast ? maImgAlgin2h : maImgAlgin2 ); - appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), bHighContrast ? maImgAlgin3h : maImgAlgin3 ); - appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), bHighContrast ? maImgAlgin4h : maImgAlgin4 ); - appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), bHighContrast ? maImgAlgin5h : maImgAlgin5 ); + appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), maImgAlgin1 ); + appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), maImgAlgin2 ); + appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), maImgAlgin3 ); + appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), maImgAlgin4 ); + appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), maImgAlgin5 ); } } @@ -519,7 +506,7 @@ FontWorkAlignmentControl::FontWorkAlignmentControl( const Reference< lang::XMult OUString SAL_CALL FontWorkAlignmentControl_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontWorkAlignmentController" )); + return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontworkAlignmentController" )); } // -------------------------------------------------------------------- @@ -586,13 +573,13 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( svt::ToolboxCont SetSelectHdl( LINK( this, FontWorkCharacterSpacingWindow, SelectHdl ) ); appendEntry( 0, String( SVX_RES( STR_CHARS_SPACING_VERY_TIGHT ) ), MIB_RADIOCHECK ); - appendEntry( 1, String( SVX_RES( STR_CHARS_SPACING_TIGHT ) ), MIB_RADIOCHECK ); - appendEntry( 2, String( SVX_RES( STR_CHARS_SPACING_NORMAL ) ), MIB_RADIOCHECK ); - appendEntry( 3, String( SVX_RES( STR_CHARS_SPACING_LOOSE ) ), MIB_RADIOCHECK ); + appendEntry( 1, String( SVX_RES( STR_CHARS_SPACING_TIGHT ) ), MIB_RADIOCHECK ); + appendEntry( 2, String( SVX_RES( STR_CHARS_SPACING_NORMAL ) ), MIB_RADIOCHECK ); + appendEntry( 3, String( SVX_RES( STR_CHARS_SPACING_LOOSE ) ), MIB_RADIOCHECK ); appendEntry( 4, String( SVX_RES( STR_CHARS_SPACING_VERY_LOOSE ) ), MIB_RADIOCHECK ); - appendEntry( 5, String( SVX_RES( STR_CHARS_SPACING_CUSTOM ) ), MIB_RADIOCHECK ); + appendEntry( 5, String( SVX_RES( STR_CHARS_SPACING_CUSTOM ) ), MIB_RADIOCHECK ); appendSeparator(); - appendEntry( 6, String( SVX_RES( STR_CHARS_SPACING_KERN_PAIRS ) ), MIB_CHECKABLE ); + appendEntry( 6, String( SVX_RES( STR_CHARS_SPACING_KERN_PAIRS ) ), MIB_CHECKABLE ); SetOutputSizePixel( getMenuSize() ); @@ -757,7 +744,7 @@ FontWorkCharacterSpacingControl::FontWorkCharacterSpacingControl( const Referenc OUString SAL_CALL FontWorkCharacterSpacingControl_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontWorkCharacterSpacingController" )); + return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontworkCharacterSpacingController" )); } // -------------------------------------------------------------------- @@ -816,3 +803,5 @@ sal_Int32 FontworkCharacterSpacingDialog::getScale() const } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src index 98fd8c6cb5df..51365edae329 100644 --- a/svx/source/tbxctrls/fontworkgallery.src +++ b/svx/source/tbxctrls/fontworkgallery.src @@ -132,101 +132,51 @@ DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT ImageBitmap = Bitmap { File = "fontworkalignleft_16.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_LEFT_16_H - { - ImageBitmap = Bitmap { File = "fontworkalignleft_16_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_LEFT_26 { ImageBitmap = Bitmap { File = "fontworkalignleft_26.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_LEFT_26_H - { - ImageBitmap = Bitmap { File = "fontworkalignleft_26_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_CENTER_16 { ImageBitmap = Bitmap { File = "fontworkaligncentered_16.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_CENTER_16_H - { - ImageBitmap = Bitmap { File = "fontworkaligncentered_16_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_CENTER_26 { ImageBitmap = Bitmap { File = "fontworkaligncentered_26.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_CENTER_26_H - { - ImageBitmap = Bitmap { File = "fontworkaligncentered_26_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_RIGHT_16 { ImageBitmap = Bitmap { File = "fontworkalignright_16.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_RIGHT_16_H - { - ImageBitmap = Bitmap { File = "fontworkalignright_16_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_RIGHT_26 { ImageBitmap = Bitmap { File = "fontworkalignright_26.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_RIGHT_26_H - { - ImageBitmap = Bitmap { File = "fontworkalignright_26_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_WORD_16 { ImageBitmap = Bitmap { File = "fontworkalignjustified_16.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_WORD_16_H - { - ImageBitmap = Bitmap { File = "fontworkalignjustified_16_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_WORD_26 { ImageBitmap = Bitmap { File = "fontworkalignjustified_26.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_WORD_26_H - { - ImageBitmap = Bitmap { File = "fontworkalignjustified_26_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_STRETCH_16 { ImageBitmap = Bitmap { File = "fontworkalignstretch_16.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_STRETCH_16_H - { - ImageBitmap = Bitmap { File = "fontworkalignstretch_16_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_STRETCH_26 { ImageBitmap = Bitmap { File = "fontworkalignstretch_26.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_STRETCH_26_H - { - ImageBitmap = Bitmap { File = "fontworkalignstretch_26_h.png"; }; - MASKCOLOR - }; }; DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 1f6195d0da87..48f18c6875d3 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -118,3 +119,5 @@ void FormatPaintBrushToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState //............................................................................. } //namespace svx //............................................................................. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index fb7c1330f88c..29aea86ab33c 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,14 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/msgbox.hxx> #include <svl/intitem.hxx> @@ -56,7 +53,7 @@ #include <editeng/brshitem.hxx> #include <editeng/sizeitem.hxx> #include <svx/sdgcpitm.hxx> -//CHINA001 #include "../dialog/grfpage.hxx" + #include <svx/itemwin.hxx> #include <svx/dialmgr.hxx> #include <svx/svdview.hxx> @@ -75,7 +72,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; -#include <svx/svxdlg.hxx> //CHINA001 +#include <svx/svxdlg.hxx> // ----------- // - Defines - // ----------- @@ -151,7 +148,7 @@ ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const rtl::OUString& aSize.Width() += 20, aSize.Height() += 6; SetSizePixel( aSize ); - if ( maCommand.equalsAscii( ".uno:GrafGamma" )) + if ( maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafGamma" ) )) { SetDecimalDigits( 2 ); @@ -163,7 +160,7 @@ ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const rtl::OUString& } else { - const long nMinVal = ( maCommand.equalsAscii( ".uno:GrafTransparence" )) ? 0 : -100; + const long nMinVal = ( maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafTransparence" ) )) ? 0 : -100; SetUnit( FUNIT_CUSTOM ); SetCustomUnitText( String::CreateFromAscii(" %") ); @@ -201,14 +198,14 @@ IMPL_LINK( ImplGrafMetricField, ImplModifyHdl, Timer*, EMPTYARG ) // Convert value to an any to be usable with dispatch API Any a; - if ( maCommand.equalsAscii( ".uno:GrafRed" ) || - maCommand.equalsAscii( ".uno:GrafGreen" ) || - maCommand.equalsAscii( ".uno:GrafBlue" ) || - maCommand.equalsAscii( ".uno:GrafLuminance" ) || - maCommand.equalsAscii( ".uno:GrafContrast" )) + if ( maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafRed" ) ) || + maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafGreen" ) ) || + maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafBlue" ) ) || + maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafLuminance" ) ) || + maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafContrast" ) )) a = makeAny( sal_Int16( nVal )); - else if ( maCommand.equalsAscii( ".uno:GrafGamma" ) || - maCommand.equalsAscii( ".uno:GrafTransparence" )) + else if ( maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafGamma" ) ) || + maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafTransparence" ) )) a = makeAny( sal_Int32( nVal )); if ( a.hasValue() ) @@ -235,9 +232,9 @@ void ImplGrafMetricField::Update( const SfxPoolItem* pItem ) { long nValue; - if ( maCommand.equalsAscii( ".uno:GrafTransparence" )) + if ( maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafTransparence" ) )) nValue = ( (SfxUInt16Item*) pItem )->GetValue(); - else if ( maCommand.equalsAscii( ".uno:GrafGamma" )) + else if ( maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafGamma" ) )) nValue = ( (SfxUInt32Item*) pItem )->GetValue(); else nValue = ( (SfxInt16Item*) pItem )->GetValue(); @@ -256,21 +253,20 @@ struct CommandToRID { const char* pCommand; sal_uInt16 nResId; - sal_uInt16 nHCResId; }; -static sal_uInt16 ImplGetRID( const OUString& aCommand, bool bHighContrast ) +static sal_uInt16 ImplGetRID( const OUString& aCommand ) { static const CommandToRID aImplCommandToResMap[] = { - { ".uno:GrafRed", RID_SVXIMG_GRAF_RED, RID_SVXIMG_GRAF_RED_H }, - { ".uno:GrafGreen", RID_SVXIMG_GRAF_GREEN, RID_SVXIMG_GRAF_GREEN_H }, - { ".uno:GrafBlue", RID_SVXIMG_GRAF_BLUE, RID_SVXIMG_GRAF_BLUE_H }, - { ".uno:GrafLuminance", RID_SVXIMG_GRAF_LUMINANCE, RID_SVXIMG_GRAF_LUMINANCE_H }, - { ".uno:GrafContrast", RID_SVXIMG_GRAF_CONTRAST, RID_SVXIMG_GRAF_CONTRAST_H }, - { ".uno:GrafGamma", RID_SVXIMG_GRAF_GAMMA, RID_SVXIMG_GRAF_GAMMA_H }, - { ".uno:GrafTransparence", RID_SVXIMG_GRAF_TRANSPARENCE, RID_SVXIMG_GRAF_TRANSPARENCE_H }, - { 0, 0, 0 } + { ".uno:GrafRed", RID_SVXIMG_GRAF_RED }, + { ".uno:GrafGreen", RID_SVXIMG_GRAF_GREEN }, + { ".uno:GrafBlue", RID_SVXIMG_GRAF_BLUE }, + { ".uno:GrafLuminance", RID_SVXIMG_GRAF_LUMINANCE }, + { ".uno:GrafContrast", RID_SVXIMG_GRAF_CONTRAST }, + { ".uno:GrafGamma", RID_SVXIMG_GRAF_GAMMA }, + { ".uno:GrafTransparence", RID_SVXIMG_GRAF_TRANSPARENCE }, + { 0, 0 } }; sal_uInt16 nRID = 0; @@ -280,10 +276,7 @@ static sal_uInt16 ImplGetRID( const OUString& aCommand, bool bHighContrast ) { if ( aCommand.equalsAscii( aImplCommandToResMap[ i ].pCommand )) { - if ( bHighContrast ) - nRID = aImplCommandToResMap[ i ].nHCResId; - else - nRID = aImplCommandToResMap[ i ].nResId; + nRID = aImplCommandToResMap[ i ].nResId; break; } ++i; @@ -307,7 +300,7 @@ protected: public: - ImplGrafControl( Window* pParent, sal_uInt16 nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ); + ImplGrafControl( Window* pParent, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ); ~ImplGrafControl(); void Update( const SfxPoolItem* pItem ) { maField.Update( pItem ); } @@ -316,23 +309,22 @@ public: // ----------------------------------------------------------------------------- -ImplGrafControl::ImplGrafControl( Window* pParent, sal_uInt16, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) : - Control( pParent, WB_TABSTOP ), - maImage ( this ), - maField ( this, rCmd, rFrame ) +ImplGrafControl::ImplGrafControl( + Window* pParent, + const rtl::OUString& rCmd, + const Reference< XFrame >& rFrame +) : Control( pParent, WB_TABSTOP ) + , maImage( this ) + , maField( this, rCmd, rFrame ) { - ResId aResId( ImplGetRID( rCmd, false ), DIALOG_MGR() ) ; + ResId aResId( ImplGetRID( rCmd ), DIALOG_MGR() ) ; Image aImage( aResId ); - ResId aResIdHC( ImplGetRID( rCmd, true ), DIALOG_MGR() ) ; - Image aImageHC( aResIdHC ); - Size aImgSize( aImage.GetSizePixel() ); Size aFldSize( maField.GetSizePixel() ); long nFldY, nImgY; maImage.SetImage( aImage ); - maImage.SetModeImage( aImageHC, BMP_COLOR_HIGHCONTRAST ); maImage.SetSizePixel( aImgSize ); // we want to see the backbround of the toolbox, not of the FixedImage or Control maImage.SetBackground( Wallpaper( COL_TRANSPARENT ) ); @@ -403,9 +395,9 @@ ImplGrafModeControl::ImplGrafModeControl( Window* pParent, const Reference< XFra { SetSizePixel( Size( 100, 260 ) ); - InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_STANDARD ) ); - InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_GREYS ) ); - InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_MONO ) ); + InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_STANDARD ) ); + InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_GREYS ) ); + InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_MONO ) ); InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_WATERMARK ) ); Show(); @@ -506,109 +498,6 @@ void ImplGrafModeControl::Update( const SfxPoolItem* pItem ) SetNoSelection(); } -// ----------------------- -// - ImplGrafFilterPopup - -// ----------------------- -/* -CD!!! -class ImplGrafFilterPopup : public SfxPopupWindow -{ -private: - - SvxGrafFilterToolBoxControl* mpParent; - Reference< XConfigurableUIElement > m_xToolBar; -// SfxToolBoxManager maTbxMgr; - ResId maResIdWin; - ResId maResIdTbx; - WindowAlign meTbxAlign; - Link maSelectHdl; - - DECL_LINK( TbxSelectHdl, void* ); - -public: - ImplGrafFilterPopup( sal_uInt16 nId, SvxGrafFilterToolBoxControl* pParent, - WindowAlign eAlign, - const ResId& rResIdWin, const ResId& rResIdTbx, - SfxBindings& rBindings ); - ~ImplGrafFilterPopup(); - - virtual SfxPopupWindow* Clone() const; - virtual void PopupModeEnd(); - - void StartSelection() { maTbxMgr.GetToolBox().StartSelection(); } - void Update(); -}; - -// ----------------------------------------------------------------------------- - -ImplGrafFilterPopup::ImplGrafFilterPopup( sal_uInt16 nId, SvxGrafFilterToolBoxControl* pParent, - WindowAlign eAlign, - const ResId& rResIdWin, const ResId& rResIdTbx ) : - SfxPopupWindow ( nId, rResIdWin ), - mpParent ( pParent ), - maTbxMgr ( this, GetBindings(), rResIdTbx ), - maResIdWin ( rResIdWin ), - maResIdTbx ( rResIdTbx ), - meTbxAlign ( eAlign ) -{ - maTbxMgr.UseDefault(); - - maSelectHdl = maTbxMgr.GetToolBox().GetSelectHdl(); - maTbxMgr.GetToolBox().SetSelectHdl( LINK( this, ImplGrafFilterPopup, TbxSelectHdl ) ); - - FreeResource(); - - const Size aSize( maTbxMgr.CalcWindowSizePixel() ); - maTbxMgr.SetPosSizePixel( Point(), aSize ); - SetOutputSizePixel( aSize ); -} - -// ----------------------------------------------------------------------------- - -ImplGrafFilterPopup::~ImplGrafFilterPopup() -{ -} - -// ----------------------------------------------------------------------------- - -SfxPopupWindow* ImplGrafFilterPopup::Clone() const -{ - return( new ImplGrafFilterPopup( GetId(), mpParent, meTbxAlign, - maResIdWin, maResIdTbx, - (SfxBindings&) GetBindings() ) ); -} - -// ----------------------------------------------------------------------------- - -void ImplGrafFilterPopup::Update() -{ - ToolBox* pBox = &maTbxMgr.GetToolBox(); - maTbxMgr.Activate( pBox ); - maTbxMgr.Deactivate( pBox ); -} - -// ----------------------------------------------------------------------------- - -void ImplGrafFilterPopup::PopupModeEnd() -{ - maTbxMgr.GetToolBox().EndSelection(); - SfxPopupWindow::PopupModeEnd(); -} - -// ----------------------------------------------------------------------------- - -IMPL_LINK( ImplGrafFilterPopup, TbxSelectHdl, void*, EMPTYARG ) -{ - const sal_uInt16 nSlotId = maTbxMgr.GetToolBox().GetCurItemId(); - - if( IsInPopupMode() ) - EndPopupMode(); - - GetBindings().GetDispatcher()->Execute( nSlotId, SFX_CALLMODE_ASYNCHRON ); - - return 0; -} -*/ // ------------------------------- // - SvxGrafFilterToolBoxControl - // ------------------------------- @@ -704,7 +593,7 @@ void SvxGrafToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const Window* SvxGrafToolBoxControl::CreateItemWindow( Window *pParent ) { - return( new ImplGrafControl( pParent, GetSlotId(), m_aCommandURL, m_xFrame ) ); + return( new ImplGrafControl( pParent, m_aCommandURL, m_xFrame ) ); } // ---------------------------- @@ -1008,13 +897,13 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) SfxSingleTabDialog aCropDialog( SfxViewShell::Current() ? SfxViewShell::Current()->GetWindow() : NULL, aCropDlgAttr, 950 ); const String aCropStr = SVX_RESSTR( RID_SVXSTR_GRAFCROP ); - //CHINA001 SfxTabPage* pTabPage = SvxGrfCropPage::Create( &aCropDialog, aCropDlgAttr ); + SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet error!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet error!"); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_GRFCROP ); - DBG_ASSERT(fnCreatePage, "Dialogdiet error!");//CHINA001 + DBG_ASSERT(fnCreatePage, "Dialogdiet error!"); SfxTabPage* pTabPage = (*fnCreatePage)( &aCropDialog, aCropDlgAttr ); - //CHINA001 end + pTabPage->SetText( aCropStr ); aCropDialog.SetTabPage( pTabPage ); @@ -1326,3 +1215,5 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) nWhich = aIter.NextWhich(); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/grafctrl.hrc b/svx/source/tbxctrls/grafctrl.hrc index 2da0c45c8a42..2da0c45c8a42 100644..100755 --- a/svx/source/tbxctrls/grafctrl.hrc +++ b/svx/source/tbxctrls/grafctrl.hrc diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 7666c1064e15..e7fe6fd333bf 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,7 +72,6 @@ using namespace ::com::sun::star::beans; SvxLineBox::SvxLineBox( Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) : LineLB( pParent, nBits ), - meBmpMode ( GetSettings().GetStyleSettings().GetHighContrastMode() ? BMP_COLOR_HIGHCONTRAST : BMP_COLOR_NORMAL ), nCurPos ( 0 ), aLogicalSize(40,140), bRelease ( sal_True ), @@ -115,8 +115,6 @@ void SvxLineBox::Select() { XLineStyle eXLS; sal_uInt16 nPos = GetSelectEntryPos(); -// SfxDispatcher* pDisp = rBindings.GetDispatcher(); - //DBG_ASSERT( pDisp, "invalid Dispatcher" ); switch ( nPos ) { @@ -151,7 +149,6 @@ void SvxLineBox::Select() SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineDash" )), aArgs ); -// pDisp->Execute( SID_ATTR_LINE_DASH, SFX_CALLMODE_RECORD, &aLineDashItem, 0L ); } } break; @@ -166,7 +163,6 @@ void SvxLineBox::Select() SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:XLineStyle" )), aArgs ); -// pDisp->Execute( SID_ATTR_LINE_STYLE, SFX_CALLMODE_RECORD, &aLineStyleItem, 0L ); nCurPos = GetSelectEntryPos(); ReleaseFocus_Impl(); @@ -247,9 +243,7 @@ void SvxLineBox::ReleaseFocus_Impl() pShellWnd->GrabFocus(); } } -/* -----------------------------08.03.2002 15:39------------------------------ - ---------------------------------------------------------------------------*/ void SvxLineBox::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -258,20 +252,9 @@ void SvxLineBox::DataChanged( const DataChangedEvent& rDCEvt ) SetSizePixel(LogicToPixel(aLogicalSize, MAP_APPFONT)); Size aDropSize( aLogicalSize.Width(), LOGICAL_EDIT_HEIGHT); SetDropDownSizePixel(LogicToPixel(aDropSize, MAP_APPFONT)); - } + } LineLB::DataChanged( rDCEvt ); - - if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) - { - BmpColorMode eMode = GetSettings().GetStyleSettings().GetHighContrastMode() ? BMP_COLOR_HIGHCONTRAST : BMP_COLOR_NORMAL; - if( eMode != meBmpMode ) - { - meBmpMode = eMode; - FillControl(); - } - } } void SvxLineBox::FillControl() @@ -286,10 +269,8 @@ void SvxLineBox::FillControl() if ( pItem ) Fill( pItem->GetDashList() ); } - - -// rBindings.Invalidate( SID_ATTR_LINE_DASH ); } + //======================================================================== // SvxColorBox //======================================================================== @@ -331,7 +312,6 @@ IMPL_LINK( SvxColorBox, DelayHdl_Impl, Timer *, EMPTYARG ) const SvxColorTableItem* pItem = (const SvxColorTableItem*)( pSh->GetItem( SID_COLOR_TABLE ) ); if ( pItem ) Fill( pItem->GetColorTable() ); -// rBindings.Invalidate( nId ); } return 0; } @@ -372,7 +352,6 @@ void SvxColorBox::Select() SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), maCommand, aArgs ); -// rBindings.GetDispatcher()->Execute( nId, SFX_CALLMODE_RECORD, &aLineColorItem, 0L ); nCurPos = GetSelectEntryPos(); ReleaseFocus_Impl(); @@ -435,9 +414,7 @@ long SvxColorBox::Notify( NotifyEvent& rNEvt ) } return nHandled; } -/* -----------------------------08.03.2002 15:35------------------------------ - ---------------------------------------------------------------------------*/ void SvxColorBox::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -531,7 +508,6 @@ void SvxMetricField::Modify() SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineWidth" )), aArgs ); -// rBindings.GetDispatcher()->Execute( SID_ATTR_LINE_WIDTH, SFX_CALLMODE_RECORD, &aLineWidthItem, 0L ); } // ----------------------------------------------------------------------- @@ -612,18 +588,18 @@ long SvxMetricField::Notify( NotifyEvent& rNEvt ) pSh->KeyInput( *pKEvt ); else { - bool bHandled = sal_False; + bool bHandled = false; switch ( rKey.GetCode() ) { case KEY_RETURN: Reformat(); - bHandled = sal_True; + bHandled = true; break; case KEY_ESCAPE: SetText( aCurTxt ); - bHandled = sal_True; + bHandled = true; break; } @@ -637,9 +613,7 @@ long SvxMetricField::Notify( NotifyEvent& rNEvt ) } return nHandled; } -/* -----------------------------08.03.2002 15:32------------------------------ - ---------------------------------------------------------------------------*/ void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -823,3 +797,5 @@ void SvxFillAttrBox::ReleaseFocus_Impl() pShellWnd->GrabFocus(); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index ff03e87a0997..c2171261a3ce 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,11 +31,9 @@ // include --------------------------------------------------------------- -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <vcl/toolbox.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <svl/intitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> @@ -56,91 +55,113 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxColumnsToolBoxControl,SfxUInt16Item); // class TableWindow ----------------------------------------------------- +const long TABLE_CELL_WIDTH = 15; +const long TABLE_CELL_HEIGHT = 15; + +const long TABLE_CELLS_HORIZ = 10; +const long TABLE_CELLS_VERT = 15; + +const long TABLE_POS_X = 2; +const long TABLE_POS_Y = 2; + +const long TABLE_WIDTH = TABLE_POS_X + TABLE_CELLS_HORIZ*TABLE_CELL_WIDTH; +const long TABLE_HEIGHT = TABLE_POS_Y + TABLE_CELLS_VERT*TABLE_CELL_HEIGHT; + class TableWindow : public SfxPopupWindow { private: + PushButton aTableButton; ::Color aLineColor; - ::Color aHighlightLineColor; ::Color aFillColor; ::Color aHighlightFillColor; + ::Color aBackgroundColor; long nCol; long nLine; - long nWidth; - long nHeight; - long nMX; - long nMY; - long nTextHeight; sal_Bool bInitialKeyInput; sal_Bool m_bMod1; ToolBox& rTbx; Reference< XFrame > mxFrame; rtl::OUString maCommand; - void UpdateSize_Impl( long nNewCol, long nNewLine); + DECL_LINK( SelectHdl, void * ); public: TableWindow( sal_uInt16 nSlotId, const rtl::OUString& rCmd, + const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ); ~TableWindow(); void KeyInput( const KeyEvent& rKEvt ); virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void MouseButtonUp( const MouseEvent& rMEvt ); virtual void Paint( const Rectangle& ); virtual void PopupModeEnd(); virtual SfxPopupWindow* Clone() const; - sal_uInt16 GetColCount() const { return (sal_uInt16)nCol; } - sal_uInt16 GetLineCount() const { return (sal_uInt16)nLine; } +private: + void Update( long nNewCol, long nNewLine ); + void TableDialog( const Sequence< PropertyValue >& rArgs ); + void CloseAndShowTableDialog(); }; // ----------------------------------------------------------------------- -TableWindow::TableWindow( sal_uInt16 nSlotId, const rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : - SfxPopupWindow( nSlotId, rFrame, WB_SYSTEMWINDOW ), - bInitialKeyInput(sal_True), - m_bMod1(sal_False), +IMPL_LINK( TableWindow, SelectHdl, void *, EMPTYARG ) +{ + CloseAndShowTableDialog(); + return 0; +} + +// ----------------------------------------------------------------------- + +TableWindow::TableWindow( sal_uInt16 nSlotId, const rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : + SfxPopupWindow( nSlotId, rFrame, WinBits( WB_STDPOPUP ) ), + aTableButton( this ), + nCol( 0 ), + nLine( 0 ), rTbx(rParentTbx), mxFrame( rFrame ), maCommand( rCmd ) { const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings(); svtools::ColorConfig aColorConfig; - aLineColor = ::Color( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor ); - aHighlightLineColor = rStyles.GetHighlightTextColor(); + + aLineColor = rStyles.GetShadowColor(); aFillColor = rStyles.GetWindowColor(); aHighlightFillColor = rStyles.GetHighlightColor(); + aBackgroundColor = GetSettings().GetStyleSettings().GetFaceColor(); - nTextHeight = GetTextHeight()+1; - SetBackground(); + SetBackground( aBackgroundColor ); Font aFont = GetFont(); - aFont.SetColor( aLineColor ); - aFont.SetFillColor( aFillColor ); + aFont.SetColor( ::Color( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor ) ); + aFont.SetFillColor( aBackgroundColor ); aFont.SetTransparent( sal_False ); SetFont( aFont ); - nCol = 0; - nLine = 0; - nWidth = 5; - nHeight = 5; + SetText( rText ); - Size aLogicSize = LogicToPixel( Size( 55, 35 ), MapMode( MAP_10TH_MM ) ); - nMX = aLogicSize.Width(); - nMY = aLogicSize.Height(); - SetOutputSizePixel( Size( nMX*nWidth-1, nMY*nHeight-1+nTextHeight ) ); + aTableButton.SetPosSizePixel( Point( TABLE_POS_X + TABLE_CELL_WIDTH, TABLE_HEIGHT + 5 ), + Size( TABLE_WIDTH - TABLE_POS_X - 2*TABLE_CELL_WIDTH, 24 ) ); + aTableButton.SetText( String( SVX_RESSTR( RID_SVXSTR_MORE ) ) ); + aTableButton.SetClickHdl( LINK( this, TableWindow, SelectHdl ) ); + aTableButton.Show(); + + SetOutputSizePixel( Size( TABLE_WIDTH + 3, TABLE_HEIGHT + 33 ) ); } + // ----------------------------------------------------------------------- + TableWindow::~TableWindow() { } + // ----------------------------------------------------------------------- SfxPopupWindow* TableWindow::Clone() const { - return new TableWindow( GetId(), maCommand, rTbx, mxFrame ); + return new TableWindow( GetId(), maCommand, GetText(), rTbx, mxFrame ); } // ----------------------------------------------------------------------- @@ -151,164 +172,64 @@ void TableWindow::MouseMove( const MouseEvent& rMEvt ) Point aPos = rMEvt.GetPosPixel(); Point aMousePos( aPos ); - if ( rMEvt.IsEnterWindow() ) - CaptureMouse(); - else if ( aMousePos.X() < 0 || aMousePos.Y() < 0 ) - { - nCol = 0; - nLine = 0; - ReleaseMouse(); - Invalidate(); - return; - } - - long nNewCol = 0; - long nNewLine = 0; - - if ( aPos.X() > 0 ) - nNewCol = aPos.X() / nMX + 1; - if ( aPos.Y() > 0 ) - nNewLine = aPos.Y() / nMY + 1; - - if ( nNewCol > 500 ) - nNewCol = 500; - if ( nNewLine > 1000 ) - nNewLine = 1000; - - UpdateSize_Impl( nNewCol, nNewLine); + long nNewCol = ( aMousePos.X() - TABLE_POS_X + TABLE_CELL_WIDTH ) / TABLE_CELL_WIDTH; + long nNewLine = ( aMousePos.Y() - TABLE_POS_Y + TABLE_CELL_HEIGHT ) / TABLE_CELL_HEIGHT; + Update( nNewCol, nNewLine ); } -/* -----------------------------15.05.2002 17:14------------------------------ - - ---------------------------------------------------------------------------*/ -void TableWindow::UpdateSize_Impl( long nNewCol, long nNewLine) -{ - Size aWinSize = GetOutputSizePixel(); - Point aWinPos = GetPosPixel(); - Point aMaxPos = OutputToScreenPixel( GetDesktopRectPixel().BottomRight() ); - if ( (nWidth <= nNewCol) || (nHeight < nNewLine) ) - { - long nOff = 0; - if ( nWidth <= nNewCol ) - { - nWidth = nNewCol; - nWidth++; - } - if ( nHeight <= nNewLine ) - { - nHeight = nNewLine; - nOff = 1; - } - while ( nWidth > 0 && - (short)(aWinPos.X()+(nMX*nWidth-1)) >= aMaxPos.X()-3 ) - nWidth--; - - while ( nHeight > 0 && - (short)(aWinPos.Y()+(nMY*nHeight-1+nTextHeight)) >= - aMaxPos.Y()-3 ) - nHeight--; - - if ( nNewCol > nWidth ) - nNewCol = nWidth; - - if ( nNewLine > nHeight ) - nNewLine = nHeight; - - Size _aWinSize = GetOutputSizePixel(); - Invalidate( Rectangle( 0, _aWinSize.Height()-nTextHeight+2-nOff, - _aWinSize.Width(), _aWinSize.Height() ) ); - SetOutputSizePixel( Size( nMX*nWidth-1, nMY*nHeight-1+nTextHeight ) ); - } - long nMinCol = 0; - long nMaxCol = 0; - long nMinLine = 0; - long nMaxLine = 0; - if ( nNewCol < nCol ) - { - nMinCol = nNewCol; - nMaxCol = nCol; - } - else - { - nMinCol = nCol; - nMaxCol = nNewCol; - } - if ( nNewLine < nLine ) - { - nMinLine = nNewLine; - nMaxLine = nLine; - } - else - { - nMinLine = nLine; - nMaxLine = nNewLine; - } - - if ( (nNewCol != nCol) || (nNewLine != nLine) ) - { - Invalidate( Rectangle( 0, aWinSize.Height()-nTextHeight+2, - aWinSize.Width(), aWinSize.Height() ) ); - - if ( nNewCol != nCol ) - { - Invalidate( Rectangle( nMinCol*nMX-1, 0, nMaxCol*nMX+1, nMaxLine*nMY ) ); - nCol = nNewCol; - } - if ( nNewLine != nLine ) - { - Invalidate( Rectangle( 0, nMinLine*nMY-2, nMaxCol*nMX, nMaxLine*nMY+1 ) ); - nLine = nNewLine; - } - } - Update(); -} -/* -----------------------------15.05.2002 14:22------------------------------ +// ----------------------------------------------------------------------- - ---------------------------------------------------------------------------*/ void TableWindow::KeyInput( const KeyEvent& rKEvt ) { - sal_Bool bHandled = sal_False; + bool bHandled = false; sal_uInt16 nModifier = rKEvt.GetKeyCode().GetModifier(); sal_uInt16 nKey = rKEvt.GetKeyCode().GetCode(); - if(!nModifier) + if ( !nModifier ) { - if( KEY_UP == nKey || KEY_DOWN == nKey || - KEY_LEFT == nKey || KEY_RIGHT == nKey || - KEY_ESCAPE == nKey ||KEY_RETURN == nKey ) + bHandled = true; + long nNewCol = nCol; + long nNewLine = nLine; + switch(nKey) { - bHandled = sal_True; - long nNewCol = nCol; - long nNewLine = nLine; - switch(nKey) - { - case KEY_UP : - if(nNewLine > 1) - { - nNewLine--; - break; - } - //no break; - case KEY_ESCAPE: - EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL); + case KEY_UP: + if ( nNewLine > 1 ) + nNewLine--; + else + EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL ); break; - case KEY_DOWN : + case KEY_DOWN: + if ( nNewLine < TABLE_CELLS_VERT ) nNewLine++; + else + CloseAndShowTableDialog(); break; - case KEY_LEFT : - - if(nNewCol) - nNewCol--; + case KEY_LEFT: + if ( nNewCol > 1 ) + nNewCol--; + else + EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL ); break; - case KEY_RIGHT : + case KEY_RIGHT: + if ( nNewCol < TABLE_CELLS_HORIZ ) nNewCol++; + else + CloseAndShowTableDialog(); break; - case KEY_RETURN : - if(IsMouseCaptured()) - ReleaseMouse(); - EndPopupMode(FLOATWIN_POPUPMODEEND_CLOSEALL ); + case KEY_ESCAPE: + EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL ); break; - } + case KEY_RETURN: + EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL ); + break; + case KEY_TAB: + CloseAndShowTableDialog(); + break; + default: + bHandled = false; + } + if ( bHandled ) + { //make sure that a table can initially be created if(bInitialKeyInput) { @@ -318,27 +239,17 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt ) if(!nNewCol) nNewCol = 1; } - UpdateSize_Impl( nNewCol, nNewLine); + Update( nNewCol, nNewLine ); } } else if(KEY_MOD1 == nModifier && KEY_RETURN == nKey) { m_bMod1 = sal_True; - if(IsMouseCaptured()) - ReleaseMouse(); - EndPopupMode(FLOATWIN_POPUPMODEEND_CLOSEALL ); + EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL ); } if(!bHandled) SfxPopupWindow::KeyInput(rKEvt); - -} -// ----------------------------------------------------------------------- - -void TableWindow::MouseButtonDown( const MouseEvent& rMEvt ) -{ - SfxPopupWindow::MouseButtonDown( rMEvt ); - CaptureMouse(); } // ----------------------------------------------------------------------- @@ -346,56 +257,45 @@ void TableWindow::MouseButtonDown( const MouseEvent& rMEvt ) void TableWindow::MouseButtonUp( const MouseEvent& rMEvt ) { SfxPopupWindow::MouseButtonUp( rMEvt ); - ReleaseMouse(); - - if ( IsInPopupMode() ) - EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL ); + EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL ); } // ----------------------------------------------------------------------- void TableWindow::Paint( const Rectangle& ) { - long i; - long nStart; - Size aSize = GetOutputSizePixel(); + const long nSelectionWidth = TABLE_POS_X + nCol*TABLE_CELL_WIDTH; + const long nSelectionHeight = TABLE_POS_Y + nLine*TABLE_CELL_HEIGHT; - SetLineColor(); - SetFillColor( aHighlightFillColor ); - DrawRect( Rectangle( 0, 0, nCol*nMX-1, nLine*nMY-1 ) ); - SetFillColor( aFillColor ); - DrawRect( Rectangle( nCol*nMX-1, 0, - aSize.Width(), aSize.Height()-nTextHeight+1 ) ); - DrawRect( Rectangle( 0, nLine*nMY-1, - aSize.Width(), aSize.Height()-nTextHeight+1 ) ); - - SetLineColor( aHighlightLineColor ); - for ( i = 1; i < nCol; i++ ) - DrawLine( Point( i*nMX-1, 0 ), Point( i*nMX-1, nLine*nMY-1 ) ); - for ( i = 1; i < nLine; i++ ) - DrawLine( Point( 0, i*nMY-1 ), Point( nCol*nMX-1, i*nMY-1 ) ); + // the non-selected parts of the table SetLineColor( aLineColor ); - for ( i = 1; i <= nWidth; i++ ) - { - if ( i < nCol ) - nStart = nLine*nMY-1; - else - nStart = 0; - DrawLine( Point( i*nMX-1, nStart ), Point( i*nMX-1, nHeight*nMY-1 ) ); - } - for ( i = 1; i <= nHeight; i++ ) + SetFillColor( aFillColor ); + DrawRect( Rectangle( nSelectionWidth, TABLE_POS_Y, TABLE_WIDTH, nSelectionHeight ) ); + DrawRect( Rectangle( TABLE_POS_X, nSelectionHeight, nSelectionWidth, TABLE_HEIGHT ) ); + DrawRect( Rectangle( nSelectionWidth, nSelectionHeight, TABLE_WIDTH, TABLE_HEIGHT ) ); + + // the selection + if ( nCol > 0 && nLine > 0 ) { - if ( i < nLine ) - nStart = nCol*nMX-1; - else - nStart = 0; - DrawLine( Point( nStart, i*nMY-1 ), Point( nWidth*nMX-1, i*nMY-1 ) ); + SetFillColor( aHighlightFillColor ); + DrawRect( Rectangle( TABLE_POS_X, TABLE_POS_Y, + nSelectionWidth, nSelectionHeight ) ); } - SetLineColor(); - String aText; + // lines inside of the table + SetLineColor( aLineColor ); + for ( long i = 1; i < TABLE_CELLS_VERT; ++i ) + DrawLine( Point( TABLE_POS_X, TABLE_POS_Y + i*TABLE_CELL_HEIGHT ), + Point( TABLE_WIDTH, TABLE_POS_Y + i*TABLE_CELL_HEIGHT ) ); + + for ( long i = 1; i < TABLE_CELLS_HORIZ; ++i ) + DrawLine( Point( TABLE_POS_X + i*TABLE_CELL_WIDTH, TABLE_POS_Y ), + Point( TABLE_POS_X + i*TABLE_CELL_WIDTH, TABLE_HEIGHT ) ); + + // the text near the mouse cursor telling the table dimensions if ( nCol && nLine ) { + String aText; aText += String::CreateFromInt32( nCol ); aText.AppendAscii( " x " ); aText += String::CreateFromInt32( nLine ); @@ -405,22 +305,29 @@ void TableWindow::Paint( const Rectangle& ) aText += String(SVX_RESSTR(RID_SVXSTR_PAGES)); } - } - else - aText = Button::GetStandardText( BUTTON_CANCEL ); - Size aTextSize( GetTextWidth( aText ), GetTextHeight() ); + Size aTextSize( GetTextWidth( aText ), GetTextHeight() ); - Rectangle aClearRect( 0, aSize.Height()-nTextHeight+2, (aSize.Width()), aSize.Height() ); - DrawRect( aClearRect ); + long nTextX = nSelectionWidth + TABLE_CELL_WIDTH; + long nTextY = nSelectionHeight + TABLE_CELL_HEIGHT; + const long nTipBorder = 2; - // #i95350# force RTL output - if( IsRTLEnabled() && nCol && nLine ) - aText.Insert(0x202D, 0); - DrawText( Point( (aSize.Width() - aTextSize.Width()) / 2, aSize.Height() - nTextHeight + 2 ), aText ); + if ( aTextSize.Width() + TABLE_POS_X + TABLE_CELL_WIDTH + 2*nTipBorder < nSelectionWidth ) + nTextX = nSelectionWidth - TABLE_CELL_WIDTH - aTextSize.Width(); - SetLineColor( aLineColor ); - SetFillColor(); - DrawRect( Rectangle( Point(0,0), aSize ) ); + if ( aTextSize.Height() + TABLE_POS_Y + TABLE_CELL_HEIGHT + 2*nTipBorder < nSelectionHeight ) + nTextY = nSelectionHeight - TABLE_CELL_HEIGHT - aTextSize.Height(); + + SetLineColor( aLineColor ); + SetFillColor( aBackgroundColor ); + DrawRect( Rectangle ( nTextX - 2*nTipBorder, nTextY - 2*nTipBorder, + nTextX + aTextSize.Width() + nTipBorder, nTextY + aTextSize.Height() + nTipBorder ) ); + + // #i95350# force RTL output + if ( IsRTLEnabled() ) + aText.Insert( 0x202D, 0 ); + + DrawText( Point( nTextX, nTextY ), aText ); + } } // ----------------------------------------------------------------------- @@ -429,37 +336,71 @@ void TableWindow::PopupModeEnd() { if ( !IsPopupModeCanceled() && nCol && nLine ) { - Window* pParent = rTbx.GetParent(); - sal_uInt16 nId = GetId(); - pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId)); - - Reference< XDispatchProvider > xDispatchProvider( mxFrame, UNO_QUERY ); - if ( xDispatchProvider.is() ) - { - com::sun::star::util::URL aTargetURL; - Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), - UNO_QUERY ); - aTargetURL.Complete = maCommand; - xTrans->parseStrict( aTargetURL ); - Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, rtl::OUString(), 0 ); - if ( xDispatch.is() ) - { - Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Columns" )); - aArgs[0].Value = makeAny( sal_Int16( nCol )); - aArgs[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Rows" )); - aArgs[1].Value = makeAny( sal_Int16( nLine )); + Sequence< PropertyValue > aArgs( 2 ); + aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Columns" )); + aArgs[0].Value = makeAny( sal_Int16( nCol )); + aArgs[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Rows" )); + aArgs[1].Value = makeAny( sal_Int16( nLine )); - xDispatch->dispatch( aTargetURL, aArgs ); - } - } + TableDialog( aArgs ); } - else if ( IsPopupModeCanceled() ) - ReleaseMouse(); + SfxPopupWindow::PopupModeEnd(); } +// ----------------------------------------------------------------------- + +void TableWindow::Update( long nNewCol, long nNewLine ) +{ + if ( nNewCol < 0 || nNewCol > TABLE_CELLS_HORIZ ) + nNewCol = 0; + + if ( nNewLine < 0 || nNewLine > TABLE_CELLS_VERT ) + nNewLine = 0; + + if ( nNewCol != nCol || nNewLine != nLine ) + { + nCol = nNewCol; + nLine = nNewLine; + Invalidate( Rectangle( TABLE_POS_X, TABLE_POS_Y, TABLE_WIDTH, TABLE_HEIGHT ) ); + } +} + +// ----------------------------------------------------------------------- + +void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs ) +{ + Window* pParent = rTbx.GetParent(); + sal_uInt16 nId = GetId(); + pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId)); + + Reference< XDispatchProvider > xDispatchProvider( mxFrame, UNO_QUERY ); + if ( xDispatchProvider.is() ) + { + com::sun::star::util::URL aTargetURL; + Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), + UNO_QUERY ); + aTargetURL.Complete = maCommand; + xTrans->parseStrict( aTargetURL ); + + Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, rtl::OUString(), 0 ); + if ( xDispatch.is() ) + xDispatch->dispatch( aTargetURL, rArgs ); + } +} + +// ----------------------------------------------------------------------- + +void TableWindow::CloseAndShowTableDialog() +{ + // close the toolbar tool + EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL ); + + // and open the table dialog instead + TableDialog( Sequence< PropertyValue >() ); +} + // class ColumnsWindow --------------------------------------------------- class ColumnsWindow : public SfxPopupWindow @@ -469,6 +410,7 @@ private: ::Color aHighlightLineColor; ::Color aFillColor; ::Color aHighlightFillColor; + ::Color aFaceColor; long nCol; long nWidth; long nMX; @@ -481,7 +423,7 @@ private: void UpdateSize_Impl( long nNewCol ); public: - ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ); + ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, const String &rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ); void KeyInput( const KeyEvent& rKEvt ); virtual void MouseMove( const MouseEvent& rMEvt ); @@ -496,8 +438,8 @@ public: // ----------------------------------------------------------------------- -ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : - SfxPopupWindow( nId, rFrame, WB_SYSTEMWINDOW ), +ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : + SfxPopupWindow( nId, rFrame, WB_STDPOPUP ), bInitialKeyInput(sal_True), m_bMod1(sal_False), rTbx(rParentTbx), @@ -510,18 +452,21 @@ ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, ToolB aHighlightLineColor = rStyles.GetHighlightTextColor(); aFillColor = rStyles.GetWindowColor(); aHighlightFillColor = rStyles.GetHighlightColor(); + aFaceColor = rStyles.GetFaceColor(); nTextHeight = GetTextHeight()+1; SetBackground(); Font aFont( GetFont() ); aFont.SetColor( aLineColor ); - aFont.SetFillColor( aFillColor ); + aFont.SetFillColor( aFaceColor ); aFont.SetTransparent( sal_False ); SetFont( aFont ); nCol = 0; nWidth = 4; + SetText( rText ); + Size aLogicSize = LogicToPixel( Size( 95, 155 ), MapMode( MAP_10TH_MM ) ); nMX = aLogicSize.Width(); SetOutputSizePixel( Size( nMX*nWidth-1, aLogicSize.Height()+nTextHeight ) ); @@ -532,7 +477,7 @@ ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, ToolB SfxPopupWindow* ColumnsWindow::Clone() const { - return new ColumnsWindow( GetId(), maCommand, rTbx, mxFrame ); + return new ColumnsWindow( GetId(), maCommand, GetText(), rTbx, mxFrame ); } // ----------------------------------------------------------------------- @@ -542,7 +487,6 @@ void ColumnsWindow::MouseMove( const MouseEvent& rMEvt ) SfxPopupWindow::MouseMove( rMEvt ); Point aPos = rMEvt.GetPosPixel(); Point aMousePos = aPos; - Point aWinPos = GetPosPixel(); if ( rMEvt.IsEnterWindow() ) CaptureMouse(); @@ -563,14 +507,10 @@ void ColumnsWindow::MouseMove( const MouseEvent& rMEvt ) nNewCol = 20; UpdateSize_Impl( nNewCol ); } -/* -----------------------------21.05.2002 16:16------------------------------ - ---------------------------------------------------------------------------*/ void ColumnsWindow::UpdateSize_Impl( long nNewCol ) { Size aWinSize = GetOutputSizePixel(); - long nMinCol = 0; - long nMaxCol = 0; Point aWinPos;// = GetPosPixel(); if ( nWidth <= nNewCol ) @@ -601,6 +541,8 @@ void ColumnsWindow::UpdateSize_Impl( long nNewCol ) Invalidate( Rectangle( 0, aWinSize.Height()-nTextHeight+2, aWinSize.Width(), aWinSize.Height() ) ); + long nMinCol = 0, nMaxCol = 0; + if ( nNewCol < nCol ) { nMinCol = nNewCol; @@ -625,9 +567,7 @@ void ColumnsWindow::MouseButtonDown( const MouseEvent& rMEvt ) SfxPopupWindow::MouseButtonDown( rMEvt ); CaptureMouse(); } -/* -----------------------------21.05.2002 16:11------------------------------ - ---------------------------------------------------------------------------*/ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt ) { sal_Bool bHandled = sal_False; @@ -730,12 +670,13 @@ void ColumnsWindow::Paint( const Rectangle& ) } SetLineColor(); - SetFillColor( aFillColor ); + SetFillColor( aFaceColor ); String aText; if ( nCol ) aText = String( String::CreateFromInt32(nCol) ); else - aText = Button::GetStandardText( BUTTON_CANCEL ); + aText = Button::GetStandardText( BUTTON_CANCEL ).EraseAllChars( '~' ); + Size aTextSize(GetTextWidth( aText ), GetTextHeight()); DrawText( Point( ( aSize.Width() - aTextSize.Width() ) / 2, aSize.Height() - nTextHeight + 2 ), aText ); @@ -744,7 +685,7 @@ void ColumnsWindow::Paint( const Rectangle& ) SetLineColor( aLineColor ); SetFillColor(); - DrawRect( Rectangle( Point(0,0), aSize ) ); + DrawRect( Rectangle( 0, 0, aSize.Width() - 1, aSize.Height() - nTextHeight + 1 ) ); } // ----------------------------------------------------------------------- @@ -802,7 +743,7 @@ SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindow() if ( bEnabled ) { ToolBox& rTbx = GetToolBox(); - TableWindow* pWin = new TableWindow( GetSlotId(), m_aCommandURL, rTbx, m_xFrame ); + TableWindow* pWin = new TableWindow( GetSlotId(), m_aCommandURL, GetToolBox().GetItemText( GetId() ), rTbx, m_xFrame ); pWin->StartPopupMode( &rTbx, FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_NOKEYCLOSE ); SetPopupWindow( pWin ); return pWin; @@ -815,7 +756,7 @@ SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindow() SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindowCascading() { if ( bEnabled ) - return new TableWindow( GetSlotId(), m_aCommandURL, GetToolBox(), m_xFrame ); + return new TableWindow( GetSlotId(), m_aCommandURL, GetToolBox().GetItemText( GetId() ), GetToolBox(), m_xFrame ); return 0; } @@ -868,7 +809,7 @@ SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindow() ColumnsWindow* pWin = 0; if(bEnabled) { - pWin = new ColumnsWindow( GetSlotId(), m_aCommandURL, GetToolBox(), m_xFrame ); + pWin = new ColumnsWindow( GetSlotId(), m_aCommandURL, GetToolBox().GetItemText( GetId() ), GetToolBox(), m_xFrame ); pWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_NOKEYCLOSE ); SetPopupWindow( pWin ); @@ -883,13 +824,11 @@ SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindowCascading() ColumnsWindow* pWin = 0; if(bEnabled) { - pWin = new ColumnsWindow( GetSlotId(), m_aCommandURL, GetToolBox(), m_xFrame ); + pWin = new ColumnsWindow( GetSlotId(), m_aCommandURL, GetToolBox().GetItemText( GetId() ), GetToolBox(), m_xFrame ); } return pWin; } -/* -----------------18.11.99 16:38------------------- - --------------------------------------------------*/ void SvxColumnsToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) @@ -897,3 +836,5 @@ void SvxColumnsToolBoxControl::StateChanged( sal_uInt16 nSID, bEnabled = SFX_ITEM_DISABLED != eState; SfxToolBoxControl::StateChanged(nSID, eState, pState ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 9c0a5262ce7a..def01cd52812 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,9 +48,7 @@ #include <svl/stritem.hxx> #include <svx/dialmgr.hxx> #include <svx/lboxctrl.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <tools/urlobj.hxx> #include <svx/svxids.hrc> @@ -70,7 +69,6 @@ class SvxPopupWindowListBox : public SfxPopupWindow { using FloatingWindow::StateChanged; - FixedInfo aInfo; ListBox * pListBox; ToolBox & rToolBox; sal_Bool bUserSel; @@ -95,7 +93,6 @@ public: void StartSelection(); inline ListBox & GetListBox() { return *pListBox; } - inline FixedInfo & GetInfo() { return aInfo; } sal_Bool IsUserSelected() const { return bUserSel; } void SetUserSelected( sal_Bool bVal ) { bUserSel = bVal; } @@ -106,7 +103,6 @@ public: SvxPopupWindowListBox::SvxPopupWindowListBox( sal_uInt16 nSlotId, const rtl::OUString& rCommandURL, sal_uInt16 nId, ToolBox& rTbx ) : SfxPopupWindow( nSlotId, Reference< XFrame >(), SVX_RES( RID_SVXTBX_UNDO_REDO_CTRL ) ), - aInfo ( this, SVX_RES( FT_NUM_OPERATIONS ) ), rToolBox ( rTbx ), bUserSel ( sal_False ), nTbxId ( nId ), @@ -189,7 +185,7 @@ SvxListBoxControl::~SvxListBoxControl() SfxPopupWindow* SvxListBoxControl::CreatePopupWindow() { - DBG_ERROR( "not implemented" ); + OSL_FAIL( "not implemented" ); return 0; } @@ -242,7 +238,7 @@ void SvxListBoxControl::Impl_SetInfo( sal_uInt16 nCount ) String aText( aActionStr ); aText.SearchAndReplaceAllAscii( "$(ARG1)", String::CreateFromInt32( nCount ) ); - pPopupWin->GetInfo().SetText( aText ); + pPopupWin->SetText( aText ); } @@ -306,13 +302,10 @@ void SvxUndoRedoControl::StateChanged( if ( pState && pState->ISA( SfxStringListItem ) ) { SfxStringListItem &rItem = *(SfxStringListItem *)pState; - const List* pLst = rItem.GetList(); - DBG_ASSERT( pLst, "no undo actions available" ); - if ( pLst ) - { - for( long nI = 0, nEnd = pLst->Count(); nI < nEnd; ++nI ) - aUndoRedoList.push_back( rtl::OUString( *(String *)pLst->GetObject( nI ))); - } + + const std::vector<String> &aLst = rItem.GetList(); + for( long nI = 0, nEnd = aLst.size(); nI < nEnd; ++nI ) + aUndoRedoList.push_back( rtl::OUString( aLst[nI] )); } } } @@ -321,7 +314,7 @@ SfxPopupWindow* SvxUndoRedoControl::CreatePopupWindow() { DBG_ASSERT(( SID_UNDO == GetSlotId() || SID_REDO == GetSlotId() ), "mismatching ids" ); - if ( m_aCommandURL.equalsAscii( ".uno:Undo" )) + if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:Undo" ) )) updateStatus( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GetUndoStrings" ))); else updateStatus( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GetRedoStrings" ))); @@ -349,3 +342,5 @@ SfxPopupWindow* SvxUndoRedoControl::CreatePopupWindow() return pPopupWin; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/lboxctrl.hrc b/svx/source/tbxctrls/lboxctrl.hrc index 3026fee5cff3..3026fee5cff3 100644..100755 --- a/svx/source/tbxctrls/lboxctrl.hrc +++ b/svx/source/tbxctrls/lboxctrl.hrc diff --git a/svx/source/tbxctrls/lboxctrl.src b/svx/source/tbxctrls/lboxctrl.src index 4150e07ba249..735706033578 100644 --- a/svx/source/tbxctrls/lboxctrl.src +++ b/svx/source/tbxctrls/lboxctrl.src @@ -32,28 +32,21 @@ FloatingWindow RID_SVXTBX_UNDO_REDO_CTRL { Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( 150 , 74 ) ; + Size = MAP_APPFONT ( 102 , 87 ) ; HelpID = HID_SVXTBX_UNDO_REDO_CTRL ; - SysWin = TRUE; - Border = TRUE ; + StdPopup = TRUE; Hide = TRUE ; - SVLook = TRUE ; OutputSize = TRUE ; ListBox LB_SVXTBX_UNDO_REDO_CTRL { HelpID = "svx:ListBox:RID_SVXTBX_UNDO_REDO_CTRL:LB_SVXTBX_UNDO_REDO_CTRL"; Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( 150 , 60 ) ; + Size = MAP_APPFONT ( 100 , 85 ) ; Border = TRUE ; DropDown = FALSE ; OutputSize = TRUE ; }; - FixedText FT_NUM_OPERATIONS - { - Pos = MAP_APPFONT ( 6 , 64 ) ; - Size = MAP_APPFONT ( 138 , 10 ) ; - }; }; String RID_SVXSTR_NUM_UNDO_ACTIONS diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 3369f1ae8eb5..1bfae3ee5dfc 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,11 +31,9 @@ // include --------------------------------------------------------------- -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> @@ -198,7 +197,7 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState ) break; default: - DBG_ERROR( "Nicht unterstuetzter Linientyp" ); + OSL_FAIL( "Nicht unterstuetzter Linientyp" ); break; } } @@ -382,7 +381,7 @@ SvxLineEndWindow::SvxLineEndWindow( const String& rWndTitle ) : SfxPopupWindow( nSlotId, rFrame, - WinBits( WB_BORDER | WB_STDFLOATWIN | WB_SIZEABLE | WB_3DLOOK ) ), + WinBits( WB_STDPOPUP ) ), pLineEndList ( NULL ), aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ), nCols ( 2 ), @@ -404,7 +403,7 @@ SvxLineEndWindow::SvxLineEndWindow( SfxPopupWindow( nSlotId, rFrame, pParentWindow, - WinBits( WB_BORDER | WB_STDFLOATWIN | WB_SIZEABLE | WB_3DLOOK ) ), + WinBits( WB_STDPOPUP ) ), pLineEndList ( NULL ), aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ), nCols ( 2 ), @@ -600,7 +599,7 @@ void SvxLineEndWindow::Resize() // ----------------------------------------------------------------------- -void __EXPORT SvxLineEndWindow::Resizing( Size& rNewSize ) +void SvxLineEndWindow::Resizing( Size& rNewSize ) { Size aBitmapSize = aBmpSize; // -> Member aBitmapSize.Width() += 6; // @@ -766,7 +765,7 @@ SfxPopupWindow* SvxLineEndToolBoxControl::CreatePopupWindow() { SvxLineEndWindow* pLineEndWin = new SvxLineEndWindow( GetId(), m_xFrame, &GetToolBox(), SVX_RESSTR( RID_SVXSTR_LINEEND ) ); - pLineEndWin->StartPopupMode( &GetToolBox(), sal_True ); + pLineEndWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS | FLOATWIN_POPUPMODE_ALLOWTEAROFF ); pLineEndWin->StartSelection(); SetPopupWindow( pLineEndWin ); return pLineEndWin; @@ -782,3 +781,5 @@ void SvxLineEndToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, co rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/subtoolboxcontrol.cxx b/svx/source/tbxctrls/subtoolboxcontrol.cxx index 526f32434c2e..492cce486b2f 100644 --- a/svx/source/tbxctrls/subtoolboxcontrol.cxx +++ b/svx/source/tbxctrls/subtoolboxcontrol.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ SfxPopupWindowType SvxSubToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index ad97a61900fa..e7b10ef33c99 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,8 +32,9 @@ // include --------------------------------------------------------------- -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <tools/shl.hxx> +#include <tools/color.hxx> #include <svl/poolitem.hxx> #include <svl/eitem.hxx> #include <vcl/toolbox.hxx> @@ -41,6 +43,7 @@ #include <svtools/ctrlbox.hxx> #include <svl/style.hxx> #include <svtools/ctrltool.hxx> +#include <svtools/borderhelper.hxx> #include <svl/stritem.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/tplpitem.hxx> @@ -88,6 +91,7 @@ #include "colorwindow.hxx" #include <memory> +#include <svx/framelink.hxx> #include <svx/tbxcolorupdate.hxx> #include <editeng/eerdll.hxx> #include <editeng/editrids.hrc> @@ -111,10 +115,10 @@ sal_Bool lcl_FontChangedHint( const SfxHint &rHint ); // namespaces using ::rtl::OUString; +using namespace ::editeng; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; @@ -273,27 +277,18 @@ public: const SfxPoolItem* pState ); virtual SfxPopupWindow* Clone() const; virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - inline sal_Bool IsHighContrast( void ) const; }; -inline sal_Bool SvxFrameWindow_Impl::IsHighContrast( void ) const -{ - return GetSettings().GetStyleSettings().GetHighContrastMode(); -} - //======================================================================== // class SvxLineWindow_Impl --------------------------------------------------- //======================================================================== class SvxLineWindow_Impl : public SfxPopupWindow { private: - ValueSet aLineSet; + LineListBox m_aLineStyleLb; bool m_bIsWriter; #if _SOLAR__PRIVATE - void MakeLineBitmap( sal_uInt16 nNo, Bitmap& rBmp, const Size& rSize, String& rStr, - const ::Color& rLine, const ::Color& rBack ); DECL_LINK( SelectHdl, void * ); #endif @@ -303,11 +298,9 @@ protected: virtual Window* GetPreferredKeyInputWindow(); virtual void GetFocus(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void CreateBitmaps( void ); public: SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ); - void StartSelection(); virtual SfxPopupWindow* Clone() const; }; @@ -437,16 +430,16 @@ void SvxStyleBox_Impl::Select() Sequence< PropertyValue > aArgs( 2 ); aArgs[0].Value = makeAny( OUString( aSelEntry ) ); - aArgs[1].Name = OUString::createFromAscii( "Family" ); + aArgs[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Family")); aArgs[1].Value = makeAny( sal_Int16( eStyleFamily )); if( bCreateNew ) { - aArgs[0].Name = OUString::createFromAscii( "Param" ); + aArgs[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Param")); SfxToolBoxControl::Dispatch( m_xDispatchProvider, String::CreateFromAscii(".uno:StyleNewByExample"), aArgs); } else { - aArgs[0].Name = OUString::createFromAscii( "Template" ); + aArgs[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Template")); SfxToolBoxControl::Dispatch( m_xDispatchProvider, m_aCommand, aArgs ); } } @@ -508,9 +501,7 @@ long SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) } return nHandled ? nHandled : ComboBox::Notify( rNEvt ); } -/* -----------------------------08.03.2002 13:03------------------------------ - ---------------------------------------------------------------------------*/ void SvxStyleBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -819,21 +810,23 @@ void SvxFontNameBox_Impl::Select() #define WB_NO_DIRECTSELECT ((WinBits)0x04000000) #endif -#define PALETTE_X 10 -#define PALETTE_Y 11 +#define PALETTE_X 8 +#define PALETTE_Y 13 #define PALETTE_SIZE (PALETTE_X * PALETTE_Y) SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, sal_uInt16 nSlotId, const Reference< XFrame >& rFrame, const String& rWndTitle, - Window* pParentWindow ) : + Window* pParentWindow, + const ::Color rLastColor ) : - SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK|WB_DIALOGCONTROL ) ), + SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ), theSlotId( nSlotId ), aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT) ), - maCommand( rCommand ) + maCommand( rCommand ), + mLastColor( rLastColor ) { SfxObjectShell* pDocSh = SfxObjectShell::Current(); @@ -895,6 +888,8 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, { pEntry = pColorTable->GetColor(i); aColorSet.InsertItem( i+1, pEntry->GetColor(), pEntry->GetName() ); + if( pEntry->GetColor() == mLastColor ) + aColorSet.SelectItem( i+1 ); } while ( i < PALETTE_SIZE ) @@ -933,7 +928,7 @@ void SvxColorWindow_Impl::KeyInput( const KeyEvent& rKEvt ) SfxPopupWindow* SvxColorWindow_Impl::Clone() const { - return new SvxColorWindow_Impl( maCommand, theSlotId, GetFrame(), GetText(), GetParent() ); + return new SvxColorWindow_Impl( maCommand, theSlotId, GetFrame(), GetText(), GetParent(), mLastColor ); } // ----------------------------------------------------------------------- @@ -942,7 +937,6 @@ IMPL_LINK( SvxColorWindow_Impl, SelectHdl, void *, EMPTYARG ) { sal_uInt16 nItemId = aColorSet.GetSelectItemId(); SvxColorItem aColorItem( aColorSet.GetItemColor( nItemId ), theSlotId ); - /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() calls. This instance may be deleted in the meantime (i.e. when a dialog is opened while in Dispatch()), accessing members will crash in this case. */ @@ -1061,7 +1055,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) : - SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL ) ), + SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ), aFrameSet ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ), bParagraphMode(sal_False) @@ -1069,7 +1063,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFram BindListener(); String sCommand(String::CreateFromAscii( ".uno:BorderReducedMode" )); AddStatusListener( sCommand ); - aImgList = ImageList( SVX_RES( IsHighContrast()? RID_SVXIL_FRAME_HC : RID_SVXIL_FRAME ) ); + aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) ); /* * 1 2 3 4 @@ -1101,9 +1095,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFram aFrameSet.SetAccessibleName( SVX_RESSTR(RID_SVXSTR_FRAME) ); aFrameSet.Show(); } -/*-- 22.09.2004 12:27:50--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxFrameWindow_Impl::~SvxFrameWindow_Impl() { UnbindListener(); @@ -1131,7 +1123,7 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) { - aImgList = ImageList( SVX_RES( IsHighContrast()? RID_SVXIL_FRAME_HC : RID_SVXIL_FRAME ) ); + aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) ); sal_uInt16 nNumOfItems = aFrameSet.GetItemCount(); @@ -1168,7 +1160,7 @@ IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG ) sal_uInt16 nModifier = aFrameSet.GetModifier(); sal_uInt8 nValidFlags = 0; - theDefLine.SetOutWidth( DEF_LINE_WIDTH_0 ); + theDefLine.GuessLinesWidths( theDefLine.GetStyle(), DEF_LINE_WIDTH_0 ); switch ( nSel ) { case 1: nValidFlags |= FRM_VALID_ALL; @@ -1333,12 +1325,15 @@ sal_Bool SvxFrameWindow_Impl::Close() //======================================================================== // class SvxLineWindow_Impl -------------------------------------------------- //======================================================================== +Color lcl_mediumColor( Color aMain, Color /*aDefault*/ ) +{ + return SvxBorderLine::threeDMediumColor( aMain ); +} SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) : - SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL ) ), - - aLineSet( this, WinBits( WB_3DLOOK | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD | WB_NONEFIELD | WB_NO_DIRECTSELECT ) ) + SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_AUTOSIZE ) ), + m_aLineStyleLb( this ) { try { @@ -1348,19 +1343,46 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame catch(const uno::Exception& ) { } - Size aBmpSize( 55, 12 ); - CreateBitmaps(); - aLineSet.SetColCount( 2 ); - aLineSet.SetSelectHdl( LINK( this, SvxLineWindow_Impl, SelectHdl ) ); - aLineSet.SetText( SVX_RESSTR(STR_NONE) ); + m_aLineStyleLb.SetPosSizePixel( 2, 2, 110, 140 ); + SetOutputSizePixel( Size( 114, 144 ) ); + + m_aLineStyleLb.SetSourceUnit( FUNIT_TWIP ); + m_aLineStyleLb.SetNone( SVX_RESSTR(STR_NONE) ); + + m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( SOLID ), SOLID ); + m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( DOTTED ), DOTTED ); + m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( DASHED ), DASHED ); + + // Double lines + m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( DOUBLE ), DOUBLE ); + m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( THINTHICK_SMALLGAP ), THINTHICK_SMALLGAP, 20 ); + m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( THINTHICK_MEDIUMGAP ), THINTHICK_MEDIUMGAP ); + m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( THINTHICK_LARGEGAP ), THINTHICK_LARGEGAP ); + m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( THICKTHIN_SMALLGAP ), THICKTHIN_SMALLGAP, 20 ); + m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( THICKTHIN_MEDIUMGAP ), THICKTHIN_MEDIUMGAP ); + m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( THICKTHIN_LARGEGAP ), THICKTHIN_LARGEGAP ); + + // Engraved / Embossed + m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( EMBOSSED ), EMBOSSED, 15, + &SvxBorderLine::threeDLightColor, &SvxBorderLine::threeDDarkColor, + &lcl_mediumColor ); + m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( ENGRAVED ), ENGRAVED, 15, + &SvxBorderLine::threeDDarkColor, &SvxBorderLine::threeDLightColor, + &lcl_mediumColor ); + + // Inset / Outset + m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( OUTSET ), OUTSET, 10, + &SvxBorderLine::lightColor, &SvxBorderLine::darkColor ); + m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( INSET ), INSET, 10, + &SvxBorderLine::darkColor, &SvxBorderLine::lightColor ); + m_aLineStyleLb.SetWidth( 20 ); // 1pt by default - aLineSet.SetAccessibleName( SVX_RESSTR(RID_SVXSTR_FRAME_STYLE) ); - lcl_CalcSizeValueSet( *this, aLineSet, aBmpSize ); + m_aLineStyleLb.SetSelectHdl( LINK( this, SvxLineWindow_Impl, SelectHdl ) ); SetHelpId( HID_POPUP_LINE ); SetText( SVX_RESSTR(RID_SVXSTR_FRAME_STYLE) ); - aLineSet.Show(); + m_aLineStyleLb.Show(); } SfxPopupWindow* SvxLineWindow_Impl::Clone() const @@ -1370,241 +1392,20 @@ SfxPopupWindow* SvxLineWindow_Impl::Clone() const // ----------------------------------------------------------------------- -void SvxLineWindow_Impl::MakeLineBitmap( sal_uInt16 nNo, Bitmap& rBmp, const Size& rSize, String& rStr, - const ::Color& rLineCol, const ::Color& rBackCol ) -{ - VirtualDevice aVirDev( *this ); - Rectangle aRect( Point(2,0), Size(rSize.Width()-4,0) ); - - // grau einfaerben und Bitmap sichern: - aVirDev.SetOutputSizePixel( rSize ); - aVirDev.SetLineColor(); - aVirDev.SetFillColor( rBackCol ); - aVirDev.DrawRect( Rectangle( Point(0,0), rSize ) ); - aVirDev.SetFillColor( rLineCol ); - - sal_uInt16 nLineWidth = 0; - switch ( nNo ) - { - case 1: // DEF_LINE_WIDTH_0 - aRect.Top() = 6; - aRect.Bottom() = 6; - aVirDev.DrawRect( aRect ); - break; - - case 2: // DEF_LINE_WIDTH_1 - aRect.Top() = 5; - aRect.Bottom() = 6; - aVirDev.DrawRect( aRect ); - nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_1/20; - break; - - case 3: // DEF_LINE_WIDTH_2 - aRect.Top() = 5; - aRect.Bottom() = 7; - aVirDev.DrawRect( aRect ); - nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_2/20; - break; - - case 4: // DEF_LINE_WIDTH_3 - aRect.Top() = 4; - aRect.Bottom() = 7; - aVirDev.DrawRect( aRect ); - aVirDev.DrawRect( Rectangle( Point(2,4), Point(37,7) ) ); - nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_3/20; - break; - - case 5: // DEF_LINE_WIDTH_4 - aRect.Top() = 4; - aRect.Bottom() = 8; - aVirDev.DrawRect( aRect ); - nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_4/20; - break; - - case 6: // DEF_DOUBLE_LINE0 - aRect.Top() = 5; - aRect.Bottom() = 5; - aVirDev.DrawRect( aRect ); - aRect.Top() = 7; - aRect.Bottom() = 7; - aVirDev.DrawRect( aRect ); - nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE0_OUT+DEF_DOUBLE_LINE0_IN+DEF_DOUBLE_LINE0_DIST)/20; - break; - - case 7: // DEF_DOUBLE_LINE7 - aRect.Top() = 4; - aRect.Bottom() = 4; - aVirDev.DrawRect( aRect ); - aRect.Top() = 7; - aRect.Bottom() = 7; - aVirDev.DrawRect( aRect ); - nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE7_OUT+DEF_DOUBLE_LINE7_IN+DEF_DOUBLE_LINE7_DIST)/20; - break; - - case 8: // DEF_DOUBLE_LINE1 - aRect.Top() = 4; - aRect.Bottom() = 5; - aVirDev.DrawRect( aRect ); - aRect.Top() = 7; - aRect.Bottom() = 8; - aVirDev.DrawRect( aRect ); - nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE1_OUT+DEF_DOUBLE_LINE1_IN+DEF_DOUBLE_LINE1_DIST)/20; - break; - - case 9: // DEF_DOUBLE_LINE2 - aRect.Top() = 3; - aRect.Bottom() = 5; - aVirDev.DrawRect( aRect ); - aRect.Top() = 8; - aRect.Bottom() = 10; - aVirDev.DrawRect( aRect ); - nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE2_OUT+DEF_DOUBLE_LINE2_IN+DEF_DOUBLE_LINE2_DIST)/20; - break; - - case 10: // DEF_DOUBLE_LINE8 - aRect.Top() = 3; - aRect.Bottom() = 4; - aVirDev.DrawRect( aRect ); - aRect.Top() = 7; - aRect.Bottom() = 7; - aVirDev.DrawRect( aRect ); - nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE8_OUT+DEF_DOUBLE_LINE8_IN+DEF_DOUBLE_LINE8_DIST)/20; - break; - - case 11: // DEF_DOUBLE_LINE9 - aRect.Top() = 3; - aRect.Bottom() = 5; - aVirDev.DrawRect( aRect ); - aRect.Top() = 8; - aRect.Bottom() = 8; - aVirDev.DrawRect( aRect ); - nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE9_OUT+DEF_DOUBLE_LINE9_IN+DEF_DOUBLE_LINE9_DIST)/20; - break; - - case 12: // DEF_DOUBLE_LINE10 - aRect.Top() = 2; - aRect.Bottom() = 5; - aVirDev.DrawRect( aRect ); - aRect.Top() = 8; - aRect.Bottom() = 8; - aVirDev.DrawRect( aRect ); - nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE10_OUT+DEF_DOUBLE_LINE10_IN+DEF_DOUBLE_LINE10_DIST)/20; - break; - - case 13: // DEF_DOUBLE_LINE3 - aRect.Top() = 4; - aRect.Bottom() = 5; - aVirDev.DrawRect( aRect ); - aRect.Top() = 7; - aRect.Bottom() = 7; - aVirDev.DrawRect( aRect ); - nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE3_OUT+DEF_DOUBLE_LINE3_IN+DEF_DOUBLE_LINE3_DIST)/20; - break; - - case 14: // DEF_DOUBLE_LINE4 - aRect.Top() = 4; - aRect.Bottom() = 4; - aVirDev.DrawRect( aRect ); - aRect.Top() = 6; - aRect.Bottom() = 7; - aVirDev.DrawRect( aRect ); - nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE4_OUT+DEF_DOUBLE_LINE4_IN+DEF_DOUBLE_LINE4_DIST)/20; - break; - - case 15: // DEF_DOUBLE_LINE5 - aRect.Top() = 3; - aRect.Bottom() = 5; - aVirDev.DrawRect( aRect ); - aRect.Top() = 8; - aRect.Bottom() = 9; - aVirDev.DrawRect( aRect ); - nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE5_OUT+DEF_DOUBLE_LINE5_IN+DEF_DOUBLE_LINE5_DIST)/20; - break; - - case 16: // DEF_DOUBLE_LINE6 - aRect.Top() = 3; - aRect.Bottom() = 4; - aVirDev.DrawRect( aRect ); - aRect.Top() = 7; - aRect.Bottom() = 9; - aVirDev.DrawRect( aRect ); - nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE6_OUT+DEF_DOUBLE_LINE6_IN+DEF_DOUBLE_LINE6_DIST)/20; - break; - - default: - break; - } - if ( nLineWidth ) - { - rStr = String::CreateFromInt32( nLineWidth ); - rStr.AppendAscii(" pt"); - } - rBmp = aVirDev.GetBitmap( Point(0,0), rSize ); -} - -// ----------------------------------------------------------------------- - IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG ) { SvxLineItem aLineItem( SID_FRAME_LINESTYLE ); - sal_uInt16 n1 = 0, - n2 = 0, - n3 = 0; - sal_Bool bSetLine = sal_True; + SvxBorderStyle nStyle = SvxBorderStyle( m_aLineStyleLb.GetSelectEntryStyle() ); - switch ( aLineSet.GetSelectItemId() ) - { - case 1: n1 = DEF_LINE_WIDTH_0; break; - case 2: n1 = DEF_LINE_WIDTH_1; break; - case 3: n1 = DEF_LINE_WIDTH_2; break; - case 4: n1 = DEF_LINE_WIDTH_3; break; - case 5: n1 = DEF_LINE_WIDTH_4; break; - - case 6: n1 = DEF_DOUBLE_LINE0_OUT; - n2 = DEF_DOUBLE_LINE0_IN; - n3 = DEF_DOUBLE_LINE0_DIST; break; - case 7: n1 = DEF_DOUBLE_LINE7_OUT; - n2 = DEF_DOUBLE_LINE7_IN; - n3 = DEF_DOUBLE_LINE7_DIST; break; - case 8: n1 = DEF_DOUBLE_LINE1_OUT; - n2 = DEF_DOUBLE_LINE1_IN; - n3 = DEF_DOUBLE_LINE1_DIST; break; - case 9: n1 = DEF_DOUBLE_LINE2_OUT; - n2 = DEF_DOUBLE_LINE2_IN; - n3 = DEF_DOUBLE_LINE2_DIST; break; - case 10: n1 = DEF_DOUBLE_LINE8_OUT; - n2 = DEF_DOUBLE_LINE8_IN; - n3 = DEF_DOUBLE_LINE8_DIST; break; - case 11: n1 = DEF_DOUBLE_LINE9_OUT; - n2 = DEF_DOUBLE_LINE9_IN; - n3 = DEF_DOUBLE_LINE9_DIST; break; - case 12: n1 = DEF_DOUBLE_LINE10_OUT; - n2 = DEF_DOUBLE_LINE10_IN; - n3 = DEF_DOUBLE_LINE10_DIST; break; - case 13: n1 = DEF_DOUBLE_LINE3_OUT; - n2 = DEF_DOUBLE_LINE3_IN; - n3 = DEF_DOUBLE_LINE3_DIST; break; - case 14: n1 = DEF_DOUBLE_LINE4_OUT; - n2 = DEF_DOUBLE_LINE4_IN; - n3 = DEF_DOUBLE_LINE4_DIST; break; - case 15: n1 = DEF_DOUBLE_LINE5_OUT; - n2 = DEF_DOUBLE_LINE5_IN; - n3 = DEF_DOUBLE_LINE5_DIST; break; - case 16: n1 = DEF_DOUBLE_LINE6_OUT; - n2 = DEF_DOUBLE_LINE6_IN; - n3 = DEF_DOUBLE_LINE6_DIST; break; - case 0: - default: - bSetLine = sal_False; - break; - } - if ( bSetLine ) + if ( m_aLineStyleLb.GetSelectEntryPos( ) > 0 ) { - SvxBorderLine aTmp( NULL, n1, n2, n3 ); + SvxBorderLine aTmp; + aTmp.SetStyle( nStyle ); + aTmp.SetWidth( 20 ); // TODO Make it depend on a width field aLineItem.SetLine( &aTmp ); } else - aLineItem.SetLine( 0 ); + aLineItem.SetLine( NULL ); if ( IsInPopupMode() ) EndPopupMode(); @@ -1615,11 +1416,6 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG ) aLineItem.QueryValue( a, m_bIsWriter ? CONVERT_TWIPS : 0 ); aArgs[0].Value = a; - /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call. - This instance may be deleted in the meantime (i.e. when a dialog is opened - while in Dispatch()), accessing members will crash in this case. */ - aLineSet.SetNoSelection(); - SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( GetFrame()->getController(), UNO_QUERY ), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineStyle" )), aArgs ); @@ -1630,14 +1426,7 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG ) void SvxLineWindow_Impl::Resize() { - lcl_ResizeValueSet( *this, aLineSet); -} - -// ----------------------------------------------------------------------- - -void SvxLineWindow_Impl::StartSelection() -{ - aLineSet.StartSelection(); + m_aLineStyleLb.Resize(); } // ----------------------------------------------------------------------- @@ -1651,44 +1440,26 @@ sal_Bool SvxLineWindow_Impl::Close() Window* SvxLineWindow_Impl::GetPreferredKeyInputWindow() { - return &aLineSet; + return &m_aLineStyleLb; } // ----------------------------------------------------------------------- void SvxLineWindow_Impl::GetFocus() { - aLineSet.GrabFocus(); + m_aLineStyleLb.GrabFocus(); } void SvxLineWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { SfxPopupWindow::DataChanged( rDCEvt ); - +#if 0 if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) { CreateBitmaps(); Invalidate(); } -} - -void SvxLineWindow_Impl::CreateBitmaps( void ) -{ - Size aBmpSize( 55, 12 ); - Bitmap aBmp; - String aStr; - - const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - svtools::ColorConfig aColorConfig; - ::Color aLineCol( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor ); - ::Color aBackCol( rStyleSettings.GetWindowColor() ); - aLineSet.Clear(); - - for( sal_uInt16 i = 1 ; i < 17 ; ++i ) - { - MakeLineBitmap( i, aBmp, aBmpSize, aStr, aLineCol, aBackCol ); - aLineSet.InsertItem( i, aBmp, aStr ); - } +#endif } // ----------------------------------------------------------------------- @@ -1837,7 +1608,7 @@ struct SvxStyleToolBoxControl::Impl } catch(const uno::Exception& ) { - DBG_ERROR("error while initializing style names"); + OSL_FAIL("error while initializing style names"); } } }; @@ -1954,7 +1725,7 @@ SfxStyleFamily SvxStyleToolBoxControl::GetActFamily() case SID_STYLE_FAMILY4: return SFX_STYLE_FAMILY_PAGE; case SID_STYLE_FAMILY5: return SFX_STYLE_FAMILY_PSEUDO; default: - DBG_ERROR( "unknown style family" ); + OSL_FAIL( "unknown style family" ); break; } return SFX_STYLE_FAMILY_PARA; @@ -1973,7 +1744,6 @@ void SvxStyleToolBoxControl::FillStyleBox() { const SfxStyleFamily eFamily = GetActFamily(); sal_uInt16 nCount = pStyleSheetPool->Count(); - sal_uInt16 i = 0; SfxStyleSheetBase* pStyle = NULL; sal_Bool bDoFill = sal_False; @@ -1992,6 +1762,7 @@ void SvxStyleToolBoxControl::FillStyleBox() } else { + sal_uInt16 i= 0; while ( pStyle && !bDoFill ) { bDoFill = ( pBox->GetEntry(i) != pStyle->GetName() ); @@ -2008,12 +1779,12 @@ void SvxStyleToolBoxControl::FillStyleBox() { sal_uInt16 _i; sal_uInt32 nCnt = pImpl->aDefaultStyles.size(); - bool bInsert; pStyle = pStyleSheetPool->First(); if( pImpl->bSpecModeWriter || pImpl->bSpecModeCalc ) { + bool bInsert; while ( pStyle ) { // sort out default styles @@ -2327,9 +2098,10 @@ SvxFontColorToolBoxControl::SvxFontColorToolBoxControl( : SfxToolBoxControl( nSlotId, nId, rTbx ), pBtnUpdater( new ::svx::ToolboxButtonColorUpdater( - nSlotId, nId, &GetToolBox(), TBX_UPDATER_MODE_CHAR_COLOR_NEW )) + nSlotId, nId, &GetToolBox(), TBX_UPDATER_MODE_CHAR_COLOR_NEW )), + mLastColor( COL_AUTO ) { - rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) ); + rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); } // ----------------------------------------------------------------------- @@ -2356,7 +2128,8 @@ SfxPopupWindow* SvxFontColorToolBoxControl::CreatePopupWindow() SID_ATTR_CHAR_COLOR, m_xFrame, SVX_RESSTR( RID_SVXITEMS_EXTRAS_CHARCOLOR ), - &GetToolBox() ); + &GetToolBox(), + mLastColor); pColorWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF ); @@ -2380,7 +2153,10 @@ void SvxFontColorToolBoxControl::StateChanged( pItem = PTR_CAST( SvxColorItem, pState ); if ( pItem ) - pBtnUpdater->Update( pItem->GetValue()); + { + pBtnUpdater->Update( pItem->GetValue() ); + mLastColor= pItem->GetValue(); + } rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK ); @@ -2392,7 +2168,8 @@ void SvxFontColorToolBoxControl::StateChanged( SvxColorToolBoxControl::SvxColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : - SfxToolBoxControl( nSlotId, nId, rTbx ) + SfxToolBoxControl( nSlotId, nId, rTbx ), + mLastColor( COL_AUTO ) { if ( nSlotId == SID_BACKGROUND_COLOR ) rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); @@ -2427,7 +2204,8 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow() SID_BACKGROUND_COLOR, m_xFrame, SVX_RESSTR(nResId), - &GetToolBox() ); + &GetToolBox(), + mLastColor); pColorWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF ); @@ -2439,16 +2217,16 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow() // ----------------------------------------------------------------------- void SvxColorToolBoxControl::StateChanged( - sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) - { - const SvxColorItem* pItem = 0; + const SvxColorItem* pItem = 0; if ( SFX_ITEM_DONTCARE != eState ) pItem = PTR_CAST( SvxColorItem, pState ); - if ( pItem ) + if ( pItem ) { pBtnUpdater->Update( pItem->GetValue() ); + mLastColor= pItem->GetValue(); + } sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); @@ -2466,7 +2244,8 @@ SvxFontColorExtToolBoxControl::SvxFontColorExtToolBoxControl( ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), - pBtnUpdater(0) + pBtnUpdater(0), + mLastColor( COL_AUTO ) { rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) ); // The following commands are available at the writer module. @@ -2504,7 +2283,8 @@ SfxPopupWindow* SvxFontColorExtToolBoxControl::CreatePopupWindow() GetSlotId(), m_xFrame, SVX_RESSTR( RID_SVXITEMS_EXTRAS_CHARCOLOR ), - &GetToolBox() ); + &GetToolBox(), + mLastColor ); if ( GetSlotId() == SID_ATTR_CHAR_COLOR_BACKGROUND ) pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_EXTRAS_CHARBACKGROUND ) ); @@ -2543,7 +2323,10 @@ void SvxFontColorExtToolBoxControl::StateChanged( pItem = PTR_CAST( SvxColorItem, pState ); if ( pItem ) + { pBtnUpdater->Update( pItem->GetValue() ); + mLastColor = pItem->GetValue(); + } } } @@ -2647,8 +2430,7 @@ SfxPopupWindowType SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow() { SvxLineWindow_Impl* pLineWin = new SvxLineWindow_Impl( GetSlotId(), m_xFrame, &GetToolBox() ); - pLineWin->StartPopupMode( &GetToolBox(), sal_True ); - pLineWin->StartSelection(); + pLineWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS | FLOATWIN_POPUPMODE_ALLOWTEAROFF ); SetPopupWindow( pLineWin ); return pLineWin; @@ -2679,7 +2461,8 @@ SvxFrameLineColorToolBoxControl::SvxFrameLineColorToolBoxControl( ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), - pBtnUpdater(new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() )) + pBtnUpdater(new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() )), + mLastColor( COL_AUTO ) { rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); } @@ -2708,7 +2491,8 @@ SfxPopupWindow* SvxFrameLineColorToolBoxControl::CreatePopupWindow() SID_FRAME_LINECOLOR, m_xFrame, SVX_RESSTR(RID_SVXSTR_FRAME_COLOR), - &GetToolBox() ); + &GetToolBox(), + mLastColor); pColorWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF ); @@ -2720,9 +2504,7 @@ SfxPopupWindow* SvxFrameLineColorToolBoxControl::CreatePopupWindow() // ----------------------------------------------------------------------- void SvxFrameLineColorToolBoxControl::StateChanged( - sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) - { sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); @@ -2732,9 +2514,12 @@ void SvxFrameLineColorToolBoxControl::StateChanged( const SvxColorItem* pItem = 0; if ( SFX_ITEM_DONTCARE != eState ) { - pItem = PTR_CAST( SvxColorItem, pState ); + pItem = PTR_CAST( SvxColorItem, pState ); if ( pItem ) + { pBtnUpdater->Update( pItem->GetValue()); + mLastColor = pItem->GetValue(); + } } } @@ -2866,3 +2651,5 @@ Reference< ::com::sun::star::accessibility::XAccessible > SvxFontNameBox_Impl::C FillList(); return FontNameBox::CreateAccessible(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src index f49966e9ae17..8101cd52aea3 100644 --- a/svx/source/tbxctrls/tbcontrl.src +++ b/svx/source/tbxctrls/tbcontrl.src @@ -40,11 +40,13 @@ Image RID_SVX_RELOAD_NORMAL ImageBitmap = Bitmap { File = "reload.bmp" ; }; MASKCOLOR }; + Image RID_SVX_RELOAD_SPECIAL { ImageBitmap = Bitmap { File = "reloads.bmp" ; }; MASKCOLOR }; + ImageList RID_SVXIL_FRAME { Prefix = "fr"; @@ -52,33 +54,32 @@ ImageList RID_SVXIL_FRAME IdCount = { 12 ; }; MASKCOLOR }; -ImageList RID_SVXIL_FRAME_HC -{ - Prefix = "frh"; - IdList = { 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 ; 8 ; 9 ; 10 ; 11 ; 12 ; }; - IdCount = { 12 ; }; - MASKCOLOR -}; + String RID_SVXSTR_TRANSPARENT { Text [ en-US ] = "No Fill" ; }; String RID_SVXSTR_FILLPATTERN + { Text [ en-US ] = "Pattern" ; }; + String RID_SVXSTR_FRAME { Text [ en-US ] = "Borders" ; }; + String RID_SVXSTR_FRAME_STYLE { Text [ en-US ] = "Border Style" ; }; + String RID_SVXSTR_FRAME_COLOR { Text [ en-US ] = "Border Color" ; }; + ComboBox RID_SVXTBX_STYLE { HelpId = HID_STYLE_LISTBOX ; @@ -90,22 +91,27 @@ ComboBox RID_SVXTBX_STYLE Border = TRUE ; Hide = TRUE ; }; + String RID_SVXSTR_EXTRAS_CHARBACKGROUND { Text [ en-US ] = "Highlighting" ; }; + String RID_SVXSTR_BACKGROUND { Text [ en-US ] = "Background"; }; + String RID_SVXSTR_AUTOMATIC { Text [ en-US ] = "Automatic"; }; + String RID_SVXSTR_PAGES { Text [ en-US ] = "Pages"; }; + Image RID_SVXIMG_GRAF_RED { ImageBitmap = Bitmap { File = "sc10865.bmp" ; }; @@ -141,45 +147,12 @@ Image RID_SVXIMG_GRAF_TRANSPARENCE ImageBitmap = Bitmap { File = "sc10869.bmp" ; }; MASKCOLOR }; -Image RID_SVXIMG_GRAF_RED_H -{ - ImageBitmap = Bitmap { File = "sch10865.bmp" ; }; - MASKCOLOR -}; -Image RID_SVXIMG_GRAF_GREEN_H -{ - ImageBitmap = Bitmap { File = "sch10866.bmp" ; }; - MASKCOLOR -}; -Image RID_SVXIMG_GRAF_BLUE_H -{ - ImageBitmap = Bitmap { File = "sch10867.bmp" ; }; - MASKCOLOR -}; -Image RID_SVXIMG_GRAF_LUMINANCE_H -{ - ImageBitmap = Bitmap { File = "sch10863.bmp" ; }; - MASKCOLOR -}; -Image RID_SVXIMG_GRAF_CONTRAST_H -{ - ImageBitmap = Bitmap { File = "sch10864.bmp" ; }; - MASKCOLOR -}; -Image RID_SVXIMG_GRAF_GAMMA_H -{ - ImageBitmap = Bitmap { File = "sch10868.bmp" ; }; - MASKCOLOR -}; -Image RID_SVXIMG_GRAF_TRANSPARENCE_H -{ - ImageBitmap = Bitmap { File = "sch10869.bmp" ; }; - MASKCOLOR -}; + String RID_SVXSTR_CLEARFORM { Text [ en-US ] = "Clear formatting"; }; + String RID_SVXSTR_MORE { Text [ en-US ] = "More..."; diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index bbb00d0085a0..a7f58369df98 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,7 +40,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <svtools/ctrltool.hxx> #include <svtools/ctrlbox.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <memory> @@ -323,7 +324,7 @@ throw (uno::RuntimeException) { svt::ToolboxController::dispose(); - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; delete m_pBox; m_pBox = 0; } @@ -335,8 +336,8 @@ throw ( uno::RuntimeException ) { if ( m_pBox ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - if ( rEvent.FeatureURL.Path.equalsAscii( "FontHeight" )) + SolarMutexGuard aSolarMutexGuard; + if ( rEvent.FeatureURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FontHeight" ) )) { if ( rEvent.IsEnabled ) { @@ -350,7 +351,7 @@ throw ( uno::RuntimeException ) else m_pBox->Disable(); } - else if ( rEvent.FeatureURL.Path.equalsAscii( "CharFontName" )) + else if ( rEvent.FeatureURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CharFontName" ) )) { if ( rEvent.State >>= m_aCurrentFont ) m_pBox->UpdateFont( m_aCurrentFont ); @@ -390,7 +391,7 @@ uno::Reference< awt::XWindow > SAL_CALL FontHeightToolBoxControl::createItemWind Window* pParent = VCLUnoHelper::GetWindow( xParent ); if ( pParent ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; m_pBox = new SvxFontSizeBox_Impl( pParent, uno::Reference< frame::XDispatchProvider >( m_xFrame, uno::UNO_QUERY ), @@ -427,3 +428,5 @@ uno::Reference< uno::XInterface > SAL_CALL FontHeightToolBoxControl_createInstan } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index f2926c38aa5b..64e84b777830 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,21 +41,21 @@ #include <toolkit/helper/vclunohelper.hxx> #include <vcl/toolbox.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> namespace svx { -static const ::rtl::OUString SEARCHITEM_SEARCHSTRING = ::rtl::OUString::createFromAscii("SearchItem.SearchString"); -static const ::rtl::OUString SEARCHITEM_SEARCHBACKWARD = ::rtl::OUString::createFromAscii("SearchItem.Backward"); +static const ::rtl::OUString SEARCHITEM_SEARCHSTRING( RTL_CONSTASCII_USTRINGPARAM( "SearchItem.SearchString" ) ); +static const ::rtl::OUString SEARCHITEM_SEARCHBACKWARD( RTL_CONSTASCII_USTRINGPARAM( "SearchItem.Backward" ) ); -static const ::rtl::OUString COMMAND_EXECUTESEARCH = ::rtl::OUString::createFromAscii(".uno:ExecuteSearch"); -static const ::rtl::OUString COMMAND_FINDTEXT = ::rtl::OUString::createFromAscii(".uno:FindText") ; -static const ::rtl::OUString COMMAND_DOWNSEARCH = ::rtl::OUString::createFromAscii(".uno:DownSearch"); -static const ::rtl::OUString COMMAND_UPSEARCH = ::rtl::OUString::createFromAscii(".uno:UpSearch") ; -static const ::rtl::OUString COMMAND_APPENDSEARCHHISTORY = ::rtl::OUString::createFromAscii("AppendSearchHistory"); +static const ::rtl::OUString COMMAND_EXECUTESEARCH( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExecuteSearch" ) ); +static const ::rtl::OUString COMMAND_FINDTEXT( RTL_CONSTASCII_USTRINGPARAM( ".uno:FindText" ) ); +static const ::rtl::OUString COMMAND_DOWNSEARCH( RTL_CONSTASCII_USTRINGPARAM(".uno:DownSearch") ); +static const ::rtl::OUString COMMAND_UPSEARCH( RTL_CONSTASCII_USTRINGPARAM(".uno:UpSearch") ); +static const ::rtl::OUString COMMAND_APPENDSEARCHHISTORY( RTL_CONSTASCII_USTRINGPARAM( "AppendSearchHistory") ); -static const ::rtl::OUString SERVICENAME_URLTRANSFORMER = ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer"); +static const ::rtl::OUString SERVICENAME_URLTRANSFORMER( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer") ); static const sal_Int32 REMEMBER_SIZE = 10; void impl_executeSearch( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr, const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) @@ -131,15 +132,28 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) case EVENT_KEYINPUT: { const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); - sal_Bool bCtrl = pKeyEvent->GetKeyCode().IsMod1(); - sal_Bool bAlt = pKeyEvent->GetKeyCode().IsMod2(); sal_Bool bShift = pKeyEvent->GetKeyCode().IsShift(); sal_uInt16 nCode = pKeyEvent->GetKeyCode().GetCode(); - if ( (bCtrl && bAlt && KEY_F == nCode) || KEY_ESCAPE == nCode ) + if ( KEY_ESCAPE == nCode ) { nRet = 1; GrabFocusToDocument(); + + // hide the findbar + css::uno::Reference< css::beans::XPropertySet > xPropSet(m_xFrame, css::uno::UNO_QUERY); + if (xPropSet.is()) + { + css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; + css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) ); + aValue >>= xLayoutManager; + if (xLayoutManager.is()) + { + const ::rtl::OUString sResourceURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/findbar" ) ); + xLayoutManager->hideElement( sResourceURL ); + xLayoutManager->destroyElement( sResourceURL ); + } + } } if ( KEY_RETURN == nCode ) @@ -339,7 +353,7 @@ css::uno::Sequence< ::rtl::OUString > FindTextToolbarController::getSupportedSe // XComponent void SAL_CALL FindTextToolbarController::dispose() throw ( css::uno::RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; SearchToolbarControllersManager::createControllersManager()->freeController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL); @@ -387,7 +401,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL FindTextToolbarController::cre ToolBox* pToolbar = ( ToolBox* )pParent; m_pFindTextFieldControl = new FindTextFieldControl( pToolbar, WinBits( WB_DROPDOWN | WB_VSCROLL), m_xFrame, m_xServiceManager ); - Size aSize(100, m_pFindTextFieldControl->GetTextHeight() + 200); + Size aSize(250, m_pFindTextFieldControl->GetTextHeight() + 200); m_pFindTextFieldControl->SetSizePixel( aSize ); m_pFindTextFieldControl->SetModifyHdl(LINK(this, FindTextToolbarController, EditModifyHdl)); } @@ -399,12 +413,12 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL FindTextToolbarController::cre // XStatusListener void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) return; ::rtl::OUString aFeatureURL = rEvent.FeatureURL.Complete; - if (aFeatureURL.equalsAscii("AppendSearchHistory")) + if (aFeatureURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AppendSearchHistory"))) { m_pFindTextFieldControl->Remember_Impl(m_pFindTextFieldControl->GetText()); } @@ -503,7 +517,7 @@ css::uno::Sequence< ::rtl::OUString > DownSearchToolboxController::getSupported // XComponent void SAL_CALL DownSearchToolboxController::dispose() throw ( css::uno::RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; SearchToolbarControllersManager::createControllersManager()->freeController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL); @@ -560,7 +574,7 @@ void SAL_CALL DownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) // XStatusListener void SAL_CALL DownSearchToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ ) throw ( css::uno::RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) return; } @@ -632,7 +646,7 @@ css::uno::Sequence< ::rtl::OUString > UpSearchToolboxController::getSupportedSe // XComponent void SAL_CALL UpSearchToolboxController::dispose() throw ( css::uno::RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; SearchToolbarControllersManager::createControllersManager()->freeController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL); @@ -689,7 +703,7 @@ void SAL_CALL UpSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) th // XStatusListener void SAL_CALL UpSearchToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ ) throw ( css::uno::RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) return; } @@ -742,8 +756,8 @@ void SAL_CALL FindbarDispatcher::release() throw() sal_Bool SAL_CALL FindbarDispatcher::supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ) { return ( - ServiceName.equalsAscii("com.sun.star.comp.svx.FindbarDispatcher") || - ServiceName.equalsAscii("com.sun.star.frame.ProtocolHandler") + ServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.comp.svx.FindbarDispatcher")) || + ServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.frame.ProtocolHandler")) ); } @@ -772,7 +786,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL FindbarDispatcher::queryDi { css::uno::Reference< css::frame::XDispatch > xDispatch; - if ( aURL.Protocol.equalsAscii("vnd.sun.star.findbar:") ) + if ( aURL.Protocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.findbar:")) ) xDispatch = this; return xDispatch; @@ -793,22 +807,29 @@ css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL Fin void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css::uno::Sequence < css::beans::PropertyValue >& /*lArgs*/ ) throw( css::uno::RuntimeException ) { //vnd.sun.star.findbar:FocusToFindbar - set cursor to the FindTextFieldControl of the findbar - if ( aURL.Path.equalsAscii("FocusToFindbar") ) + if ( aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FocusToFindbar")) ) { css::uno::Reference< css::beans::XPropertySet > xPropSet(m_xFrame, css::uno::UNO_QUERY); if(!xPropSet.is()) return; css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString::createFromAscii("LayoutManager") ); + css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) ); aValue >>= xLayoutManager; if (!xLayoutManager.is()) return; - const ::rtl::OUString sResourceURL = ::rtl::OUString::createFromAscii("private:resource/toolbar/findbar"); + const ::rtl::OUString sResourceURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/findbar" ) ); css::uno::Reference< css::ui::XUIElement > xUIElement = xLayoutManager->getElement(sResourceURL); if (!xUIElement.is()) - return; + { + // show the findbar if necessary + xLayoutManager->createElement( sResourceURL ); + xLayoutManager->showElement( sResourceURL ); + xUIElement = xLayoutManager->getElement( sResourceURL ); + if ( !xUIElement.is() ) + return; + } css::uno::Reference< css::awt::XWindow > xWindow(xUIElement->getRealInterface(), css::uno::UNO_QUERY); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); @@ -819,7 +840,7 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css for ( sal_uInt16 i=0; i<nItemCount; ++i ) { ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i); - if ( sItemCommand.equalsAscii(".uno:FindText") ) + if ( sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:FindText")) ) { Window* pItemWin = pToolBox->GetItemWindow( i ); if ( pItemWin ) @@ -871,3 +892,5 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FindbarDispatcher_createIns //----------------------------------------------------------------------------------------------------------- } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx index 8b509fdafc50..bf92efdb48df 100644 --- a/svx/source/tbxctrls/tbxalign.cxx +++ b/svx/source/tbxctrls/tbxalign.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,11 +37,9 @@ #include "svx/tbxdraw.hxx" #include "tbxdraw.hrc" #include <tools/shl.hxx> -#ifndef _SFX_IMAGEMGR_HXX #include <sfx2/imagemgr.hxx> -#endif #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <sfx2/app.hxx> #include <vcl/toolbox.hxx> @@ -85,7 +84,7 @@ SfxPopupWindowType SvxTbxCtlAlign::GetPopupWindowType() const SfxPopupWindow* SvxTbxCtlAlign::CreatePopupWindow() { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( GetSlotId() == SID_OBJECT_ALIGN ) createAndPositionSubToolBar( m_aSubTbResName ); return NULL; @@ -105,7 +104,7 @@ SfxPopupWindow* SvxTbxCtlAlign::CreatePopupWindow() { // Provide the controlled sub-toolbar name, so we are notified whenever // this toolbar executes a function. - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return m_aSubTbName; } @@ -113,13 +112,13 @@ void SAL_CALL SvxTbxCtlAlign::functionSelected( const ::rtl::OUString& aCommand { // Our sub-toolbar wants to executes a function. We have to change // the image of our toolbar button to reflect the new function. - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( !m_bDisposed ) { if ( aCommand.getLength() > 0 ) { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface()); - Image aImage = GetImage( xFrame, aCommand, hasBigImages(), isHighContrast() ); + Image aImage = GetImage( xFrame, aCommand, hasBigImages() ); if ( !!aImage ) GetToolBox().SetItemImage( GetId(), aImage ); } @@ -130,12 +129,14 @@ void SAL_CALL SvxTbxCtlAlign::updateImage() throw (::com::sun::star::uno::Runtim { // We should update the button image of our parent (toolbar). Use the stored // command to set the correct current image. - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( m_aCommand.getLength() > 0 ) { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface()); - Image aImage = GetImage( xFrame, m_aCommand, hasBigImages(), isHighContrast() ); + Image aImage = GetImage( xFrame, m_aCommand, hasBigImages() ); if ( !!aImage ) GetToolBox().SetItemImage( GetId(), aImage ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx index 83b48b9e57b7..c4aa2c1c07ce 100644 --- a/svx/source/tbxctrls/tbxcolor.cxx +++ b/svx/source/tbxctrls/tbxcolor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,7 +103,7 @@ namespace svx } catch( const Exception& ) { - OSL_ENSURE( sal_False, "ToolboxAccess::toggleToolbox: caught an exception!" ); + OSL_FAIL( "ToolboxAccess::toggleToolbox: caught an exception!" ); } } @@ -116,3 +117,4 @@ namespace svx } // namespace svx //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index e218f01fac0e..0be242c9daf8 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -149,7 +150,7 @@ namespace svx } else { - DBG_ERROR( "ToolboxButtonColorUpdater::Update: TBX_UPDATER_MODE_CHAR_COLOR / TBX_UPDATER_MODE_CHAR_BACKGROUND" ); + OSL_FAIL( "ToolboxButtonColorUpdater::Update: TBX_UPDATER_MODE_CHAR_COLOR / TBX_UPDATER_MODE_CHAR_BACKGROUND" ); // !!! DrawChar( aVirDev, aColor ); } @@ -206,3 +207,5 @@ namespace svx //........................................................................ } // namespace svx //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/tbxdraw.hrc b/svx/source/tbxctrls/tbxdraw.hrc index e7d687468118..e7d687468118 100644..100755 --- a/svx/source/tbxctrls/tbxdraw.hrc +++ b/svx/source/tbxctrls/tbxdraw.hrc diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index 5943d6d0286d..a759aa6da7ec 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <tools/ref.hxx> #include <tools/shl.hxx> @@ -118,3 +119,4 @@ void SvxTbxCtlDraw::Select( sal_Bool ) toggleToolbox(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index 6f437dfb791e..81dea2c4a84a 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,8 +41,6 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxCTLTextTbxCtrl, SfxBoolItem); SFX_IMPL_TOOLBOX_CONTROL(SvxVertTextTbxCtrl, SfxBoolItem); -// -----------------------------27.04.01 15:50-------------------------------- - SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) { @@ -63,15 +62,10 @@ SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId { } -/* -----------------------------27.04.01 15:53-------------------------------- - - ---------------------------------------------------------------------------*/ SvxVertCTLTextTbxCtrl::~SvxVertCTLTextTbxCtrl( ) { } -/* -----------------------------27.04.01 15:50-------------------------------- - ---------------------------------------------------------------------------*/ void SvxVertCTLTextTbxCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState, @@ -117,7 +111,5 @@ void SvxVertCTLTextTbxCtrl::StateChanged( } } } -/* -----------------------------27.04.01 15:50-------------------------------- - - ---------------------------------------------------------------------------*/ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 41d4a8c824c5..500af917b67b 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef _COM_SUN_STAR_DRAWING_ENHANCEDCUSTOMSHAPEPARAMETERPARIR_HPP_ #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> -#endif #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> #include <com/sun/star/drawing/ShadeMode.hpp> #include <com/sun/star/drawing/Position3D.hpp> @@ -45,9 +44,7 @@ #include <svx/xsflclit.hxx> #include <svx/dialmgr.hxx> #include <svx/svdoashp.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <svx/svdview.hxx> #include <editeng/colritem.hxx> #include "svx/chrtitem.hxx" @@ -689,10 +686,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) sal_Bool bParallel = sal_True; Position3D aViewPoint( 3472, -3472, 25000 ); - double fOriginX = 0.50; - double fOriginY = -0.50; double fSkewAngle = -135; - double fSkew = 50.0; pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sProjectionMode ); sal_Int16 nProjectionMode = sal_Int16(); @@ -701,6 +695,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) if( bParallel ) { + double fSkew = 50.0; EnhancedCustomShapeParameterPair aSkewPropPair; pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sSkew ); if( pAny && ( *pAny >>= aSkewPropPair ) ) @@ -715,6 +710,8 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) } else { + double fOriginX = 0.50; + double fOriginY = -0.50; pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sViewPoint ); if( pAny ) *pAny >>= aViewPoint; @@ -1372,3 +1369,5 @@ void ExtrusionBar::getState( SdrView* pSdrView, SfxItemSet& rSet ) getExtrusionColorState( pSdrView, rSet ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 64367edbc85e..3493b187bbfd 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,9 +38,7 @@ #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> #include <svx/dialmgr.hxx> #include <svx/svdoashp.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <svx/svdview.hxx> #include <svx/sdasitm.hxx> #include <svx/svdoashp.hxx> @@ -639,3 +638,5 @@ void FontworkBar::getState( SdrView* pSdrView, SfxItemSet& rSet ) SetFontWorkShapeTypeState( pSdrView, rSet ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc b/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc index b99403b57e1f..b99403b57e1f 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc +++ b/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index d4e2d2272c12..e83787168746 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,14 +49,10 @@ #include <unotools/linguprops.hxx> // header for class IntlWrapper #include <unotools/intlwrapper.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif // header for class Application #include <vcl/svapp.hxx> -#ifndef _SVX_HELPID_HRC #include "helpid.hrc" -#endif //disable compiler warning C4355: 'this' : used in base member initializer list #ifdef _MSC_VER @@ -201,7 +198,7 @@ void DictionaryList::refillFromDictionary( sal_Int32 nTextConversionOptions ) if(aRightList.getLength()!=1) { - OSL_ASSERT("The Chinese Translation Dictionary should have exactly one Mapping for each term."); + OSL_FAIL("The Chinese Translation Dictionary should have exactly one Mapping for each term."); continue; } @@ -495,7 +492,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); - Any aAny( aLngCfg.GetProperty( rtl::OUString::createFromAscii( UPN_IS_REVERSE_MAPPING ) ) ); + Any aAny( aLngCfg.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )) ) ); if( aAny >>= bValue ) m_aCB_Reverse.Check( bValue ); @@ -514,7 +511,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) { Reference< linguistic2::XConversionDictionaryList > xDictionaryList( m_xFactory->createInstanceWithContext( - rtl::OUString::createFromAscii("com.sun.star.linguistic2.ConversionDictionaryList") + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ConversionDictionaryList")) , m_xContext), uno::UNO_QUERY); if( xDictionaryList.is() ) { @@ -523,17 +520,17 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) { try { - rtl::OUString aNameTo_Simplified( rtl::OUString::createFromAscii("ChineseT2S") ); - rtl::OUString aNameTo_Traditional( rtl::OUString::createFromAscii("ChineseS2T") ); + rtl::OUString aNameTo_Simplified( RTL_CONSTASCII_USTRINGPARAM("ChineseT2S") ); + rtl::OUString aNameTo_Traditional( RTL_CONSTASCII_USTRINGPARAM("ChineseS2T") ); lang::Locale aLocale; - aLocale.Language = rtl::OUString::createFromAscii("zh"); + aLocale.Language = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("zh") ); if( xContainer->hasByName( aNameTo_Simplified ) ) xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >( xContainer->getByName( aNameTo_Simplified ), UNO_QUERY ); else { - aLocale.Country = rtl::OUString::createFromAscii("TW"); + aLocale.Country = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TW") ); xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >( xDictionaryList->addNewDictionary( aNameTo_Simplified , aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE @@ -548,7 +545,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) xContainer->getByName( aNameTo_Traditional ), UNO_QUERY ); else { - aLocale.Country = rtl::OUString::createFromAscii("CN"); + aLocale.Country = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CN") ); xDictionary_To_Traditional = Reference< linguistic2::XConversionDictionary >( xDictionaryList->addNewDictionary( aNameTo_Traditional , aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE @@ -853,7 +850,7 @@ short ChineseDictionaryDialog::Execute() SvtLinguConfig aLngCfg; Any aAny; aAny <<= sal_Bool( !!m_aCB_Reverse.IsChecked() ); - aLngCfg.SetProperty( rtl::OUString::createFromAscii( UPN_IS_REVERSE_MAPPING ), aAny ); + aLngCfg.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )), aAny ); m_aCT_DictionaryToSimplified.save(); m_aCT_DictionaryToTraditional.save(); @@ -893,3 +890,5 @@ IMPL_LINK( ChineseDictionaryDialog, HeaderBarClick, void*, EMPTYARG ) //............................................................................. } //end namespace //............................................................................. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc index 5c4c8e2bf049..5c4c8e2bf049 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 31b77aa32f04..892d5b793620 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ // header for class FixedLine #include <vcl/fixed.hxx> // header for class RadioButton -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif // header for class Edit #include <vcl/edit.hxx> // header for class ListBox @@ -199,3 +198,5 @@ private: } //end namespace //............................................................................. #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc index 4545ef26fc5b..4545ef26fc5b 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc index e2b67ab7df9f..e2b67ab7df9f 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index 68a5b59974fc..dbc47e20aebb 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,7 +32,7 @@ #include "chinese_translation_unodialog.hxx" #include "chinese_translationdialog.hxx" #include <osl/mutex.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> // header for class Application #include <vcl/svapp.hxx> #include <toolkit/awt/vclxwindow.hxx> @@ -51,8 +52,8 @@ namespace textconversiondlgs //............................................................................. using namespace ::com::sun::star; -#define SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.linguistic2.ChineseTranslationDialog") -#define SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.linguistic2.ChineseTranslationDialog") +#define SERVICE_IMPLEMENTATION_NAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.linguistic2.ChineseTranslationDialog")) +#define SERVICE_NAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ChineseTranslationDialog")) #define C2U(cChar) rtl::OUString::createFromAscii(cChar) @@ -69,7 +70,7 @@ ChineseTranslation_UnoDialog::ChineseTranslation_UnoDialog( const uno::Reference ChineseTranslation_UnoDialog::~ChineseTranslation_UnoDialog() { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; impl_DeleteDialog(); } @@ -131,7 +132,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::setTitle( const ::rtl::OUString& ) t //------------------------------------------------------------------------- void SAL_CALL ChineseTranslation_UnoDialog::initialize( const uno::Sequence< uno::Any >& aArguments ) throw(uno::Exception, uno::RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; if( m_bDisposed || m_bInDispose ) return; @@ -154,7 +155,7 @@ sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute() throw(uno::RuntimeExc { sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL; { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; if( m_bDisposed || m_bInDispose ) return nRet; @@ -186,7 +187,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::dispose() throw (uno::RuntimeExcepti { lang::EventObject aEvt; { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; if( m_bDisposed || m_bInDispose ) return; m_bInDispose = true; @@ -203,7 +204,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::dispose() throw (uno::RuntimeExcepti void SAL_CALL ChineseTranslation_UnoDialog::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) throw (uno::RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; if( m_bDisposed || m_bInDispose ) return; m_aDisposeEventListeners.addInterface( xListener ); @@ -211,7 +212,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::addEventListener( const uno::Referen void SAL_CALL ChineseTranslation_UnoDialog::removeEventListener( const uno::Reference< lang::XEventListener > & xListener ) throw (uno::RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; if( m_bDisposed || m_bInDispose ) return; m_aDisposeEventListeners.removeInterface( xListener ); @@ -238,7 +239,7 @@ uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const ::rtl::O sal_Bool bTranslateCommonTerms = sal_False; { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; if( m_bDisposed || m_bInDispose || !m_pDialog ) return aRet; m_pDialog->getSettings( bDirectionToSimplified, bUseCharacterVariants, bTranslateCommonTerms ); @@ -283,3 +284,5 @@ void SAL_CALL ChineseTranslation_UnoDialog::removeVetoableChangeListener( const //............................................................................. } //end namespace //............................................................................. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index f6811c4e0160..21988292a2e2 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,3 +142,5 @@ private: } //end namespace //............................................................................. #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index 7888884b6d78..250b660cacec 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,9 +39,7 @@ // header for class SvtLinguConfigItem #include <unotools/lingucfg.hxx> #include <unotools/linguprops.hxx> -#ifndef _SVX_HELPID_HRC #include "helpid.hrc" -#endif //disable compiler warning C4355: 'this' : used in base member initializer list #ifdef _MSC_VER @@ -78,18 +77,18 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent ) SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); - Any aAny( aLngCfg.GetProperty( rtl::OUString::createFromAscii( UPN_IS_DIRECTION_TO_SIMPLIFIED ) ) ); + Any aAny( aLngCfg.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_DIRECTION_TO_SIMPLIFIED )) ) ); aAny >>= bValue; if( bValue ) m_aRB_To_Simplified.Check(); else m_aRB_To_Traditional.Check(); - aAny = aLngCfg.GetProperty( rtl::OUString::createFromAscii( UPN_IS_USE_CHARACTER_VARIANTS ) ); + aAny = aLngCfg.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_USE_CHARACTER_VARIANTS )) ); if( aAny >>= bValue ) m_aCB_Use_Variants.Check( bValue ); - // #117820# (search for other occurences!) + // #117820# (search for other occurrences!) // disable and hide that checkbox until it is decided if it is needed or not. // If it is to be removed later the respective code needs to be removed as // well, otherwise we just have to remove the next lines again. @@ -97,7 +96,7 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent ) m_aCB_Use_Variants.Enable( sal_False ); m_aCB_Use_Variants.Show( sal_False ); - aAny = aLngCfg.GetProperty( rtl::OUString::createFromAscii( UPN_IS_TRANSLATE_COMMON_TERMS ) ); + aAny = aLngCfg.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_TRANSLATE_COMMON_TERMS )) ); if( aAny >>= bValue ) m_aCB_Translate_Commonterms.Check( bValue ); @@ -131,7 +130,7 @@ void ChineseTranslationDialog::getSettings( sal_Bool& rbDirectionToSimplified void ChineseTranslationDialog::impl_UpdateVariantsCheckBox() { -// #117820# (search for other occurences!) +// #117820# (search for other occurrences!) // m_aCB_Use_Variants.Enable( m_aRB_To_Traditional.IsChecked() ); } @@ -143,7 +142,7 @@ IMPL_LINK( ChineseTranslationDialog, DirectionHdl, void*, EMPTYARG ) IMPL_LINK( ChineseTranslationDialog, CommonTermsHdl, void*, EMPTYARG ) { -// #117820# (search for other occurences!) +// #117820# (search for other occurrences!) // if( m_aCB_Translate_Commonterms.IsChecked() && m_aRB_To_Traditional.IsChecked() ) // m_aCB_Use_Variants.Check( true ); return 0; @@ -155,11 +154,11 @@ IMPL_LINK( ChineseTranslationDialog, OkHdl, void*, EMPTYARG ) SvtLinguConfig aLngCfg; Any aAny; aAny <<= sal_Bool( !!m_aRB_To_Simplified.IsChecked() ); - aLngCfg.SetProperty( rtl::OUString::createFromAscii( UPN_IS_DIRECTION_TO_SIMPLIFIED ), aAny ); + aLngCfg.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_DIRECTION_TO_SIMPLIFIED )), aAny ); aAny <<= sal_Bool( !!m_aCB_Use_Variants.IsChecked() ); - aLngCfg.SetProperty( rtl::OUString::createFromAscii( UPN_IS_USE_CHARACTER_VARIANTS ), aAny ); + aLngCfg.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_USE_CHARACTER_VARIANTS )), aAny ); aAny <<= sal_Bool( !!m_aCB_Translate_Commonterms.IsChecked() ); - aLngCfg.SetProperty( rtl::OUString::createFromAscii( UPN_IS_TRANSLATE_COMMON_TERMS ), aAny ); + aLngCfg.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_TRANSLATE_COMMON_TERMS )), aAny ); EndDialog( RET_OK ); return 0; @@ -199,3 +198,5 @@ IMPL_LINK( ChineseTranslationDialog, DictionaryHdl, void*, EMPTYARG ) //............................................................................. } //end namespace //............................................................................. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc index f7607cf087dd..f7607cf087dd 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx index 9d046d120e68..44c97f666f5b 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ // header for class FixedLine #include <vcl/fixed.hxx> // header for class RadioButton -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif //............................................................................. namespace textconversiondlgs @@ -88,3 +87,5 @@ private: } //end namespace //............................................................................. #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/resid.cxx b/svx/source/unodialogs/textconversiondlgs/resid.cxx index 43a5acc043f6..6a3b1ed3b95e 100644 --- a/svx/source/unodialogs/textconversiondlgs/resid.cxx +++ b/svx/source/unodialogs/textconversiondlgs/resid.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,3 +51,5 @@ TextConversionDlgs_ResId::TextConversionDlgs_ResId(sal_uInt16 nId) //............................................................................. } //end namespace //............................................................................. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/resid.hxx b/svx/source/unodialogs/textconversiondlgs/resid.hxx index d2891870a649..17c4ce341008 100644 --- a/svx/source/unodialogs/textconversiondlgs/resid.hxx +++ b/svx/source/unodialogs/textconversiondlgs/resid.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ class TextConversionDlgs_ResId : public ResId } //end namespace //............................................................................. #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/resids.hrc b/svx/source/unodialogs/textconversiondlgs/resids.hrc index 0c2e3965295d..0c2e3965295d 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/resids.hrc +++ b/svx/source/unodialogs/textconversiondlgs/resids.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx index e0e8a8effb7f..330a069140c2 100644 --- a/svx/source/unodialogs/textconversiondlgs/services.cxx +++ b/svx/source/unodialogs/textconversiondlgs/services.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( } } //========================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index eb9a7cb8128f..cb8ba42fc04f 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,7 +30,7 @@ #include "precompiled_svx.hxx" #include <vector> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/frame/XModel.hpp> @@ -85,7 +86,6 @@ using namespace ::comphelper; using namespace ::osl; -using namespace ::vos; using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star; @@ -1000,24 +1000,24 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( NULL == mpUnoPage ) return sal_False; - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); - - if( NULL == pFilter || NULL == mpUnoPage->GetSdrPage() || NULL == mpDoc ) + if( NULL == mpUnoPage->GetSdrPage() || NULL == mpDoc ) return sal_False; + GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); + // get the arguments from the descriptor ExportSettings aSettings( mpDoc ); ParseSettings( aDescriptor, aSettings ); const sal_uInt16 nFilter = aSettings.maMediaType.getLength() - ? pFilter->GetExportFormatNumberForMediaType( aSettings.maMediaType ) - : pFilter->GetExportFormatNumberForShortName( aSettings.maFilterName ); - sal_Bool bVectorType = !pFilter->IsExportPixelFormat( nFilter ); + ? rFilter.GetExportFormatNumberForMediaType( aSettings.maMediaType ) + : rFilter.GetExportFormatNumberForShortName( aSettings.maFilterName ); + sal_Bool bVectorType = !rFilter.IsExportPixelFormat( nFilter ); // create the output stuff Graphic aGraphic; @@ -1046,7 +1046,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes // SvOutputStream, or adapt the graphic filter to not seek anymore. SvMemoryStream aStream( 1024, 1024 ); - nStatus = pFilter->ExportGraphic( aGraphic, String(), aStream, nFilter, &aSettings.maFilterData ); + nStatus = rFilter.ExportGraphic( aGraphic, String(), aStream, nFilter, &aSettings.maFilterData ); // copy temp stream to XOutputStream SvOutputStream aOutputStream( aSettings.mxOutputStream ); @@ -1058,7 +1058,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes INetURLObject aURLObject( aSettings.maURL.Complete ); DBG_ASSERT( aURLObject.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); - nStatus = XOutBitmap::ExportGraphic( aGraphic, aURLObject, *pFilter, nFilter, &aSettings.maFilterData ); + nStatus = XOutBitmap::ExportGraphic( aGraphic, aURLObject, rFilter, nFilter, &aSettings.maFilterData ); } } } @@ -1089,7 +1089,7 @@ void SAL_CALL GraphicExporter::cancel() void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XComponent >& xComponent ) throw(IllegalArgumentException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; mxShapes = NULL; mpUnoPage = NULL; @@ -1223,12 +1223,12 @@ sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& MimeTypeNam { const String aMimeTypeName( MimeTypeName ); - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); - sal_uInt16 nCount = pFilter->GetExportFormatCount(); + GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); + sal_uInt16 nCount = rFilter.GetExportFormatCount(); sal_uInt16 nFilter; for( nFilter = 0; nFilter < nCount; nFilter++ ) { - if( aMimeTypeName.Equals( pFilter->GetExportFormatMediaType( nFilter ) ) ) + if( aMimeTypeName.Equals( rFilter.GetExportFormatMediaType( nFilter ) ) ) { return sal_True; } @@ -1239,8 +1239,8 @@ sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& MimeTypeNam Sequence< OUString > SAL_CALL GraphicExporter::getSupportedMimeTypeNames( ) throw (RuntimeException) { - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); - sal_uInt16 nCount = pFilter->GetExportFormatCount(); + GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); + sal_uInt16 nCount = rFilter.GetExportFormatCount(); sal_uInt16 nFilter; sal_uInt16 nFound = 0; @@ -1249,7 +1249,7 @@ Sequence< OUString > SAL_CALL GraphicExporter::getSupportedMimeTypeNames( ) thr for( nFilter = 0; nFilter < nCount; nFilter++ ) { - OUString aMimeType( pFilter->GetExportFormatMediaType( nFilter ) ); + OUString aMimeType( rFilter.GetExportFormatMediaType( nFilter ) ); if( aMimeType.getLength() ) { *pStr++ = aMimeType; @@ -1276,8 +1276,9 @@ Graphic SvxGetGraphicForShape( SdrObject& rShape, bool bVector ) } catch( Exception& ) { - DBG_ERROR("SvxGetGraphicForShape(), exception caught!"); + OSL_FAIL("SvxGetGraphicForShape(), exception caught!"); } return aGraphic; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/UnoGraphicExporter.hxx b/svx/source/unodraw/UnoGraphicExporter.hxx index ebf0ac7a7a9c..8176ffe2be32 100644 --- a/svx/source/unodraw/UnoGraphicExporter.hxx +++ b/svx/source/unodraw/UnoGraphicExporter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,5 @@ namespace svx } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index 69ee2502c27d..b6bc05b066ca 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,7 +37,7 @@ #include <svx/svdmodel.hxx> #include "UnoNameItemTable.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include "svx/unoapi.hxx" @@ -44,7 +45,6 @@ using namespace ::com::sun::star; using namespace ::rtl; using namespace ::cppu; -using namespace ::vos; SvxUnoNameItemTable::SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw() : mpModel( pModel ), @@ -116,7 +116,7 @@ void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, cons void SAL_CALL SvxUnoNameItemTable::insertByName( const OUString& aApiName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( hasByName( aApiName ) ) throw container::ElementExistException(); @@ -132,7 +132,7 @@ void SAL_CALL SvxUnoNameItemTable::insertByName( const OUString& aApiName, const void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // a little quickfix for 2.0 to let applications clear api // created items that are not used @@ -160,7 +160,7 @@ void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName ) maItemSetVector.erase( aIter ); return; } - aIter++; + ++aIter; } if( !hasByName( Name ) ) @@ -171,7 +171,7 @@ void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName ) void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; String aName; SvxUnogetInternalNameForItem( mnWhich, aApiName, aName ); @@ -195,7 +195,7 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons (*aIter)->Put( *pNewItem ); return; } - aIter++; + ++aIter; } // if it is not in our own sets, modify the pool! @@ -227,7 +227,7 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons uno::Any SAL_CALL SvxUnoNameItemTable::getByName( const OUString& aApiName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; String aName; SvxUnogetInternalNameForItem( mnWhich, aApiName, aName ); @@ -259,7 +259,7 @@ uno::Any SAL_CALL SvxUnoNameItemTable::getByName( const OUString& aApiName ) uno::Sequence< OUString > SAL_CALL SvxUnoNameItemTable::getElementNames( ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; std::set< OUString, comphelper::UStringLess > aNameSet; @@ -296,7 +296,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoNameItemTable::getElementNames( ) sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; String aName; SvxUnogetInternalNameForItem( mnWhich, aApiName, aName ); @@ -323,7 +323,7 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName ) sal_Bool SAL_CALL SvxUnoNameItemTable::hasElements( ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; const NameOrIndex *pItem; @@ -339,3 +339,5 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::hasElements( ) return sal_False; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx index 995b58fb0cc0..1d314ab56025 100644 --- a/svx/source/unodraw/UnoNameItemTable.hxx +++ b/svx/source/unodraw/UnoNameItemTable.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,5 @@ public: }; #endif // _SVX_UNONAMEITEMTABLE_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index c504a46f29f3..fc401c68c8a8 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,9 +35,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#ifndef _CPPUHELPER_IMPLBASE3_HXX_ #include <cppuhelper/implbase2.hxx> -#endif #include <osl/diagnose.h> #include <osl/mutex.hxx> #include <comphelper/stl_types.hxx> @@ -312,3 +311,5 @@ Sequence< ::rtl::OUString > SAL_CALL NamespaceMap::getSupportedServiceNames( ) { return NamespaceMap_getSupportedServiceNames(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 4a54b30c6caa..65dd6f4a0bb0 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,7 +36,7 @@ #include <com/sun/star/drawing/Hatch.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <cppuhelper/implbase2.hxx> @@ -49,7 +50,6 @@ using namespace com::sun::star; using namespace ::cppu; using namespace ::rtl; -using namespace ::vos; class SvxUnoXPropertyTable : public WeakImplHelper2< container::XNameContainer, lang::XServiceInfo > { @@ -133,7 +133,7 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::supportsService( const OUString& Servic void SAL_CALL SvxUnoXPropertyTable::insertByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( NULL == mpList && NULL == mpTable ) throw lang::IllegalArgumentException(); @@ -157,7 +157,7 @@ void SAL_CALL SvxUnoXPropertyTable::insertByName( const OUString& aName, const void SAL_CALL SvxUnoXPropertyTable::removeByName( const OUString& Name ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; String aInternalName; SvxUnogetInternalNameForItem( mnWhich, Name, aInternalName ); @@ -185,7 +185,7 @@ void SAL_CALL SvxUnoXPropertyTable::removeByName( const OUString& Name ) void SAL_CALL SvxUnoXPropertyTable::replaceByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; String aInternalName; SvxUnogetInternalNameForItem( mnWhich, aName, aInternalName ); @@ -217,7 +217,7 @@ void SAL_CALL SvxUnoXPropertyTable::replaceByName( const OUString& aName, const uno::Any SAL_CALL SvxUnoXPropertyTable::getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; String aInternalName; SvxUnogetInternalNameForItem( mnWhich, aName, aInternalName ); @@ -239,7 +239,7 @@ uno::Any SAL_CALL SvxUnoXPropertyTable::getByName( const OUString& aName ) uno::Sequence< OUString > SAL_CALL SvxUnoXPropertyTable::getElementNames() throw( uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; const long nCount = getCount(); uno::Sequence< OUString > aNames( nCount ); @@ -263,7 +263,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXPropertyTable::getElementNames() sal_Bool SAL_CALL SvxUnoXPropertyTable::hasByName( const OUString& aName ) throw( uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; String aInternalName; SvxUnogetInternalNameForItem( mnWhich, aName, aInternalName ); @@ -285,7 +285,7 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasByName( const OUString& aName ) sal_Bool SAL_CALL SvxUnoXPropertyTable::hasElements( ) throw( uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return getCount() != 0; } @@ -741,3 +741,5 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames uno::Sequence< OUString > aServices( &aServiceName, 1 ); return aServices; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx index ab09bbfb475b..8934552e6410 100644 --- a/svx/source/unodraw/gluepts.cxx +++ b/svx/source/unodraw/gluepts.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include "precompiled_svx.hxx" #include <com/sun/star/container/XIdentifierContainer.hpp> #include <com/sun/star/container/XIndexContainer.hpp> -#ifndef _COM_SUN_STAR_DRAWING_GLUEPOINT2_HDL_ #include <com/sun/star/drawing/GluePoint2.hpp> -#endif #include <cppuhelper/implbase2.hxx> @@ -546,3 +545,5 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoGluePointAccess_createInstance( { return *new SvxUnoGluePointAccess(pObject); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index a945105a5eba..00c89833d7f0 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,11 +42,13 @@ #include <vcl/svapp.hxx> +#include <boost/scoped_ptr.hpp> + //=============================================== // const -#define IMPLEMENTATIONNAME_RECOVERYUI ::rtl::OUString::createFromAscii("com.sun.star.comp.svx.RecoveryUI") -#define SERVICENAME_RECOVERYUI ::rtl::OUString::createFromAscii("com.sun.star.dialog.RecoveryUI") +#define IMPLEMENTATIONNAME_RECOVERYUI ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svx.RecoveryUI")) +#define SERVICENAME_RECOVERYUI ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.dialog.RecoveryUI")) //=============================================== // namespace @@ -109,7 +112,7 @@ css::uno::Any SAL_CALL RecoveryUI::dispatchWithReturnValue(const css::util::URL& { // Internaly we use VCL ... every call into vcl based code must // be guarded by locking the global solar mutex. - ::vos::OGuard aSolarLock(&Application::GetSolarMutex()); + ::SolarMutexGuard aSolarLock; css::uno::Any aRet; RecoveryUI::EJob eJob = impl_classifyJob(aURL); @@ -152,7 +155,7 @@ void SAL_CALL RecoveryUI::dispatch(const css::util::URL& void SAL_CALL RecoveryUI::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL& ) throw(css::uno::RuntimeException) { // TODO - OSL_ENSURE(sal_False, "RecoveryUI::addStatusListener()\nNot implemented yet!"); + OSL_FAIL("RecoveryUI::addStatusListener()\nNot implemented yet!"); } //=============================================== @@ -160,7 +163,7 @@ void SAL_CALL RecoveryUI::removeStatusListener(const css::uno::Reference< css::f throw(css::uno::RuntimeException) { // TODO - OSL_ENSURE(sal_False, "RecoveryUI::removeStatusListener()\nNot implemented yet!"); + OSL_FAIL("RecoveryUI::removeStatusListener()\nNot implemented yet!"); } //=============================================== @@ -189,24 +192,24 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL RecoveryUI::st_createInstan static OUString GetCrashConfigDir() { -#if defined(WNT) || defined(OS2) - OUString ustrValue = OUString::createFromAscii("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"); +#if defined(WNT) + OUString ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}")); #elif defined(MACOSX) - OUString ustrValue = OUString::createFromAscii("~"); + OUString ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("~")); #else - OUString ustrValue = OUString::createFromAscii("$SYSUSERCONFIG"); + OUString ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSUSERCONFIG")); #endif Bootstrap::expandMacros( ustrValue ); -#if defined(WNT) || defined(OS2) - ustrValue += OUString::createFromAscii("/user/crashdata"); +#if defined(WNT) + ustrValue += OUString(RTL_CONSTASCII_USTRINGPARAM("/user/crashdata")); #endif return ustrValue; } //=============================================== -#if defined(WNT) || defined(OS2) +#if defined(WNT) #define LCKFILE "crashdat.lck" #else #define LCKFILE ".crash_report_unsent" @@ -230,7 +233,7 @@ static bool new_crash_pending() OUString aUnsentURL = GetUnsentURL(); File aFile( aUnsentURL ); - if ( FileBase::E_None == aFile.open( OpenFlag_Read ) ) + if ( FileBase::E_None == aFile.open( osl_File_OpenFlag_Read ) ) { aFile.close(); return true; @@ -311,29 +314,28 @@ void RecoveryUI::impl_doRecovery() // create all needed dialogs for this operation // and bind it to the used core service - svxdr::TabDialog4Recovery* pWizard = new svxdr::TabDialog4Recovery (m_pParentWindow); - svxdr::IExtendedTabPage* pPage1 = new svxdr::RecoveryDialog (pWizard, pCore ); + boost::scoped_ptr<svxdr::TabDialog4Recovery> xWizard(new svxdr::TabDialog4Recovery(m_pParentWindow)); + svxdr::IExtendedTabPage* pPage1 = new svxdr::RecoveryDialog(xWizard.get(), pCore ); svxdr::IExtendedTabPage* pPage2 = 0; svxdr::IExtendedTabPage* pPage3 = 0; - pWizard->addTabPage(pPage1); + xWizard->addTabPage(pPage1); if ( !bRecoveryOnly && new_crash_pending() ) { - pPage2 = new svxdr::ErrorRepWelcomeDialog(pWizard ); - pPage3 = new svxdr::ErrorRepSendDialog (pWizard ); - pWizard->addTabPage(pPage2); - pWizard->addTabPage(pPage3); + pPage2 = new svxdr::ErrorRepWelcomeDialog(xWizard.get()); + pPage3 = new svxdr::ErrorRepSendDialog(xWizard.get()); + xWizard->addTabPage(pPage2); + xWizard->addTabPage(pPage3); } // start the wizard - pWizard->Execute(); + xWizard->Execute(); impl_showAllRecoveredDocs(); delete pPage3 ; delete pPage2 ; delete pPage1 ; - delete pWizard; delete_pending_crash(); } @@ -397,3 +399,5 @@ void RecoveryUI::impl_showAllRecoveredDocs() } } // namespace svx + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx index d59d13e94795..abe386350154 100644 --- a/svx/source/unodraw/shapeimpl.hxx +++ b/svx/source/unodraw/shapeimpl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -124,6 +125,8 @@ public: virtual ~SvxTableShape() throw(); }; -#endif +SvxUnoPropertyMapProvider& getSvxMapProvider(); +#endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx index 408587d31822..e62df605910d 100644 --- a/svx/source/unodraw/shapepropertynotifier.cxx +++ b/svx/source/unodraw/shapepropertynotifier.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -38,7 +39,7 @@ #include <cppuhelper/weak.hxx> #include <tools/diagnose_ex.h> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace { @@ -75,7 +76,7 @@ namespace svx using ::com::sun::star::beans::XPropertySet; /** === end UNO using === **/ - typedef ::std::hash_map< ShapeProperty, PPropertyValueProvider, ShapePropertyHash > PropertyProviders; + typedef ::boost::unordered_map< ShapeProperty, PPropertyValueProvider, ShapePropertyHash > PropertyProviders; typedef ::cppu::OMultiTypeInterfaceContainerHelperVar < ::rtl::OUString , ::comphelper::UStringHash @@ -205,3 +206,5 @@ namespace svx //........................................................................ } // namespace svx //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index 9bedf71db64d..9bfcae7dacf9 100644 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,7 +48,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; SvxTableShape::SvxTableShape( SdrObject* pObj ) throw() -: SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_TABLE), aSvxMapProvider.GetPropertySet(SVXMAP_TABLE, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_TABLE), getSvxMapProvider().GetPropertySet(SVXMAP_TABLE, SdrObject::GetGlobalDrawObjectItemPool()) ) { SetShapeType( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TableShape" ) ) ); } @@ -192,3 +193,4 @@ void SvxTableShape::unlock() SvxShape::unlock(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index 793e9a6d858b..60d5664915a8 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -120,3 +121,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoBitmapTable_createInstance( Sdr return *new SvxUnoBitmapTable(pModel); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index 6b54a1458307..5f66007443a2 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -391,3 +392,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index 9c7637c4d5a9..088d8aa74772 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -106,3 +107,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDashTable_createInstance( SdrMo +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index bbb575a06410..2b9fe518bf8d 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoGradientTable_createInstance( S +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index 64fbdae052a0..9e647fb88b7b 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoHatchTable_createInstance( SdrM +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unomlstr.cxx b/svx/source/unodraw/unomlstr.cxx index 2519a2c36d1c..6a9ac061bb15 100644 --- a/svx/source/unodraw/unomlstr.cxx +++ b/svx/source/unodraw/unomlstr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/svdobj.hxx> // header for class OGuard -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> // header for class Application #include <vcl/svapp.hxx> @@ -49,7 +50,7 @@ SvxUnoShapeModifyListener::~SvxUnoShapeModifyListener() throw() // ::com::sun::star::util::XModifyListener void SAL_CALL SvxUnoShapeModifyListener::modified(const lang::EventObject& ) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( mpObj ) { mpObj->SetChanged(); @@ -70,3 +71,4 @@ void SvxUnoShapeModifyListener::invalidate() throw() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 016128488ab4..d0e2475ac41f 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,12 +33,12 @@ #include <com/sun/star/lang/ServiceNotRegisteredException.hpp> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/drawing/XShape.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#include <tools/list.hxx> #include <svl/itemprop.hxx> #include <svtools/unoevent.hxx> #include <comphelper/sequence.hxx> +#include <comphelper/servicehelper.hxx> #include <comphelper/serviceinfohelper.hxx> #include <cppuhelper/implbase2.hxx> @@ -62,13 +63,10 @@ #include <svx/svdpage.hxx> #include <svx/unoshape.hxx> -extern UHashMapEntry pSdrShapeIdentifierMap[]; - //-//////////////////////////////////////////////////////////////////// using namespace ::rtl; using namespace ::osl; -using namespace ::vos; using namespace ::com::sun::star; //-//////////////////////////////////////////////////////////////////// @@ -82,8 +80,6 @@ using namespace ::com::sun::star; //-//////////////////////////////////////////////////////////////////// -#ifndef SVX_LIGHT - class SvxUnoDrawPagesAccess : public ::cppu::WeakImplHelper2< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::lang::XServiceInfo > { private: @@ -110,10 +106,8 @@ public: virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; -#endif //-//////////////////////////////////////////////////////////////////// -#ifndef SVX_LIGHT const SvEventDescription* ImplGetSupportedMacroItems() { static const SvEventDescription aMacroDescriptionsImpl[] = @@ -125,7 +119,6 @@ const SvEventDescription* ImplGetSupportedMacroItems() return aMacroDescriptionsImpl; } -#endif //-//////////////////////////////////////////////////////////////////// @@ -185,14 +178,14 @@ sal_Bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* return sal_True; } -uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance( const OUString& ServiceSpecifier ) +uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance( const OUString& rServiceSpecifier ) throw( uno::Exception, uno::RuntimeException ) { const OUString aDrawingPrefix( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.") ); - if( ServiceSpecifier.compareTo( aDrawingPrefix, aDrawingPrefix.getLength() ) == 0 ) + if( rServiceSpecifier.compareTo( aDrawingPrefix, aDrawingPrefix.getLength() ) == 0 ) { - sal_uInt32 nType = aSdrShapeIdentifierMap.getId( ServiceSpecifier ); + sal_uInt32 nType = UHashMap::getId( rServiceSpecifier ); if( nType != UHASHMAP_NOTFOUND ) { sal_uInt16 nT = (sal_uInt16)(nType & ~E3D_INVENTOR_FLAG); @@ -202,7 +195,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance( } } - uno::Reference< uno::XInterface > xRet( createTextField( ServiceSpecifier ) ); + uno::Reference< uno::XInterface > xRet( createTextField( rServiceSpecifier ) ); if( !xRet.is() ) throw lang::ServiceNotRegisteredException(); @@ -223,28 +216,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstanceWi uno::Sequence< OUString > SAL_CALL SvxUnoDrawMSFactory::getAvailableServiceNames() throw( uno::RuntimeException ) { - UHashMapEntry* pMap = pSdrShapeIdentifierMap; - - sal_uInt32 nCount = 0; - while (pMap->aIdentifier.getLength()) - { - pMap++; - nCount++; - } - - uno::Sequence< OUString > aSeq( nCount ); - OUString* pStrings = aSeq.getArray(); - - pMap = pSdrShapeIdentifierMap; - sal_uInt32 nIdx = 0; - while(pMap->aIdentifier.getLength()) - { - pStrings[nIdx] = pMap->aIdentifier; - pMap++; - nIdx++; - } - - return aSeq; + return UHashMap::getServiceNames(); } uno::Sequence< OUString > SvxUnoDrawMSFactory::concatServiceNames( uno::Sequence< OUString >& rServices1, uno::Sequence< OUString >& rServices2 ) throw() @@ -271,8 +243,6 @@ uno::Sequence< OUString > SvxUnoDrawMSFactory::concatServiceNames( uno::Sequence } -#ifndef SVX_LIGHT - /// SvxUnoDrawingModel::SvxUnoDrawingModel( SdrModel* pDoc ) throw() : mpDoc( pDoc ) @@ -333,22 +303,21 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawingModel::getTypes( ) throw(uno:: return maTypeSequence; } +namespace +{ + class theSvxUnoDrawingModelImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxUnoDrawingModelImplementationId > {}; +} + uno::Sequence< sal_Int8 > SAL_CALL SvxUnoDrawingModel::getImplementationId( ) throw(uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId; - if( aId.getLength() == 0 ) - { - aId.realloc( 16 ); - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - } - return aId; + return theSvxUnoDrawingModelImplementationId::get().getSeq(); } void SAL_CALL SvxUnoDrawingModel::lockControllers( ) throw(uno::RuntimeException) { if( mpDoc ) - mpDoc->setLock( sal_True ); + mpDoc->setLock(true); } void SAL_CALL SvxUnoDrawingModel::unlockControllers( ) @@ -356,7 +325,7 @@ void SAL_CALL SvxUnoDrawingModel::unlockControllers( ) { if( mpDoc && mpDoc->isLocked() ) { - mpDoc->setLock( sal_False ); + mpDoc->setLock(false); } } @@ -370,7 +339,7 @@ sal_Bool SAL_CALL SvxUnoDrawingModel::hasControllersLocked( ) uno::Reference< drawing::XDrawPages > SAL_CALL SvxUnoDrawingModel::getDrawPages() throw(uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; uno::Reference< drawing::XDrawPages > xDrawPages( mxDrawPagesAccess ); @@ -384,7 +353,7 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SvxUnoDrawingModel::getDrawPages( uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( const OUString& aServiceSpecifier ) throw(uno::Exception, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( 0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DashTable") ) ) { @@ -623,7 +592,7 @@ SvxUnoDrawPagesAccess::~SvxUnoDrawPagesAccess() throw() sal_Int32 SAL_CALL SvxUnoDrawPagesAccess::getCount() throw(uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; sal_Int32 nCount = 0; @@ -636,7 +605,7 @@ sal_Int32 SAL_CALL SvxUnoDrawPagesAccess::getCount() uno::Any SAL_CALL SvxUnoDrawPagesAccess::getByIndex( sal_Int32 Index ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; uno::Any aAny; @@ -688,7 +657,7 @@ sal_Bool SAL_CALL SvxUnoDrawPagesAccess::hasElements() uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex ) throw(uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; uno::Reference< drawing::XDrawPage > xDrawPage; @@ -711,7 +680,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewBy void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage ) throw(uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; sal_uInt16 nPageCount = mrModel.mpDoc->GetPageCount(); if( nPageCount > 1 ) @@ -775,4 +744,4 @@ com::sun::star::uno::Reference< com::sun::star::container::XIndexReplace > SvxCr /////////////////////////////////////////////////////////////////////// -#endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index a46b535a9baf..4c338f202cb6 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,7 +47,7 @@ #include <svx/xflhtit.hxx> #include <vector> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> @@ -57,7 +58,6 @@ using namespace ::com::sun::star; using namespace ::rtl; using namespace ::cppu; -using namespace ::vos; typedef std::vector< SfxItemSet* > ItemPoolVector; @@ -187,7 +187,7 @@ void SAL_CALL SvxUnoMarkerTable::ImplInsertByName( const OUString& aName, const void SAL_CALL SvxUnoMarkerTable::insertByName( const OUString& aApiName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( hasByName( aApiName ) ) throw container::ElementExistException(); @@ -201,7 +201,7 @@ void SAL_CALL SvxUnoMarkerTable::insertByName( const OUString& aApiName, const u void SAL_CALL SvxUnoMarkerTable::removeByName( const OUString& aApiName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // a little quickfix for 2.0 to let applications clear api // created items that are not used @@ -229,7 +229,7 @@ void SAL_CALL SvxUnoMarkerTable::removeByName( const OUString& aApiName ) maItemSetVector.erase( aIter ); return; } - aIter++; + ++aIter; } if( !hasByName( Name ) ) @@ -240,7 +240,7 @@ void SAL_CALL SvxUnoMarkerTable::removeByName( const OUString& aApiName ) void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; String aName; SvxUnogetInternalNameForItem( XATTR_LINEEND, aApiName, aName ); @@ -270,7 +270,7 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const (*aIter)->Put( aStartMarker, XATTR_LINESTART ); return; } - aIter++; + ++aIter; } // if it is not in our own sets, modify the pool! @@ -329,7 +329,7 @@ static sal_Bool getByNameFromPool( const String& rSearchName, SfxItemPool* pPool uno::Any SAL_CALL SvxUnoMarkerTable::getByName( const OUString& aApiName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; String aName; SvxUnogetInternalNameForItem( XATTR_LINEEND, aApiName, aName ); @@ -378,7 +378,7 @@ static void createNamesForPool( SfxItemPool* pPool, sal_uInt16 nWhich, std::set< uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getElementNames() throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; std::set< OUString, comphelper::UStringLess > aNameSet; @@ -405,7 +405,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getElementNames() sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( aName.getLength() == 0 ) return sal_False; @@ -446,7 +446,7 @@ uno::Type SAL_CALL SvxUnoMarkerTable::getElementType( ) sal_Bool SAL_CALL SvxUnoMarkerTable::hasElements( ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; NameOrIndex *pItem; @@ -480,3 +480,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoMarkerTable_createInstance( Sdr +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 3602158722a9..2b0298b26b74 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,13 +32,12 @@ #define _SVX_USE_UNOGLOBALS_ #include <com/sun/star/document/EventObject.hpp> #include <com/sun/star/lang/DisposedException.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <osl/mutex.hxx> #include <sfx2/dispatch.hxx> #include <sot/clsids.hxx> #include <comphelper/serviceinfohelper.hxx> -#include <rtl/uuid.h> #include <rtl/memory.h> #include <sfx2/objsh.hxx> #include <svx/svdpool.hxx> @@ -61,7 +61,6 @@ #include <tools/diagnose_ex.h> using ::rtl::OUString; -using namespace ::vos; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -72,13 +71,6 @@ using namespace ::com::sun::star::drawing; #define INTERFACE_TYPE( xint ) \ ::getCppuType((const Reference< xint >*)0) -#define QUERYINT( xint ) \ - if( rType == ::getCppuType((const Reference< xint >*)0) ) \ - aAny <<= Reference< xint >(this) - -DECLARE_LIST( SvxDrawPageList, SvxDrawPage * ) - - /********************************************************************** * class SvxDrawPage * **********************************************************************/ @@ -196,7 +188,7 @@ void SvxDrawPage::disposing() throw() void SvxDrawPage::dispose() throw(::com::sun::star::uno::RuntimeException) { - OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; // An frequently programming error is to release the last // reference to this object in the disposing message. @@ -253,7 +245,7 @@ void SvxDrawPage::dispose() void SAL_CALL SvxDrawPage::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( mpModel == 0 ) throw lang::DisposedException(); @@ -265,7 +257,7 @@ void SAL_CALL SvxDrawPage::addEventListener( const ::com::sun::star::uno::Refere void SAL_CALL SvxDrawPage::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( mpModel == 0 ) throw lang::DisposedException(); @@ -305,7 +297,7 @@ void SvxDrawPage::Notify( SfxBroadcaster&, const SfxHint& /*rHint*/ ) void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( ( mpModel == NULL ) || ( mpPage == NULL ) ) throw lang::DisposedException(); @@ -338,7 +330,7 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( (mpModel == 0) || (mpPage == 0) ) throw lang::DisposedException(); @@ -375,7 +367,7 @@ void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape ) sal_Int32 SAL_CALL SvxDrawPage::getCount() throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( (mpModel == 0) || (mpPage == 0) ) throw lang::DisposedException(); @@ -387,7 +379,7 @@ sal_Int32 SAL_CALL SvxDrawPage::getCount() uno::Any SAL_CALL SvxDrawPage::getByIndex( sal_Int32 Index ) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( (mpModel == 0) || (mpPage == 0) ) throw lang::DisposedException(); @@ -418,7 +410,7 @@ uno::Type SAL_CALL SvxDrawPage::getElementType() sal_Bool SAL_CALL SvxDrawPage::hasElements() throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( (mpModel == 0) || (mpPage == 0) ) throw lang::DisposedException(); @@ -444,7 +436,7 @@ namespace //---------------------------------------------------------------------- // ACHTUNG: _SelectObjectsInView selektiert die ::com::sun::star::drawing::Shapes nur in der angegebennen -// SdrPageView. Dies mu nicht die sichtbare SdrPageView sein. +// SdrPageView. Dies mu� nicht die sichtbare SdrPageView sein. //---------------------------------------------------------------------- void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aShapes, SdrPageView* pPageView ) throw () { @@ -468,7 +460,7 @@ void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aS //---------------------------------------------------------------------- // ACHTUNG: _SelectObjectInView selektiert das Shape *nur* in der angegebennen -// SdrPageView. Dies mu nicht die sichtbare SdrPageView sein. +// SdrPageView. Dies mu� nicht die sichtbare SdrPageView sein. //---------------------------------------------------------------------- void SvxDrawPage::_SelectObjectInView( const Reference< drawing::XShape > & xShape, SdrPageView* pPageView ) throw() { @@ -486,7 +478,7 @@ void SvxDrawPage::_SelectObjectInView( const Reference< drawing::XShape > & xSha Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference< drawing::XShapes >& xShapes ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( (mpModel == 0) || (mpPage == 0) ) throw lang::DisposedException(); @@ -525,7 +517,7 @@ Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference< void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGroup ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( (mpModel == 0) || (mpPage == 0) ) throw lang::DisposedException(); @@ -648,7 +640,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x //---------------------------------------------------------------------- void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const OUString& aName ) const throw() { - sal_uInt32 nTempType = aSdrShapeIdentifierMap.getId( aName ); + sal_uInt32 nTempType = UHashMap::getId( aName ); if( nTempType == UHASHMAP_NOTFOUND ) { @@ -828,7 +820,8 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 } if( pRet == NULL ) { - pRet = new SvxOle2Shape( pObj, aSvxMapProvider.GetMap(SVXMAP_OLE2), aSvxMapProvider.GetPropertySet(SVXMAP_OLE2, SdrObject::GetGlobalDrawObjectItemPool()) ); + SvxUnoPropertyMapProvider& rSvxMapProvider = getSvxMapProvider(); + pRet = new SvxOle2Shape( pObj, rSvxMapProvider.GetMap(SVXMAP_OLE2), rSvxMapProvider.GetPropertySet(SVXMAP_OLE2, SdrObject::GetGlobalDrawObjectItemPool()) ); } } break; @@ -842,7 +835,10 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 pRet = new SvxShapePolyPolygon( pObj , PolygonKind_PATHPLIN ); break; case OBJ_PAGE: - pRet = new SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_PAGE), aSvxMapProvider.GetPropertySet(SVXMAP_PAGE, SdrObject::GetGlobalDrawObjectItemPool()) ); + { + SvxUnoPropertyMapProvider& rSvxMapProvider = getSvxMapProvider(); + pRet = new SvxShape( pObj, rSvxMapProvider.GetMap(SVXMAP_PAGE), rSvxMapProvider.GetPropertySet(SVXMAP_PAGE, SdrObject::GetGlobalDrawObjectItemPool()) ); + } break; case OBJ_MEASURE: pRet = new SvxShapeDimensioning( pObj ); @@ -862,7 +858,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 pRet = new SvxTableShape( pObj ); break; default: // unbekanntes 2D-Objekt auf der Page - DBG_ERROR("Nicht implementierter Starone-Shape erzeugt! [CL]"); + OSL_FAIL("Nicht implementierter Starone-Shape erzeugt! [CL]"); pRet = new SvxShapeText( pObj ); break; } @@ -870,7 +866,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 } default: // Unbekannter Inventor { - DBG_ERROR("AW: Unknown Inventor in SvxDrawPage::_CreateShape()"); + OSL_FAIL("AW: Unknown Inventor in SvxDrawPage::_CreateShape()"); break; } } @@ -1004,3 +1000,5 @@ SdrPage* GetSdrPageFromXDrawPage( uno::Reference< drawing::XDrawPage > xDrawPage } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index fd682129b184..74e2235b1b8f 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,13 +29,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYSTATE_HDL_ #include <com/sun/star/beans/PropertyState.hpp> -#endif #include <comphelper/propertysetinfo.hxx> -#include <rtl/uuid.h> -#include <vos/mutex.hxx> +#include <comphelper/servicehelper.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include "svx/unopool.hxx" #include <svx/svdmodel.hxx> @@ -208,7 +207,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn void SvxUnoDrawPool::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SfxItemPool* pPool = getModelPool( sal_False ); @@ -223,7 +222,7 @@ void SvxUnoDrawPool::_setPropertyValues( const comphelper::PropertyMapEntry** pp void SvxUnoDrawPool::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValue ) throw(beans::UnknownPropertyException, lang::WrappedTargetException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SfxItemPool* pPool = getModelPool( sal_True ); @@ -238,7 +237,7 @@ void SvxUnoDrawPool::_getPropertyValues( const comphelper::PropertyMapEntry** pp void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** ppEntries, beans::PropertyState* pStates ) throw(beans::UnknownPropertyException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SfxItemPool* pPool = getModelPool( sal_True ); @@ -301,7 +300,7 @@ void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** pp void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry* pEntry ) throw(beans::UnknownPropertyException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SfxItemPool* pPool = getModelPool( sal_True ); @@ -320,7 +319,7 @@ void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry* uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry* pEntry ) throw(beans::UnknownPropertyException, lang::WrappedTargetException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // OD 13.10.2003 #i18732# - use method <GetPoolDefaultItem(..)> instead of // using probably incompatible item pool <mpDefaultsPool> @@ -388,18 +387,15 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawPool::getTypes() return aTypes; } +namespace +{ + class theSvxUnoDrawPoolImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxUnoDrawPoolImplementationId > {}; +} + uno::Sequence< sal_Int8 > SAL_CALL SvxUnoDrawPool::getImplementationId() throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); - - static uno::Sequence< sal_Int8 > aId; - if( aId.getLength() == 0 ) - { - aId.realloc( 16 ); - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - } - return aId; + return theSvxUnoDrawPoolImplementationId::get().getSeq(); } // XServiceInfo @@ -428,3 +424,5 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawPool::getSupportedServiceNames( ) aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults" )); return aSNS; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index a4abc4e23d88..b07eaa84206d 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" +#include <sal/macros.h> + #define _SVX_USE_UNOGLOBALS_ #include <com/sun/star/table/XTable.hpp> @@ -39,9 +42,10 @@ #include <com/sun/star/media/ZoomLevel.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <boost/unordered_map.hpp> #include <tools/fldunit.hxx> #include <tools/shl.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <comphelper/propertysetinfo.hxx> #include <svx/dialmgr.hxx> @@ -645,8 +649,8 @@ SfxItemPropertyMapEntry* ImplGetSvxControlShapePropertyMap() { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, // #i112587# - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN("Visible"), SDRATTR_OBJVISIBLE , &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , &::getBooleanCppuType(), 0, 0}, \ + { MAP_CHAR_LEN("Visible"), SDRATTR_OBJVISIBLE , &::getBooleanCppuType(), 0, 0}, \ {0,0,0,0,0,0} }; @@ -818,7 +822,6 @@ comphelper::PropertyMapEntry* ImplGetSvxDrawingDefaultsPropertyMap() return aSvxDrawingDefaultsPropertyMap_Impl; } -// OD 13.10.2003 #i18732# comphelper::PropertyMapEntry* ImplGetAdditionalWriterDrawingDefaultsPropertyMap() { static comphelper::PropertyMapEntry aSvxAdditionalDefaultsPropertyMap_Impl[] = @@ -831,107 +834,110 @@ comphelper::PropertyMapEntry* ImplGetAdditionalWriterDrawingDefaultsPropertyMap( return aSvxAdditionalDefaultsPropertyMap_Impl; } -// --------------------------------------------------------------------- - -SvxUnoPropertyMapProvider aSvxMapProvider; - -UHashMapEntry pSdrShapeIdentifierMap[] = -{ - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.RectangleShape"), OBJ_RECT ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.EllipseShape"), OBJ_CIRC ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ControlShape"), OBJ_UNO ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ConnectorShape"), OBJ_EDGE ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MeasureShape"), OBJ_MEASURE ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.LineShape"), OBJ_LINE ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.PolyPolygonShape"), OBJ_POLY ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.PolyLineShape"), OBJ_PLIN ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OpenBezierShape"), OBJ_PATHLINE ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ClosedBezierShape"), OBJ_PATHFILL ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OpenFreeHandShape"), OBJ_FREELINE ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ClosedFreeHandShape"), OBJ_FREEFILL ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.PolyPolygonPathShape"), OBJ_PATHPOLY ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.PolyLinePathShape"), OBJ_PATHPLIN ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.GraphicObjectShape"), OBJ_GRAF ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.GroupShape"), OBJ_GRUP ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TextShape"), OBJ_TEXT ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape"), OBJ_OLE2 ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.PageShape"), OBJ_PAGE ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.CaptionShape"), OBJ_CAPTION ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.FrameShape"), OBJ_FRAME ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.PluginShape"), OBJ_OLE2_PLUGIN ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.AppletShape"), OBJ_OLE2_APPLET ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.CustomShape"), OBJ_CUSTOMSHAPE ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MediaShape"), OBJ_MEDIA ), - - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DSceneObject"), E3D_POLYSCENE_ID | E3D_INVENTOR_FLAG ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DCubeObject"), E3D_CUBEOBJ_ID | E3D_INVENTOR_FLAG ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DSphereObject"), E3D_SPHEREOBJ_ID | E3D_INVENTOR_FLAG ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DLatheObject"), E3D_LATHEOBJ_ID | E3D_INVENTOR_FLAG ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DExtrudeObject"), E3D_EXTRUDEOBJ_ID | E3D_INVENTOR_FLAG ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DPolygonObject"), E3D_POLYGONOBJ_ID | E3D_INVENTOR_FLAG ), - UHashMapEntry (RTL_CONSTASCII_STRINGPARAM(""), 0 ) -}; - -// --------------------------------------------------------------------- - -UHashMap aSdrShapeIdentifierMap( pSdrShapeIdentifierMap ); - /*********************************************************************** * class UHashMap * ***********************************************************************/ -UHashMap::UHashMap( UHashMapEntry* pMap ) +typedef ::boost::unordered_map< rtl::OUString, sal_uInt32, rtl::OUStringHash > UHashMapImpl; + +namespace { + static const UHashMapImpl &GetUHashImpl() + { + static UHashMapImpl aImpl(63); + static bool bInited = false; + if (!bInited) { + struct { const char *name; sal_Int32 length; sal_uInt32 id; } aInit[] = { + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.RectangleShape"), OBJ_RECT }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.EllipseShape"), OBJ_CIRC }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ControlShape"), OBJ_UNO }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ConnectorShape"), OBJ_EDGE }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MeasureShape"), OBJ_MEASURE }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.LineShape"), OBJ_LINE }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.PolyPolygonShape"), OBJ_POLY }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.PolyLineShape"), OBJ_PLIN }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OpenBezierShape"), OBJ_PATHLINE }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ClosedBezierShape"), OBJ_PATHFILL }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OpenFreeHandShape"), OBJ_FREELINE }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ClosedFreeHandShape"), OBJ_FREEFILL }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.PolyPolygonPathShape"), OBJ_PATHPOLY }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.PolyLinePathShape"), OBJ_PATHPLIN }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.GraphicObjectShape"), OBJ_GRAF }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.GroupShape"), OBJ_GRUP }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TextShape"), OBJ_TEXT }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape"), OBJ_OLE2 }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.PageShape"), OBJ_PAGE }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.CaptionShape"), OBJ_CAPTION }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.FrameShape"), OBJ_FRAME }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.PluginShape"), OBJ_OLE2_PLUGIN }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.AppletShape"), OBJ_OLE2_APPLET }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.CustomShape"), OBJ_CUSTOMSHAPE }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MediaShape"), OBJ_MEDIA }, + + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DSceneObject"), E3D_POLYSCENE_ID | E3D_INVENTOR_FLAG }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DCubeObject"), E3D_CUBEOBJ_ID | E3D_INVENTOR_FLAG }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DSphereObject"), E3D_SPHEREOBJ_ID | E3D_INVENTOR_FLAG }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DLatheObject"), E3D_LATHEOBJ_ID | E3D_INVENTOR_FLAG }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DExtrudeObject"), E3D_EXTRUDEOBJ_ID | E3D_INVENTOR_FLAG }, + { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DPolygonObject"), E3D_POLYGONOBJ_ID | E3D_INVENTOR_FLAG }, + }; + for (sal_uInt32 i = 0; i < SAL_N_ELEMENTS(aInit); i++) + aImpl[rtl::OUString( aInit[i].name, aInit[i].length, RTL_TEXTENCODING_ASCII_US ) ] = aInit[i].id; + bInited = true; + } + return aImpl; + } +} + +//---------------------------------------------------------------------- +rtl::OUString UHashMap::getNameFromId(sal_uInt32 nId) { - while( pMap->aIdentifier.getLength() ) - { - OUString aStr( pMap->aIdentifier ); - size_t nHash = aStr.hashCode() & (HASHARRAYSIZE-1); + const UHashMapImpl &rMap = GetUHashImpl(); - m_aHashList[nHash].Insert(pMap); - pMap++; + for (UHashMapImpl::const_iterator it = rMap.begin(); it != rMap.end(); it++) + { + if (it->second == nId) + return it->first; } + OSL_FAIL("[CL] unknown SdrObjekt identifier"); + return rtl::OUString(); } -// --------------------------------------------------------------------- - -sal_uInt32 UHashMap::getId( const OUString& rCompareString ) +uno::Sequence< OUString > UHashMap::getServiceNames() { - size_t nHash = rCompareString.hashCode() & (HASHARRAYSIZE-1); + const UHashMapImpl &rMap = GetUHashImpl(); - UHashMapEntryList& rList = m_aHashList[nHash]; - - UHashMapEntry * pMap = rList.First(); + int i = 0; + uno::Sequence< OUString > aSeq( rMap.size() ); + OUString* pStrings = aSeq.getArray(); - while(pMap) - { - if( rCompareString == pMap->aIdentifier ) - return pMap->nId; + for (UHashMapImpl::const_iterator it = rMap.begin(); it != rMap.end(); it++) + pStrings[i++] = it->first; - pMap = rList.Next(); - } + return aSeq; +} - return UHASHMAP_NOTFOUND; +sal_uInt32 UHashMap::getId( const OUString& rCompareString ) +{ + const UHashMapImpl &rMap = GetUHashImpl(); + UHashMapImpl::const_iterator it = rMap.find( rCompareString ); + if( it == rMap.end() ) + return UHASHMAP_NOTFOUND; + else + return it->second; } /*********************************************************************** * class SvxUnoPropertyMapProvider * ***********************************************************************/ -EXTERN_C -#if defined( PM2 ) && (!defined( CSET ) && !defined ( MTW ) && !defined( WTC )) -int _stdcall -#else -#ifdef WNT -int _cdecl -#else -int -#endif -#endif -Svx_CompareMap(const void* pSmaller, const void* pBigger ) +struct theSvxMapProvider : + public rtl::Static<SvxUnoPropertyMapProvider, theSvxMapProvider> +{ +}; + +SvxUnoPropertyMapProvider& getSvxMapProvider() { - int nDiff = strcmp( ((const SfxItemPropertyMapEntry*)pSmaller)->pName, - ((const SfxItemPropertyMapEntry*)pBigger)->pName ); - return nDiff; + return theSvxMapProvider::get(); } // --------------------------------------------------------------------- @@ -953,16 +959,6 @@ SvxUnoPropertyMapProvider::~SvxUnoPropertyMapProvider() // --------------------------------------------------------------------- -/*void SvxUnoPropertyMapProvider::Sort(sal_uInt16 nId) -{ - SfxItemPropertyMapEntry* pTemp = aMapArr[nId]; - sal_uInt16 i = 0; - while(pTemp[i].pName) { i++; } - qsort(aMapArr[nId], i, sizeof(SfxItemPropertyMapEntry), Svx_CompareMap); -}*/ - -// --------------------------------------------------------------------- - const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(sal_uInt16 nPropertyId) { DBG_ASSERT(nPropertyId < SVXMAP_END, "Id ?" ); @@ -996,7 +992,7 @@ const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(sal_uInt16 nPro case SVXMAP_PAGE: aMapArr[SVXMAP_PAGE] = ImplGetSvxPageShapePropertyMap(); break; default: - DBG_ERROR( "Unknown property map for SvxUnoPropertyMapProvider!" ); + OSL_FAIL( "Unknown property map for SvxUnoPropertyMapProvider!" ); } // Sort(nPropertyId); } @@ -1165,21 +1161,6 @@ bool SvxUnoGetResourceRanges( const short nWhich, int& nApiResIds, int& nIntResI return sal_True; } -/*sal_Int16 SvxUnoGetWhichIdForNamedProperty( const ::rtl::OUString & rPropName ) -{ - sal_Int16 nWhich = 0; - - const SfxItemPropertyMapEntry* pMap = aSvxMapProvider.GetMap( SVXMAP_SHAPE ); - if( pMap ) - { - const SfxItemPropertyMapEntry* pFound = SfxItemPropertyMapEntry::getByName( pMap, rPropName ); - if( pFound ) - nWhich = pFound->nWID; - } - - return nWhich; -} */ - bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount, String& rString ) throw() { // first, calculate the search string length without an optional number behind the name @@ -1233,7 +1214,7 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount return sal_False; } -static sal_uInt16 __READONLY_DATA SvxUnoColorNameDefResId[] = +static sal_uInt16 SvxUnoColorNameDefResId[] = { RID_SVXSTR_BLUEGREY_DEF, RID_SVXSTR_BLACK_DEF, @@ -1261,10 +1242,25 @@ static sal_uInt16 __READONLY_DATA SvxUnoColorNameDefResId[] = RID_SVXSTR_SALMON_DEF, RID_SVXSTR_SEABLUE_DEF, RID_SVXSTR_COLOR_SUN_DEF, - RID_SVXSTR_COLOR_CHART_DEF + RID_SVXSTR_COLOR_CHART_DEF, + RID_SVXSTR_LIBRE_GREEN_1_DEF, + RID_SVXSTR_LIBRE_GREEN_ACCENT_DEF, + RID_SVXSTR_LIBRE_BLUE_ACCENT_DEF, + RID_SVXSTR_LIBRE_ORANGE_ACCENT_DEF, + RID_SVXSTR_LIBRE_PURPLE_DEF, + RID_SVXSTR_LIBRE_PURPLE_ACCENT_DEF, + RID_SVXSTR_LIBRE_YELLOW_ACCENT_DEF, + RID_SVXSTR_TANGO_BUTTER_DEF, + RID_SVXSTR_TANGO_ORANGE_DEF, + RID_SVXSTR_TANGO_CHOCOLATE_DEF, + RID_SVXSTR_TANGO_CHAMELEON_DEF, + RID_SVXSTR_TANGO_SKY_BLUE_DEF, + RID_SVXSTR_TANGO_PLUM_DEF, + RID_SVXSTR_TANGO_SCARLET_RED_DEF, + RID_SVXSTR_TANGO_ALUMINIUM_DEF }; -static sal_uInt16 __READONLY_DATA SvxUnoColorNameResId[] = +static sal_uInt16 SvxUnoColorNameResId[] = { RID_SVXSTR_BLUEGREY, RID_SVXSTR_BLACK, @@ -1292,17 +1288,44 @@ static sal_uInt16 __READONLY_DATA SvxUnoColorNameResId[] = RID_SVXSTR_SALMON, RID_SVXSTR_SEABLUE, RID_SVXSTR_COLOR_SUN, - RID_SVXSTR_COLOR_CHART + RID_SVXSTR_COLOR_CHART, + RID_SVXSTR_LIBRE_GREEN_1, + RID_SVXSTR_LIBRE_GREEN_ACCENT, + RID_SVXSTR_LIBRE_BLUE_ACCENT, + RID_SVXSTR_LIBRE_ORANGE_ACCENT, + RID_SVXSTR_LIBRE_PURPLE, + RID_SVXSTR_LIBRE_PURPLE_ACCENT, + RID_SVXSTR_LIBRE_YELLOW_ACCENT, + RID_SVXSTR_TANGO_BUTTER, + RID_SVXSTR_TANGO_ORANGE, + RID_SVXSTR_TANGO_CHOCOLATE, + RID_SVXSTR_TANGO_CHAMELEON, + RID_SVXSTR_TANGO_SKY_BLUE, + RID_SVXSTR_TANGO_PLUM, + RID_SVXSTR_TANGO_SCARLET_RED, + RID_SVXSTR_TANGO_ALUMINIUM }; bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* pDestResIds, int nCount, String& rString ) throw() { - int i = 0; + //We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't + //replace "Red Hat 1" with the translation of Red :-) + rtl::OUString sStr(rString); + const sal_Unicode *pStr = sStr.getStr(); + sal_Int32 nLength = sStr.getLength(); + while( nLength > 0 ) + { + const sal_Unicode nChar = pStr[nLength-1]; + if (nChar != '%' && (nChar < '0' || nChar > '9')) + break; + nLength--; + } + sStr = rtl::OUString(pStr, nLength).trim(); - for( i = 0; i < nCount; i++ ) + for(int i = 0; i < nCount; ++i ) { String aStrDefName = SVX_RESSTR( pSourceResIds[i] ); - if( rString.Search( aStrDefName ) == 0 ) + if( sStr.equals( aStrDefName ) ) { String aReplace = SVX_RESSTR( pDestResIds[i] ); rString.Replace( 0, aStrDefName.Len(), aReplace ); @@ -1318,7 +1341,6 @@ bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* pDestRe */ void SvxUnogetApiNameForItem( const sal_Int16 nWhich, const String& rInternalName, rtl::OUString& rApiName ) throw() { -#ifndef SVX_LIGHT String aNew = rInternalName; if( nWhich == XATTR_LINECOLOR ) @@ -1344,7 +1366,6 @@ void SvxUnogetApiNameForItem( const sal_Int16 nWhich, const String& rInternalNam } } } -#endif // just use previous name, if nothing else was found. rApiName = rInternalName; @@ -1355,7 +1376,6 @@ void SvxUnogetApiNameForItem( const sal_Int16 nWhich, const String& rInternalNam */ void SvxUnogetInternalNameForItem( const sal_Int16 nWhich, const rtl::OUString& rApiName, String& rInternalName ) throw() { -#ifndef SVX_LIGHT String aNew = rApiName; if( nWhich == XATTR_LINECOLOR ) @@ -1381,7 +1401,6 @@ void SvxUnogetInternalNameForItem( const sal_Int16 nWhich, const rtl::OUString& } } } -#endif // !SVX_LIGHT // just use previous name, if nothing else was found. rInternalName = rApiName; @@ -1391,11 +1410,11 @@ void SvxUnogetInternalNameForItem( const sal_Int16 nWhich, const rtl::OUString& comphelper::PropertySetInfo* SvxPropertySetInfoPool::getOrCreate( sal_Int32 nServiceId ) throw() { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( nServiceId > SVXUNO_SERVICEID_LASTID ) { - DBG_ERROR( "unknown service id!" ); + OSL_FAIL( "unknown service id!" ); return NULL; } @@ -1417,7 +1436,7 @@ comphelper::PropertySetInfo* SvxPropertySetInfoPool::getOrCreate( sal_Int32 nSer break; default: - DBG_ERROR( "unknown service id!" ); + OSL_FAIL( "unknown service id!" ); } } @@ -1426,3 +1445,4 @@ comphelper::PropertySetInfo* SvxPropertySetInfoPool::getOrCreate( sal_Int32 nSer comphelper::PropertySetInfo* SvxPropertySetInfoPool::mpInfos[SVXUNO_SERVICEID_LASTID+1] = { NULL }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 17709c6197ce..b0e1ace320f0 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,21 +35,20 @@ #include <com/sun/star/style/VerticalAlignment.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> -#include <com/sun/star/awt/TextAlign.hpp> //added by BerryJia for fixing Bug102407 2002-11-4 -#include <com/sun/star/style/ParagraphAdjust.hpp> //added by BerryJia for fixing Bug102407 2002-11-4 +#include <com/sun/star/awt/TextAlign.hpp> +#include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/drawing/PointSequenceSequence.hpp> #include <com/sun/star/drawing/PointSequence.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <tools/urlobj.hxx> #include <unotools/localfilehelper.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svtools/fltcall.hxx> #include <svtools/filter.hxx> #include <boost/scoped_ptr.hpp> #include <svx/svdpool.hxx> -#include <rtl/uuid.h> #include <rtl/memory.h> #include <tools/urlobj.hxx> @@ -72,9 +72,10 @@ #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> +#include <comphelper/servicehelper.hxx> + using ::rtl::OUString; using namespace ::osl; -using namespace ::vos; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -98,7 +99,7 @@ sal_Bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetSt ***********************************************************************/ SvxShapeGroup::SvxShapeGroup( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw() : - SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_GROUP), aSvxMapProvider.GetPropertySet(SVXMAP_GROUP, SdrObject::GetGlobalDrawObjectItemPool()) ), + SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_GROUP), getSvxMapProvider().GetPropertySet(SVXMAP_GROUP, SdrObject::GetGlobalDrawObjectItemPool()) ), mxPage( pDrawPage ) { } @@ -152,16 +153,15 @@ uno::Sequence< uno::Type > SAL_CALL SvxShapeGroup::getTypes() return SvxShape::getTypes(); } +namespace +{ + class theSvxShapeGroupImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxShapeGroupImplementationId > {}; +} + uno::Sequence< sal_Int8 > SAL_CALL SvxShapeGroup::getImplementationId() throw (uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId; - if( aId.getLength() == 0 ) - { - aId.realloc( 16 ); - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - } - return aId; + return theSvxShapeGroupImplementationId::get().getSeq(); } // ::com::sun::star::drawing::XShape @@ -221,7 +221,7 @@ void SAL_CALL SvxShapeGroup::leaveGroup( ) throw(uno::RuntimeException) void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; SvxShape* pShape = SvxShape::getImplementation( xShape ); @@ -248,15 +248,14 @@ void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShap // Establish connection between new SdrObject and its wrapper before // inserting the new shape into the group. There a new wrapper // would be created when this connection would not already exist. - if(pShape) - pShape->Create( pSdrShape, mxPage.get() ); + pShape->Create( pSdrShape, mxPage.get() ); if( mpModel ) mpModel->SetChanged(); } else { - DBG_ERROR("could not add XShape to group shape!"); + OSL_FAIL("could not add XShape to group shape!"); } } @@ -264,7 +263,7 @@ void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShap void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; SdrObject* pSdrShape = NULL; SvxShape* pShape = SvxShape::getImplementation( xShape ); @@ -318,7 +317,7 @@ void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xS //---------------------------------------------------------------------- sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; sal_Int32 nRetval = 0; @@ -334,7 +333,7 @@ sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException ) uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index ) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( !mpObj.is() || mpObj->GetSubList() == NULL ) throw uno::RuntimeException(); @@ -362,7 +361,7 @@ uno::Type SAL_CALL SvxShapeGroup::getElementType() throw( uno::RuntimeException //---------------------------------------------------------------------- sal_Bool SAL_CALL SvxShapeGroup::hasElements() throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; return mpObj.is() && mpObj->GetSubList() && (mpObj->GetSubList()->GetObjCount() > 0); } @@ -381,7 +380,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapeGroup::getSupportedServiceNames() ***********************************************************************/ SvxShapeConnector::SvxShapeConnector( SdrObject* pObj ) throw() : - SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CONNECTOR), aSvxMapProvider.GetPropertySet(SVXMAP_CONNECTOR, SdrObject::GetGlobalDrawObjectItemPool()) ) + SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CONNECTOR), getSvxMapProvider().GetPropertySet(SVXMAP_CONNECTOR, SdrObject::GetGlobalDrawObjectItemPool()) ) { } @@ -427,16 +426,15 @@ uno::Sequence< uno::Type > SAL_CALL SvxShapeConnector::getTypes() return SvxShape::getTypes(); } +namespace +{ + class theSvxShapeConnectorImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxShapeConnectorImplementationId > {}; +} + uno::Sequence< sal_Int8 > SAL_CALL SvxShapeConnector::getImplementationId() throw (uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId; - if( aId.getLength() == 0 ) - { - aId.realloc( 16 ); - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - } - return aId; + return theSvxShapeConnectorImplementationId::get().getSeq(); } // ::com::sun::star::drawing::XShape @@ -480,7 +478,7 @@ void SAL_CALL SvxShapeConnector::setSize( const awt::Size& rSize ) void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; Reference< drawing::XShape > xRef( xShape, UNO_QUERY ); SvxShape* pShape = SvxShape::getImplementation( xRef ); @@ -496,7 +494,7 @@ void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XC void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; Reference< drawing::XShape > xRef( xShape, UNO_QUERY ); SvxShape* pShape = SvxShape::getImplementation( xRef ); @@ -512,7 +510,7 @@ void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XCon void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing::XConnectableShape >& ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if(mpObj.is()) mpObj->DisconnectFromNode( sal_True ); @@ -525,7 +523,7 @@ void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing: void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::XConnectableShape >& ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if(mpObj.is()) mpObj->DisconnectFromNode( sal_False ); @@ -548,7 +546,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapeConnector::getSupportedServiceNames() DBG_NAME(SvxShapeControl) SvxShapeControl::SvxShapeControl( SdrObject* pObj ) throw() : - SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CONTROL), aSvxMapProvider.GetPropertySet(SVXMAP_CONTROL, SdrObject::GetGlobalDrawObjectItemPool()) ) + SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CONTROL), getSvxMapProvider().GetPropertySet(SVXMAP_CONTROL, SdrObject::GetGlobalDrawObjectItemPool()) ) { DBG_CTOR(SvxShapeControl,NULL); setShapeKind( OBJ_UNO ); @@ -595,16 +593,15 @@ uno::Sequence< uno::Type > SAL_CALL SvxShapeControl::getTypes() return SvxShape::getTypes(); } +namespace +{ + class theSvxShapeControlImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxShapeControlImplementationId > {}; +} + uno::Sequence< sal_Int8 > SAL_CALL SvxShapeControl::getImplementationId() throw (uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId; - if( aId.getLength() == 0 ) - { - aId.realloc( 16 ); - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - } - return aId; + return theSvxShapeControlImplementationId::get().getSeq(); } // ::com::sun::star::drawing::XShape @@ -648,7 +645,7 @@ void SAL_CALL SvxShapeControl::setSize( const awt::Size& rSize ) Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl() throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; Reference< awt::XControlModel > xModel; @@ -663,7 +660,7 @@ Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl() void SAL_CALL SvxShapeControl::setControl( const Reference< awt::XControlModel >& xControl ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; SdrUnoObj* pUnoObj = dynamic_cast< SdrUnoObj * >(mpObj.get()); if( pUnoObj ) @@ -844,18 +841,18 @@ void SAL_CALL SvxShapeControl::setPropertyValue( const OUString& aPropertyName, if( xInfo.is() && xInfo->hasPropertyByName( aFormsName ) ) { uno::Any aConvertedValue( aValue ); - if ( aFormsName.equalsAscii( "FontSlant" ) ) + if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FontSlant" ) ) ) { awt::FontSlant nSlant; if( !(aValue >>= nSlant ) ) throw lang::IllegalArgumentException(); aConvertedValue <<= (sal_Int16)nSlant; } - else if ( aFormsName.equalsAscii( "Align" ) ) + else if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Align" ) ) ) { lcl_convertParaAdjustmentToTextAlignment( aConvertedValue ); } - else if ( aFormsName.equalsAscii( "VerticalAlign" ) ) + else if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VerticalAlign" ) ) ) { convertVerticalAdjustToVerticalAlign( aConvertedValue ); } @@ -885,7 +882,7 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyValue( const OUString& aPropertyNa if( xInfo.is() && xInfo->hasPropertyByName( aFormsName ) ) { aValue = xControl->getPropertyValue( aFormsName ); - if ( aFormsName.equalsAscii( "FontSlant" ) ) + if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FontSlant" ) ) ) { awt::FontSlant eSlant = awt::FontSlant_NONE; sal_Int16 nSlant = sal_Int16(); @@ -899,11 +896,11 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyValue( const OUString& aPropertyNa } aValue <<= eSlant; } - else if ( aFormsName.equalsAscii( "Align" ) ) + else if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Align" ) ) ) { lcl_convertTextAlignmentToParaAdjustment( aValue ); } - else if ( aFormsName.equalsAscii( "VerticalAlign" ) ) + else if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VerticalAlign" ) ) ) { convertVerticalAlignToVerticalAdjust( aValue ); } @@ -979,17 +976,17 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const ::rtl::OUString& aP if( xControl.is() ) { Any aDefault( xControl->getPropertyDefault( aFormsName ) ); - if ( aFormsName.equalsAscii( "FontSlant" ) ) + if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FontSlant" ) ) ) { sal_Int16 nSlant( 0 ); aDefault >>= nSlant; aDefault <<= (awt::FontSlant)nSlant; } - else if ( aFormsName.equalsAscii( "Align" ) ) + else if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Align" ) ) ) { lcl_convertTextAlignmentToParaAdjustment( aDefault ); } - else if ( aFormsName.equalsAscii( "VerticalAlign" ) ) + else if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VerticalAlign" ) ) ) { convertVerticalAlignToVerticalAdjust( aDefault ); } @@ -1011,7 +1008,7 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const ::rtl::OUString& aP //---------------------------------------------------------------------- SvxShapeDimensioning::SvxShapeDimensioning( SdrObject* pObj ) throw() -: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_DIMENSIONING), aSvxMapProvider.GetPropertySet(SVXMAP_DIMENSIONING, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_DIMENSIONING), getSvxMapProvider().GetPropertySet(SVXMAP_DIMENSIONING, SdrObject::GetGlobalDrawObjectItemPool()) ) { } @@ -1032,7 +1029,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapeDimensioning::getSupportedServiceName //---------------------------------------------------------------------- SvxShapeCircle::SvxShapeCircle( SdrObject* pObj ) throw() -: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CIRCLE), aSvxMapProvider.GetPropertySet(SVXMAP_CIRCLE, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CIRCLE), getSvxMapProvider().GetPropertySet(SVXMAP_CIRCLE, SdrObject::GetGlobalDrawObjectItemPool()) ) { } @@ -1057,7 +1054,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapeCircle::getSupportedServiceNames() th //---------------------------------------------------------------------- SvxShapePolyPolygon::SvxShapePolyPolygon( SdrObject* pObj , drawing::PolygonKind eNew ) throw( com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException) -: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_POLYPOLYGON), aSvxMapProvider.GetPropertySet(SVXMAP_POLYPOLYGON, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_POLYPOLYGON), getSvxMapProvider().GetPropertySet(SVXMAP_POLYPOLYGON, SdrObject::GetGlobalDrawObjectItemPool()) ) , mePolygonKind( eNew ) { } @@ -1290,7 +1287,7 @@ drawing::PolygonKind SvxShapePolyPolygon::GetPolygonKind() const throw() //---------------------------------------------------------------------- void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw() { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if(mpObj.is()) ((SdrPathObj*)mpObj.get())->SetPathPoly(rNew); @@ -1299,7 +1296,7 @@ void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw( //---------------------------------------------------------------------- basegfx::B2DPolyPolygon SvxShapePolyPolygon::GetPolygon() const throw() { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if(mpObj.is()) { @@ -1324,7 +1321,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygon::getSupportedServiceNames #include <com/sun/star/drawing/FlagSequence.hpp> //---------------------------------------------------------------------- SvxShapePolyPolygonBezier::SvxShapePolyPolygonBezier( SdrObject* pObj , drawing::PolygonKind eNew ) throw() -: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_POLYPOLYGONBEZIER), aSvxMapProvider.GetPropertySet(SVXMAP_POLYPOLYGONBEZIER, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_POLYPOLYGONBEZIER), getSvxMapProvider().GetPropertySet(SVXMAP_POLYPOLYGONBEZIER, SdrObject::GetGlobalDrawObjectItemPool()) ) , mePolygonKind( eNew ) { } @@ -1586,7 +1583,7 @@ drawing::PolygonKind SvxShapePolyPolygonBezier::GetPolygonKind() const throw() //---------------------------------------------------------------------- void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw() { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if(mpObj.is()) static_cast<SdrPathObj*>(mpObj.get())->SetPathPoly(rNew); @@ -1595,7 +1592,7 @@ void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) //---------------------------------------------------------------------- basegfx::B2DPolyPolygon SvxShapePolyPolygonBezier::GetPolygon() const throw() { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if(mpObj.is()) { @@ -1620,19 +1617,15 @@ uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygonBezier::getSupportedServic #include <com/sun/star/awt/XBitmap.hpp> #include <vcl/cvtgrf.hxx> #include <svx/svdograf.hxx> -#ifndef SVX_LIGHT -#ifndef _SFXDOCFILE_HXX #include <sfx2/docfile.hxx> -#endif #include <sfx2/app.hxx> #include <sfx2/fcontnr.hxx> -#endif #include "toolkit/unohlp.hxx" //---------------------------------------------------------------------- SvxGraphicObject::SvxGraphicObject( SdrObject* pObj ) throw() -: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_GRAPHICOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_GRAPHICOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_GRAPHICOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_GRAPHICOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) { } @@ -1735,8 +1728,8 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const if( aURLObj.GetProtocol() != INET_PROT_NOT_VALID ) { - GraphicFilter* pGrfFilter = GraphicFilter::GetGraphicFilter(); - aFilterName = pGrfFilter->GetImportFormatName( pGrfFilter->GetImportFormatNumberForShortName( aURLObj.getExtension() ) ); + GraphicFilter &rGrfFilter = GraphicFilter::GetGraphicFilter(); + aFilterName = rGrfFilter.GetImportFormatName( rGrfFilter.GetImportFormatNumberForShortName( aURLObj.getExtension() ) ); } } else @@ -1880,7 +1873,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const /////////////////////////////////////////////////////////////////////// SvxShapeCaption::SvxShapeCaption( SdrObject* pObj ) throw() -: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CAPTION), aSvxMapProvider.GetPropertySet(SVXMAP_CAPTION, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CAPTION), getSvxMapProvider().GetPropertySet(SVXMAP_CAPTION, SdrObject::GetGlobalDrawObjectItemPool()) ) { } @@ -1893,7 +1886,7 @@ SvxShapeCaption::~SvxShapeCaption() throw() ***********************************************************************/ SvxCustomShape::SvxCustomShape( SdrObject* pObj ) throw() : - SvxShapeText( pObj, aSvxMapProvider.GetMap( SVXMAP_CUSTOMSHAPE ), aSvxMapProvider.GetPropertySet(SVXMAP_CUSTOMSHAPE, SdrObject::GetGlobalDrawObjectItemPool()) ) + SvxShapeText( pObj, getSvxMapProvider().GetMap( SVXMAP_CUSTOMSHAPE ), getSvxMapProvider().GetPropertySet(SVXMAP_CUSTOMSHAPE, SdrObject::GetGlobalDrawObjectItemPool()) ) { } @@ -1944,16 +1937,15 @@ uno::Sequence< uno::Type > SAL_CALL SvxCustomShape::getTypes() return SvxShapeText::getTypes(); } +namespace +{ + class theSvxCustomShapeImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxCustomShapeImplementationId > {}; +} + uno::Sequence< sal_Int8 > SAL_CALL SvxCustomShape::getImplementationId() throw (uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId; - if( aId.getLength() == 0 ) - { - aId.realloc( 16 ); - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - } - return aId; + return theSvxCustomShapeImplementationId::get().getSeq(); } // ::com::sun::star::drawing::XShape @@ -1968,7 +1960,7 @@ OUString SAL_CALL SvxCustomShape::getShapeType() //------------------------------------------------------------------1---- awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if ( mpModel && mpObj.is() ) { SdrAShapeObjGeoData aCustomShapeGeoData; @@ -2073,7 +2065,7 @@ void SAL_CALL SvxCustomShape::setSize( const awt::Size& rSize ) void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; SdrObject* pObject = mpObj.get(); sal_Bool bCustomShapeGeometry = pObject && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CustomShapeGeometry" ) ); @@ -2155,3 +2147,5 @@ void SvxCustomShape::createCustomShapeDefaults( const rtl::OUString& rValueType { ((SdrObjCustomShape*)mpObj.get())->MergeDefaultAttributes( &rValueType ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index be20ca4421e3..f56f870c006b 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,10 +36,10 @@ #include <com/sun/star/drawing/DoubleSequence.hpp> #include <com/sun/star/drawing/CameraGeometry.hpp> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> +#include <comphelper/servicehelper.hxx> #include <comphelper/serviceinfohelper.hxx> -#include <rtl/uuid.h> #include <rtl/memory.h> #include <svx/svdpool.hxx> #include <svx/unoshape.hxx> @@ -57,9 +58,9 @@ #include <basegfx/polygon/b3dpolygontools.hxx> #include <com/sun/star/drawing/PolyPolygonShape3D.hpp> #include <basegfx/polygon/b2dpolypolygontools.hxx> +#include "shapeimpl.hxx" using ::rtl::OUString; -using namespace ::vos; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -79,7 +80,7 @@ using namespace ::com::sun::star::container; //---------------------------------------------------------------------- Svx3DSceneObject::Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw() -: SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DSCENEOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_3DSCENEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DSCENEOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DSCENEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) , mxPage( pDrawPage ) { } @@ -134,23 +135,22 @@ uno::Sequence< uno::Type > SAL_CALL Svx3DSceneObject::getTypes() return SvxShape::getTypes(); } +namespace +{ + class theSvx3DSceneObjectImplementationId : public rtl::Static< UnoTunnelIdInit, theSvx3DSceneObjectImplementationId > {}; +} + uno::Sequence< sal_Int8 > SAL_CALL Svx3DSceneObject::getImplementationId() throw (uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId; - if( aId.getLength() == 0 ) - { - aId.realloc( 16 ); - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - } - return aId; + return theSvx3DSceneObjectImplementationId::get().getSeq(); } //---------------------------------------------------------------------- void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SvxShape* pShape = SvxShape::getImplementation( xShape ); @@ -179,7 +179,7 @@ void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SvxShape* pShape = SvxShape::getImplementation( xShape ); @@ -220,7 +220,7 @@ void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xSha sal_Int32 SAL_CALL Svx3DSceneObject::getCount() throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; sal_Int32 nRetval = 0; @@ -234,7 +234,7 @@ sal_Int32 SAL_CALL Svx3DSceneObject::getCount() uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index ) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( !mpObj.is() || mpObj->GetSubList() == NULL ) throw uno::RuntimeException(); @@ -265,7 +265,7 @@ uno::Type SAL_CALL Svx3DSceneObject::getElementType() sal_Bool SAL_CALL Svx3DSceneObject::hasElements() throw( uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return mpObj.is() && mpObj->GetSubList() && (mpObj->GetSubList()->GetObjCount() > 0); } @@ -502,7 +502,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames() //---------------------------------------------------------------------- Svx3DCubeObject::Svx3DCubeObject( SdrObject* pObj ) throw() -: SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DCUBEOBJEKT), aSvxMapProvider.GetPropertySet(SVXMAP_3DCUBEOBJEKT, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DCUBEOBJEKT), getSvxMapProvider().GetPropertySet(SVXMAP_3DCUBEOBJEKT, SdrObject::GetGlobalDrawObjectItemPool()) ) { } @@ -514,7 +514,7 @@ Svx3DCubeObject::~Svx3DCubeObject() throw() //---------------------------------------------------------------------- bool Svx3DCubeObject::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; switch( pProperty->nWID ) { @@ -633,7 +633,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames() //---------------------------------------------------------------------- Svx3DSphereObject::Svx3DSphereObject( SdrObject* pObj ) throw() -: SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DSPHEREOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_3DSPHEREOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DSPHEREOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DSPHEREOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) { } @@ -749,7 +749,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames() //---------------------------------------------------------------------- Svx3DLatheObject::Svx3DLatheObject( SdrObject* pObj ) throw() -: SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DLATHEOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_3DLATHEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DLATHEOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DLATHEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) { } @@ -956,7 +956,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames() ***********************************************************************/ Svx3DExtrudeObject::Svx3DExtrudeObject( SdrObject* pObj ) throw() -: SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DEXTRUDEOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_3DEXTRUDEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DEXTRUDEOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DEXTRUDEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) { } @@ -1068,7 +1068,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames( //---------------------------------------------------------------------- Svx3DPolygonObject::Svx3DPolygonObject( SdrObject* pObj ) throw() -: SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DPOLYGONOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_3DPOLYGONOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DPOLYGONOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DPOLYGONOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) { } @@ -1208,3 +1208,5 @@ uno::Sequence< OUString > SAL_CALL Svx3DPolygonObject::getSupportedServiceNames( } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 9f906dc59a39..a7c08e759a99 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,14 +39,10 @@ #include <svx/svdoole2.hxx> #include <svx/svdomedia.hxx> #include <svx/svdpool.hxx> -#ifndef SVX_LIGHT -#ifndef _SOT_CLSIDS_HXX #include <sot/clsids.hxx> -#endif #include <sfx2/frmdescr.hxx> -#endif #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <sfx2/objsh.hxx> @@ -73,7 +70,6 @@ extern sal_Bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rT /////////////////////////////////////////////////////////////////////// using namespace ::osl; -using namespace ::vos; using namespace ::rtl; using namespace ::cppu; using namespace ::com::sun::star; @@ -84,7 +80,7 @@ using namespace ::com::sun::star::beans; /////////////////////////////////////////////////////////////////////// SvxOle2Shape::SvxOle2Shape( SdrObject* pObject ) throw() -: SvxShape( pObject, aSvxMapProvider.GetMap(SVXMAP_OLE2), aSvxMapProvider.GetPropertySet(SVXMAP_OLE2, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxShape( pObject, getSvxMapProvider().GetMap(SVXMAP_OLE2), getSvxMapProvider().GetPropertySet(SVXMAP_OLE2, SdrObject::GetGlobalDrawObjectItemPool()) ) { } @@ -125,7 +121,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx { SfxObjectShell* pPersist = mpModel->GetPersist(); ::rtl::OUString aPersistName; - Any aAny( getPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ) ) ); + Any aAny( getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )) ) ); aAny >>= aPersistName; //TODO/LATER: how to cope with creation failure?! @@ -133,7 +129,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx if( xObj.is() ) { aAny <<= aPersistName; - setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), aAny ); + setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )), aAny ); pOle2->SetObjRef( xObj ); Rectangle aRect = pOle2->GetLogicRect(); @@ -171,7 +167,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx } catch( uno::Exception& ) { - OSL_ENSURE( sal_False, "Couldn't set the visual area for the object!\n" ); + OSL_FAIL( "Couldn't set the visual area for the object!\n" ); } } @@ -368,7 +364,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx // usage. Removed it, former fallback is used now if ( pProperty->nWID == OWN_ATTR_OLEMODEL || pProperty->nWID == OWN_ATTR_OLE_EMBEDDED_OBJECT ) { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 const sal_Bool bSuccess(pObj->AddOwnLightClient()); OSL_ENSURE( bSuccess, "An object without client is provided!" ); #else @@ -471,7 +467,7 @@ sal_Bool SvxOle2Shape::createObject( const SvGlobalName &aClassName ) ::comphelper::IEmbeddedHelper* pPersist = mpModel->GetPersist(); ::rtl::OUString aPersistName; OUString aTmpStr; - if( getPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ) ) >>= aTmpStr ) + if( getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )) ) >>= aTmpStr ) aPersistName = aTmpStr; //TODO/LATER: how to cope with creation failure?! @@ -502,7 +498,7 @@ sal_Bool SvxOle2Shape::createObject( const SvGlobalName &aClassName ) } // connect the object after the visual area is set - setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), Any( aTmpStr = aPersistName ) ); + setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )), Any( aTmpStr = aPersistName ) ); // the object is inserted during setting of PersistName property usually if( pOle2Obj->IsEmpty() ) @@ -525,7 +521,7 @@ sal_Bool SvxOle2Shape::createLink( const ::rtl::OUString& aLinkURL ) ::comphelper::IEmbeddedHelper* pPersist = mpModel->GetPersist(); uno::Sequence< beans::PropertyValue > aMediaDescr( 1 ); - aMediaDescr[0].Name = ::rtl::OUString::createFromAscii( "URL" ); + aMediaDescr[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")); aMediaDescr[0].Value <<= aLinkURL; uno::Reference< task::XInteractionHandler > xInteraction = pPersist->getInteractionHandler(); @@ -565,7 +561,7 @@ sal_Bool SvxOle2Shape::createLink( const ::rtl::OUString& aLinkURL ) } // connect the object after the visual area is set - setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), uno::makeAny( aPersistName ) ); + setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )), uno::makeAny( aPersistName ) ); // the object is inserted during setting of PersistName property usually if ( pOle2Obj->IsEmpty() ) @@ -633,7 +629,7 @@ const SvGlobalName SvxOle2Shape::GetClassName_Impl(rtl::OUString& rHexCLSID) /////////////////////////////////////////////////////////////////////// SvxAppletShape::SvxAppletShape( SdrObject* pObject ) throw() -: SvxOle2Shape( pObject, aSvxMapProvider.GetMap(SVXMAP_APPLET), aSvxMapProvider.GetPropertySet(SVXMAP_APPLET, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_APPLET), getSvxMapProvider().GetPropertySet(SVXMAP_APPLET, SdrObject::GetGlobalDrawObjectItemPool()) ) { SetShapeType( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.AppletShape" ) ) ); } @@ -706,7 +702,7 @@ bool SvxAppletShape::getPropertyValueImpl( const ::rtl::OUString& rName, const S /////////////////////////////////////////////////////////////////////// SvxPluginShape::SvxPluginShape( SdrObject* pObject ) throw() -: SvxOle2Shape( pObject, aSvxMapProvider.GetMap(SVXMAP_PLUGIN), aSvxMapProvider.GetPropertySet(SVXMAP_PLUGIN, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_PLUGIN), getSvxMapProvider().GetPropertySet(SVXMAP_PLUGIN, SdrObject::GetGlobalDrawObjectItemPool()) ) { SetShapeType( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.PluginShape" ) ) ); } @@ -779,7 +775,7 @@ bool SvxPluginShape::getPropertyValueImpl( const ::rtl::OUString& rName, const S /////////////////////////////////////////////////////////////////////// SvxFrameShape::SvxFrameShape( SdrObject* pObject ) throw() -: SvxOle2Shape( pObject, aSvxMapProvider.GetMap(SVXMAP_FRAME), aSvxMapProvider.GetPropertySet(SVXMAP_FRAME, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_FRAME), getSvxMapProvider().GetPropertySet(SVXMAP_FRAME, SdrObject::GetGlobalDrawObjectItemPool()) ) { SetShapeType( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.FrameShape" ) ) ); } @@ -854,7 +850,7 @@ bool SvxFrameShape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sf ***********************************************************************/ SvxMediaShape::SvxMediaShape( SdrObject* pObj ) throw() -: SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_MEDIA), aSvxMapProvider.GetPropertySet(SVXMAP_MEDIA, SdrObject::GetGlobalDrawObjectItemPool()) ) +: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_MEDIA), getSvxMapProvider().GetPropertySet(SVXMAP_MEDIA, SdrObject::GetGlobalDrawObjectItemPool()) ) { SetShapeType( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.MediaShape" ) ) ); } @@ -936,7 +932,7 @@ bool SvxMediaShape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sf break; default: - DBG_ERROR("SvxMediaShape::setPropertyValueImpl(), unknown argument!"); + OSL_FAIL("SvxMediaShape::setPropertyValueImpl(), unknown argument!"); } if( bOk ) @@ -985,7 +981,7 @@ bool SvxMediaShape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sf break; default: - DBG_ERROR("SvxMediaShape::getPropertyValueImpl(), unknown property!"); + OSL_FAIL("SvxMediaShape::getPropertyValueImpl(), unknown property!"); } return true; } @@ -994,3 +990,5 @@ bool SvxMediaShape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sf return SvxShape::getPropertyValueImpl( rName, pProperty, rValue ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 73872e2e4b0a..82a2c0ea13ab 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,17 +38,17 @@ #include <vcl/svapp.hxx> #include <svl/itemprop.hxx> #include <svtools/fltcall.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <editeng/unotext.hxx> #include <svx/svdobj.hxx> #include <svx/svdoole2.hxx> #include <osl/mutex.hxx> -#include <comphelper/extract.hxx> #include "svx/shapepropertynotifier.hxx" +#include <comphelper/extract.hxx> +#include <comphelper/scopeguard.hxx> +#include <comphelper/servicehelper.hxx> #include <comphelper/serviceinfohelper.hxx> #include <toolkit/unohlp.hxx> -#include <comphelper/serviceinfohelper.hxx> -#include <rtl/uuid.h> #include <rtl/memory.h> #include <vcl/gfxlink.hxx> #include <vcl/virdev.hxx> @@ -96,6 +97,7 @@ #include <editeng/outlobj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> +#include "shapeimpl.hxx" #include <vector> @@ -104,12 +106,10 @@ #include "svx/extrud3d.hxx" #include "unopolyhelper.hxx" -#include <comphelper/scopeguard.hxx> #include <boost/bind.hpp> using ::rtl::OUString; using namespace ::osl; -using namespace ::vos; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -209,8 +209,8 @@ SvxShape::SvxShape( SdrObject* pObject ) throw() : maSize(100,100) , mpImpl( new SvxShapeImpl( *this, maMutex ) ) , mbIsMultiPropertyCall(false) -, mpPropSet(aSvxMapProvider.GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool())) -, maPropMapEntries(aSvxMapProvider.GetMap(SVXMAP_SHAPE)) +, mpPropSet(getSvxMapProvider().GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool())) +, maPropMapEntries(getSvxMapProvider().GetMap(SVXMAP_SHAPE)) , mpObj(pObject) , mpModel(NULL) , mnLockCount(0) @@ -239,8 +239,8 @@ SvxShape::SvxShape() throw() : maSize(100,100) , mpImpl( new SvxShapeImpl( *this, maMutex ) ) , mbIsMultiPropertyCall(false) -, mpPropSet(aSvxMapProvider.GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool())) -, maPropMapEntries(aSvxMapProvider.GetMap(SVXMAP_SHAPE)) +, mpPropSet(getSvxMapProvider().GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool())) +, maPropMapEntries(getSvxMapProvider().GetMap(SVXMAP_SHAPE)) , mpObj(NULL) , mpModel(NULL) , mnLockCount(0) @@ -252,7 +252,7 @@ SvxShape::SvxShape() throw() //---------------------------------------------------------------------- SvxShape::~SvxShape() throw() { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; DBG_ASSERT( mnLockCount == 0, "Locked shape was disposed!" ); @@ -340,21 +340,14 @@ uno::Any SAL_CALL SvxShape::queryAggregation( const uno::Type& rType ) throw (un return SvxShape_UnoImplHelper::queryAggregation(rType); } -//---------------------------------------------------------------------- +namespace +{ + class theSvxShapeUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvxShapeUnoTunnelId > {}; +} + const ::com::sun::star::uno::Sequence< sal_Int8 > & SvxShape::getUnoTunnelId() throw() { - static ::com::sun::star::uno::Sequence< sal_Int8 > * pSeq = 0; - if( !pSeq ) - { - ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ); - if( !pSeq ) - { - static ::com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 ); - rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); - pSeq = &aSeq; - } - } - return *pSeq; + return theSvxShapeUnoTunnelId::get().getSeq(); } //---------------------------------------------------------------------- @@ -472,14 +465,12 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ ) OSL_ENSURE( ( pCreatedObj == NULL ) || ( pCreatedObj == pNewObj ), "SvxShape::Create: the same shape used for two different objects?! Strange ..." ); - // --> CL, OD 2005-07-19 #i52126# - correct condition + // Correct condition (#i52126#) if ( pCreatedObj != pNewObj ) - // <-- { DBG_ASSERT( pNewObj->GetModel(), "no model for SdrObject?" ); - // --> CL, OD 2005-07-19 #i52126# + // Correct condition (#i52126#) mpImpl->mpCreatedObj = pNewObj; - // <-- if( mpObj.is() && mpObj->GetModel() ) { @@ -528,12 +519,11 @@ void SvxShape::ChangeModel( SdrModel* pNewModel ) } } - // --> CL, OD 2005-07-19 #i52126# - always listen to new model + // Always listen to new model (#i52126#) if( pNewModel ) { StartListening( *pNewModel ); } - // <-- // HACK #i53696# ChangeModel should be virtual, but it isn't. can't change that for 2.0.1 SvxShapeText* pShapeText = dynamic_cast< SvxShapeText* >( this ); @@ -570,15 +560,14 @@ void SvxShape::ForceMetricToItemPoolMetric(Pair& rPoint) const throw() } default: { - DBG_ERROR("AW: Missing unit translation to PoolMetric!"); + OSL_FAIL("AW: Missing unit translation to PoolMetric!"); } } } } } -//---------------------------------------------------------------------- -// --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051 +// Reintroduction of fix for issue i59051 (#i108851#) void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon) const throw() { DBG_TESTSOLARMUTEX(); @@ -600,13 +589,12 @@ void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon } default: { - DBG_ERROR("Missing unit translation to PoolMetric!"); + OSL_FAIL("Missing unit translation to PoolMetric!"); } } } } } -// <-- //---------------------------------------------------------------------- void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw() @@ -628,15 +616,14 @@ void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw() } default: { - DBG_ERROR("AW: Missing unit translation to 100th mm!"); + OSL_FAIL("AW: Missing unit translation to 100th mm!"); } } } } } -//---------------------------------------------------------------------- -// --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051 +// Reintroduction of fix for issue i59051 (#i108851#) void SvxShape::ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) const throw() { DBG_TESTSOLARMUTEX(); @@ -658,15 +645,12 @@ void SvxShape::ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) cons } default: { - DBG_ERROR("Missing unit translation to 100th mm!"); + OSL_FAIL("Missing unit translation to 100th mm!"); } } } } } -// <-- -//---------------------------------------------------------------------- - //---------------------------------------------------------------------- void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet, @@ -834,7 +818,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() *pTypes++ = ::getCppuType((const uno::Reference< lang::XComponent >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0); -// *pTypes++ = ::getCppuType((const uno::Reference< beans::XTolerantMultiPropertySet >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0); *pTypes++ = beans::XMultiPropertyStates::static_type(); *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0); @@ -867,7 +850,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() *pTypes++ = ::getCppuType((const uno::Reference< lang::XComponent >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0); -// *pTypes++ = ::getCppuType((const uno::Reference< beans::XTolerantMultiPropertySet >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0); *pTypes++ = beans::XMultiPropertyStates::static_type(); *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0); @@ -902,7 +884,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() *pTypes++ = ::getCppuType((const uno::Reference< lang::XComponent >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0); -// *pTypes++ = ::getCppuType((const uno::Reference< beans::XTolerantMultiPropertySet >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0); *pTypes++ = beans::XMultiPropertyStates::static_type(); *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0); @@ -941,7 +922,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() *pTypes++ = ::getCppuType((const uno::Reference< lang::XComponent >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0); -// *pTypes++ = ::getCppuType((const uno::Reference< beans::XTolerantMultiPropertySet >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0); *pTypes++ = beans::XMultiPropertyStates::static_type(); *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0); @@ -975,7 +955,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() *pTypes++ = ::getCppuType((const uno::Reference< lang::XComponent >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0); -// *pTypes++ = ::getCppuType((const uno::Reference< beans::XTolerantMultiPropertySet >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0); *pTypes++ = beans::XMultiPropertyStates::static_type(); *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0); @@ -1008,7 +987,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() *pTypes++ = ::getCppuType((const uno::Reference< lang::XComponent >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0); -// *pTypes++ = ::getCppuType((const uno::Reference< beans::XTolerantMultiPropertySet >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0); *pTypes++ = beans::XMultiPropertyStates::static_type(); *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0); @@ -1062,7 +1040,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() *pTypes++ = ::getCppuType((const uno::Reference< lang::XComponent >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0); -// *pTypes++ = ::getCppuType((const uno::Reference< beans::XTolerantMultiPropertySet >*)0); *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0); *pTypes++ = beans::XMultiPropertyStates::static_type(); *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0); @@ -1116,13 +1093,6 @@ Reference< uno::XInterface > SvxShape_NewInstance() } //---------------------------------------------------------------------- - -void SvxShape::onUserCall(SdrUserCallType /*_eUserCall*/, const Rectangle& /*_rNewBoundRect*/ ) -{ - // obsolete, not called anymore -} - -//---------------------------------------------------------------------- // SfxListener //---------------------------------------------------------------------- @@ -1242,7 +1212,7 @@ static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect ) awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( mpObj.is() && mpModel) { @@ -1265,7 +1235,7 @@ awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException) //---------------------------------------------------------------------- void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( mpObj.is() && mpModel ) { @@ -1295,7 +1265,7 @@ void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::Run //---------------------------------------------------------------------- awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( mpObj.is() && mpModel) { @@ -1312,7 +1282,7 @@ awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException) void SAL_CALL SvxShape::setSize( const awt::Size& rSize ) throw(beans::PropertyVetoException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( mpObj.is() && mpModel) { @@ -1356,7 +1326,7 @@ void SAL_CALL SvxShape::setSize( const awt::Size& rSize ) // XNamed OUString SAL_CALL SvxShape::getName( ) throw(::com::sun::star::uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( mpObj.is() ) { return mpObj->GetName(); @@ -1371,7 +1341,7 @@ OUString SAL_CALL SvxShape::getName( ) throw(::com::sun::star::uno::RuntimeExce void SAL_CALL SvxShape::setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( mpObj.is() ) { mpObj->SetName( aName ); @@ -1387,23 +1357,10 @@ void SAL_CALL SvxShape::setName( const ::rtl::OUString& aName ) throw(::com::sun //---------------------------------------------------------------------- OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException) { - if( 0 == maShapeType.getLength() ) - { - UHashMapEntry* pMap = pSdrShapeIdentifierMap; - while ( ( pMap->nId != mpImpl->mnObjId ) && pMap->aIdentifier.getLength() ) - ++pMap; - - if ( pMap->aIdentifier.getLength() ) - { - return pMap->aIdentifier; - } - else - { - DBG_ERROR("[CL] unknown SdrObjekt identifier"); - } - } - - return maShapeType; + if( !maShapeType.getLength() ) + return UHashMap::getNameFromId( mpImpl->mnObjId ); + else + return maShapeType; } // XComponent @@ -1411,7 +1368,7 @@ OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException) //---------------------------------------------------------------------- void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( mpImpl->mbDisposing ) return; // caught a recursion @@ -1524,14 +1481,14 @@ void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyN void SAL_CALL SvxShape::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - OSL_ENSURE( false, "SvxShape::addVetoableChangeListener: don't have any vetoable properties, so why ...?" ); + OSL_FAIL( "SvxShape::addVetoableChangeListener: don't have any vetoable properties, so why ...?" ); } //---------------------------------------------------------------------- void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - OSL_ENSURE( false, "SvxShape::removeVetoableChangeListener: don't have any vetoable properties, so why ...?" ); + OSL_FAIL( "SvxShape::removeVetoableChangeListener: don't have any vetoable properties, so why ...?" ); } //---------------------------------------------------------------------- @@ -1741,193 +1698,6 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN //---------------------------------------------------------------------- -// static -/* os: unused function - uno::Any SAL_CALL SvxShape::GetFillAttributeByName( - const ::rtl::OUString& rPropertyName, const ::rtl::OUString& rName, SdrModel* pModel ) -{ - uno::Any aResult; - DBG_ASSERT( pModel, "Invalid Model in GetFillAttributeByName()" ); - if( ! pModel ) - return aResult; - - sal_Int16 nWhich = SvxUnoGetWhichIdForNamedProperty( rPropertyName ); - - // search pool for item - const SfxItemPool& rPool = pModel->GetItemPool(); - - const String aSearchName( rName ); - const sal_uInt32 nCount = rPool.GetItemCount((sal_uInt16)nWhich); - const NameOrIndex* pItem = 0; - bool bFound = false; - - for( sal_uInt32 nSurrogate = 0; ! bFound && nSurrogate < nCount; nSurrogate++ ) - { - pItem = (NameOrIndex*)rPool.GetItem((sal_uInt16)nWhich, nSurrogate); - if( pItem && ( pItem->GetName() == aSearchName ) ) - { - bFound = true; - } - } - - // check the property lists that are loaded for the model for items that - // support such. - String aStrName; - SvxUnogetInternalNameForItem( nWhich, rName, aStrName ); - - switch( nWhich ) - { - case XATTR_FILLBITMAP: - { - XFillBitmapItem aBmpItem; - if( ! bFound ) - { - XBitmapList* pBitmapList = pModel->GetBitmapList(); - - if( !pBitmapList ) - break; - - long nPos = ((XPropertyList*)pBitmapList)->Get(aStrName); - if( nPos == -1 ) - break; - - XBitmapEntry* pEntry = pBitmapList->GetBitmap( nPos ); - aBmpItem.SetWhich( XATTR_FILLBITMAP ); - aBmpItem.SetName( rName ); - aBmpItem.SetBitmapValue( pEntry->GetXBitmap() ); - pItem = & aBmpItem; - } - DBG_ASSERT( pItem, "Invalid Item" ); - if( pItem ) - pItem->QueryValue( aResult ); // default: XBitmap. MID_GRAFURL instead? - } - break; - - case XATTR_FILLGRADIENT: - { - XFillGradientItem aGrdItem; - if( ! bFound ) - { - XGradientList* pGradientList = pModel->GetGradientList(); - - if( !pGradientList ) - break; - - long nPos = ((XPropertyList*)pGradientList)->Get(aStrName); - if( nPos == -1 ) - break; - - XGradientEntry* pEntry = pGradientList->GetGradient( nPos ); - aGrdItem.SetWhich( XATTR_FILLGRADIENT ); - aGrdItem.SetName( rName ); - aGrdItem.SetGradientValue( pEntry->GetGradient() ); - pItem = & aGrdItem; - } - DBG_ASSERT( pItem, "Invalid Item" ); - if( pItem ) - pItem->QueryValue( aResult, MID_FILLGRADIENT ); - } - break; - - case XATTR_FILLHATCH: - { - XFillHatchItem aHatchItem; - if( ! bFound ) - { - XHatchList* pHatchList = pModel->GetHatchList(); - - if( !pHatchList ) - break; - - long nPos = ((XPropertyList*)pHatchList)->Get(aStrName); - if( nPos == -1 ) - break; - - XHatchEntry* pEntry = pHatchList->GetHatch( nPos ); - aHatchItem.SetWhich( XATTR_FILLHATCH ); - aHatchItem.SetName( rName ); - aHatchItem.SetHatchValue( pEntry->GetHatch() ); - pItem = & aHatchItem; - } - DBG_ASSERT( pItem, "Invalid Item" ); - if( pItem ) - pItem->QueryValue( aResult, MID_FILLHATCH ); - } - break; - - case XATTR_LINEEND: - case XATTR_LINESTART: - { - if( ! bFound ) - { - XLineEndList* pLineEndList = pModel->GetLineEndList(); - - if( !pLineEndList ) - break; - - long nPos = ((XPropertyList*)pLineEndList)->Get(aStrName); - if( nPos == -1 ) - break; - - XLineEndEntry* pEntry = pLineEndList->GetLineEnd( nPos ); - if( nWhich == XATTR_LINEEND ) - { - XLineEndItem aLEItem; - aLEItem.SetWhich( XATTR_LINEEND ); - aLEItem.SetName( rName ); - aLEItem.SetLineEndValue( pEntry->GetLineEnd() ); - aLEItem.QueryValue( aResult ); - } - else - { - XLineStartItem aLSItem; - aLSItem.SetWhich( XATTR_LINESTART ); - aLSItem.SetName( rName ); - aLSItem.SetLineStartValue( pEntry->GetLineEnd() ); - aLSItem.QueryValue( aResult ); - } - } - else - { - DBG_ASSERT( pItem, "Invalid Item" ); - if( pItem ) - pItem->QueryValue( aResult ); - } - } - break; - - case XATTR_LINEDASH: - { - XLineDashItem aDashItem; - if( ! bFound ) - { - XDashList* pDashList = pModel->GetDashList(); - - if( !pDashList ) - break; - - long nPos = ((XPropertyList*)pDashList)->Get(aStrName); - if( nPos == -1 ) - break; - - XDashEntry* pEntry = pDashList->GetDash( nPos ); - aDashItem.SetWhich( XATTR_LINEDASH ); - aDashItem.SetName( rName ); - aDashItem.SetDashValue( pEntry->GetDash() ); - pItem = & aDashItem; - } - DBG_ASSERT( pItem, "Invalid Item" ); - if( pItem ) - pItem->QueryValue( aResult, MID_LINEDASH ); - } - break; - } - - return aResult; -} */ - -//---------------------------------------------------------------------- - void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1944,7 +1714,7 @@ void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const u void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(rPropertyName); @@ -2069,7 +1839,7 @@ uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName ) uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName); @@ -2128,7 +1898,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) // XMultiPropertySet void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { - OGuard aSolarGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aSolarGuard; const sal_Int32 nCount = aPropertyNames.getLength(); const OUString* pNames = aPropertyNames.getConstArray(); @@ -2217,7 +1987,7 @@ void SvxShape::endSetPropertyValues() } catch( uno::Exception& ) { - DBG_ERROR( "SvxShape::getPropertyValues, unknown property asked" ); + OSL_FAIL( "SvxShape::getPropertyValues, unknown property asked" ); } } } @@ -2234,7 +2004,7 @@ void SvxShape::endSetPropertyValues() } catch( uno::Exception& ) { - DBG_ERROR( "SvxShape::getPropertyValues, unknown property asked" ); + OSL_FAIL( "SvxShape::getPropertyValues, unknown property asked" ); } } } @@ -2325,7 +2095,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE } else { - DBG_ERROR("SvxShape::GetAnyForItem() Returnvalue has wrong Type!" ); + OSL_FAIL("SvxShape::GetAnyForItem() Returnvalue has wrong Type!" ); } } @@ -2354,7 +2124,7 @@ beans::PropertyState SAL_CALL SvxShape::getPropertyState( const OUString& Proper beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName); @@ -2375,9 +2145,6 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope case SFX_ITEM_DEFAULT: eState = beans::PropertyState_DEFAULT_VALUE; break; -// case SFX_ITEM_UNKNOWN: -// case SFX_ITEM_DONTCARE: -// case SFX_ITEM_DISABLED: default: eState = beans::PropertyState_AMBIGUOUS_VALUE; break; @@ -2569,11 +2336,10 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper { Point aPoint( aUnoPoint.X, aUnoPoint.Y ); - // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051 + // Reintroduction of fix for issue i59051 (#i108851#) // perform metric change before applying anchor position, // because the anchor position is in pool metric. ForceMetricToItemPoolMetric( aPoint ); - // <-- if( mpModel->IsWriter() ) aPoint += mpObj->GetAnchorPos(); @@ -2600,9 +2366,8 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper if ( rValue >>= aPolyPoly ) { basegfx::B2DPolyPolygon aNewPolyPolygon( SvxConvertPolyPolygonBezierToB2DPolyPolygon( &aPolyPoly ) ); - // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051 + // Reintroduction of fix for issue i59051 (#i108851#) ForceMetricToItemPoolMetric( aNewPolyPolygon ); - // <-- if( mpModel->IsWriter() ) { Point aPoint( mpObj->GetAnchorPos() ); @@ -2625,9 +2390,8 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper { Point aPoint( aUnoPoint.X, aUnoPoint.Y ); - // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051 + // Reintroduction of fix for issue #i59051# (#i108851#) ForceMetricToItemPoolMetric( aPoint ); - // <-- if( mpModel->IsWriter() ) aPoint += mpObj->GetAnchorPos(); @@ -2857,13 +2621,6 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper { switch( pProperty->nWID ) { -/* - case OWN_ATTR_HASLEVELS: - { - rValue <<= SvxTextEditSource::hasLevels( mpObj.get() ); - break; - } -*/ case OWN_ATTR_CAPTION_POINT: { Point aVclPoint = ((SdrCaptionObj*)mpObj.get())->GetTailPos(); @@ -3054,9 +2811,8 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper Point aPoint( mpObj->GetAnchorPos() ); aPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(-aPoint.X(), -aPoint.Y())); } - // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue 59051 + // Reintroduction of fix for issue #i59051# (#i108851#) ForceMetricTo100th_mm( aPolyPoly ); - // <-- drawing::PolyPolygonBezierCoords aRetval; SvxConvertB2DPolyPolygonToPolyPolygonBezier( aPolyPoly, aRetval); rValue <<= aRetval; @@ -3077,9 +2833,8 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper if( mpModel->IsWriter() ) aPoint -= mpObj->GetAnchorPos(); - // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue 59051 + // Reintroduction of fix for issue #i59051# (#i108851#) ForceMetricTo100th_mm( aPoint ); - // <-- awt::Point aUnoPoint( aPoint.X(), aPoint.Y() ); rValue <<= aUnoPoint; @@ -3321,13 +3076,12 @@ uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( cons if( mpImpl->mpMaster ) { for( sal_Int32 nIdx = 0; nIdx < nCount; nIdx++ ) - pState[nIdx] = getPropertyState( pNames[nIdx] ); - + pState[nIdx] = mpImpl->mpMaster->getPropertyState( pNames[nIdx] ); } else { for( sal_Int32 nIdx = 0; nIdx < nCount; nIdx++ ) - pState[nIdx] = getPropertyState( pNames[nIdx] ); + pState[nIdx] = _getPropertyState( pNames[nIdx] ); } return aRet; @@ -3351,7 +3105,7 @@ void SAL_CALL SvxShape::setPropertyToDefault( const OUString& PropertyName ) void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; const SfxItemPropertySimpleEntry* pProperty = mpPropSet->getPropertyMapEntry(PropertyName); @@ -3384,7 +3138,7 @@ uno::Any SAL_CALL SvxShape::getPropertyDefault( const OUString& aPropertyName ) uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(aPropertyName); @@ -3410,7 +3164,7 @@ uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName ) // XMultiPropertyStates void SvxShape::setAllPropertiesToDefault() throw (uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( !mpObj.is() ) throw lang::DisposedException(); @@ -3530,7 +3284,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::getSupportedServiceNames() uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() throw(uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( mpObj.is() && mpObj->GetObjInventor() == SdrInventor) { @@ -3543,9 +3297,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_GroupServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_GroupServices, 2, @@ -3553,7 +3304,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_Shape ); pSeq = &SvxShape_GroupServices; - } } return *pSeq; @@ -3563,9 +3313,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_CustomShapeServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_CustomShapeServices, 13, @@ -3585,7 +3332,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_ShadowProperties, sUNO_service_drawing_RotationDescriptor); pSeq = &SvxShape_CustomShapeServices; - } } return *pSeq; } @@ -3594,9 +3340,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_LineServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_LineServices,14, @@ -3619,7 +3362,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_RotationDescriptor); pSeq = &SvxShape_LineServices; - } } return *pSeq; } @@ -3629,9 +3371,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_RectServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_RectServices,14, @@ -3652,8 +3391,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_ShadowProperties, sUNO_service_drawing_RotationDescriptor); pSeq = &SvxShape_RectServices; - } - } return *pSeq; } @@ -3666,9 +3403,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_CircServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_CircServices,14, @@ -3691,7 +3425,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_RotationDescriptor); pSeq = &SvxShape_CircServices; - } } return *pSeq; @@ -3703,9 +3436,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_PathServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_PathServices,14, sUNO_service_drawing_PolyLineShape, @@ -3727,7 +3457,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_ShadowProperties, sUNO_service_drawing_RotationDescriptor); pSeq = &SvxShape_PathServices; - } } return *pSeq; } @@ -3738,9 +3467,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_PolyServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_PolyServices,15, sUNO_service_drawing_PolyPolygonShape, @@ -3764,7 +3490,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_RotationDescriptor); pSeq = &SvxShape_PolyServices; - } } return *pSeq; } @@ -3775,9 +3500,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_FreeLineServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_FreeLineServices,15, @@ -3802,7 +3524,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_RotationDescriptor); pSeq = &SvxShape_FreeLineServices; - } } return *pSeq; @@ -3814,9 +3535,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_FreeFillServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_FreeFillServices,15, sUNO_service_drawing_ClosedBezierShape, @@ -3840,7 +3558,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_RotationDescriptor); pSeq = &SvxShape_FreeFillServices; - } } return *pSeq; } @@ -3852,9 +3569,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_TextServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_TextServices,14, sUNO_service_drawing_TextShape, @@ -3876,7 +3590,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_RotationDescriptor); pSeq = &SvxShape_TextServices; - } } return *pSeq; } @@ -3886,9 +3599,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_GrafServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_GrafServices, 12, sUNO_service_drawing_GraphicObjectShape, @@ -3908,7 +3618,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_RotationDescriptor); pSeq = &SvxShape_GrafServices; - } } return *pSeq; } @@ -3918,9 +3627,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_Ole2Services; comphelper::ServiceInfoHelper::addToSequence( SvxShape_Ole2Services, 2, @@ -3928,7 +3634,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_Shape); pSeq = &SvxShape_Ole2Services; - } } return *pSeq; } @@ -3938,9 +3643,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_CaptionServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_CaptionServices,14, @@ -3963,7 +3665,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_RotationDescriptor); pSeq = &SvxShape_CaptionServices; - } } return *pSeq; @@ -3974,9 +3675,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_PageServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_PageServices, 2, @@ -3984,7 +3682,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_Shape ); pSeq = &SvxShape_PageServices; - } } return *pSeq; @@ -3995,9 +3692,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_MeasureServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_MeasureServices,15, sUNO_service_drawing_MeasureShape, @@ -4021,7 +3715,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_RotationDescriptor); pSeq = &SvxShape_MeasureServices; - } } return *pSeq; @@ -4032,9 +3725,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_FrameServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_FrameServices, 2, @@ -4042,7 +3732,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_Shape ); pSeq = &SvxShape_FrameServices; - } } return *pSeq; @@ -4053,16 +3742,12 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard _aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_UnoServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2, sUNO_service_drawing_ControlShape, sUNO_service_drawing_Shape ); pSeq = &SvxShape_UnoServices; - } } return *pSeq; } @@ -4072,9 +3757,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_EdgeServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_EdgeServices,15, @@ -4098,7 +3780,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_RotationDescriptor); pSeq = &SvxShape_EdgeServices; - } } return *pSeq; } @@ -4107,9 +3788,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_MediaServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_MediaServices, 2, @@ -4117,7 +3795,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sUNO_service_drawing_Shape); pSeq = &SvxShape_MediaServices; - } } return *pSeq; } @@ -4132,20 +3809,16 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() static uno::Sequence< OUString > *pSeq = 0; if( 0 == pSeq ) { -// OGuard aGuard( Application::GetSolarMutex() ); -// if( 0 == pSeq ) - { static uno::Sequence< OUString > SvxShape_UnoServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2, sUNO_service_drawing_ControlShape, sUNO_service_drawing_Shape ); pSeq = &SvxShape_UnoServices; - } } return *pSeq; } - OSL_ENSURE( false, "SvxShape::_getSupportedServiceNames: could not determine object type!" ); + OSL_FAIL( "SvxShape::_getSupportedServiceNames: could not determine object type!" ); uno::Sequence< OUString > aSeq; return aSeq; } @@ -4169,7 +3842,7 @@ sal_Bool SAL_CALL SvxShape::supportsService( const OUString& ServiceName ) throw uno::Reference< container::XIndexContainer > SAL_CALL SvxShape::getGluePoints() throw(uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; uno::Reference< container::XIndexContainer > xGluePoints( mxGluePoints ); if( mpObj.is() && !xGluePoints.is() ) @@ -4187,7 +3860,7 @@ uno::Reference< container::XIndexContainer > SAL_CALL SvxShape::getGluePoints() uno::Reference< uno::XInterface > SAL_CALL SvxShape::getParent( ) throw(uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( mpObj.is() && mpObj->GetObjList() ) { @@ -4205,7 +3878,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxShape::getParent( ) case SDROBJLIST_MASTERPAGE: return PTR_CAST( SdrPage, pObjList )->getUnoPage(); default: - DBG_ERROR( "SvxShape::getParent( ): unexpected SdrObjListKind" ); + OSL_FAIL( "SvxShape::getParent( ): unexpected SdrObjListKind" ); break; } } @@ -4241,7 +3914,7 @@ void SvxShape::unlock() // XActionLockable sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (::com::sun::star::uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; return mnLockCount != 0; } @@ -4250,7 +3923,7 @@ sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (::com::sun::star::uno::Run void SAL_CALL SvxShape::addActionLock( ) throw (::com::sun::star::uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; DBG_ASSERT( mnLockCount < 0xffff, "lock overflow in SvxShape!" ); mnLockCount++; @@ -4263,7 +3936,7 @@ void SAL_CALL SvxShape::addActionLock( ) throw (::com::sun::star::uno::RuntimeE void SAL_CALL SvxShape::removeActionLock( ) throw (::com::sun::star::uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; DBG_ASSERT( mnLockCount > 0, "lock underflow in SvxShape!" ); mnLockCount--; @@ -4276,7 +3949,7 @@ void SAL_CALL SvxShape::removeActionLock( ) throw (::com::sun::star::uno::Runti void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (::com::sun::star::uno::RuntimeException ) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( (mnLockCount == 0) && (nLock != 0) ) unlock(); @@ -4291,7 +3964,7 @@ void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (::com::sun::sta sal_Int16 SAL_CALL SvxShape::resetActionLocks( ) throw (::com::sun::star::uno::RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; if( mnLockCount != 0 ) unlock(); @@ -4339,13 +4012,13 @@ void SvxShape::updateShapeKind() * class SvxShapeText * ***********************************************************************/ SvxShapeText::SvxShapeText() throw () -: SvxShape(NULL, aSvxMapProvider.GetMap(SVXMAP_TEXT), aSvxMapProvider.GetPropertySet(SVXMAP_TEXT, SdrObject::GetGlobalDrawObjectItemPool()) ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() ) +: SvxShape(NULL, getSvxMapProvider().GetMap(SVXMAP_TEXT), getSvxMapProvider().GetPropertySet(SVXMAP_TEXT, SdrObject::GetGlobalDrawObjectItemPool()) ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() ) { } //---------------------------------------------------------------------- SvxShapeText::SvxShapeText( SdrObject* pObject ) throw () -: SvxShape( pObject, aSvxMapProvider.GetMap(SVXMAP_TEXT), aSvxMapProvider.GetPropertySet(SVXMAP_TEXT, SdrObject::GetGlobalDrawObjectItemPool()) ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() ) +: SvxShape( pObject, getSvxMapProvider().GetMap(SVXMAP_TEXT), getSvxMapProvider().GetPropertySet(SVXMAP_TEXT, SdrObject::GetGlobalDrawObjectItemPool()) ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() ) { if( pObject && pObject->GetModel() ) SetEditSource( new SvxTextEditSource( pObject, 0, static_cast< uno::XWeak * >( this ) ) ); @@ -4492,7 +4165,7 @@ void SvxShapeText::unlock() // ::com::sun::star::text::XTextRange uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno::RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL; if( pForwarder ) ::GetSelection( maSelection, pForwarder ); @@ -4502,7 +4175,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno:: uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() throw(uno::RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL; if( pForwarder ) ::GetSelection( maSelection, pForwarder ); @@ -4511,7 +4184,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() throw(uno::Ru OUString SAL_CALL SvxShapeText::getString() throw(uno::RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL; if( pForwarder ) ::GetSelection( maSelection, pForwarder ); @@ -4521,7 +4194,7 @@ OUString SAL_CALL SvxShapeText::getString() throw(uno::RuntimeException) void SAL_CALL SvxShapeText::setString( const OUString& aString ) throw(uno::RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL; if( pForwarder ) ::GetSelection( maSelection, pForwarder ); @@ -4582,7 +4255,7 @@ bool SvxShapeText::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* p ***********************************************************************/ DBG_NAME(SvxShapeRect) SvxShapeRect::SvxShapeRect( SdrObject* pObj ) throw() -: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_SHAPE), aSvxMapProvider.GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool())) +: SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_SHAPE), getSvxMapProvider().GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool())) { DBG_CTOR(SvxShapeRect,NULL); } @@ -4659,3 +4332,5 @@ void SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet& rPropSet, co bool bDontConvertNegativeValues = ( pMap->nWID == XATTR_FILLBMP_SIZEX || pMap->nWID == XATTR_FILLBMP_SIZEY ); rPropSet.setPropertyValue( pMap, rVal, rSet, bDontConvertNegativeValues ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index f42e06cd8619..b3b55360a1f9 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -256,3 +257,5 @@ Reference< XInterface > SAL_CALL SvxShapeCollection_createInstance( const Refere { return *( new SvxShapeCollection() ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 2d82868512c5..514497ff6e47 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,11 +55,10 @@ #include <editeng/unotext.hxx> #include <com/sun/star/linguistic2/XLinguServiceManager.hpp> #include <comphelper/processfactory.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svx/sdrpaintwindow.hxx> using namespace ::osl; -using namespace ::vos; using namespace ::rtl; using ::com::sun::star::uno::XInterface; @@ -1054,7 +1054,7 @@ SvxTextEditSource::SvxTextEditSource( SvxTextEditSourceImpl* pImpl ) //------------------------------------------------------------------------ SvxTextEditSource::~SvxTextEditSource() { - OGuard aGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aGuard; mpImpl->release(); } @@ -1153,3 +1153,5 @@ void SvxTextEditSource::UpdateOutliner() { mpImpl->UpdateOutliner(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index 0f277467bd1f..6b125424f152 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTransGradientTable_createInstan +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index ac90eb5ee362..2e9da27b76ab 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,20 +34,16 @@ #include "svx/galtheme.hxx" #include "svx/galmisc.hxx" #include <svx/fmmodel.hxx> -#include <rtl/uuid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/graph.hxx> #include <svl/itemprop.hxx> #include <svl/itempool.hxx> +#include <comphelper/servicehelper.hxx> #include "galobj.hxx" -#ifndef _COM_SUN_STAR_BEANS_PROPERTYSTATE_HDL_ #include <com/sun/star/beans/PropertyState.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HDL_ #include <com/sun/star/beans/PropertyAttribute.hpp> -#endif #include <com/sun/star/gallery/GalleryItemType.hpp> #define UNOGALLERY_GALLERYITEMTYPE 1 @@ -206,21 +203,15 @@ uno::Sequence< uno::Type > SAL_CALL GalleryItem::getTypes() return aTypes; } -// ------------------------------------------------------------------------------ +namespace +{ + class theGalleryItemImplementationId : public rtl::Static< UnoTunnelIdInit, theGalleryItemImplementationId > {}; +} uno::Sequence< sal_Int8 > SAL_CALL GalleryItem::getImplementationId() throw(uno::RuntimeException) { - const vos::OGuard aGuard( Application::GetSolarMutex() ); - static uno::Sequence< sal_Int8 > aId; - - if( aId.getLength() == 0 ) - { - aId.realloc( 16 ); - rtl_createUuid( reinterpret_cast< sal_uInt8* >( aId.getArray() ), 0, sal_True ); - } - - return aId; + return theGalleryItemImplementationId::get().getSeq(); } // ------------------------------------------------------------------------------ @@ -228,7 +219,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GalleryItem::getImplementationId() sal_Int8 SAL_CALL GalleryItem::getType() throw (uno::RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; sal_Int8 nRet = gallery::GalleryItemType::EMPTY; if( isValid() ) @@ -257,7 +248,7 @@ sal_Int8 SAL_CALL GalleryItem::getType() ::comphelper::PropertySetInfo* GalleryItem::createPropertySetInfo() { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; ::comphelper::PropertySetInfo* pRet = new ::comphelper::PropertySetInfo(); static ::comphelper::PropertyMapEntry aEntries[] = @@ -297,7 +288,7 @@ void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEnt lang::IllegalArgumentException, lang::WrappedTargetException ) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; while( *ppEntries ) { @@ -342,7 +333,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt throw( beans::UnknownPropertyException, lang::WrappedTargetException ) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; while( *ppEntries ) { @@ -483,3 +474,5 @@ GalleryDrawingModel::~GalleryDrawingModel() UNO3_GETIMPLEMENTATION_IMPL( GalleryDrawingModel ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx index a48f83a49313..c79d82ac77d5 100644 --- a/svx/source/unogallery/unogalitem.hxx +++ b/svx/source/unogallery/unogalitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/gallery/XGalleryItem.hpp> #include <comphelper/propertysethelper.hxx> -#ifndef _COMPHELPER_PROPERTYSETINFO_HXX_ #include <comphelper/propertysetinfo.hxx> -#endif class GalleryTheme; struct GalleryObject; @@ -124,3 +123,5 @@ public: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index 1145be7e3f5e..673a99041241 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,12 +37,13 @@ #include "svx/gallery1.hxx" #include "svx/galmisc.hxx" #include <svx/fmmodel.hxx> -#include <rtl/uuid.h> -#include <vos/mutex.hxx> -#ifndef _SV_SVAPP_HXX_ +#include <svx/svdpage.hxx> +#include <svx/unopage.hxx> +#include <svl/itempool.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#endif #include <unotools/pathoptions.hxx> +#include <comphelper/servicehelper.hxx> using namespace ::com::sun::star; @@ -64,7 +66,7 @@ GalleryTheme::GalleryTheme( const ::rtl::OUString& rThemeName ) GalleryTheme::~GalleryTheme() { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; DBG_ASSERT( !mpTheme || mpGallery, "Theme is living without Gallery" ); @@ -147,21 +149,15 @@ uno::Sequence< uno::Type > SAL_CALL GalleryTheme::getTypes() return aTypes; } -// ------------------------------------------------------------------------------ +namespace +{ + class theGalleryThemeImplementationId : public rtl::Static< UnoTunnelIdInit, theGalleryThemeImplementationId > {}; +} uno::Sequence< sal_Int8 > SAL_CALL GalleryTheme::getImplementationId() throw(uno::RuntimeException) { - const vos::OGuard aGuard( Application::GetSolarMutex() ); - static uno::Sequence< sal_Int8 > aId; - - if( aId.getLength() == 0 ) - { - aId.realloc( 16 ); - rtl_createUuid( reinterpret_cast< sal_uInt8* >( aId.getArray() ), 0, sal_True ); - } - - return aId; + return theGalleryThemeImplementationId::get().getSeq(); } // ------------------------------------------------------------------------------ @@ -177,7 +173,7 @@ uno::Type SAL_CALL GalleryTheme::getElementType() sal_Bool SAL_CALL GalleryTheme::hasElements() throw (uno::RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; return( ( mpTheme != NULL ) && ( mpTheme->GetObjectCount() > 0 ) ); } @@ -187,7 +183,7 @@ sal_Bool SAL_CALL GalleryTheme::hasElements() sal_Int32 SAL_CALL GalleryTheme::getCount() throw (uno::RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; return( mpTheme ? mpTheme->GetObjectCount() : 0 ); } @@ -197,7 +193,7 @@ sal_Int32 SAL_CALL GalleryTheme::getCount() uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; uno::Any aRet; if( mpTheme ) @@ -223,7 +219,7 @@ uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex ) ::rtl::OUString SAL_CALL GalleryTheme::getName( ) throw (uno::RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; ::rtl::OUString aRet; if( mpTheme ) @@ -237,7 +233,7 @@ uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex ) void SAL_CALL GalleryTheme::update( ) throw (uno::RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; if( mpTheme ) { @@ -252,7 +248,7 @@ void SAL_CALL GalleryTheme::update( ) const ::rtl::OUString& rURL, ::sal_Int32 nIndex ) throw (lang::WrappedTargetException, uno::RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; sal_Int32 nRet = -1; if( mpTheme ) @@ -285,7 +281,7 @@ void SAL_CALL GalleryTheme::update( ) const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nIndex ) throw (lang::WrappedTargetException, uno::RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; sal_Int32 nRet = -1; if( mpTheme ) @@ -313,7 +309,7 @@ void SAL_CALL GalleryTheme::update( ) const uno::Reference< lang::XComponent >& Drawing, sal_Int32 nIndex ) throw (lang::WrappedTargetException, uno::RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; sal_Int32 nRet = -1; if( mpTheme ) @@ -322,11 +318,43 @@ void SAL_CALL GalleryTheme::update( ) if( pModel && pModel->GetDoc() && pModel->GetDoc()->ISA( FmFormModel ) ) { + //Here we're inserting something that's already a gallery theme drawing + nIndex = ::std::max( ::std::min( nIndex, getCount() ), sal_Int32( 0 ) ); if( mpTheme->InsertModel( *static_cast< FmFormModel* >( pModel->GetDoc() ), nIndex ) ) nRet = nIndex; } + else if (!pModel) + { + //#i80184# Try to do the right thing and make a Gallery drawing out of an ordinary + //Drawing if possible. + try + { + uno::Reference< drawing::XDrawPagesSupplier > xDrawPagesSupplier( Drawing, uno::UNO_QUERY_THROW ); + uno::Reference< drawing::XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), uno::UNO_QUERY_THROW ); + uno::Reference< drawing::XDrawPage > xPage( xDrawPages->getByIndex( 0 ), uno::UNO_QUERY_THROW ); + SvxDrawPage* pUnoPage = xPage.is() ? SvxDrawPage::getImplementation( xPage ) : NULL; + SdrModel* pOrigModel = pUnoPage ? pUnoPage->GetSdrPage()->GetModel() : NULL; + SdrPage* pOrigPage = pUnoPage ? pUnoPage->GetSdrPage() : NULL; + + if (pOrigPage && pOrigModel) + { + FmFormModel* pTmpModel = new FmFormModel(&pOrigModel->GetItemPool()); + SdrPage* pNewPage = pOrigPage->Clone(); + pTmpModel->InsertPage(pNewPage, 0); + + uno::Reference< lang::XComponent > xDrawing( new GalleryDrawingModel( pTmpModel ) ); + pTmpModel->setUnoModel( uno::Reference< uno::XInterface >::query( xDrawing ) ); + + nRet = insertDrawingByIndex( xDrawing, nIndex ); + return nRet; + } + } + catch (...) + { + } + } } return nRet; @@ -337,7 +365,7 @@ void SAL_CALL GalleryTheme::update( ) void SAL_CALL GalleryTheme::removeByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; if( mpTheme ) { @@ -352,7 +380,7 @@ void SAL_CALL GalleryTheme::removeByIndex( sal_Int32 nIndex ) void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; const GalleryHint& rGalleryHint = static_cast< const GalleryHint& >( rHint ); switch( rGalleryHint.GetType() ) @@ -389,7 +417,7 @@ void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint ) void GalleryTheme::implReleaseItems( GalleryObject* pObj ) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; for( GalleryItemList::iterator aIter = maItemList.begin(); aIter != maItemList.end(); ) { @@ -414,7 +442,7 @@ void GalleryTheme::implReleaseItems( GalleryObject* pObj ) void GalleryTheme::implRegisterGalleryItem( ::unogallery::GalleryItem& rItem ) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; // DBG_ASSERT( maItemList.find( &rItem ) == maItemList.end(), "Item already registered" ); maItemList.push_back( &rItem ); @@ -424,10 +452,12 @@ void GalleryTheme::implRegisterGalleryItem( ::unogallery::GalleryItem& rItem ) void GalleryTheme::implDeregisterGalleryItem( ::unogallery::GalleryItem& rItem ) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; // DBG_ASSERT( maItemList.find( &rItem ) != maItemList.end(), "Item is not registered" ); maItemList.remove( &rItem ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx index 376d4dfb08a9..db689a378f7d 100644 --- a/svx/source/unogallery/unogaltheme.hxx +++ b/svx/source/unogallery/unogaltheme.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,3 +109,5 @@ private: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index d6204da54eb8..d5cd542c6c1f 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,12 +32,10 @@ #include "unogalthemeprovider.hxx" #include "unogaltheme.hxx" #include "svx/gallery1.hxx" -#include <rtl/uuid.h> -#include <vos/mutex.hxx> -#ifndef _SV_SVAPP_HXX_ +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#endif #include <unotools/pathoptions.hxx> +#include <comphelper/servicehelper.hxx> #include <com/sun/star/gallery/XGalleryTheme.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -156,21 +155,15 @@ uno::Sequence< uno::Type > SAL_CALL GalleryThemeProvider::getTypes() return aTypes; } -// ------------------------------------------------------------------------------ +namespace +{ + class theGalleryThemeProviderImplementationId : public rtl::Static< UnoTunnelIdInit, theGalleryThemeProviderImplementationId > {}; +} uno::Sequence< sal_Int8 > SAL_CALL GalleryThemeProvider::getImplementationId() throw(uno::RuntimeException) { - const vos::OGuard aGuard( Application::GetSolarMutex() ); - static uno::Sequence< sal_Int8 > aId; - - if( aId.getLength() == 0 ) - { - aId.realloc( 16 ); - rtl_createUuid( reinterpret_cast< sal_uInt8* >( aId.getArray() ), 0, sal_True ); - } - - return aId; + return theGalleryThemeProviderImplementationId::get().getSeq(); } // ------------------------------------------------------------------------------ @@ -191,7 +184,7 @@ void SAL_CALL GalleryThemeProvider::initialize( const uno::Sequence< uno::Any >& { const beans::PropertyValue& rProp = aParams[ i ]; - if( rProp.Name.equalsAscii( "ProvideHiddenThemes" ) ) + if( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ProvideHiddenThemes" ) ) ) rProp.Value >>= mbHiddenThemes; } } @@ -209,7 +202,7 @@ uno::Type SAL_CALL GalleryThemeProvider::getElementType() sal_Bool SAL_CALL GalleryThemeProvider::hasElements() throw (uno::RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; return( ( mpGallery != NULL ) && ( mpGallery->GetThemeCount() > 0 ) ); } @@ -219,7 +212,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasElements() uno::Any SAL_CALL GalleryThemeProvider::getByName( const ::rtl::OUString& rName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; uno::Any aRet; if( !mpGallery || !mpGallery->HasTheme( rName ) ) @@ -239,7 +232,7 @@ uno::Any SAL_CALL GalleryThemeProvider::getByName( const ::rtl::OUString& rName uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider::getElementNames() throw (uno::RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; sal_uInt32 i = 0, nCount = ( mpGallery ? mpGallery->GetThemeCount() : 0 ), nRealCount = 0; uno::Sequence< ::rtl::OUString > aSeq( nCount ); @@ -261,7 +254,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider::getElementNames( sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const ::rtl::OUString& rName ) throw (uno::RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; sal_Bool bRet = sal_False; @@ -276,7 +269,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const ::rtl::OUString& rName uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNewByName( const ::rtl::OUString& rThemeName ) throw (container::ElementExistException, uno::RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; uno::Reference< gallery::XGalleryTheme > xRet; if( mpGallery ) @@ -299,7 +292,7 @@ uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNe void SAL_CALL GalleryThemeProvider::removeByName( const ::rtl::OUString& rName ) throw (container::NoSuchElementException, uno::RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; if( !mpGallery || !mpGallery->HasTheme( rName ) || @@ -314,3 +307,5 @@ void SAL_CALL GalleryThemeProvider::removeByName( const ::rtl::OUString& rName ) } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index fdeda1dd726b..03f8d3ebafff 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,9 +36,7 @@ #include <com/sun/star/embed/XEmbedObjectFactory.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> -#ifndef _COM_SUN_STAR_EMBED_XEMBED_PERSIST_HPP_ #include <com/sun/star/embed/XEmbedPersist.hpp> -#endif #include <com/sun/star/embed/EntryInitModes.hpp> #include <com/sun/star/embed/EmbedStates.hpp> #include <com/sun/star/embed/Aspects.hpp> @@ -52,9 +51,7 @@ #include <comphelper/storagehelper.hxx> #include <comphelper/embeddedobjectcontainer.hxx> -#ifndef _SO_CLSIDS_HXX #include <sot/clsids.hxx> -#endif #include <map> #include "svx/xmleohlp.hxx" @@ -193,7 +190,7 @@ SvXMLEmbeddedObjectHelper::~SvXMLEmbeddedObjectHelper() { SvXMLEmbeddedObjectHelper_Impl::iterator aIter = mpStreamMap->begin(); SvXMLEmbeddedObjectHelper_Impl::iterator aEnd = mpStreamMap->end(); - for( ; aIter != aEnd; aIter++ ) + for( ; aIter != aEnd; ++aIter ) { if( aIter->second ) { @@ -352,7 +349,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( if( -1 != rContainerStorageName.indexOf( '/' ) ) { - DBG_ERROR( "SvXMLEmbeddedObjectHelper: invalid path name" ); + OSL_FAIL( "SvXMLEmbeddedObjectHelper: invalid path name" ); return sal_False; } @@ -817,3 +814,4 @@ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasElements() } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index c3b5bc5e55d0..5eabfa5742de 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,7 +81,7 @@ sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutp uno::Reference< lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() ); if( !xServiceFactory.is() ) { - DBG_ERROR( "got no service manager" ); + OSL_FAIL( "got no service manager" ); bDocRet = sal_False; } @@ -89,7 +90,7 @@ sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutp uno::Reference< uno::XInterface > xWriter( xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" ) ) ) ); if( !xWriter.is() ) { - DBG_ERROR( "com.sun.star.xml.sax.Writer service missing" ); + OSL_FAIL( "com.sun.star.xml.sax.Writer service missing" ); bDocRet = sal_False; } @@ -120,7 +121,7 @@ sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutp uno::Reference< document::XFilter > xFilter( xServiceFactory->createInstanceWithArguments( OUString::createFromAscii( pExportService ), aArgs ), uno::UNO_QUERY ); if( !xFilter.is() ) { - DBG_ERROR( "com.sun.star.comp.Draw.XMLExporter service missing" ); + OSL_FAIL( "com.sun.star.comp.Draw.XMLExporter service missing" ); bDocRet = sal_False; } @@ -138,7 +139,7 @@ sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutp } } } - catch(uno::Exception e) + catch(uno::Exception const& e) { DBG_UNHANDLED_EXCEPTION(); bDocRet = sal_False; @@ -227,7 +228,7 @@ sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInpu aParserInput.aInputStream = xInputStream; // get parser - Reference< xml::sax::XParser > xParser( xServiceFactory->createInstance( OUString::createFromAscii("com.sun.star.xml.sax.Parser") ), UNO_QUERY ); + Reference< xml::sax::XParser > xParser( xServiceFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ), UNO_QUERY ); DBG_ASSERT( xParser.is(), "Can't create parser" ); // prepare filter arguments @@ -281,3 +282,5 @@ sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInpu Reference< lang::XComponent > xComponent; return SvxDrawingLayerImport( pModel, xInputStream, xComponent ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 5284e32f810e..23cb968233b9 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,10 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" +#include <sal/macros.h> #include <com/sun/star/embed/XTransactedObject.hpp> -#ifndef _COM_SUN_STAR_EMBED_ElementModes_HPP_ #include <com/sun/star/embed/ElementModes.hpp> -#endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -74,7 +74,7 @@ const MetaCommentAction* ImplCheckForEPS( GDIMetaFile& rMtf ) static ByteString aComment( (const sal_Char*)"EPSReplacementGraphic" ); const MetaCommentAction* pComment = NULL; - if ( ( rMtf.GetActionCount() >= 2 ) + if ( ( rMtf.GetActionSize() >= 2 ) && ( rMtf.FirstAction()->GetType() == META_EPS_ACTION ) && ( ((const MetaAction*)rMtf.GetAction( 1 ))->GetType() == META_COMMENT_ACTION ) && ( ((const MetaCommentAction*)rMtf.GetAction( 1 ))->GetComment() == aComment ) ) @@ -139,7 +139,7 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const ::rtl::OUString& rGraphi { if( aGraphic.GetType() == GRAPHIC_BITMAP ) { - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); + GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); String aFormat; if( aGraphic.IsAnimated() ) @@ -147,7 +147,7 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const ::rtl::OUString& rGraphi else aFormat = String( RTL_CONSTASCII_USTRINGPARAM( "png" ) ); - bRet = ( pFilter->ExportGraphic( aGraphic, String(), *pStm, pFilter->GetExportFormatNumberForShortName( aFormat ) ) == 0 ); + bRet = ( rFilter.ExportGraphic( aGraphic, String(), *pStm, rFilter.GetExportFormatNumberForShortName( aFormat ) ) == 0 ); } else if( aGraphic.GetType() == GRAPHIC_GDIMETAFILE ) { @@ -331,7 +331,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() mpOStm->Seek( 0 ); sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW; sal_uInt16 pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW; - GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *mpOStm ,nFormat,&pDeterminedFormat ); + GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, String(), *mpOStm ,nFormat,&pDeterminedFormat ); if (pDeterminedFormat == GRFILTER_FORMAT_DONTKNOW) { @@ -374,7 +374,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() if (nStreamLen_) { pDest->Seek(0L); - GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat ); + GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat ); } } delete pDest; @@ -455,7 +455,7 @@ sal_Bool SvXMLGraphicHelper::ImplGetStreamNames( const ::rtl::OUString& rURLStr, } else { - DBG_ERROR( "SvXMLGraphicHelper::ImplInsertGraphicURL: invalid scheme" ); + OSL_FAIL( "SvXMLGraphicHelper::ImplInsertGraphicURL: invalid scheme" ); } } @@ -518,7 +518,6 @@ SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const ::rt aRet.xStream = aRet.xStorage->openStreamElement( rPictureStreamName, nMode ); if( aRet.xStream.is() && ( GRAPHICHELPER_MODE_WRITE == meCreateMode ) ) { -//REMOVE ::rtl::OUString aPropName( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ); ::rtl::OUString aPropName( RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption") ); uno::Reference < beans::XPropertySet > xProps( aRet.xStream, uno::UNO_QUERY ); xProps->setPropertyValue( aPropName, uno::makeAny( sal_True) ); @@ -553,7 +552,7 @@ String SvXMLGraphicHelper::ImplGetGraphicMimeType( const String& rFileName ) con { const ByteString aExt( rFileName.Copy( rFileName.Len() - 3 ), RTL_TEXTENCODING_ASCII_US ); - for( long i = 0, nCount = sizeof( aMapper ) / sizeof( aMapper[ 0 ] ); ( i < nCount ) && !aMimeType.Len(); i++ ) + for( long i = 0, nCount = SAL_N_ELEMENTS( aMapper ); ( i < nCount ) && !aMimeType.Len(); i++ ) if( aExt == aMapper[ i ].pExt ) aMimeType = String( aMapper[ i ].pMimeType, RTL_TEXTENCODING_ASCII_US ); } @@ -571,7 +570,7 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStor if( aStream.xStream.is() ) { SvStream* pStream = utl::UcbStreamHelper::CreateStream( aStream.xStream ); - GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pStream ); + GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, String(), *pStream ); delete pStream; } @@ -606,7 +605,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt xProps->setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), aAny ); } - const sal_Bool bCompressed = ( ( 0 == aMimeType.getLength() ) || ( aMimeType == ::rtl::OUString::createFromAscii( "image/tiff" ) ) ); + const sal_Bool bCompressed = ( ( 0 == aMimeType.getLength() ) || ( aMimeType == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/tiff")) ) ); aAny <<= bCompressed; xProps->setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "Compressed" ) ), aAny ); @@ -617,7 +616,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt { if( aGraphic.GetType() == GRAPHIC_BITMAP ) { - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); + GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); String aFormat; if( aGraphic.IsAnimated() ) @@ -625,8 +624,8 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt else aFormat = String( RTL_CONSTASCII_USTRINGPARAM( "png" ) ); - bRet = ( pFilter->ExportGraphic( aGraphic, String(), *pStream, - pFilter->GetExportFormatNumberForShortName( aFormat ) ) == 0 ); + bRet = ( rFilter.ExportGraphic( aGraphic, String(), *pStream, + rFilter.GetExportFormatNumberForShortName( aFormat ) ) == 0 ); } else if( aGraphic.GetType() == GRAPHIC_GDIMETAFILE ) { @@ -957,7 +956,7 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream() if( aId.getLength() ) { - aRet = ::rtl::OUString::createFromAscii( XML_GRAPHICOBJECT_URL_BASE ); + aRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_GRAPHICOBJECT_URL_BASE )); aRet += aId; } } @@ -1162,3 +1161,5 @@ Sequence< ::rtl::OUString > SAL_CALL SvXMLGraphicExportHelper_getSupportedServic } } // namespace svx + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 4441e22dbcc0..bc5d4447bc4e 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -199,14 +200,14 @@ sal_Bool SvxXMLXTableExportComponent::save( const OUString& rURL, const uno::Ref uno::Reference< lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() ); if( !xServiceFactory.is() ) { - DBG_ERROR( "got no service manager" ); + OSL_FAIL( "got no service manager" ); return sal_False; } uno::Reference< uno::XInterface > xWriter( xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" ) ) ) ); if( !xWriter.is() ) { - DBG_ERROR( "com.sun.star.xml.sax.Writer service missing" ); + OSL_FAIL( "com.sun.star.xml.sax.Writer service missing" ); return sal_False; } @@ -219,7 +220,7 @@ sal_Bool SvxXMLXTableExportComponent::save( const OUString& rURL, const uno::Ref if( !xStorage.is() ) { - DBG_ERROR( "no storage!" ); + OSL_FAIL( "no storage!" ); break; } @@ -237,7 +238,7 @@ sal_Bool SvxXMLXTableExportComponent::save( const OUString& rURL, const uno::Ref SvStream* pStream = pMedium->GetOutStream(); if( NULL == pStream ) { - DBG_ERROR( "no output stream!" ); + OSL_FAIL( "no output stream!" ); break; } @@ -343,7 +344,7 @@ sal_Bool SvxXMLXTableExportComponent::exportTable() throw() } else { - DBG_ERROR( "unknown type for export"); + OSL_FAIL( "unknown type for export"); break; } @@ -367,7 +368,7 @@ sal_Bool SvxXMLXTableExportComponent::exportTable() throw() GetDocHandler()->endDocument(); } - catch( Exception e ) + catch( Exception const& ) { bRet = sal_False; } @@ -490,3 +491,5 @@ void SvxXMLBitmapEntryExporter::exportEntry( const OUString& rStrName, const Any { maImageStyle.exportXML( rStrName, rValue, mrExport ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index b9cd5443f259..2b1304d0913a 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,9 +42,7 @@ #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/drawing/Hatch.hpp> #include <com/sun/star/io/XOutputStream.hpp> -#ifndef _COM_SUN_STAR_IO_XSEEKABLE_HDL_ #include <com/sun/star/io/XSeekable.hdl> -#endif #include <comphelper/processfactory.hxx> #include <unotools/streamwrap.hxx> #include <rtl/ustrbuf.hxx> @@ -76,12 +75,12 @@ using namespace ::rtl; using namespace ::xmloff::token; using namespace cppu; -sal_Char __READONLY_DATA sXML_np__office[] = "__office"; -sal_Char __READONLY_DATA sXML_np__office_ooo[] = "___office"; -sal_Char __READONLY_DATA sXML_np__draw[] = "__draw"; -sal_Char __READONLY_DATA sXML_np__draw_ooo[] = "___draw"; -sal_Char __READONLY_DATA sXML_np__ooo[] = "__ooo"; -sal_Char __READONLY_DATA sXML_np__xlink[] = "__xlink"; +sal_Char const sXML_np__office[] = "__office"; +sal_Char const sXML_np__office_ooo[] = "___office"; +sal_Char const sXML_np__draw[] = "__draw"; +sal_Char const sXML_np__draw_ooo[] = "___draw"; +sal_Char const sXML_np__ooo[] = "__ooo"; +sal_Char const sXML_np__xlink[] = "__xlink"; /////////////////////////////////////////////////////////////////////// @@ -264,7 +263,7 @@ void SvxXMLTableImportContext::importMarker( sal_uInt16 nPrfx, const OUString& r } catch( Exception& ) { - DBG_ERROR("SvxXMLTableImportContext::importMarker(), exception caught!"); + OSL_FAIL("SvxXMLTableImportContext::importMarker(), exception caught!"); } } @@ -280,7 +279,7 @@ void SvxXMLTableImportContext::importDash( sal_uInt16 nPrfx, const OUString& rLo } catch( Exception& ) { - DBG_ERROR("SvxXMLTableImportContext::importDash(), exception caught!"); + OSL_FAIL("SvxXMLTableImportContext::importDash(), exception caught!"); } } @@ -296,7 +295,7 @@ void SvxXMLTableImportContext::importHatch( sal_uInt16 nPrfx, const OUString& rL } catch( Exception& ) { - DBG_ERROR("SvxXMLTableImportContext::importHatch(), exception caught!"); + OSL_FAIL("SvxXMLTableImportContext::importHatch(), exception caught!"); } } @@ -312,7 +311,7 @@ void SvxXMLTableImportContext::importGradient( sal_uInt16 nPrfx, const OUString& } catch( Exception& ) { - DBG_ERROR("SvxXMLTableImportContext::importGradient(), exception caught!"); + OSL_FAIL("SvxXMLTableImportContext::importGradient(), exception caught!"); } } @@ -328,7 +327,7 @@ void SvxXMLTableImportContext::importBitmap( sal_uInt16 nPrfx, const OUString& r } catch( Exception& ) { - DBG_ERROR("SvxXMLTableImportContext::importBitmap(), exception caught!"); + OSL_FAIL("SvxXMLTableImportContext::importBitmap(), exception caught!"); } } @@ -378,7 +377,7 @@ sal_Bool SvxXMLXTableImport::load( const OUString& rUrl, const uno::Reference< X uno::Reference<lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() ); if( !xServiceFactory.is() ) { - DBG_ERROR( "SvxXMLXTableImport::load: got no service manager" ); + OSL_FAIL( "SvxXMLXTableImport::load: got no service manager" ); break; } @@ -397,7 +396,7 @@ sal_Bool SvxXMLXTableImport::load( const OUString& rUrl, const uno::Reference< X xIStm.set( xStorage->openStreamElement( aContentStmName, embed::ElementModes::READ ), uno::UNO_QUERY_THROW ); if( !xIStm.is() ) { - DBG_ERROR( "could not open Content stream" ); + OSL_FAIL( "could not open Content stream" ); break; } @@ -436,7 +435,7 @@ sal_Bool SvxXMLXTableImport::load( const OUString& rUrl, const uno::Reference< X // each time you load a document with property tables that are not // on the current machine. Maybe a better fix would be to place // a file exists check before importing... -// DBG_ERROR("svx::SvxXMLXTableImport::load(), exception caught!"); +// OSL_FAIL("svx::SvxXMLXTableImport::load(), exception caught!"); bRet = sal_False; } @@ -486,3 +485,4 @@ SvXMLImportContext *SvxXMLXTableImport::CreateContext( sal_uInt16 nPrefix, const return new SvXMLImportContext( *this, nPrefix, rLocalName ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 62c434097699..e88e5e4e6737 100755 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -327,7 +328,7 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, INetURLObject aURL( rFileName ); Graphic aGraphic; String aExt; - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); + GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); sal_uInt16 nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND; sal_Bool bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated(); @@ -397,19 +398,19 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, if( bWriteTransGrf ) aFilter = FORMAT_GIF; - nFilter = pFilter->GetExportFormatNumberForShortName( aFilter ); + nFilter = rFilter.GetExportFormatNumberForShortName( aFilter ); if( GRFILTER_FORMAT_NOTFOUND == nFilter ) { - nFilter = pFilter->GetExportFormatNumberForShortName( FORMAT_JPG ); + nFilter = rFilter.GetExportFormatNumberForShortName( FORMAT_JPG ); if( GRFILTER_FORMAT_NOTFOUND == nFilter ) - nFilter = pFilter->GetExportFormatNumberForShortName( FORMAT_BMP ); + nFilter = rFilter.GetExportFormatNumberForShortName( FORMAT_BMP ); } if( GRFILTER_FORMAT_NOTFOUND != nFilter ) { - aExt = pFilter->GetExportFormatShortName( nFilter ).ToLowerAscii(); + aExt = rFilter.GetExportFormatShortName( nFilter ).ToLowerAscii(); if( bWriteTransGrf ) { @@ -476,7 +477,7 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, if( 0 == (nFlags & XOUTBMP_DONT_ADD_EXTENSION)) aURL.setExtension( aExt ); rFileName = aURL.GetMainURL( INetURLObject::NO_DECODE ); - nErr = ExportGraphic( aGraphic, aURL, *pFilter, nFilter, NULL ); + nErr = ExportGraphic( aGraphic, aURL, rFilter, nFilter, NULL ); } } } @@ -768,3 +769,5 @@ sal_Bool DitherBitmap( Bitmap& rBitmap ) return bRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx index 3dd39fc10347..c7d1b6a210f0 100644 --- a/svx/source/xoutdev/_xpoly.cxx +++ b/svx/source/xoutdev/_xpoly.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,10 +52,6 @@ DBG_NAME(XPolyPolygon); |* |* ImpXPolygon::ImpXPolygon() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 12.01.95 ESO -|* *************************************************************************/ ImpXPolygon::ImpXPolygon( sal_uInt16 nInitSize, sal_uInt16 _nResize ) @@ -74,10 +71,6 @@ ImpXPolygon::ImpXPolygon( sal_uInt16 nInitSize, sal_uInt16 _nResize ) |* |* ImpXPolygon::ImpXPolygon() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 12.01.95 ESO -|* *************************************************************************/ ImpXPolygon::ImpXPolygon( const ImpXPolygon& rImpXPoly ) @@ -104,10 +97,6 @@ ImpXPolygon::ImpXPolygon( const ImpXPolygon& rImpXPoly ) |* |* ImpXPolygon::~ImpXPolygon() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 12.01.95 ESO -|* *************************************************************************/ ImpXPolygon::~ImpXPolygon() @@ -122,9 +111,6 @@ ImpXPolygon::~ImpXPolygon() |* |* ImpXPolygon::operator==() |* -|* Ersterstellung Joe 26-09-95 -|* Letzte Aenderung -|* *************************************************************************/ @@ -147,8 +133,6 @@ bool ImpXPolygon::operator==(const ImpXPolygon& rImpXPoly) const |* Damit wird verhindert, dass bei XPoly[n] = XPoly[0] durch ein |* Resize der fuer den rechten Ausdruck verwendete Point-Array |* vorzeitig geloescht wird. -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 12.01.95 ESO |* *************************************************************************/ @@ -207,10 +191,6 @@ void ImpXPolygon::Resize( sal_uInt16 nNewSize, sal_Bool bDeletePoints ) |* |* ImpXPolygon::InsertSpace() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 29.03.95 ESO -|* *************************************************************************/ void ImpXPolygon::InsertSpace( sal_uInt16 nPos, sal_uInt16 nCount ) @@ -244,10 +224,6 @@ void ImpXPolygon::InsertSpace( sal_uInt16 nPos, sal_uInt16 nCount ) |* |* ImpXPolygon::Remove() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 12.01.94 ESO -|* *************************************************************************/ void ImpXPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount ) @@ -275,10 +251,6 @@ void ImpXPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount ) |* |* XPolygon::XPolygon() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 08.11.94 -|* *************************************************************************/ XPolygon::XPolygon( sal_uInt16 nSize, sal_uInt16 nResize ) @@ -291,10 +263,6 @@ XPolygon::XPolygon( sal_uInt16 nSize, sal_uInt16 nResize ) |* |* XPolygon::XPolygon() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 08.11.94 -|* *************************************************************************/ XPolygon::XPolygon( const XPolygon& rXPoly ) @@ -309,8 +277,6 @@ XPolygon::XPolygon( const XPolygon& rXPoly ) |* XPolygon::XPolygon() |* |* XPolygon aus einem Standardpolygon erstellen -|* Ersterstellung 18.01.95 ESO -|* Letzte Aenderung 18.01.95 ESO |* *************************************************************************/ @@ -334,8 +300,6 @@ XPolygon::XPolygon( const Polygon& rPoly ) |* XPolygon::XPolygon() |* |* Rechteck (auch mit abgerundeten Ecken) als Bezierpolygon erzeugen -|* Ersterstellung 09.01.95 ESO -|* Letzte Aenderung 09.01.95 ESO |* *************************************************************************/ @@ -404,8 +368,6 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy) |* XPolygon::XPolygon() |* |* Ellipsen(bogen) als Bezierpolygon erzeugen -|* Ersterstellung 09.01.95 -|* Letzte Aenderung 09.01.95 |* *************************************************************************/ @@ -454,10 +416,6 @@ XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy, |* |* XPolygon::~XPolygon() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 08.11.94 -|* *************************************************************************/ XPolygon::~XPolygon() @@ -474,8 +432,6 @@ XPolygon::~XPolygon() |* XPolygon::CheckReference() |* |* Referenzzaehler desImpXPoly pruefen und ggf. von diesem abkoppeln -|* Ersterstellung 17.01.95 ESO -|* Letzte Aenderung 17.01.95 ESO |* *************************************************************************/ @@ -492,10 +448,6 @@ void XPolygon::CheckReference() |* |* XPolygon::SetSize() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 08.11.94 -|* *************************************************************************/ void XPolygon::SetSize( sal_uInt16 nNewSize ) @@ -508,10 +460,6 @@ void XPolygon::SetSize( sal_uInt16 nNewSize ) |* |* XPolygon::GetSize() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 12.01.95 ESO -|* *************************************************************************/ sal_uInt16 XPolygon::GetSize() const @@ -524,10 +472,6 @@ sal_uInt16 XPolygon::GetSize() const |* |* XPolygon::SetPointCount() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 12.01.95 ESO -|* *************************************************************************/ void XPolygon::SetPointCount( sal_uInt16 nPoints ) @@ -551,10 +495,6 @@ void XPolygon::SetPointCount( sal_uInt16 nPoints ) |* |* XPolygon::GetPointCount() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 12.01.95 ESO -|* *************************************************************************/ sal_uInt16 XPolygon::GetPointCount() const @@ -567,10 +507,6 @@ sal_uInt16 XPolygon::GetPointCount() const |* |* XPolygon::Insert() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 08.11.94 -|* *************************************************************************/ void XPolygon::Insert( sal_uInt16 nPos, const Point& rPt, XPolyFlags eFlags ) @@ -586,10 +522,6 @@ void XPolygon::Insert( sal_uInt16 nPos, const Point& rPt, XPolyFlags eFlags ) |* |* XPolygon::Insert() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 08.11.94 -|* *************************************************************************/ void XPolygon::Insert( sal_uInt16 nPos, const XPolygon& rXPoly ) @@ -613,10 +545,6 @@ void XPolygon::Insert( sal_uInt16 nPos, const XPolygon& rXPoly ) |* |* XPolygon::Insert() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 08.11.94 -|* *************************************************************************/ void XPolygon::Insert( sal_uInt16 nPos, const Polygon& rPoly ) @@ -639,10 +567,6 @@ void XPolygon::Insert( sal_uInt16 nPos, const Polygon& rPoly ) |* |* XPolygon::Remove() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 08.11.94 -|* *************************************************************************/ void XPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount ) @@ -655,10 +579,6 @@ void XPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount ) |* |* XPolygon::Move() |* -|* Beschreibung -|* Ersterstellung 09.11.94 -|* Letzte Aenderung 09.11.94 -|* *************************************************************************/ void XPolygon::Move( long nHorzMove, long nVertMove ) @@ -682,10 +602,6 @@ void XPolygon::Move( long nHorzMove, long nVertMove ) |* |* XPolygon::GetBoundRect() |* -|* Beschreibung -|* Ersterstellung 09.11.94 -|* Letzte Aenderung 12.01.95 ESO -|* *************************************************************************/ Rectangle XPolygon::GetBoundRect() const @@ -714,10 +630,6 @@ Rectangle XPolygon::GetBoundRect() const |* |* XPolygon::operator[]() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 12.01.95 -|* *************************************************************************/ const Point& XPolygon::operator[]( sal_uInt16 nPos ) const @@ -732,10 +644,6 @@ const Point& XPolygon::operator[]( sal_uInt16 nPos ) const |* |* XPolygon::operator[]() |* -|* Beschreibung -|* Ersterstellung 08.11.94 -|* Letzte Aenderung 12.01.95 ESO -|* *************************************************************************/ Point& XPolygon::operator[]( sal_uInt16 nPos ) @@ -759,8 +667,6 @@ Point& XPolygon::operator[]( sal_uInt16 nPos ) |* XPolygon::operator=() |* |* Beschreibung Zuweisungsoperator -|* Ersterstellung ESO 22.11.94 -|* Letzte Aenderung ESO 12.01.95 |* *************************************************************************/ @@ -784,8 +690,6 @@ XPolygon& XPolygon::operator=( const XPolygon& rXPoly ) |* XPolygon::operator==() |* |* Beschreibung Gleichheitsoperator -|* Ersterstellung ESO 22.11.94 -|* Letzte Aenderung Joe 26.09.95 |* *************************************************************************/ @@ -801,8 +705,6 @@ sal_Bool XPolygon::operator==( const XPolygon& rXPoly ) const |* XPolygon::operator!=() |* |* Beschreibung Ungleichheitsoperator -|* Ersterstellung ESO 22.11.94 -|* Letzte Aenderung Joe 26.09.95 |* *************************************************************************/ @@ -818,8 +720,6 @@ sal_Bool XPolygon::operator!=( const XPolygon& rXPoly ) const |* XPolygon::GetFlags() |* |* Flags fuer den Punkt an der Position nPos zurueckgeben -|* Ersterstellung ESO 11.11.94 -|* Letzte Aenderung ESO 12.01.95 |* *************************************************************************/ @@ -834,8 +734,6 @@ XPolyFlags XPolygon::GetFlags( sal_uInt16 nPos ) const |* XPolygon::SetFlags() |* |* Flags fuer den Punkt an der Position nPos setzen -|* Ersterstellung ESO 11.11.94 -|* Letzte Aenderung ESO 12.01.95 |* *************************************************************************/ @@ -851,8 +749,6 @@ void XPolygon::SetFlags( sal_uInt16 nPos, XPolyFlags eFlags ) |* XPolygon::IsControl() |* |* Kurzform zur Abfrage des CONTROL-Flags -|* Ersterstellung ESO 09.01.95 -|* Letzte Aenderung ESO 12.01.95 |* *************************************************************************/ @@ -866,8 +762,6 @@ sal_Bool XPolygon::IsControl(sal_uInt16 nPos) const |* XPolygon::IsSmooth() |* |* Kurzform zur Abfrage von SMOOTH- und SYMMTR-Flag -|* Ersterstellung ESO 18.04.95 -|* Letzte Aenderung ESO 18.04.95 |* *************************************************************************/ @@ -882,8 +776,6 @@ sal_Bool XPolygon::IsSmooth(sal_uInt16 nPos) const |* XPolygon::CalcDistance() |* |* Abstand zwischen zwei Punkten berechnen -|* Ersterstellung ESO 09.01.95 -|* Letzte Aenderung ESO 09.01.95 |* *************************************************************************/ @@ -901,8 +793,6 @@ double XPolygon::CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2) |* XPolygon::SubdivideBezier() |* |* Bezierkurve unterteilen -|* Ersterstellung ESO 09.01.95 -|* Letzte Aenderung ESO 09.01.95 |* *************************************************************************/ @@ -1029,8 +919,6 @@ sal_Bool XPolygon::CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& |* Pnt = der zu modifizierende Punkt |* Wenn Center am Anfang bzw. Ende des Polygons liegt, wird Pnt |* auf die entgegengesetzte Seite verlegt -|* Ersterstellung ESO 09.01.95 -|* Letzte Aenderung ESO 18.04.95 |* \************************************************************************/ @@ -1076,8 +964,6 @@ void XPolygon::CalcSmoothJoin(sal_uInt16 nCenter, sal_uInt16 nDrag, sal_uInt16 n |* Center = End- bzw. Anfangspunkt der Bezierkurven |* Prev = vorheriger Zugpunkt |* Next = naechster Zugpunkt -|* Ersterstellung ESO 09.01.95 -|* Letzte Aenderung ESO 18.04.95 |* \************************************************************************/ @@ -1114,8 +1000,6 @@ void XPolygon::CalcTangent(sal_uInt16 nCenter, sal_uInt16 nPrev, sal_uInt16 nNex |* XPolygon::PointsToBezier() |* |* wandelt vier Polygonpunkte in eine Bezierkurve durch diese Punkte um -|* Ersterstellung ESO 09.01.95 -|* Letzte Aenderung ESO 09.01.95 |* \************************************************************************/ @@ -1192,8 +1076,6 @@ void XPolygon::PointsToBezier(sal_uInt16 nFirst) |* XPolygon::Translate() |* |* Polygon auf den uebergebenen Punkt verschieben -|* Ersterstellung ESO 17.01.95 -|* Letzte Aenderung ESO 17.01.95 |* *************************************************************************/ @@ -1214,8 +1096,6 @@ void XPolygon::Translate(const Point& rTrans) |* |* Alle Punkte um den Punkt rCenter drehen, Sinus und Cosinus |* muessen uebergeben werden -|* Ersterstellung ESO 09.01.95 -|* Letzte Aenderung ESO 17.01.95 |* *************************************************************************/ @@ -1265,8 +1145,6 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos) |* |* Alle Punkte um den Punkt rCenter mit dem Winkel nAngle drehen |* Winkel in 10tel Grad, Wertebereich 0 - 3600 -|* Ersterstellung ESO 17.01.95 -|* Letzte Aenderung ESO 17.01.95 |* *************************************************************************/ @@ -1288,8 +1166,6 @@ void XPolygon::Rotate(const Point& rCenter, sal_uInt16 nAngle) |* XPolygon::Scale() |* |* XPolygon in X- und/oder Y-Richtung skalieren -|* Ersterstellung ESO 01.02.95 -|* Letzte Aenderung ESO 01.02.95 |* *************************************************************************/ @@ -1314,8 +1190,6 @@ void XPolygon::Scale(double fSx, double fSy) |* |* XPolygon in X-Richtung um einen beliebigen Winkel kippen, |* bezogen auf eine Referenz-Y-Koordinate -|* Ersterstellung ESO 01.02.95 -|* Letzte Aenderung ESO 01.02.95 |* *************************************************************************/ @@ -1341,8 +1215,6 @@ void XPolygon::SlantX(long nYRef, double fSin, double fCos) |* |* XPolygon in Y-Richtung um einen beliebigen Winkel kippen, |* bezogen auf eine Referenz-X-Koordinate -|* Ersterstellung ESO 01.02.95 -|* Letzte Aenderung ESO 01.02.95 |* *************************************************************************/ @@ -1373,8 +1245,6 @@ void XPolygon::SlantY(long nXRef, double fSin, double fCos) |* 1: rechts oben | | |* 2: rechts unten 3----2 |* 3: links unten -|* Ersterstellung ESO 07.07.95 -|* Letzte Aenderung ESO 07.07.95 |* *************************************************************************/ @@ -1384,9 +1254,8 @@ void XPolygon::Distort(const Rectangle& rRefRect, pImpXPolygon->CheckPointDelete(); CheckReference(); - long Xr, Wr, X1, X2, X3, X4; - long Yr, Hr, Y1, Y2, Y3, Y4; - double fTx, fTy, fUx, fUy; + long Xr, Wr; + long Yr, Hr; Xr = rRefRect.Left(); Yr = rRefRect.Top(); @@ -1395,6 +1264,8 @@ void XPolygon::Distort(const Rectangle& rRefRect, if ( Wr && Hr ) { + long X1, X2, X3, X4; + long Y1, Y2, Y3, Y4; DBG_ASSERT(rDistortedRect.pImpXPolygon->nPoints >= 4, "Distort-Rechteck zu klein"); @@ -1411,6 +1282,7 @@ void XPolygon::Distort(const Rectangle& rRefRect, for (sal_uInt16 i = 0; i < nPntCnt; i++) { + double fTx, fTy, fUx, fUy; Point& rPnt = pImpXPolygon->pPointAry[i]; fTx = (double)(rPnt.X() - Xr) / Wr; @@ -1443,17 +1315,14 @@ void XPolygon::Rotate20() long nPntCnt = pImpXPolygon->nPoints; long nIndex0 = 0; - for (long nPoints = 1; - nPoints < nPntCnt; - nPoints ++) + for (long nPoints = 1; nPoints < nPntCnt; ++nPoints) { - Point &rPnt = pImpXPolygon->pPointAry[nPoints]; + const Point &rPnt = pImpXPolygon->pPointAry[nPoints]; - if ((rPnt.X () < fMinX) || (fMinX == rPnt.X ()) && - (fMinY >= rPnt.Y ())) + if ( (rPnt.X() < fMinX) || (fMinX == rPnt.X() && fMinY >= rPnt.Y()) ) { - fMinX = rPnt.X (); - fMinY = rPnt.Y (); + fMinX = rPnt.X(); + fMinY = rPnt.Y(); nIndex0 = nPoints; } } @@ -1507,8 +1376,6 @@ XPolygon::XPolygon(const basegfx::B2DPolygon& rPolygon) |* ImpXPolyPolygon::ImpXPolyPolygon() |* |* Beschreibung Erzeugt das XPolygon-Array -|* Ersterstellung CL 09.11.94 -|* Letzte Aenderung MM 09.11.94 |* *************************************************************************/ @@ -1518,12 +1385,8 @@ ImpXPolyPolygon::ImpXPolyPolygon( const ImpXPolyPolygon& rImpXPolyPoly ) : nRefCount = 1; // Einzelne Elemente duplizieren - XPolygon* pXPoly = aXPolyList.First(); - while ( pXPoly ) - { - aXPolyList.Replace( new XPolygon( *(aXPolyList.GetCurObject()) ) ); - pXPoly = aXPolyList.Next(); - } + for ( size_t i = 0, n = aXPolyList.size(); i < n; ++i ) + aXPolyList[ i ] = new XPolygon( *aXPolyList[ i ] ); } @@ -1532,40 +1395,32 @@ ImpXPolyPolygon::ImpXPolyPolygon( const ImpXPolyPolygon& rImpXPolyPoly ) : |* ImpXPolyPolygon::~ImpXPolyPolygon() |* |* Beschreibung Loescht das Polygon-Array -|* Ersterstellung CL 09.06.93 -|* Letzte Aenderung CL 09.06.93 |* *************************************************************************/ ImpXPolyPolygon::~ImpXPolyPolygon() { - XPolygon* pXPoly = aXPolyList.First(); - while( pXPoly ) - { - delete pXPoly; - pXPoly = aXPolyList.Next(); - } + for ( size_t i = 0, n = aXPolyList.size(); i < n; ++i ) + delete aXPolyList[ i ]; + aXPolyList.clear(); } /************************************************************************* |* |* ImpXPolyPolygon::operator==() |* -|* Ersterstellung Joe 26-09-95 -|* Letzte Aenderung -|* *************************************************************************/ - bool ImpXPolyPolygon::operator==(const ImpXPolyPolygon& rImpXPolyPoly) const { - sal_uInt16 nAnz=(sal_uInt16)aXPolyList.Count(); - const XPolygonList& rCmpList=rImpXPolyPoly.aXPolyList; - if (nAnz!=(sal_uInt16)rCmpList.Count()) return sal_False; + size_t nAnz = aXPolyList.size(); + const XPolygonList& rCmpList = rImpXPolyPoly.aXPolyList; + if ( nAnz != rCmpList.size() ) return false; bool bEq=true; - for (sal_uInt16 i=nAnz; i>0 && bEq;) { + for ( size_t i = nAnz; i > 0 && bEq; ) + { i--; - bEq= *aXPolyList.GetObject(i) == *rCmpList.GetObject(i); + bEq = ( *aXPolyList[ i ] == *rCmpList[ i ] ); } return bEq; } @@ -1574,16 +1429,12 @@ bool ImpXPolyPolygon::operator==(const ImpXPolyPolygon& rImpXPolyPoly) const |* |* XPolyPolygon::XPolyPolygon() |* -|* Beschreibung POLY.SDW -|* Ersterstellung CL 27.01.93 -|* Letzte Aenderung CL 27.01.93 -|* *************************************************************************/ -XPolyPolygon::XPolyPolygon( sal_uInt16 nInitSize, sal_uInt16 nResize ) +XPolyPolygon::XPolyPolygon( sal_uInt16 /*nInitSize*/, sal_uInt16 /*nResize*/ ) { DBG_CTOR(XPolyPolygon,NULL); - pImpXPolyPolygon = new ImpXPolyPolygon( nInitSize, nResize ); + pImpXPolyPolygon = new ImpXPolyPolygon(); } @@ -1591,27 +1442,19 @@ XPolyPolygon::XPolyPolygon( sal_uInt16 nInitSize, sal_uInt16 nResize ) |* |* XPolyPolygon::XPolyPolygon() |* -|* Beschreibung POLY.SDW -|* Ersterstellung CL 27.01.93 -|* Letzte Aenderung CL 27.01.93 -|* *************************************************************************/ XPolyPolygon::XPolyPolygon( const XPolygon& rXPoly ) { DBG_CTOR(XPolyPolygon,NULL); - pImpXPolyPolygon = new ImpXPolyPolygon; - pImpXPolyPolygon->aXPolyList.Insert( new XPolygon( rXPoly ) ); + pImpXPolyPolygon = new ImpXPolyPolygon(); + pImpXPolyPolygon->aXPolyList.push_back( new XPolygon( rXPoly ) ); } /************************************************************************* |* |* XPolyPolygon::XPolyPolygon() |* -|* Beschreibung POLY.SDW -|* Ersterstellung CL 27.01.93 -|* Letzte Aenderung CL 27.01.93 -|* *************************************************************************/ XPolyPolygon::XPolyPolygon( const XPolyPolygon& rXPolyPoly ) @@ -1626,8 +1469,6 @@ XPolyPolygon::XPolyPolygon( const XPolyPolygon& rXPolyPoly ) |* XPolyPolygon::XPolyPolygon() |* |* XPolyPolygon aus einen Standard-PolyPolygon erzeugen -|* Ersterstellung 18.01.95 ESO -|* Letzte Aenderung 18.01.95 ESO |* *************************************************************************/ @@ -1637,7 +1478,7 @@ XPolyPolygon::XPolyPolygon( const PolyPolygon& rPolyPoly ) pImpXPolyPolygon = new ImpXPolyPolygon; for (sal_uInt16 i = 0; i < rPolyPoly.Count(); i++) - pImpXPolyPolygon->aXPolyList.Insert( + pImpXPolyPolygon->aXPolyList.push_back( new XPolygon(rPolyPoly.GetObject(i)) ); } @@ -1645,10 +1486,6 @@ XPolyPolygon::XPolyPolygon( const PolyPolygon& rPolyPoly ) |* |* XPolyPolygon::~XPolyPolygon() |* -|* Beschreibung POLY.SDW -|* Ersterstellung CL 27.01.93 -|* Letzte Aenderung CL 27.01.93 -|* *************************************************************************/ XPolyPolygon::~XPolyPolygon() @@ -1665,8 +1502,6 @@ XPolyPolygon::~XPolyPolygon() |* XPolygon::CheckReference() |* |* Referenzzaehler desImpXPolyPoly pruefen und ggf. von diesem abkoppeln -|* Ersterstellung 18.01.95 ESO -|* Letzte Aenderung 18.01.95 ESO |* *************************************************************************/ @@ -1683,17 +1518,20 @@ void XPolyPolygon::CheckReference() |* |* XPolyPolygon::Insert() |* -|* Beschreibung POLY.SDW -|* Ersterstellung CL 27.01.93 -|* Letzte Aenderung CL 27.01.93 -|* *************************************************************************/ void XPolyPolygon::Insert( const XPolygon& rXPoly, sal_uInt16 nPos ) { CheckReference(); XPolygon* pXPoly = new XPolygon( rXPoly ); - pImpXPolyPolygon->aXPolyList.Insert( pXPoly, nPos ); + if ( nPos < pImpXPolyPolygon->aXPolyList.size() ) + { + XPolygonList::iterator it = pImpXPolyPolygon->aXPolyList.begin(); + ::std::advance( it, nPos ); + pImpXPolyPolygon->aXPolyList.insert( it, pXPoly ); + } + else + pImpXPolyPolygon->aXPolyList.push_back( pXPoly ); } /************************************************************************* @@ -1701,8 +1539,6 @@ void XPolyPolygon::Insert( const XPolygon& rXPoly, sal_uInt16 nPos ) |* XPolyPolygon::Insert() |* |* saemtliche XPolygone aus einem XPolyPolygon einfuegen -|* Ersterstellung 18.01.95 ESO -|* Letzte Aenderung 18.01.95 ESO |* *************************************************************************/ @@ -1710,12 +1546,19 @@ void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, sal_uInt16 nPos ) { CheckReference(); - for (sal_uInt16 i = 0; i < rXPolyPoly.Count(); i++) + for ( size_t i = 0; i < rXPolyPoly.Count(); i++) { - XPolygon* pXPoly = new XPolygon(rXPolyPoly[i]); - pImpXPolyPolygon->aXPolyList.Insert(pXPoly, nPos); - if ( nPos != XPOLYPOLY_APPEND ) + XPolygon* pXPoly = new XPolygon( rXPolyPoly[i] ); + + if ( nPos < pImpXPolyPolygon->aXPolyList.size() ) + { + XPolygonList::iterator it = pImpXPolyPolygon->aXPolyList.begin(); + ::std::advance( it, nPos ); + pImpXPolyPolygon->aXPolyList.insert( it, pXPoly ); nPos++; + } + else + pImpXPolyPolygon->aXPolyList.push_back( pXPoly ); } } @@ -1723,16 +1566,15 @@ void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, sal_uInt16 nPos ) |* |* XPolyPolygon::Remove() |* -|* Beschreibung POLY.SDW -|* Ersterstellung CL 27.01.93 -|* Letzte Aenderung CL 27.01.93 -|* *************************************************************************/ XPolygon XPolyPolygon::Remove( sal_uInt16 nPos ) { CheckReference(); - XPolygon* pTmpXPoly = pImpXPolyPolygon->aXPolyList.Remove( nPos ); + XPolygonList::iterator it = pImpXPolyPolygon->aXPolyList.begin(); + ::std::advance( it, nPos ); + XPolygon* pTmpXPoly = *it; + pImpXPolyPolygon->aXPolyList.erase( it ); XPolygon aXPoly( *pTmpXPoly ); delete pTmpXPoly; return aXPoly; @@ -1743,17 +1585,14 @@ XPolygon XPolyPolygon::Remove( sal_uInt16 nPos ) |* |* XPolyPolygon::Replace() |* -|* Beschreibung POLY.SDW -|* Ersterstellung CL 27.01.93 -|* Letzte Aenderung CL 27.01.93 -|* *************************************************************************/ XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, sal_uInt16 nPos ) { CheckReference(); XPolygon* pXPoly = new XPolygon( rXPoly ); - XPolygon* pTmpXPoly = pImpXPolyPolygon->aXPolyList.Replace( pXPoly, nPos ); + XPolygon* pTmpXPoly = pImpXPolyPolygon->aXPolyList[ nPos ]; + pImpXPolyPolygon->aXPolyList[ nPos ] = pXPoly; XPolygon aXPoly( *pTmpXPoly ); delete pTmpXPoly; return aXPoly; @@ -1764,15 +1603,11 @@ XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, sal_uInt16 nPos ) |* |* XPolyPolygon::GetObject() |* -|* Beschreibung POLY.SDW -|* Ersterstellung CL 27.01.93 -|* Letzte Aenderung CL 27.01.93 -|* *************************************************************************/ const XPolygon& XPolyPolygon::GetObject( sal_uInt16 nPos ) const { - return *(pImpXPolyPolygon->aXPolyList.GetObject( nPos )); + return *(pImpXPolyPolygon->aXPolyList[ nPos ]); } @@ -1780,10 +1615,6 @@ const XPolygon& XPolyPolygon::GetObject( sal_uInt16 nPos ) const |* |* XPolyPolygon::Clear() |* -|* Beschreibung POLY.SDW -|* Ersterstellung CL 27.01.93 -|* Letzte Aenderung TH 17.10.94 -|* *************************************************************************/ void XPolyPolygon::Clear() @@ -1795,13 +1626,9 @@ void XPolyPolygon::Clear() } else { - XPolygon* pXPoly = pImpXPolyPolygon->aXPolyList.First(); - while( pXPoly ) - { - delete pXPoly; - pXPoly = pImpXPolyPolygon->aXPolyList.Next(); - } - pImpXPolyPolygon->aXPolyList.Clear(); + for( size_t i = 0, n = pImpXPolyPolygon->aXPolyList.size(); i < n; ++i ) + delete pImpXPolyPolygon->aXPolyList[ i ]; + pImpXPolyPolygon->aXPolyList.clear(); } } @@ -1810,15 +1637,11 @@ void XPolyPolygon::Clear() |* |* XPolyPolygon::Count() |* -|* Beschreibung -|* Ersterstellung CL 27.01.93 -|* Letzte Aenderung CL 27.01.93 -|* *************************************************************************/ sal_uInt16 XPolyPolygon::Count() const { - return (sal_uInt16)(pImpXPolyPolygon->aXPolyList.Count()); + return (sal_uInt16)(pImpXPolyPolygon->aXPolyList.size()); } @@ -1826,10 +1649,6 @@ sal_uInt16 XPolyPolygon::Count() const |* |* XPolyPolygon::Move() |* -|* Beschreibung POLY.SDW -|* Ersterstellung TH 04.10.94 -|* Letzte Aenderung TH 04.10.94 -|* *************************************************************************/ void XPolyPolygon::Move( long nHorzMove, long nVertMove ) @@ -1842,11 +1661,10 @@ void XPolyPolygon::Move( long nHorzMove, long nVertMove ) CheckReference(); // Punkte verschieben - XPolygon* pXPoly = pImpXPolyPolygon->aXPolyList.First(); - while( pXPoly ) + for ( size_t i = 0, n = pImpXPolyPolygon->aXPolyList.size(); i < n; ++i ) { + XPolygon* pXPoly = pImpXPolyPolygon->aXPolyList[ i ]; pXPoly->Move( nHorzMove, nVertMove ); - pXPoly = pImpXPolyPolygon->aXPolyList.Next(); } } @@ -1854,20 +1672,16 @@ void XPolyPolygon::Move( long nHorzMove, long nVertMove ) |* |* XPolyPolygon::GetBoundRect() |* -|* Beschreibung POLY.SDW -|* Ersterstellung TH 04.10.94 -|* Letzte Aenderung TH 04.10.94 -|* *************************************************************************/ Rectangle XPolyPolygon::GetBoundRect() const { - sal_uInt16 nXPoly = (sal_uInt16)pImpXPolyPolygon->aXPolyList.Count(); + size_t nXPoly = pImpXPolyPolygon->aXPolyList.size(); Rectangle aRect; - for ( sal_uInt16 n = 0; n < nXPoly; n++ ) + for ( size_t n = 0; n < nXPoly; n++ ) { - const XPolygon* pXPoly = pImpXPolyPolygon->aXPolyList.GetObject( n ); + const XPolygon* pXPoly = pImpXPolyPolygon->aXPolyList[ n ]; aRect.Union( pXPoly->GetBoundRect() ); } @@ -1879,26 +1693,18 @@ Rectangle XPolyPolygon::GetBoundRect() const |* |* XPolyPolygon::operator[]() |* -|* Beschreibung POLY.SDW -|* Ersterstellung TH 28.10.94 -|* Letzte Aenderung TH 28.10.94 -|* *************************************************************************/ XPolygon& XPolyPolygon::operator[]( sal_uInt16 nPos ) { CheckReference(); - return *(pImpXPolyPolygon->aXPolyList.GetObject( nPos )); + return *( pImpXPolyPolygon->aXPolyList[ nPos ] ); } /************************************************************************* |* |* XPolyPolygon::operator=() |* -|* Beschreibung POLY.SDW -|* Ersterstellung CL 27.01.93 -|* Letzte Aenderung CL 27.01.93 -|* *************************************************************************/ XPolyPolygon& XPolyPolygon::operator=( const XPolyPolygon& rXPolyPoly ) @@ -1919,10 +1725,6 @@ XPolyPolygon& XPolyPolygon::operator=( const XPolyPolygon& rXPolyPoly ) |* |* XPolyPolygon::operator==() |* -|* Beschreibung POLY.SDW -|* Ersterstellung CL 27.01.93 -|* Letzte Aenderung Joe 27.01.93 -|* *************************************************************************/ sal_Bool XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const @@ -1936,10 +1738,6 @@ sal_Bool XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const |* |* XPolyPolygon::operator!=() |* -|* Beschreibung POLY.SDW -|* Ersterstellung CL 27.01.93 -|* Letzte Aenderung Joe 27.01.93 -|* *************************************************************************/ sal_Bool XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const @@ -1953,8 +1751,6 @@ sal_Bool XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const |* XPolyPolygon::Translate() |* |* Alle Polygone auf den uebergebenen Punkt verschieben -|* Ersterstellung ESO 25.01.95 -|* Letzte Aenderung ESO 25.01.95 |* *************************************************************************/ @@ -1962,8 +1758,8 @@ void XPolyPolygon::Translate(const Point& rTrans) { CheckReference(); - for (sal_uInt16 i = 0; i < Count(); i++) - pImpXPolyPolygon->aXPolyList.GetObject(i)->Translate(rTrans); + for (size_t i = 0; i < Count(); i++) + pImpXPolyPolygon->aXPolyList[ i ]->Translate(rTrans); } /************************************************************************* @@ -1972,8 +1768,6 @@ void XPolyPolygon::Translate(const Point& rTrans) |* |* Alle Polygone um den Punkt rCenter drehen, Sinus und Cosinus |* muessen uebergeben werden -|* Ersterstellung ESO 25.01.95 -|* Letzte Aenderung ESO 25.01.95 |* *************************************************************************/ @@ -1981,8 +1775,8 @@ void XPolyPolygon::Rotate(const Point& rCenter, double fSin, double fCos) { CheckReference(); - for (sal_uInt16 i = 0; i < Count(); i++) - pImpXPolyPolygon->aXPolyList.GetObject(i)->Rotate(rCenter, fSin, fCos); + for (size_t i = 0; i < Count(); i++) + pImpXPolyPolygon->aXPolyList[ i ]->Rotate(rCenter, fSin, fCos); } /************************************************************************* @@ -1996,8 +1790,8 @@ void XPolyPolygon::Rotate20() { CheckReference(); - for (sal_uInt16 i = 0; i < Count(); i++) - pImpXPolyPolygon->aXPolyList.GetObject(i)->Rotate20(); + for (size_t i = 0; i < Count(); i++) + pImpXPolyPolygon->aXPolyList[ i ]->Rotate20(); } /************************************************************************* @@ -2006,8 +1800,6 @@ void XPolyPolygon::Rotate20() |* |* Alle Poylgone um den Punkt rCenter mit dem Winkel nAngle drehen |* Winkel in 10tel Grad, Wertebereich 0 - 3600 -|* Ersterstellung ESO 25.01.95 -|* Letzte Aenderung ESO 25.01.95 |* *************************************************************************/ @@ -2029,8 +1821,6 @@ void XPolyPolygon::Rotate(const Point& rCenter, sal_uInt16 nAngle) |* XPolyPolygon::Scale() |* |* Alle Polygone in X- und/oder Y-Richtung skalieren -|* Ersterstellung ESO 01.02.95 -|* Letzte Aenderung ESO 01.02.95 |* *************************************************************************/ @@ -2038,8 +1828,8 @@ void XPolyPolygon::Scale(double fSx, double fSy) { CheckReference(); - for (sal_uInt16 i = 0; i < Count(); i++) - pImpXPolyPolygon->aXPolyList.GetObject(i)->Scale(fSx, fSy); + for (size_t i = 0; i < Count(); i++) + pImpXPolyPolygon->aXPolyList[ i ]->Scale(fSx, fSy); } /************************************************************************* @@ -2048,8 +1838,6 @@ void XPolyPolygon::Scale(double fSx, double fSy) |* |* Alle Polygone in X-Richtung um einen beliebigen Winkel kippen, |* bezogen auf eine Referenz-Y-Koordinate -|* Ersterstellung ESO 01.02.95 -|* Letzte Aenderung ESO 01.02.95 |* *************************************************************************/ @@ -2057,8 +1845,8 @@ void XPolyPolygon::SlantX(long nYRef, double fSin, double fCos) { CheckReference(); - for (sal_uInt16 i = 0; i < Count(); i++) - pImpXPolyPolygon->aXPolyList.GetObject(i)->SlantX(nYRef, fSin, fCos); + for (size_t i = 0; i < Count(); i++) + pImpXPolyPolygon->aXPolyList[ i ]->SlantX(nYRef, fSin, fCos); } /************************************************************************* @@ -2067,8 +1855,6 @@ void XPolyPolygon::SlantX(long nYRef, double fSin, double fCos) |* |* Alle Polygone in Y-Richtung um einen beliebigen Winkel kippen, |* bezogen auf eine Referenz-X-Koordinate -|* Ersterstellung ESO 01.02.95 -|* Letzte Aenderung ESO 01.02.95 |* *************************************************************************/ @@ -2076,8 +1862,8 @@ void XPolyPolygon::SlantY(long nXRef, double fSin, double fCos) { CheckReference(); - for (sal_uInt16 i = 0; i < Count(); i++) - pImpXPolyPolygon->aXPolyList.GetObject(i)->SlantY(nXRef, fSin, fCos); + for (size_t i = 0; i < Count(); i++) + pImpXPolyPolygon->aXPolyList[ i ]->SlantY(nXRef, fSin, fCos); } /************************************************************************* @@ -2091,8 +1877,6 @@ void XPolyPolygon::SlantY(long nXRef, double fSin, double fCos) |* 1: rechts oben | | |* 2: rechts unten 3----2 |* 3: links unten -|* Ersterstellung ESO 07.07.95 -|* Letzte Aenderung ESO 07.07.95 |* *************************************************************************/ @@ -2101,9 +1885,8 @@ void XPolyPolygon::Distort(const Rectangle& rRefRect, { CheckReference(); - for (sal_uInt16 i = 0; i < Count(); i++) - pImpXPolyPolygon->aXPolyList.GetObject(i)->Distort(rRefRect, - rDistortedRect); + for (size_t i = 0; i < Count(); i++) + pImpXPolyPolygon->aXPolyList[ i ]->Distort(rRefRect, rDistortedRect); } basegfx::B2DPolyPolygon XPolyPolygon::getB2DPolyPolygon() const @@ -2122,7 +1905,7 @@ basegfx::B2DPolyPolygon XPolyPolygon::getB2DPolyPolygon() const XPolyPolygon::XPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon) { DBG_CTOR(XPolyPolygon,NULL); - pImpXPolyPolygon = new ImpXPolyPolygon( 16, 16 ); + pImpXPolyPolygon = new ImpXPolyPolygon(); for(sal_uInt32 a(0L); a < rPolyPolygon.count(); a++) { @@ -2133,3 +1916,5 @@ XPolyPolygon::XPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon) } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index fedc43d228f5..99f832ebad5a 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,10 +110,6 @@ long ScaleMetricValue( long nVal, long nMul, long nDiv ) |* |* NameOrIndex::NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex) |* -|* Beschreibung -|* Ersterstellung 14.11.94 -|* Letzte Aenderung 14.11.94 -|* *************************************************************************/ NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, sal_Int32 nIndex) : @@ -125,10 +122,6 @@ NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, sal_Int32 nIndex) : |* |* NameOrIndex::NameOrIndex(sal_uInt16 nWhich, const String& rName) |* -|* Beschreibung -|* Ersterstellung 14.11.94 -|* Letzte Aenderung 14.11.94 -|* *************************************************************************/ NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, const XubString& rName) : @@ -141,10 +134,6 @@ NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, const XubString& rName) : |* |* NameOrIndex::NameOrIndex(sal_uInt16 nWhich, SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 14.11.94 -|* Letzte Aenderung 14.11.94 -|* *************************************************************************/ NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, SvStream& rIn) : @@ -157,10 +146,6 @@ NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, SvStream& rIn) : |* |* NameOrIndex::NameOrIndex(const NameOrIndex& rNameOrIndex) |* -|* Beschreibung -|* Ersterstellung 14.11.94 -|* Letzte Aenderung 14.11.94 -|* *************************************************************************/ NameOrIndex::NameOrIndex(const NameOrIndex& rNameOrIndex) : @@ -173,10 +158,6 @@ NameOrIndex::NameOrIndex(const NameOrIndex& rNameOrIndex) : |* |* int NameOrIndex::operator==(const SfxPoolItem& rItem) const |* -|* Beschreibung -|* Ersterstellung 14.11.94 -|* Letzte Aenderung 14.11.94 -|* *************************************************************************/ int NameOrIndex::operator==(const SfxPoolItem& rItem) const @@ -189,10 +170,6 @@ int NameOrIndex::operator==(const SfxPoolItem& rItem) const |* |* SfxPoolItem* NameOrIndex::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 14.11.94 -|* Letzte Aenderung 14.11.94 -|* *************************************************************************/ SfxPoolItem* NameOrIndex::Clone(SfxItemPool* /*pPool*/) const @@ -205,10 +182,6 @@ SfxPoolItem* NameOrIndex::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* NameOrIndex::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 14.11.94 -|* Letzte Aenderung 14.11.94 -|* *************************************************************************/ SfxPoolItem* NameOrIndex::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -220,10 +193,6 @@ SfxPoolItem* NameOrIndex::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const |* |* SvStream* NameOrIndex::Store(SvStream& rIn) const |* -|* Beschreibung -|* Ersterstellung 14.11.94 -|* Letzte Aenderung 14.11.94 -|* *************************************************************************/ SvStream& NameOrIndex::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const @@ -484,19 +453,19 @@ const Color& XColorItem::GetColorValue(const XColorTable* pTable) const } -sal_Bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetColorValue().GetRGBColor(); - return sal_True; + return true; } -sal_Bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; SetColorValue( nValue ); - return sal_True; + return true; } @@ -513,10 +482,6 @@ TYPEINIT1_AUTOFACTORY(XLineStyleItem, SfxEnumItem); |* |* XLineStyleItem::XLineStyleItem(XLineStyle eTheLineStyle) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 18.11.94 -|* *************************************************************************/ XLineStyleItem::XLineStyleItem(XLineStyle eTheLineStyle) : @@ -528,10 +493,6 @@ XLineStyleItem::XLineStyleItem(XLineStyle eTheLineStyle) : |* |* XLineStyleItem::XLineStyleItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XLineStyleItem::XLineStyleItem(SvStream& rIn) : @@ -543,10 +504,6 @@ XLineStyleItem::XLineStyleItem(SvStream& rIn) : |* |* XLineStyleItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 09.11.94 -|* Letzte Aenderung 09.11.94 -|* *************************************************************************/ SfxPoolItem* XLineStyleItem::Clone(SfxItemPool* /*pPool*/) const @@ -558,10 +515,6 @@ SfxPoolItem* XLineStyleItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -609,14 +562,14 @@ SfxItemPresentation XLineStyleItem::GetPresentation } } -sal_Bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { ::com::sun::star::drawing::LineStyle eLS = (::com::sun::star::drawing::LineStyle)GetValue(); rVal <<= eLS; - return sal_True; + return true; } -sal_Bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { ::com::sun::star::drawing::LineStyle eLS; if(!(rVal >>= eLS )) @@ -624,12 +577,12 @@ sal_Bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u // also try an int (for Basic) sal_Int32 nLS = 0; if(!(rVal >>= nLS)) - return sal_False; + return false; eLS = (::com::sun::star::drawing::LineStyle)nLS; } SetValue( sal::static_int_cast< sal_uInt16 >( eLS ) ); - return sal_True; + return true; } //------------------------------------------------------------------------ @@ -647,10 +600,6 @@ sal_uInt16 XLineStyleItem::GetValueCount() const |* |* XDash::XDash(XDashStyle, sal_uInt16, sal_uIntPtr, sal_uInt16, sal_uIntPtr, sal_uIntPtr) |* -|* Beschreibung -|* Ersterstellung 21.11.94 -|* Letzte Aenderung 21.11.94 -|* *************************************************************************/ XDash::XDash(XDashStyle eTheDash, sal_uInt16 nTheDots, sal_uIntPtr nTheDotLen, @@ -668,10 +617,6 @@ XDash::XDash(XDashStyle eTheDash, sal_uInt16 nTheDots, sal_uIntPtr nTheDotLen, |* |* int XDash::operator==(const SfxPoolItem& rItem) const |* -|* Beschreibung -|* Ersterstellung 29.11.94 -|* Letzte Aenderung 29.11.94 -|* *************************************************************************/ bool XDash::operator==(const XDash& rDash) const @@ -885,10 +830,6 @@ TYPEINIT1_AUTOFACTORY(XLineDashItem, NameOrIndex); |* |* XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash) : @@ -901,10 +842,6 @@ XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash) : |* |* XLineDashItem::XLineDashItem(const String& rName, const XDash& rTheDash) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XLineDashItem::XLineDashItem(const XubString& rName, const XDash& rTheDash) : @@ -917,10 +854,6 @@ XLineDashItem::XLineDashItem(const XubString& rName, const XDash& rTheDash) : |* |* XLineDashItem::XLineDashItem(const XLineDashItem& rItem) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XLineDashItem::XLineDashItem(const XLineDashItem& rItem) : @@ -933,10 +866,6 @@ XLineDashItem::XLineDashItem(const XLineDashItem& rItem) : |* |* XLineDashItem::XLineDashItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XLineDashItem::XLineDashItem(SvStream& rIn) : @@ -976,10 +905,6 @@ XLineDashItem::XLineDashItem(SfxItemPool* /*pPool*/) |* |* XLineDashItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineDashItem::Clone(SfxItemPool* /*pPool*/) const @@ -991,10 +916,6 @@ SfxPoolItem* XLineDashItem::Clone(SfxItemPool* /*pPool*/) const |* |* int XLineDashItem::operator==(const SfxPoolItem& rItem) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ int XLineDashItem::operator==(const SfxPoolItem& rItem) const @@ -1007,10 +928,6 @@ int XLineDashItem::operator==(const SfxPoolItem& rItem) const |* |* SfxPoolItem* XLineDashItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineDashItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -1022,10 +939,6 @@ SfxPoolItem* XLineDashItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const |* |* SfxPoolItem* XLineDashItem::Store(SvStream& rOut) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const @@ -1049,10 +962,6 @@ SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const |* |* const XDash& XLineDashItem::GetValue(const XDashTable* pTable) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 18.11.94 -|* *************************************************************************/ const XDash& XLineDashItem::GetDashValue(const XDashTable* pTable) const // GetValue -> GetDashValue @@ -1089,22 +998,22 @@ SfxItemPresentation XLineDashItem::GetPresentation //------------------------------------------------------------------------ -FASTBOOL XLineDashItem::HasMetrics() const +bool XLineDashItem::HasMetrics() const { - return sal_True; + return true; } //------------------------------------------------------------------------ -FASTBOOL XLineDashItem::ScaleMetrics(long nMul, long nDiv) +bool XLineDashItem::ScaleMetrics(long nMul, long nDiv) { aDash.SetDotLen( ScaleMetricValue( aDash.GetDotLen(), nMul, nDiv ) ); aDash.SetDashLen( ScaleMetricValue( aDash.GetDashLen(), nMul, nDiv ) ); aDash.SetDistance( ScaleMetricValue( aDash.GetDistance(), nMul, nDiv ) ); - return sal_True; + return true; } -sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -1202,13 +1111,13 @@ sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 break; } - default: DBG_ERROR("Wrong MemberId!"); return sal_False; + default: OSL_FAIL("Wrong MemberId!"); return false; } - return sal_True; + return true; } -sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -1231,7 +1140,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI else if ( aPropSeq[n].Name.equalsAsciiL( "LineDash", 8 )) { if ( aPropSeq[n].Value >>= aLineDash ) - bLineDash = sal_True; + bLineDash = true; } } @@ -1253,17 +1162,17 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI SetDashValue( aXDash ); } - return sal_True; + return true; } - return sal_False; + return false; } case MID_NAME: { rtl::OUString aName; if (!(rVal >>= aName)) - return sal_False; + return false; SetName( aName ); break; } @@ -1272,7 +1181,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI { ::com::sun::star::drawing::LineDash aLineDash; if(!(rVal >>= aLineDash)) - return sal_False; + return false; XDash aXDash; @@ -1294,7 +1203,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI { sal_Int16 nVal = sal_Int16(); if(!(rVal >>= nVal)) - return sal_False; + return false; XDash aXDash = GetDashValue(); aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(nVal))); @@ -1312,7 +1221,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI { sal_Int16 nVal = sal_Int16(); if(!(rVal >>= nVal)) - return sal_False; + return false; XDash aXDash = GetDashValue(); if ( nMemberId == MID_LINEDASH_DOTS ) @@ -1333,7 +1242,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI { sal_Int32 nVal = 0; if(!(rVal >>= nVal)) - return sal_False; + return false; XDash aXDash = GetDashValue(); if ( nMemberId == MID_LINEDASH_DOTLEN ) @@ -1351,7 +1260,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI } } - return sal_True; + return true; } sal_Bool XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) @@ -1390,10 +1299,6 @@ TYPEINIT1_AUTOFACTORY(XLineWidthItem, SfxMetricItem); |* |* XLineWidthItem::XLineWidthItem(long nWidth) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 18.11.94 -|* *************************************************************************/ XLineWidthItem::XLineWidthItem(long nWidth) : @@ -1405,10 +1310,6 @@ XLineWidthItem::XLineWidthItem(long nWidth) : |* |* XLineWidthItem::XLineWidthItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XLineWidthItem::XLineWidthItem(SvStream& rIn) : @@ -1420,10 +1321,6 @@ XLineWidthItem::XLineWidthItem(SvStream& rIn) : |* |* XLineWidthItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineWidthItem::Clone(SfxItemPool* /*pPool*/) const @@ -1435,10 +1332,6 @@ SfxPoolItem* XLineWidthItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -1472,17 +1365,17 @@ SfxItemPresentation XLineWidthItem::GetPresentation } } -sal_Bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Int32 nValue = GetValue(); if( 0 != (nMemberId&CONVERT_TWIPS) ) nValue = TWIP_TO_MM100(nValue); rVal <<= nValue; - return sal_True; + return true; } -sal_Bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Int32 nValue = 0; rVal >>= nValue; @@ -1490,7 +1383,7 @@ sal_Bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u nValue = MM100_TO_TWIP(nValue); SetValue( nValue ); - return sal_True; + return true; } // ------------------- @@ -1502,10 +1395,6 @@ TYPEINIT1_AUTOFACTORY(XLineColorItem, XColorItem); |* |* XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor) : @@ -1517,10 +1406,6 @@ XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor) : |* |* XLineColorItem::XLineColorItem(const XubString& rName, const Color& rTheColor) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XLineColorItem::XLineColorItem(const XubString& rName, const Color& rTheColor) : @@ -1532,10 +1417,6 @@ XLineColorItem::XLineColorItem(const XubString& rName, const Color& rTheColor) : |* |* XLineColorItem::XLineColorItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XLineColorItem::XLineColorItem(SvStream& rIn) : @@ -1547,10 +1428,6 @@ XLineColorItem::XLineColorItem(SvStream& rIn) : |* |* XLineColorItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineColorItem::Clone(SfxItemPool* /*pPool*/) const @@ -1562,10 +1439,6 @@ SfxPoolItem* XLineColorItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -1597,20 +1470,20 @@ SfxItemPresentation XLineColorItem::GetPresentation } } -sal_Bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetColorValue().GetRGBColor(); - return sal_True; + return true; } -sal_Bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) - return sal_False; + return false; SetColorValue( nValue ); - return sal_True; + return true; } ////////////////////////////////////////////////////////////////////////////// @@ -1721,10 +1594,6 @@ TYPEINIT1_AUTOFACTORY(XLineStartItem, NameOrIndex); |* |* XLineStartItem::XLineStartItem(sal_Int32 nIndex) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 18.11.94 -|* *************************************************************************/ XLineStartItem::XLineStartItem(sal_Int32 nIndex) @@ -1737,10 +1606,6 @@ XLineStartItem::XLineStartItem(sal_Int32 nIndex) |* XLineStartItem::XLineStartItem(const XubString& rName, |* const basegfx::B2DPolyPolygon& rXPolygon) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 18.11.94 -|* *************************************************************************/ XLineStartItem::XLineStartItem(const XubString& rName, const basegfx::B2DPolyPolygon& rPolyPolygon) @@ -1753,10 +1618,6 @@ XLineStartItem::XLineStartItem(const XubString& rName, const basegfx::B2DPolyPol |* |* XLineStartItem::XLineStartItem(const XLineStartItem& rItem) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 17.11.94 -|* *************************************************************************/ XLineStartItem::XLineStartItem(const XLineStartItem& rItem) @@ -1769,10 +1630,6 @@ XLineStartItem::XLineStartItem(const XLineStartItem& rItem) |* |* XLineStartItem::XLineStartItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 17.11.94 -|* *************************************************************************/ XLineStartItem::XLineStartItem(SvStream& rIn) : @@ -1803,10 +1660,6 @@ XLineStartItem::XLineStartItem(SfxItemPool* /*pPool*/) |* |* XLineStartItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineStartItem::Clone(SfxItemPool* /*pPool*/) const @@ -1818,10 +1671,6 @@ SfxPoolItem* XLineStartItem::Clone(SfxItemPool* /*pPool*/) const |* |* int XLineStartItem::operator==(const SfxPoolItem& rItem) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 18.11.94 -|* *************************************************************************/ int XLineStartItem::operator==(const SfxPoolItem& rItem) const @@ -1833,10 +1682,6 @@ int XLineStartItem::operator==(const SfxPoolItem& rItem) const |* |* SfxPoolItem* XLineStartItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -1848,10 +1693,6 @@ SfxPoolItem* XLineStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const |* |* SfxPoolItem* XLineStartItem::Store(SvStream& rOut) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 18.11.94 -|* *************************************************************************/ SvStream& XLineStartItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const @@ -1871,10 +1712,6 @@ SvStream& XLineStartItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const |* const basegfx::B2DPolyPolygon& XLineStartItem::GetValue(const XLineEndTable* pTable) |* const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 18.11.94 -|* *************************************************************************/ basegfx::B2DPolyPolygon XLineStartItem::GetLineStartValue(const XLineEndTable* pTable) const @@ -1913,7 +1750,7 @@ SfxItemPresentation XLineStartItem::GetPresentation } } -sal_Bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -1930,16 +1767,16 @@ sal_Bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 rVal <<= aBezier; } - return sal_True; + return true; } -sal_Bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; if( nMemberId == MID_NAME ) { - return sal_False; + return false; } else { @@ -1948,7 +1785,7 @@ sal_Bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u if( rVal.hasValue() && rVal.getValue() ) { if( rVal.getValueType() != ::getCppuType((const com::sun::star::drawing::PolyPolygonBezierCoords*)0) ) - return sal_False; + return false; com::sun::star::drawing::PolyPolygonBezierCoords* pCoords = (com::sun::star::drawing::PolyPolygonBezierCoords*)rVal.getValue(); if( pCoords->Coordinates.getLength() > 0 ) @@ -1960,7 +1797,7 @@ sal_Bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u } } - return sal_True; + return true; } /** this function searches in both the models pool and the styles pool for XLineStartItem @@ -2193,10 +2030,6 @@ TYPEINIT1_AUTOFACTORY(XLineEndItem, NameOrIndex); |* |* XLineEndItem::XLineEndItem(sal_Int32 nIndex) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 18.11.94 -|* *************************************************************************/ XLineEndItem::XLineEndItem(sal_Int32 nIndex) @@ -2209,10 +2042,6 @@ XLineEndItem::XLineEndItem(sal_Int32 nIndex) |* XLineEndItem::XLineEndItem(const XubString& rName, |* const basegfx::B2DPolyPolygon& rXPolygon) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 18.11.94 -|* *************************************************************************/ XLineEndItem::XLineEndItem(const XubString& rName, const basegfx::B2DPolyPolygon& rPolyPolygon) @@ -2225,10 +2054,6 @@ XLineEndItem::XLineEndItem(const XubString& rName, const basegfx::B2DPolyPolygon |* |* XLineEndItem::XLineEndItem(const XLineEndItem& rItem) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 18.11.94 -|* *************************************************************************/ XLineEndItem::XLineEndItem(const XLineEndItem& rItem) @@ -2241,10 +2066,6 @@ XLineEndItem::XLineEndItem(const XLineEndItem& rItem) |* |* XLineEndItem::XLineEndItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 17.11.94 -|* *************************************************************************/ XLineEndItem::XLineEndItem(SvStream& rIn) : @@ -2275,10 +2096,6 @@ XLineEndItem::XLineEndItem(SfxItemPool* /*pPool*/) |* |* XLineEndItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineEndItem::Clone(SfxItemPool* /*pPool*/) const @@ -2290,10 +2107,6 @@ SfxPoolItem* XLineEndItem::Clone(SfxItemPool* /*pPool*/) const |* |* int XLineEndItem::operator==(const SfxPoolItem& rItem) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 17.11.94 -|* *************************************************************************/ int XLineEndItem::operator==(const SfxPoolItem& rItem) const @@ -2305,10 +2118,6 @@ int XLineEndItem::operator==(const SfxPoolItem& rItem) const |* |* SfxPoolItem* XLineEndItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineEndItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -2320,10 +2129,6 @@ SfxPoolItem* XLineEndItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const |* |* SfxPoolItem* XLineEndItem::Store(SvStream& rOut) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 17.11.94 -|* *************************************************************************/ SvStream& XLineEndItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const @@ -2342,10 +2147,6 @@ SvStream& XLineEndItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const |* |* const basegfx::B2DPolyPolygon& XLineEndItem::GetValue(const XLineEndTable* pTable) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 18.11.94 -|* *************************************************************************/ basegfx::B2DPolyPolygon XLineEndItem::GetLineEndValue(const XLineEndTable* pTable) const @@ -2607,7 +2408,7 @@ SfxItemPresentation XLineEndItem::GetPresentation } } -sal_Bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -2623,16 +2424,16 @@ sal_Bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 n SvxConvertB2DPolyPolygonToPolyPolygonBezier( maPolyPolygon, aBezier ); rVal <<= aBezier; } - return sal_True; + return true; } -sal_Bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; if( nMemberId == MID_NAME ) { - return sal_False; + return false; } else { @@ -2641,7 +2442,7 @@ sal_Bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uIn if( rVal.hasValue() && rVal.getValue() ) { if( rVal.getValueType() != ::getCppuType((const com::sun::star::drawing::PolyPolygonBezierCoords*)0) ) - return sal_False; + return false; com::sun::star::drawing::PolyPolygonBezierCoords* pCoords = (com::sun::star::drawing::PolyPolygonBezierCoords*)rVal.getValue(); if( pCoords->Coordinates.getLength() > 0 ) @@ -2653,7 +2454,7 @@ sal_Bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uIn } } - return sal_True; + return true; } // ---------------------------- @@ -2665,10 +2466,6 @@ TYPEINIT1_AUTOFACTORY(XLineStartWidthItem, SfxMetricItem); |* |* XLineStartWidthItem::XLineStartWidthItem(sal_Int32 nWidth) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 18.11.94 -|* *************************************************************************/ XLineStartWidthItem::XLineStartWidthItem(long nWidth) : @@ -2680,10 +2477,6 @@ XLineStartWidthItem::XLineStartWidthItem(long nWidth) : |* |* XLineStartWidthItem::XLineStartWidthItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XLineStartWidthItem::XLineStartWidthItem(SvStream& rIn) : @@ -2695,10 +2488,6 @@ XLineStartWidthItem::XLineStartWidthItem(SvStream& rIn) : |* |* XLineStartWidthItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineStartWidthItem::Clone(SfxItemPool* /*pPool*/) const @@ -2711,10 +2500,6 @@ SfxPoolItem* XLineStartWidthItem::Clone(SfxItemPool* /*pPool*/) const |* SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 nVer) |* const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -2748,18 +2533,18 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation } } -sal_Bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); - return sal_True; + return true; } -sal_Bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; SetValue( nValue ); - return sal_True; + return true; } @@ -2773,10 +2558,6 @@ TYPEINIT1_AUTOFACTORY(XLineEndWidthItem, SfxMetricItem); |* |* XLineEndWidthItem::XLineEndWidthItem(long nWidth) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XLineEndWidthItem::XLineEndWidthItem(long nWidth) : @@ -2788,10 +2569,6 @@ XLineEndWidthItem::XLineEndWidthItem(long nWidth) : |* |* XLineEndWidthItem::XLineEndWidthItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XLineEndWidthItem::XLineEndWidthItem(SvStream& rIn) : @@ -2803,10 +2580,6 @@ XLineEndWidthItem::XLineEndWidthItem(SvStream& rIn) : |* |* XLineEndWidthItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineEndWidthItem::Clone(SfxItemPool* /*pPool*/) const @@ -2818,10 +2591,6 @@ SfxPoolItem* XLineEndWidthItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -2855,18 +2624,18 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation } } -sal_Bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); - return sal_True; + return true; } -sal_Bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; SetValue( nValue ); - return sal_True; + return true; } @@ -2879,10 +2648,6 @@ TYPEINIT1_AUTOFACTORY(XLineStartCenterItem, SfxBoolItem); |* |* XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter) : @@ -2894,10 +2659,6 @@ XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter) : |* |* XLineStartCenterItem::XLineStartCenterItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XLineStartCenterItem::XLineStartCenterItem(SvStream& rIn) : @@ -2909,10 +2670,6 @@ XLineStartCenterItem::XLineStartCenterItem(SvStream& rIn) : |* |* XLineStartCenterItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineStartCenterItem::Clone(SfxItemPool* /*pPool*/) const @@ -2925,10 +2682,6 @@ SfxPoolItem* XLineStartCenterItem::Clone(SfxItemPool* /*pPool*/) const |* SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 nVer) |* const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -2961,20 +2714,20 @@ SfxItemPresentation XLineStartCenterItem::GetPresentation } } -sal_Bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { sal_Bool bValue = GetValue(); rVal.setValue( &bValue, ::getCppuBooleanType() ); - return sal_True; + return true; } -sal_Bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() ) - return sal_False; + return false; SetValue( *(sal_Bool*)rVal.getValue() ); - return sal_True; + return true; } @@ -2987,10 +2740,6 @@ TYPEINIT1_AUTOFACTORY(XLineEndCenterItem, SfxBoolItem); |* |* XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter) : @@ -3002,10 +2751,6 @@ XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter) : |* |* XLineEndCenterItem::XLineEndCenterItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XLineEndCenterItem::XLineEndCenterItem(SvStream& rIn) : @@ -3017,10 +2762,6 @@ XLineEndCenterItem::XLineEndCenterItem(SvStream& rIn) : |* |* XLineEndCenterItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineEndCenterItem::Clone(SfxItemPool* /*pPool*/) const @@ -3033,10 +2774,6 @@ SfxPoolItem* XLineEndCenterItem::Clone(SfxItemPool* /*pPool*/) const |* SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 nVer) |* const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -3069,20 +2806,20 @@ SfxItemPresentation XLineEndCenterItem::GetPresentation } } -sal_Bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { sal_Bool bValue = GetValue(); rVal.setValue( &bValue, ::getCppuBooleanType() ); - return sal_True; + return true; } -sal_Bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() ) - return sal_False; + return false; SetValue( *(sal_Bool*)rVal.getValue() ); - return sal_True; + return true; } @@ -3099,10 +2836,6 @@ TYPEINIT1_AUTOFACTORY(XFillStyleItem, SfxEnumItem); |* |* XFillStyleItem::XFillStyleItem(XFillStyle eFillStyle) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XFillStyleItem::XFillStyleItem(XFillStyle eFillStyle) : @@ -3114,10 +2847,6 @@ XFillStyleItem::XFillStyleItem(XFillStyle eFillStyle) : |* |* XFillStyleItem::XFillStyleItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XFillStyleItem::XFillStyleItem(SvStream& rIn) : @@ -3129,10 +2858,6 @@ XFillStyleItem::XFillStyleItem(SvStream& rIn) : |* |* XFillStyleItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 09.11.94 -|* Letzte Aenderung 09.11.94 -|* *************************************************************************/ SfxPoolItem* XFillStyleItem::Clone(SfxItemPool* /*pPool*/) const @@ -3144,10 +2869,6 @@ SfxPoolItem* XFillStyleItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -3213,17 +2934,17 @@ sal_uInt16 XFillStyleItem::GetValueCount() const } // ----------------------------------------------------------------------- -sal_Bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { ::com::sun::star::drawing::FillStyle eFS = (::com::sun::star::drawing::FillStyle)GetValue(); rVal <<= eFS; - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { ::com::sun::star::drawing::FillStyle eFS; if(!(rVal >>= eFS)) @@ -3231,13 +2952,13 @@ sal_Bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u // also try an int (for Basic) sal_Int32 nFS = 0; if(!(rVal >>= nFS)) - return sal_False; + return false; eFS = (::com::sun::star::drawing::FillStyle)nFS; } SetValue( sal::static_int_cast< sal_uInt16 >( eFS ) ); - return sal_True; + return true; } @@ -3250,10 +2971,6 @@ TYPEINIT1_AUTOFACTORY(XFillColorItem, XColorItem); |* |* XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor) : @@ -3265,10 +2982,6 @@ XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor) : |* |* XFillColorItem::XFillColorItem(const XubString& rName, const Color& rTheColor) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XFillColorItem::XFillColorItem(const XubString& rName, const Color& rTheColor) : @@ -3280,10 +2993,6 @@ XFillColorItem::XFillColorItem(const XubString& rName, const Color& rTheColor) : |* |* XFillColorItem::XFillColorItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XFillColorItem::XFillColorItem(SvStream& rIn) : @@ -3295,10 +3004,6 @@ XFillColorItem::XFillColorItem(SvStream& rIn) : |* |* XFillColorItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XFillColorItem::Clone(SfxItemPool* /*pPool*/) const @@ -3310,10 +3015,6 @@ SfxPoolItem* XFillColorItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -3347,23 +3048,23 @@ SfxItemPresentation XFillColorItem::GetPresentation // ----------------------------------------------------------------------- -sal_Bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetColorValue().GetRGBColor(); - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue )) - return sal_False; + return false; SetColorValue( nValue ); - return sal_True; + return true; } // ----------------------------- @@ -3453,10 +3154,6 @@ XGradient::XGradient() : |* XGradient::XGradient(XGradientStyle, const Color&, const Color&, |* long, sal_uInt16, sal_uInt16, sal_uInt16) |* -|* Beschreibung -|* Ersterstellung 21.11.94 -|* Letzte Aenderung 21.11.94 -|* *************************************************************************/ XGradient::XGradient(const Color& rStart, const Color& rEnd, @@ -3481,10 +3178,6 @@ XGradient::XGradient(const Color& rStart, const Color& rEnd, |* |* int XGradient::operator==(const SfxPoolItem& rItem) const |* -|* Beschreibung -|* Ersterstellung 29.11.94 -|* Letzte Aenderung 29.11.94 -|* *************************************************************************/ bool XGradient::operator==(const XGradient& rGradient) const @@ -3512,10 +3205,6 @@ TYPEINIT1_AUTOFACTORY(XFillGradientItem, NameOrIndex); |* XFillGradientItem::XFillGradientItem(sal_Int32 nIndex, |* const XGradient& rTheGradient) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XFillGradientItem::XFillGradientItem(sal_Int32 nIndex, @@ -3530,10 +3219,6 @@ XFillGradientItem::XFillGradientItem(sal_Int32 nIndex, |* XFillGradientItem::XFillGradientItem(const XubString& rName, |* const XGradient& rTheGradient) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XFillGradientItem::XFillGradientItem(const XubString& rName, @@ -3547,10 +3232,6 @@ XFillGradientItem::XFillGradientItem(const XubString& rName, |* |* XFillGradientItem::XFillGradientItem(const XFillGradientItem& rItem) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XFillGradientItem::XFillGradientItem(const XFillGradientItem& rItem) : @@ -3563,10 +3244,6 @@ XFillGradientItem::XFillGradientItem(const XFillGradientItem& rItem) : |* |* XFillGradientItem::XFillGradientItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XFillGradientItem::XFillGradientItem(SvStream& rIn, sal_uInt16 nVer) : @@ -3630,10 +3307,6 @@ XFillGradientItem::XFillGradientItem(SfxItemPool* /*pPool*/) |* |* XFillGradientItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XFillGradientItem::Clone(SfxItemPool* /*pPool*/) const @@ -3645,10 +3318,6 @@ SfxPoolItem* XFillGradientItem::Clone(SfxItemPool* /*pPool*/) const |* |* int XFillGradientItem::operator==(const SfxPoolItem& rItem) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ int XFillGradientItem::operator==(const SfxPoolItem& rItem) const @@ -3661,10 +3330,6 @@ int XFillGradientItem::operator==(const SfxPoolItem& rItem) const |* |* SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, sal_uInt16 nVer) const @@ -3676,10 +3341,6 @@ SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* |* SfxPoolItem* XFillGradientItem::Store(SvStream& rOut) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SvStream& XFillGradientItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const @@ -3716,10 +3377,6 @@ SvStream& XFillGradientItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) co |* const XGradient& XFillGradientItem::GetValue(const XGradientTable* pTable) |* const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 18.11.94 -|* *************************************************************************/ const XGradient& XFillGradientItem::GetGradientValue(const XGradientTable* pTable) const // GetValue -> GetGradientValue @@ -3735,10 +3392,6 @@ const XGradient& XFillGradientItem::GetGradientValue(const XGradientTable* pTabl |* |* sal_uInt16 XFillGradientItem::GetVersion() const |* -|* Beschreibung -|* Ersterstellung 01.11.95 -|* Letzte Aenderung 01.11.95 -|* *************************************************************************/ sal_uInt16 XFillGradientItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const @@ -3774,7 +3427,7 @@ SfxItemPresentation XFillGradientItem::GetPresentation } // ----------------------------------------------------------------------- -sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { //sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -3847,14 +3500,14 @@ sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uI case MID_GRADIENT_ENDINTENSITY: rVal <<= GetGradientValue().GetEndIntens(); break; case MID_GRADIENT_STEPCOUNT: rVal <<= GetGradientValue().GetSteps(); break; - default: DBG_ERROR("Wrong MemberId!"); return sal_False; + default: OSL_FAIL("Wrong MemberId!"); return false; } - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -3900,17 +3553,17 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sa SetGradientValue( aXGradient ); } - return sal_True; + return true; } - return sal_False; + return false; } case MID_NAME: { rtl::OUString aName; if (!(rVal >>= aName )) - return sal_False; + return false; SetName( aName ); break; } @@ -3919,7 +3572,7 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sa { ::com::sun::star::awt::Gradient aGradient2; if(!(rVal >>= aGradient2)) - return sal_False; + return false; XGradient aXGradient; @@ -3943,7 +3596,7 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sa { sal_Int32 nVal = 0; if(!(rVal >>= nVal )) - return sal_False; + return false; XGradient aXGradient = GetGradientValue(); @@ -3966,7 +3619,7 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sa { sal_Int16 nVal = sal_Int16(); if(!(rVal >>= nVal )) - return sal_False; + return false; XGradient aXGradient = GetGradientValue(); @@ -3995,7 +3648,7 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sa } } - return sal_True; + return true; } sal_Bool XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) @@ -4134,14 +3787,14 @@ sal_uInt16 XFillFloatTransparenceItem::GetVersion( sal_uInt16 nFileFormatVersion //------------------------------------------------------------------------ -sal_Bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { return XFillGradientItem::QueryValue( rVal, nMemberId ); } //------------------------------------------------------------------------ -sal_Bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { return XFillGradientItem::PutValue( rVal, nMemberId ); } @@ -4204,10 +3857,6 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM |* |* XHatch::XHatch(XHatchStyle, const Color&, long, long) |* -|* Beschreibung -|* Ersterstellung 21.11.94 -|* Letzte Aenderung 21.11.94 -|* *************************************************************************/ XHatch::XHatch(const Color& rCol, XHatchStyle eTheStyle, long nTheDistance, @@ -4223,10 +3872,6 @@ XHatch::XHatch(const Color& rCol, XHatchStyle eTheStyle, long nTheDistance, |* |* int XHatch::operator==(const SfxPoolItem& rItem) const |* -|* Beschreibung -|* Ersterstellung 29.11.94 -|* Letzte Aenderung 29.11.94 -|* *************************************************************************/ bool XHatch::operator==(const XHatch& rHatch) const @@ -4248,10 +3893,6 @@ TYPEINIT1_AUTOFACTORY(XFillHatchItem, NameOrIndex); |* XFillHatchItem::XFillHatchItem(sal_Int32 nIndex, |* const XHatch& rTheHatch) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XFillHatchItem::XFillHatchItem(sal_Int32 nIndex, @@ -4266,10 +3907,6 @@ XFillHatchItem::XFillHatchItem(sal_Int32 nIndex, |* XFillHatchItem::XFillHatchItem(const XubString& rName, |* const XHatch& rTheHatch) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XFillHatchItem::XFillHatchItem(const XubString& rName, @@ -4283,10 +3920,6 @@ XFillHatchItem::XFillHatchItem(const XubString& rName, |* |* XFillHatchItem::XFillHatchItem(const XFillHatchItem& rItem) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XFillHatchItem::XFillHatchItem(const XFillHatchItem& rItem) : @@ -4299,10 +3932,6 @@ XFillHatchItem::XFillHatchItem(const XFillHatchItem& rItem) : |* |* XFillHatchItem::XFillHatchItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ XFillHatchItem::XFillHatchItem(SvStream& rIn) : @@ -4349,10 +3978,6 @@ XFillHatchItem::XFillHatchItem(SfxItemPool* /*pPool*/) |* |* XFillHatchItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XFillHatchItem::Clone(SfxItemPool* /*pPool*/) const @@ -4364,10 +3989,6 @@ SfxPoolItem* XFillHatchItem::Clone(SfxItemPool* /*pPool*/) const |* |* int XFillHatchItem::operator==(const SfxPoolItem& rItem) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ int XFillHatchItem::operator==(const SfxPoolItem& rItem) const @@ -4380,10 +4001,6 @@ int XFillHatchItem::operator==(const SfxPoolItem& rItem) const |* |* SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -4395,10 +4012,6 @@ SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const |* |* SfxPoolItem* XFillHatchItem::Store(SvStream& rOut) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 15.11.94 -|* *************************************************************************/ SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const @@ -4425,10 +4038,6 @@ SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const |* |* const XHatch& XFillHatchItem::GetValue(const XHatchTable* pTable) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 18.11.94 -|* *************************************************************************/ const XHatch& XFillHatchItem::GetHatchValue(const XHatchTable* pTable) const // GetValue -> GetHatchValue @@ -4465,21 +4074,21 @@ SfxItemPresentation XFillHatchItem::GetPresentation //------------------------------------------------------------------------ -FASTBOOL XFillHatchItem::HasMetrics() const +bool XFillHatchItem::HasMetrics() const { - return sal_True; + return true; } //------------------------------------------------------------------------ -FASTBOOL XFillHatchItem::ScaleMetrics(long nMul, long nDiv) +bool XFillHatchItem::ScaleMetrics(long nMul, long nDiv) { aHatch.SetDistance( ScaleMetricValue( aHatch.GetDistance(), nMul, nDiv ) ); - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -4536,14 +4145,14 @@ sal_Bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 case MID_HATCH_ANGLE: rVal <<= aHatch.GetAngle(); break; - default: DBG_ERROR("Wrong MemberId!"); return sal_False; + default: OSL_FAIL("Wrong MemberId!"); return false; } - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -4579,17 +4188,17 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u aHatch.SetAngle( aUnoHatch.Angle ); } - return sal_True; + return true; } - return sal_False; + return false; } case MID_FILLHATCH: { ::com::sun::star::drawing::Hatch aUnoHatch; if(!(rVal >>= aUnoHatch)) - return sal_False; + return false; aHatch.SetHatchStyle( (XHatchStyle)aUnoHatch.Style ); aHatch.SetColor( aUnoHatch.Color ); @@ -4602,7 +4211,7 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u { rtl::OUString aName; if (!(rVal >>= aName )) - return sal_False; + return false; SetName( aName ); break; } @@ -4611,7 +4220,7 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u { sal_Int16 nVal = sal_Int16(); if (!(rVal >>= nVal )) - return sal_False; + return false; aHatch.SetHatchStyle( (XHatchStyle)nVal ); break; } @@ -4622,7 +4231,7 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u { sal_Int32 nVal = 0; if (!(rVal >>= nVal )) - return sal_False; + return false; if ( nMemberId == MID_HATCH_COLOR ) aHatch.SetColor( nVal ); @@ -4633,10 +4242,10 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u break; } - default: DBG_ERROR("Wrong MemberId!"); return sal_False; + default: OSL_FAIL("Wrong MemberId!"); return false; } - return sal_True; + return true; } sal_Bool XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) @@ -4679,10 +4288,6 @@ TYPEINIT1_AUTOFACTORY(XFormTextStyleItem, SfxEnumItem); |* |* XFormTextStyleItem::XFormTextStyleItem() |* -|* Beschreibung -|* Ersterstellung 02.02.95 ESO -|* Letzte Aenderung 02.02.95 ESO -|* *************************************************************************/ XFormTextStyleItem::XFormTextStyleItem(XFormTextStyle eTheStyle) : @@ -4694,10 +4299,6 @@ XFormTextStyleItem::XFormTextStyleItem(XFormTextStyle eTheStyle) : |* |* XFormTextStyleItem::XFormTextStyleItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 02.02.95 ESO -|* Letzte Aenderung 02.02.95 ESO -|* *************************************************************************/ XFormTextStyleItem::XFormTextStyleItem(SvStream& rIn) : @@ -4709,10 +4310,6 @@ XFormTextStyleItem::XFormTextStyleItem(SvStream& rIn) : |* |* XFormTextStyleItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 02.02.95 ESO -|* Letzte Aenderung 02.02.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextStyleItem::Clone(SfxItemPool* /*pPool*/) const @@ -4724,10 +4321,6 @@ SfxPoolItem* XFormTextStyleItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 02.02.95 ESO -|* Letzte Aenderung 02.02.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -4753,10 +4346,10 @@ sal_uInt16 XFormTextStyleItem::GetValueCount() const \*************************************************************************/ // #FontWork# -sal_Bool XFormTextStyleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XFormTextStyleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); - return sal_True; + return true; } /************************************************************************* @@ -4766,13 +4359,13 @@ sal_Bool XFormTextStyleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ \*************************************************************************/ // #FontWork# -sal_Bool XFormTextStyleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XFormTextStyleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; SetValue(sal::static_int_cast< sal_uInt16 >(nValue)); - return sal_True; + return true; } //------------------------- @@ -4784,10 +4377,6 @@ TYPEINIT1_AUTOFACTORY(XFormTextAdjustItem, SfxEnumItem); |* |* XFormTextAdjustItem::XFormTextAdjustItem() |* -|* Beschreibung -|* Ersterstellung 02.02.95 ESO -|* Letzte Aenderung 02.02.95 ESO -|* *************************************************************************/ XFormTextAdjustItem::XFormTextAdjustItem(XFormTextAdjust eTheAdjust) : @@ -4799,10 +4388,6 @@ XFormTextAdjustItem::XFormTextAdjustItem(XFormTextAdjust eTheAdjust) : |* |* XFormTextAdjustItem::XFormTextAdjustItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 02.02.95 ESO -|* Letzte Aenderung 02.02.95 ESO -|* *************************************************************************/ XFormTextAdjustItem::XFormTextAdjustItem(SvStream& rIn) : @@ -4814,10 +4399,6 @@ XFormTextAdjustItem::XFormTextAdjustItem(SvStream& rIn) : |* |* XFormTextAdjustItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 02.02.95 ESO -|* Letzte Aenderung 02.02.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextAdjustItem::Clone(SfxItemPool* /*pPool*/) const @@ -4829,10 +4410,6 @@ SfxPoolItem* XFormTextAdjustItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 02.02.95 ESO -|* Letzte Aenderung 02.02.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -4858,10 +4435,10 @@ sal_uInt16 XFormTextAdjustItem::GetValueCount() const \*************************************************************************/ // #FontWork# -sal_Bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); - return sal_True; + return true; } /************************************************************************* @@ -4871,13 +4448,13 @@ sal_Bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId* \*************************************************************************/ // #FontWork# -sal_Bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; SetValue(sal::static_int_cast< sal_uInt16 >(nValue)); - return sal_True; + return true; } //---------------------------- @@ -4889,10 +4466,6 @@ TYPEINIT1_AUTOFACTORY(XFormTextDistanceItem, SfxMetricItem); |* |* XFormTextDistanceItem::XFormTextDistanceItem() |* -|* Beschreibung -|* Ersterstellung 02.02.95 ESO -|* Letzte Aenderung 02.02.95 ESO -|* *************************************************************************/ XFormTextDistanceItem::XFormTextDistanceItem(long nDist) : @@ -4904,10 +4477,6 @@ XFormTextDistanceItem::XFormTextDistanceItem(long nDist) : |* |* XFormTextDistanceItem::XFormTextDistanceItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 02.02.95 ESO -|* Letzte Aenderung 02.02.95 ESO -|* *************************************************************************/ XFormTextDistanceItem::XFormTextDistanceItem(SvStream& rIn) : @@ -4919,10 +4488,6 @@ XFormTextDistanceItem::XFormTextDistanceItem(SvStream& rIn) : |* |* XFormTextDistanceItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 02.02.95 ESO -|* Letzte Aenderung 02.02.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextDistanceItem::Clone(SfxItemPool* /*pPool*/) const @@ -4934,10 +4499,6 @@ SfxPoolItem* XFormTextDistanceItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 02.02.95 ESO -|* Letzte Aenderung 02.02.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -4954,10 +4515,6 @@ TYPEINIT1_AUTOFACTORY(XFormTextStartItem, SfxMetricItem); |* |* XFormTextStartItem::XFormTextStartItem(long nStart) |* -|* Beschreibung -|* Ersterstellung 02.02.95 ESO -|* Letzte Aenderung 02.02.95 ESO -|* *************************************************************************/ XFormTextStartItem::XFormTextStartItem(long nStart) : @@ -4969,10 +4526,6 @@ XFormTextStartItem::XFormTextStartItem(long nStart) : |* |* XFormTextStartItem::XFormTextStartItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 02.02.95 ESO -|* Letzte Aenderung 02.02.95 ESO -|* *************************************************************************/ XFormTextStartItem::XFormTextStartItem(SvStream& rIn) : @@ -4984,10 +4537,6 @@ XFormTextStartItem::XFormTextStartItem(SvStream& rIn) : |* |* XFormTextStartItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 02.02.95 ESO -|* Letzte Aenderung 02.02.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextStartItem::Clone(SfxItemPool* /*pPool*/) const @@ -4999,10 +4548,6 @@ SfxPoolItem* XFormTextStartItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 02.02.95 ESO -|* Letzte Aenderung 02.02.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -5019,9 +4564,6 @@ TYPEINIT1_AUTOFACTORY(XFormTextMirrorItem, SfxBoolItem); |* |* XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror) |* -|* Ersterstellung 06.02.95 ESO -|* Letzte Aenderung 06.02.95 ESO -|* *************************************************************************/ XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror) : @@ -5033,9 +4575,6 @@ XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror) : |* |* XFormTextMirrorItem::XFormTextMirrorItem(SvStream& rIn) |* -|* Ersterstellung 06.02.95 ESO -|* Letzte Aenderung 06.02.95 ESO -|* *************************************************************************/ XFormTextMirrorItem::XFormTextMirrorItem(SvStream& rIn) : @@ -5047,9 +4586,6 @@ XFormTextMirrorItem::XFormTextMirrorItem(SvStream& rIn) : |* |* XFormTextMirrorItem::Clone(SfxItemPool* pPool) const |* -|* Ersterstellung 06.02.95 ESO -|* Letzte Aenderung 06.02.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextMirrorItem::Clone(SfxItemPool* /*pPool*/) const @@ -5062,9 +4598,6 @@ SfxPoolItem* XFormTextMirrorItem::Clone(SfxItemPool* /*pPool*/) const |* SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 nVer) |* const |* -|* Ersterstellung 06.02.95 ESO -|* Letzte Aenderung 06.02.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -5082,9 +4615,6 @@ TYPEINIT1_AUTOFACTORY(XFormTextOutlineItem, SfxBoolItem); |* |* XFormTextOutlineItem::XFormTextOutlineItem() |* -|* Ersterstellung 27.06.95 ESO -|* Letzte Aenderung 27.06.95 ESO -|* *************************************************************************/ XFormTextOutlineItem::XFormTextOutlineItem(sal_Bool bOutline) : @@ -5096,9 +4626,6 @@ XFormTextOutlineItem::XFormTextOutlineItem(sal_Bool bOutline) : |* |* XFormTextOutlineItem::XFormTextOutlineItem(SvStream& rIn) |* -|* Ersterstellung 27.06.95 ESO -|* Letzte Aenderung 27.06.95 ESO -|* *************************************************************************/ XFormTextOutlineItem::XFormTextOutlineItem(SvStream& rIn) : @@ -5110,9 +4637,6 @@ XFormTextOutlineItem::XFormTextOutlineItem(SvStream& rIn) : |* |* XFormTextOutlineItem::Clone(SfxItemPool* pPool) const |* -|* Ersterstellung 27.06.95 ESO -|* Letzte Aenderung 27.06.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextOutlineItem::Clone(SfxItemPool* /*pPool*/) const @@ -5125,9 +4649,6 @@ SfxPoolItem* XFormTextOutlineItem::Clone(SfxItemPool* /*pPool*/) const |* SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 nVer) |* const |* -|* Ersterstellung 27.06.95 ESO -|* Letzte Aenderung 27.06.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -5144,10 +4665,6 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowItem, SfxEnumItem); |* |* XFormTextShadowItem::XFormTextShadowItem() |* -|* Beschreibung -|* Ersterstellung 27.06.95 -|* Letzte Aenderung 27.06.95 -|* *************************************************************************/ XFormTextShadowItem::XFormTextShadowItem(XFormTextShadow eFormTextShadow) : @@ -5160,10 +4677,6 @@ XFormTextShadowItem::XFormTextShadowItem(XFormTextShadow eFormTextShadow) : |* |* XFormTextShadowItem::XFormTextShadowItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 27.06.95 -|* Letzte Aenderung 27.06.95 -|* *************************************************************************/ XFormTextShadowItem::XFormTextShadowItem(SvStream& rIn) : @@ -5175,10 +4688,6 @@ XFormTextShadowItem::XFormTextShadowItem(SvStream& rIn) : |* |* XFormTextShadowItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 27.06.95 -|* Letzte Aenderung 27.06.95 -|* *************************************************************************/ SfxPoolItem* XFormTextShadowItem::Clone(SfxItemPool* /*pPool*/) const @@ -5190,10 +4699,6 @@ SfxPoolItem* XFormTextShadowItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 27.06.95 -|* Letzte Aenderung 27.06.95 -|* *************************************************************************/ SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -5220,10 +4725,10 @@ sal_uInt16 XFormTextShadowItem::GetValueCount() const \*************************************************************************/ // #FontWork# -sal_Bool XFormTextShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XFormTextShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); - return sal_True; + return true; } /************************************************************************* @@ -5233,13 +4738,13 @@ sal_Bool XFormTextShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId* \*************************************************************************/ // #FontWork# -sal_Bool XFormTextShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XFormTextShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; SetValue(sal::static_int_cast< sal_uInt16 >(nValue)); - return sal_True; + return true; } // ------------------------------- @@ -5251,10 +4756,6 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowColorItem, XColorItem); |* |* XFormTextShadowColorItem::XFormTextShadowColorItem() |* -|* Beschreibung -|* Ersterstellung 27.06.95 -|* Letzte Aenderung 27.06.95 -|* *************************************************************************/ XFormTextShadowColorItem::XFormTextShadowColorItem(sal_Int32 nIndex, @@ -5267,10 +4768,6 @@ XFormTextShadowColorItem::XFormTextShadowColorItem(sal_Int32 nIndex, |* |* XFormTextShadowColorItem::XFormTextShadowColorItem(const XubString& rName, const Color& rTheColor) |* -|* Beschreibung -|* Ersterstellung 27.06.95 -|* Letzte Aenderung 27.06.95 -|* *************************************************************************/ XFormTextShadowColorItem::XFormTextShadowColorItem(const XubString& rName, @@ -5283,10 +4780,6 @@ XFormTextShadowColorItem::XFormTextShadowColorItem(const XubString& rName, |* |* XFormTextShadowColorItem::XFormTextShadowColorItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 27.06.95 -|* Letzte Aenderung 27.06.95 -|* *************************************************************************/ XFormTextShadowColorItem::XFormTextShadowColorItem(SvStream& rIn) : @@ -5298,10 +4791,6 @@ XFormTextShadowColorItem::XFormTextShadowColorItem(SvStream& rIn) : |* |* XFormTextShadowColorItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 27.06.95 -|* Letzte Aenderung 27.06.95 -|* *************************************************************************/ SfxPoolItem* XFormTextShadowColorItem::Clone(SfxItemPool* /*pPool*/) const @@ -5313,10 +4802,6 @@ SfxPoolItem* XFormTextShadowColorItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 27.06.95 -|* Letzte Aenderung 27.06.95 -|* *************************************************************************/ SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -5333,10 +4818,6 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowXValItem, SfxMetricItem); |* |* XFormTextShadowXValItem::XFormTextShadowXValItem(long) |* -|* Beschreibung -|* Ersterstellung 28.06.95 ESO -|* Letzte Aenderung 28.06.95 ESO -|* *************************************************************************/ XFormTextShadowXValItem::XFormTextShadowXValItem(long nVal) : @@ -5348,10 +4829,6 @@ XFormTextShadowXValItem::XFormTextShadowXValItem(long nVal) : |* |* XFormTextShadowXValItem::XFormTextShadowXValItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 28.06.95 ESO -|* Letzte Aenderung 28.06.95 ESO -|* *************************************************************************/ XFormTextShadowXValItem::XFormTextShadowXValItem(SvStream& rIn) : @@ -5363,10 +4840,6 @@ XFormTextShadowXValItem::XFormTextShadowXValItem(SvStream& rIn) : |* |* XFormTextShadowXValItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 28.06.95 ESO -|* Letzte Aenderung 28.06.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextShadowXValItem::Clone(SfxItemPool* /*pPool*/) const @@ -5378,10 +4851,6 @@ SfxPoolItem* XFormTextShadowXValItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 28.06.95 ESO -|* Letzte Aenderung 28.06.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -5398,10 +4867,6 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowYValItem, SfxMetricItem); |* |* XFormTextShadowYValItem::XFormTextShadowYValItem(long) |* -|* Beschreibung -|* Ersterstellung 28.06.95 ESO -|* Letzte Aenderung 28.06.95 ESO -|* *************************************************************************/ XFormTextShadowYValItem::XFormTextShadowYValItem(long nVal) : @@ -5413,10 +4878,6 @@ XFormTextShadowYValItem::XFormTextShadowYValItem(long nVal) : |* |* XFormTextShadowYValItem::XFormTextShadowYValItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 28.06.95 ESO -|* Letzte Aenderung 28.06.95 ESO -|* *************************************************************************/ XFormTextShadowYValItem::XFormTextShadowYValItem(SvStream& rIn) : @@ -5428,10 +4889,6 @@ XFormTextShadowYValItem::XFormTextShadowYValItem(SvStream& rIn) : |* |* XFormTextShadowYValItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 28.06.95 ESO -|* Letzte Aenderung 28.06.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextShadowYValItem::Clone(SfxItemPool* /*pPool*/) const @@ -5443,10 +4900,6 @@ SfxPoolItem* XFormTextShadowYValItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 28.06.95 ESO -|* Letzte Aenderung 28.06.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -5463,10 +4916,6 @@ TYPEINIT1_AUTOFACTORY(XFormTextStdFormItem, SfxEnumItem); |* |* XFormTextStdFormItem::XFormTextStdFormItem() |* -|* Beschreibung -|* Ersterstellung 27.06.95 -|* Letzte Aenderung 27.06.95 -|* *************************************************************************/ XFormTextStdFormItem::XFormTextStdFormItem(XFormTextStdForm eFormTextStdForm) : @@ -5479,10 +4928,6 @@ XFormTextStdFormItem::XFormTextStdFormItem(XFormTextStdForm eFormTextStdForm) : |* |* XFormTextStdFormItem::XFormTextStdFormItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 27.06.95 -|* Letzte Aenderung 27.06.95 -|* *************************************************************************/ XFormTextStdFormItem::XFormTextStdFormItem(SvStream& rIn) : @@ -5494,10 +4939,6 @@ XFormTextStdFormItem::XFormTextStdFormItem(SvStream& rIn) : |* |* XFormTextStdFormItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 27.06.95 -|* Letzte Aenderung 27.06.95 -|* *************************************************************************/ SfxPoolItem* XFormTextStdFormItem::Clone(SfxItemPool* /*pPool*/) const @@ -5509,10 +4950,6 @@ SfxPoolItem* XFormTextStdFormItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 27.06.95 -|* Letzte Aenderung 27.06.95 -|* *************************************************************************/ SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -5539,10 +4976,10 @@ sal_uInt16 XFormTextStdFormItem::GetValueCount() const \*************************************************************************/ // #FontWork# -sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); - return sal_True; + return true; } /************************************************************************* @@ -5552,13 +4989,13 @@ sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId \*************************************************************************/ // #FontWork# -sal_Bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; SetValue(sal::static_int_cast< sal_uInt16 >(nValue)); - return sal_True; + return true; } // -------------------------- @@ -5570,9 +5007,6 @@ TYPEINIT1_AUTOFACTORY(XFormTextHideFormItem, SfxBoolItem); |* |* XFormTextHideFormItem::XFormTextHideFormItem() |* -|* Ersterstellung 27.06.95 ESO -|* Letzte Aenderung 27.06.95 ESO -|* *************************************************************************/ XFormTextHideFormItem::XFormTextHideFormItem(sal_Bool bHide) : @@ -5584,9 +5018,6 @@ XFormTextHideFormItem::XFormTextHideFormItem(sal_Bool bHide) : |* |* XFormTextHideFormItem::XFormTextHideFormItem(SvStream& rIn) |* -|* Ersterstellung 27.06.95 ESO -|* Letzte Aenderung 27.06.95 ESO -|* *************************************************************************/ XFormTextHideFormItem::XFormTextHideFormItem(SvStream& rIn) : @@ -5598,9 +5029,6 @@ XFormTextHideFormItem::XFormTextHideFormItem(SvStream& rIn) : |* |* XFormTextHideFormItem::Clone(SfxItemPool* pPool) const |* -|* Ersterstellung 27.06.95 ESO -|* Letzte Aenderung 27.06.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextHideFormItem::Clone(SfxItemPool* /*pPool*/) const @@ -5613,9 +5041,6 @@ SfxPoolItem* XFormTextHideFormItem::Clone(SfxItemPool* /*pPool*/) const |* SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, sal_uInt16 nVer) |* const |* -|* Ersterstellung 27.06.95 ESO -|* Letzte Aenderung 27.06.95 ESO -|* *************************************************************************/ SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -5776,3 +5201,4 @@ SvStream& XFillAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) // eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index cd82db743f4d..521bf88d92d6 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,10 +55,6 @@ TYPEINIT1_AUTOFACTORY(XLineTransparenceItem, SfxUInt16Item); |* |* XLineTransparenceItem::XLineTransparenceItem(sal_uInt16) |* -|* Beschreibung -|* Ersterstellung 07.11.95 KA -|* Letzte Aenderung 07.11.95 KA -|* *************************************************************************/ XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) : @@ -69,10 +66,6 @@ XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) : |* |* XLineTransparenceItem::XLineTransparenceItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 07.11.95 KA -|* Letzte Aenderung 07.11.95 KA -|* *************************************************************************/ XLineTransparenceItem::XLineTransparenceItem(SvStream& rIn) : @@ -84,10 +77,6 @@ XLineTransparenceItem::XLineTransparenceItem(SvStream& rIn) : |* |* XLineTransparenceItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 07.11.95 KA -|* Letzte Aenderung 07.11.95 KA -|* *************************************************************************/ SfxPoolItem* XLineTransparenceItem::Clone(SfxItemPool* /*pPool*/) const @@ -99,10 +88,6 @@ SfxPoolItem* XLineTransparenceItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 07.11.95 KA -|* Letzte Aenderung 07.11.95 KA -|* *************************************************************************/ SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -238,7 +223,7 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres, // ----------------------------------------------------------------------------- -sal_Bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { ::com::sun::star::drawing::LineJoint eJoint = ::com::sun::star::drawing::LineJoint_NONE; @@ -259,16 +244,16 @@ sal_Bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 eJoint = ::com::sun::star::drawing::LineJoint_ROUND; break; default: - DBG_ERROR( "Unknown LineJoint enum value!" ); + OSL_FAIL( "Unknown LineJoint enum value!" ); } rVal <<= eJoint; - return sal_True; + return true; } // ----------------------------------------------------------------------------- -sal_Bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { XLineJoint eJoint = XLINEJOINT_NONE; ::com::sun::star::drawing::LineJoint eUnoJoint; @@ -278,7 +263,7 @@ sal_Bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u // also try an int (for Basic) sal_Int32 nLJ = 0; if(!(rVal >>= nLJ)) - return sal_False; + return false; eUnoJoint = (::com::sun::star::drawing::LineJoint)nLJ; } @@ -302,7 +287,7 @@ sal_Bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u SetValue( sal::static_int_cast< sal_uInt16 >( eJoint ) ); - return sal_True; + return true; } // ----------------------------------------------------------------------------- @@ -322,10 +307,6 @@ TYPEINIT1_AUTOFACTORY(XFillTransparenceItem, SfxUInt16Item); |* |* XFillTransparenceItem::XFillTransparenceItem(sal_uInt16) |* -|* Beschreibung -|* Ersterstellung 07.11.95 KA -|* Letzte Aenderung 07.11.95 KA -|* *************************************************************************/ XFillTransparenceItem::XFillTransparenceItem(sal_uInt16 nFillTransparence) : @@ -337,10 +318,6 @@ XFillTransparenceItem::XFillTransparenceItem(sal_uInt16 nFillTransparence) : |* |* XFillTransparenceItem::XFillTransparenceItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 07.11.95 KA -|* Letzte Aenderung 07.11.95 KA -|* *************************************************************************/ XFillTransparenceItem::XFillTransparenceItem(SvStream& rIn) : @@ -352,10 +329,6 @@ XFillTransparenceItem::XFillTransparenceItem(SvStream& rIn) : |* |* XFillTransparenceItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 07.11.95 KA -|* Letzte Aenderung 07.11.95 KA -|* *************************************************************************/ SfxPoolItem* XFillTransparenceItem::Clone(SfxItemPool* /*pPool*/) const @@ -367,10 +340,6 @@ SfxPoolItem* XFillTransparenceItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 07.11.95 KA -|* Letzte Aenderung 07.11.95 KA -|* *************************************************************************/ SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -415,10 +384,6 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowTranspItem, SfxUInt16Item); |* |* XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16) |* -|* Beschreibung -|* Ersterstellung 09.11.95 KA -|* Letzte Aenderung 09.11.95 KA -|* *************************************************************************/ XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence) : @@ -430,10 +395,6 @@ XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16 nShdwTransparenc |* |* XFormTextShadowTranspItem::XFormTextShadowTranspItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 09.11.95 KA -|* Letzte Aenderung 09.11.95 KA -|* *************************************************************************/ XFormTextShadowTranspItem::XFormTextShadowTranspItem(SvStream& rIn) : @@ -445,10 +406,6 @@ XFormTextShadowTranspItem::XFormTextShadowTranspItem(SvStream& rIn) : |* |* XFormTextShadowTranspItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 09.11.95 KA -|* Letzte Aenderung 09.11.95 KA -|* *************************************************************************/ SfxPoolItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool*/) const @@ -460,10 +417,6 @@ SfxPoolItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 09.11.95 KA -|* Letzte Aenderung 09.11.95 KA -|* *************************************************************************/ SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -481,10 +434,6 @@ TYPEINIT1_AUTOFACTORY(XGradientStepCountItem, SfxUInt16Item); |* |* XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 ) |* -|* Beschreibung -|* Ersterstellung 23.01.96 KA -|* Letzte Aenderung 23.01.96 KA -|* *************************************************************************/ XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 nStepCount ) : @@ -496,10 +445,6 @@ XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 nStepCount ) : |* |* XGradientStepCountItem::XGradientStepCountItem( SvStream& rIn ) |* -|* Beschreibung -|* Ersterstellung 23.01.96 KA -|* Letzte Aenderung 23.01.96 KA -|* *************************************************************************/ XGradientStepCountItem::XGradientStepCountItem( SvStream& rIn ) : @@ -511,10 +456,6 @@ XGradientStepCountItem::XGradientStepCountItem( SvStream& rIn ) : |* |* XGradientStepCountItem::Clone( SfxItemPool* pPool ) const |* -|* Beschreibung -|* Ersterstellung 23.01.96 KA -|* Letzte Aenderung 23.01.96 KA -|* *************************************************************************/ SfxPoolItem* XGradientStepCountItem::Clone( SfxItemPool* /*pPool*/) const @@ -526,10 +467,6 @@ SfxPoolItem* XGradientStepCountItem::Clone( SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 23.01.96 KA -|* Letzte Aenderung 23.01.96 KA -|* *************************************************************************/ SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -570,80 +507,26 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpTileItem, SfxBoolItem ); -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - XFillBmpTileItem::XFillBmpTileItem( sal_Bool bTile ) : SfxBoolItem( XATTR_FILLBMP_TILE, bTile ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - XFillBmpTileItem::XFillBmpTileItem( SvStream& rIn ) : SfxBoolItem( XATTR_FILLBMP_TILE, rIn ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxPoolItem* XFillBmpTileItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpTileItem( *this ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpTileItem( rIn ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxItemPresentation XFillBmpTileItem::GetPresentation ( SfxItemPresentation ePres, @@ -672,80 +555,26 @@ SfxItemPresentation XFillBmpTileItem::GetPresentation //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpPosItem, SfxEnumItem ); -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - XFillBmpPosItem::XFillBmpPosItem( RECT_POINT eRP ) : SfxEnumItem( XATTR_FILLBMP_POS, sal::static_int_cast< sal_uInt16 >( eRP ) ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - XFillBmpPosItem::XFillBmpPosItem( SvStream& rIn ) : SfxEnumItem( XATTR_FILLBMP_POS, rIn ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxPoolItem* XFillBmpPosItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpPosItem( *this ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpPosItem( rIn ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxItemPresentation XFillBmpPosItem::GetPresentation ( SfxItemPresentation ePres, @@ -768,12 +597,6 @@ SfxItemPresentation XFillBmpPosItem::GetPresentation } } -/****************************************************************************** -|* -|* -|* -\******************************************************************************/ - sal_uInt16 XFillBmpPosItem::GetValueCount() const { return 9; @@ -785,80 +608,26 @@ sal_uInt16 XFillBmpPosItem::GetValueCount() const //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpSizeXItem, SfxMetricItem ); -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - XFillBmpSizeXItem::XFillBmpSizeXItem( long nSizeX ) : SfxMetricItem( XATTR_FILLBMP_SIZEX, nSizeX ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - XFillBmpSizeXItem::XFillBmpSizeXItem( SvStream& rIn ) : SfxMetricItem( XATTR_FILLBMP_SIZEX, rIn ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxPoolItem* XFillBmpSizeXItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpSizeXItem( *this ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpSizeXItem( rIn ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxItemPresentation XFillBmpSizeXItem::GetPresentation ( SfxItemPresentation ePres, @@ -881,16 +650,7 @@ SfxItemPresentation XFillBmpSizeXItem::GetPresentation } } - -/************************************************************************* -|* -|* Beschreibung -|* Ersterstellung 05.11.96 KA -|* Letzte Aenderung 05.11.96 KA -|* -\*************************************************************************/ - -FASTBOOL XFillBmpSizeXItem::HasMetrics() const +bool XFillBmpSizeXItem::HasMetrics() const { return GetValue() > 0L; } @@ -901,80 +661,26 @@ FASTBOOL XFillBmpSizeXItem::HasMetrics() const //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpSizeYItem, SfxMetricItem ); -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - XFillBmpSizeYItem::XFillBmpSizeYItem( long nSizeY ) : SfxMetricItem( XATTR_FILLBMP_SIZEY, nSizeY ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - XFillBmpSizeYItem::XFillBmpSizeYItem( SvStream& rIn ) : SfxMetricItem( XATTR_FILLBMP_SIZEY, rIn ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxPoolItem* XFillBmpSizeYItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpSizeYItem( *this ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpSizeYItem( rIn ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxItemPresentation XFillBmpSizeYItem::GetPresentation ( SfxItemPresentation ePres, @@ -1000,13 +706,9 @@ SfxItemPresentation XFillBmpSizeYItem::GetPresentation /************************************************************************* |* -|* Beschreibung -|* Ersterstellung 05.11.96 KA -|* Letzte Aenderung 05.11.96 KA -|* \*************************************************************************/ -FASTBOOL XFillBmpSizeYItem::HasMetrics() const +bool XFillBmpSizeYItem::HasMetrics() const { return GetValue() > 0L; } @@ -1017,80 +719,26 @@ FASTBOOL XFillBmpSizeYItem::HasMetrics() const //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpSizeLogItem, SfxBoolItem ); -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - XFillBmpSizeLogItem::XFillBmpSizeLogItem( sal_Bool bLog ) : SfxBoolItem( XATTR_FILLBMP_SIZELOG, bLog ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - XFillBmpSizeLogItem::XFillBmpSizeLogItem( SvStream& rIn ) : SfxBoolItem( XATTR_FILLBMP_SIZELOG, rIn ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxPoolItem* XFillBmpSizeLogItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpSizeLogItem( *this ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpSizeLogItem( rIn ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxItemPresentation XFillBmpSizeLogItem::GetPresentation ( SfxItemPresentation ePres, @@ -1119,80 +767,26 @@ SfxItemPresentation XFillBmpSizeLogItem::GetPresentation //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetXItem, SfxUInt16Item ); -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( sal_uInt16 nOffX ) : SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETX, nOffX ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( SvStream& rIn ) : SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETX, rIn ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxPoolItem* XFillBmpTileOffsetXItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpTileOffsetXItem( *this ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpTileOffsetXItem( rIn ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxItemPresentation XFillBmpTileOffsetXItem::GetPresentation ( SfxItemPresentation ePres, @@ -1221,80 +815,26 @@ SfxItemPresentation XFillBmpTileOffsetXItem::GetPresentation //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetYItem, SfxUInt16Item ); -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( sal_uInt16 nOffY ) : SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETY, nOffY ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( SvStream& rIn ) : SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETY, rIn ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxPoolItem* XFillBmpTileOffsetYItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpTileOffsetYItem( *this ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpTileOffsetYItem( rIn ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxItemPresentation XFillBmpTileOffsetYItem::GetPresentation ( SfxItemPresentation ePres, @@ -1323,80 +863,26 @@ SfxItemPresentation XFillBmpTileOffsetYItem::GetPresentation //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpStretchItem, SfxBoolItem ); -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - XFillBmpStretchItem::XFillBmpStretchItem( sal_Bool bStretch ) : SfxBoolItem( XATTR_FILLBMP_STRETCH, bStretch ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - XFillBmpStretchItem::XFillBmpStretchItem( SvStream& rIn ) : SfxBoolItem( XATTR_FILLBMP_STRETCH, rIn ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxPoolItem* XFillBmpStretchItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpStretchItem( *this ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpStretchItem( rIn ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung 28.02.96 KA -|* Letzte Aenderung 28.02.96 KA -|* -*************************************************************************/ - SfxItemPresentation XFillBmpStretchItem::GetPresentation ( SfxItemPresentation ePres, @@ -1425,80 +911,26 @@ SfxItemPresentation XFillBmpStretchItem::GetPresentation //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetXItem, SfxUInt16Item ); -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung KA 29.04.96 -|* Letzte Aenderung KA 29.04.96 -|* -*************************************************************************/ - XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX ) : SfxUInt16Item( XATTR_FILLBMP_POSOFFSETX, nOffPosX ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung KA 29.04.96 -|* Letzte Aenderung KA 29.04.96 -|* -*************************************************************************/ - XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( SvStream& rIn ) : SfxUInt16Item( XATTR_FILLBMP_POSOFFSETX, rIn ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung KA 29.04.96 -|* Letzte Aenderung KA 29.04.96 -|* -*************************************************************************/ - SfxPoolItem* XFillBmpPosOffsetXItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpPosOffsetXItem( *this ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung KA 29.04.96 -|* Letzte Aenderung KA 29.04.96 -|* -*************************************************************************/ - SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpPosOffsetXItem( rIn ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung KA 29.04.96 -|* Letzte Aenderung KA 29.04.96 -|* -*************************************************************************/ - SfxItemPresentation XFillBmpPosOffsetXItem::GetPresentation ( SfxItemPresentation ePres, @@ -1527,80 +959,26 @@ SfxItemPresentation XFillBmpPosOffsetXItem::GetPresentation //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetYItem, SfxUInt16Item ); -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung KA 29.04.96 -|* Letzte Aenderung KA 29.04.96 -|* -*************************************************************************/ - XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY ) : SfxUInt16Item( XATTR_FILLBMP_POSOFFSETY, nOffPosY ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung KA 29.04.96 -|* Letzte Aenderung KA 29.04.96 -|* -*************************************************************************/ - XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( SvStream& rIn ) : SfxUInt16Item( XATTR_FILLBMP_POSOFFSETY, rIn ) { } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung KA 29.04.96 -|* Letzte Aenderung KA 29.04.96 -|* -*************************************************************************/ - SfxPoolItem* XFillBmpPosOffsetYItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpPosOffsetYItem( *this ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung KA 29.04.96 -|* Letzte Aenderung KA 29.04.96 -|* -*************************************************************************/ - SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpPosOffsetYItem( rIn ); } - -/************************************************************************* -|* -|* -|* -|* Beschreibung -|* Ersterstellung KA 29.04.96 -|* Letzte Aenderung KA 29.04.96 -|* -*************************************************************************/ - SfxItemPresentation XFillBmpPosOffsetYItem::GetPresentation ( SfxItemPresentation ePres, @@ -1632,10 +1010,6 @@ TYPEINIT1_AUTOFACTORY(XFillBackgroundItem, SfxBoolItem); |* |* XFillBackgroundItem::XFillBackgroundItem( sal_Bool ) |* -|* Beschreibung -|* Ersterstellung 19.11.96 KA -|* Letzte Aenderung -|* *************************************************************************/ XFillBackgroundItem::XFillBackgroundItem( sal_Bool bFill ) : @@ -1647,10 +1021,6 @@ XFillBackgroundItem::XFillBackgroundItem( sal_Bool bFill ) : |* |* XFillBackgroundItem::XFillBackgroundItem( SvStream& rIn ) |* -|* Beschreibung -|* Ersterstellung 23.01.96 KA -|* Letzte Aenderung 23.01.96 KA -|* *************************************************************************/ XFillBackgroundItem::XFillBackgroundItem( SvStream& rIn ) : @@ -1662,10 +1032,6 @@ XFillBackgroundItem::XFillBackgroundItem( SvStream& rIn ) : |* |* XFillBackgroundItem::Clone( SfxItemPool* pPool ) const |* -|* Beschreibung -|* Ersterstellung 23.01.96 KA -|* Letzte Aenderung 23.01.96 KA -|* *************************************************************************/ SfxPoolItem* XFillBackgroundItem::Clone( SfxItemPool* /*pPool*/) const @@ -1677,10 +1043,6 @@ SfxPoolItem* XFillBackgroundItem::Clone( SfxItemPool* /*pPool*/) const |* |* SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 23.01.96 KA -|* Letzte Aenderung 23.01.96 KA -|* *************************************************************************/ SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -1710,3 +1072,4 @@ SfxItemPresentation XFillBackgroundItem::GetPresentation( SfxItemPresentation eP +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 874cb35d3e30..af4a4034a00b 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,10 +61,6 @@ using namespace ::com::sun::star; |* |* XOBitmap::XOBitmap() |* -|* Beschreibung -|* Ersterstellung 27.07.95 -|* Letzte Aenderung 27.07.95 -|* *************************************************************************/ XOBitmap::XOBitmap() : @@ -78,10 +75,6 @@ XOBitmap::XOBitmap() : |* |* XOBitmap::XOBitmap( Bitmap aBitmap, XBitmapStyle eStyle = XBITMAP_TILE ) |* -|* Beschreibung -|* Ersterstellung 26.07.95 -|* Letzte Aenderung 26.07.95 -|* *************************************************************************/ XOBitmap::XOBitmap( const Bitmap& rBmp, XBitmapStyle eInStyle ) : @@ -97,10 +90,6 @@ XOBitmap::XOBitmap( const Bitmap& rBmp, XBitmapStyle eInStyle ) : |* |* XOBitmap::XOBitmap( Bitmap aBitmap, XBitmapStyle eStyle = XBITMAP_TILE ) |* -|* Beschreibung -|* Ersterstellung 26.07.95 -|* Letzte Aenderung 26.07.95 -|* *************************************************************************/ XOBitmap::XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eInStyle ) : @@ -118,10 +107,6 @@ XOBitmap::XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eInStyle ) |* const Color& aBckgrColor, const Size& rSize = Size( 8, 8 ), |* XBitmapStyle eStyle = XBITMAP_TILE ) |* -|* Beschreibung -|* Ersterstellung 26.07.95 -|* Letzte Aenderung 26.07.95 -|* *************************************************************************/ XOBitmap::XOBitmap( const sal_uInt16* pArray, const Color& rPixelColor, @@ -153,10 +138,6 @@ XOBitmap::XOBitmap( const sal_uInt16* pArray, const Color& rPixelColor, |* |* XOBitmap::XOBitmap( const XOBitmap& rXBmp ) |* -|* Beschreibung -|* Ersterstellung 27.07.95 -|* Letzte Aenderung 27.07.95 -|* *************************************************************************/ XOBitmap::XOBitmap( const XOBitmap& rXBmp ) : @@ -186,10 +167,6 @@ XOBitmap::XOBitmap( const XOBitmap& rXBmp ) : |* |* XOBitmap::XOBitmap( Bitmap aBitmap, XBitmapStyle eStyle = XBITMAP_TILE ) |* -|* Beschreibung -|* Ersterstellung 26.07.95 -|* Letzte Aenderung 26.07.95 -|* *************************************************************************/ XOBitmap::~XOBitmap() @@ -202,10 +179,6 @@ XOBitmap::~XOBitmap() |* |* XOBitmap& XOBitmap::operator=( const XOBitmap& rXBmp ) |* -|* Beschreibung -|* Ersterstellung 27.07.95 -|* Letzte Aenderung 27.07.95 -|* *************************************************************************/ XOBitmap& XOBitmap::operator=( const XOBitmap& rXBmp ) @@ -235,10 +208,6 @@ XOBitmap& XOBitmap::operator=( const XOBitmap& rXBmp ) |* |* int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const |* -|* Beschreibung -|* Ersterstellung 26.07.95 -|* Letzte Aenderung 26.07.95 -|* *************************************************************************/ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const @@ -270,10 +239,6 @@ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const |* |* void SetPixelArray( const sal_uInt16* pArray ) |* -|* Beschreibung -|* Ersterstellung 27.07.95 -|* Letzte Aenderung 27.07.95 -|* *************************************************************************/ void XOBitmap::SetPixelArray( const sal_uInt16* pArray ) @@ -300,10 +265,6 @@ void XOBitmap::SetPixelArray( const sal_uInt16* pArray ) |* |* Bitmap XOBitmap::GetBitmap() |* -|* Beschreibung -|* Ersterstellung 26.07.95 -|* Letzte Aenderung 26.07.95 -|* *************************************************************************/ Bitmap XOBitmap::GetBitmap() const @@ -315,10 +276,6 @@ Bitmap XOBitmap::GetBitmap() const |* |* Bitmap XOBitmap::GetGraphicObject() |* -|* Beschreibung -|* Ersterstellung -|* Letzte Aenderung -|* *************************************************************************/ const GraphicObject& XOBitmap::GetGraphicObject() const @@ -335,8 +292,6 @@ const GraphicObject& XOBitmap::GetGraphicObject() const |* |* Beschreibung Umwandlung der Bitmap in Array, Hinter- u. |* Vordergrundfarbe -|* Ersterstellung 27.07.95 -|* Letzte Aenderung 27.07.95 |* *************************************************************************/ @@ -381,8 +336,6 @@ void XOBitmap::Bitmap2Array() |* |* Beschreibung Umwandlung des Arrays, Hinter- u. |* Vordergrundfarbe in eine Bitmap -|* Ersterstellung 27.07.95 -|* Letzte Aenderung 27.07.95 |* *************************************************************************/ @@ -422,10 +375,6 @@ TYPEINIT1_AUTOFACTORY(XFillBitmapItem, NameOrIndex); |* XFillBitmapItem::XFillBitmapItem(long nIndex, |* const Bitmap& rTheBitmap) |* -|* Beschreibung -|* Ersterstellung 17.11.94 -|* Letzte Aenderung 17.11.94 -|* *************************************************************************/ XFillBitmapItem::XFillBitmapItem(long nIndex, @@ -440,10 +389,6 @@ XFillBitmapItem::XFillBitmapItem(long nIndex, |* XFillBitmapItem::XFillBitmapItem(const XubString& rName, |* const Bitmap& rTheBitmap) |* -|* Beschreibung -|* Ersterstellung 17.11.94 -|* Letzte Aenderung 17.11.94 -|* *************************************************************************/ XFillBitmapItem::XFillBitmapItem(const XubString& rName, @@ -457,10 +402,6 @@ XFillBitmapItem::XFillBitmapItem(const XubString& rName, |* |* XFillBitmapItem::XFillBitmapItem(const XFillBitmapItem& rItem) |* -|* Beschreibung -|* Ersterstellung 17.11.94 -|* Letzte Aenderung 17.11.94 -|* *************************************************************************/ XFillBitmapItem::XFillBitmapItem(const XFillBitmapItem& rItem) : @@ -473,10 +414,6 @@ XFillBitmapItem::XFillBitmapItem(const XFillBitmapItem& rItem) : |* |* XFillBitmapItem::XFillBitmapItem(SvStream& rIn) |* -|* Beschreibung -|* Ersterstellung 17.11.94 -|* Letzte Aenderung 26.07.94 -|* *************************************************************************/ XFillBitmapItem::XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer ) : @@ -562,10 +499,6 @@ XFillBitmapItem::XFillBitmapItem( SfxItemPool* /*pPool*/) |* |* XFillBitmapItem::Clone(SfxItemPool* pPool) const |* -|* Beschreibung -|* Ersterstellung 17.11.94 -|* Letzte Aenderung 17.11.94 -|* *************************************************************************/ SfxPoolItem* XFillBitmapItem::Clone(SfxItemPool* /*pPool*/) const @@ -577,10 +510,6 @@ SfxPoolItem* XFillBitmapItem::Clone(SfxItemPool* /*pPool*/) const |* |* int XFillBitmapItem::operator==(const SfxPoolItem& rItem) const |* -|* Beschreibung -|* Ersterstellung 17.11.94 -|* Letzte Aenderung 26.07.95 -|* *************************************************************************/ int XFillBitmapItem::operator==(const SfxPoolItem& rItem) const @@ -593,10 +522,6 @@ int XFillBitmapItem::operator==(const SfxPoolItem& rItem) const |* |* SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* -|* Beschreibung -|* Ersterstellung 17.11.94 -|* Letzte Aenderung 17.11.94 -|* *************************************************************************/ SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const @@ -608,10 +533,6 @@ SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* |* SfxPoolItem* XFillBitmapItem::Store(SvStream& rOut) const |* -|* Beschreibung -|* Ersterstellung 17.11.94 -|* Letzte Aenderung 26.07.94 -|* *************************************************************************/ SvStream& XFillBitmapItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const @@ -659,10 +580,6 @@ SvStream& XFillBitmapItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) cons |* |* const Bitmap& XFillBitmapItem::GetValue(const XBitmapTable* pTable) const |* -|* Beschreibung -|* Ersterstellung 15.11.94 -|* Letzte Aenderung 26.07.94 -|* *************************************************************************/ const XOBitmap& XFillBitmapItem::GetBitmapValue(const XBitmapTable* pTable) const // GetValue -> GetBitmapValue @@ -678,10 +595,6 @@ const XOBitmap& XFillBitmapItem::GetBitmapValue(const XBitmapTable* pTable) cons |* |* sal_uInt16 XFillBitmapItem::GetVersion() const |* -|* Beschreibung -|* Ersterstellung 26.07.95 -|* Letzte Aenderung 26.07.95 -|* *************************************************************************/ sal_uInt16 XFillBitmapItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const @@ -716,7 +629,7 @@ SfxItemPresentation XFillBitmapItem::GetPresentation //------------------------------------------------------------------------ -sal_Bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -777,12 +690,12 @@ sal_Bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt rVal <<= aPropSeq; } - return sal_True; + return true; } //------------------------------------------------------------------------ -sal_Bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -892,3 +805,5 @@ XFillBitmapItem* XFillBitmapItem::checkForUniqueItem( SdrModel* pModel ) const return (XFillBitmapItem*)this; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx index 052bc4c8d25a..e1b2d75bf27c 100644 --- a/svx/source/xoutdev/xexch.cxx +++ b/svx/source/xoutdev/xexch.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,13 +35,9 @@ #include <tools/vcompat.hxx> #include <svx/xflasit.hxx> #include <svx/xfillit0.hxx> -#ifndef _SFXIPOOL_HXX #include <svl/itempool.hxx> -#endif #include <svl/whiter.hxx> -#ifndef _SFXIPOOL_HXX #include <svl/itempool.hxx> -#endif #include <svl/itemset.hxx> #include <svx/xdef.hxx> #include "svx/xexch.hxx" @@ -202,3 +199,5 @@ XFillExchangeData& XFillExchangeData::operator=( const XFillExchangeData& rData return( *this ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index 305b181a65a2..6f239ec93229 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -233,3 +234,5 @@ XOutdevItemPool::~XOutdevItemPool() } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx index 07a1e5bf3ad9..48ca4fbc91d7 100644 --- a/svx/source/xoutdev/xtabbtmp.cxx +++ b/svx/source/xoutdev/xtabbtmp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,8 +29,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef SVX_LIGHT - #include <com/sun/star/container/XNameContainer.hpp> #include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> @@ -37,8 +36,6 @@ #include "xmlxtexp.hxx" #include "xmlxtimp.hxx" -#endif - #include <tools/urlobj.hxx> #include <vcl/virdev.hxx> #include <svl/itemset.hxx> @@ -51,7 +48,8 @@ #define GLOBALOVERFLOW using namespace com::sun::star; -using namespace rtl; + +using ::rtl::OUString; sal_Unicode const pszExtBitmap[] = {'s','o','b'}; @@ -292,3 +290,5 @@ Bitmap* XBitmapList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/) } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx index 7411904b6303..eae0c09360e2 100644 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,8 +29,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef SVX_LIGHT - #include <com/sun/star/container/XNameContainer.hpp> #include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> @@ -39,8 +38,6 @@ #include "xmlxtexp.hxx" #include "xmlxtimp.hxx" -#endif - #include <sfx2/docfile.hxx> #include <tools/urlobj.hxx> #include <svx/dialogs.hrc> @@ -51,7 +48,8 @@ #define GLOBALOVERFLOW using namespace com::sun::star; -using namespace rtl; + +using ::rtl::OUString; sal_Unicode const pszExtColor[] = {'s','o','c'}; @@ -59,12 +57,6 @@ static char const aChckColor[] = { 0x04, 0x00, 'S','O','C','L'}; // < 5.2 static char const aChckColor0[] = { 0x04, 0x00, 'S','O','C','0'}; // = 5.2 static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0 -// ------------------ -// class XColorTable -// ------------------ - -static XColorTable* pTable=0; - /************************************************************************* |* |* XColorTable::XColorTable() @@ -86,11 +78,10 @@ XColorTable::~XColorTable() { } -XColorTable* XColorTable::GetStdColorTable() +XColorTable& XColorTable::GetStdColorTable() { - if ( !pTable ) - pTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - return pTable; + static XColorTable aTable(SvtPathOptions().GetPalettePath()); + return aTable; } /************************************************************************/ @@ -170,7 +161,7 @@ sal_Bool XColorTable::Create() xub_StrLen nLen; ResMgr& rRes = DIALOG_MGR(); - static sal_uInt16 __READONLY_DATA aResId[] = + static sal_uInt16 aResId[] = { RID_SVXSTR_BLACK, RID_SVXSTR_BLUE, @@ -199,7 +190,7 @@ sal_Bool XColorTable::Create() // BM: ifndef VCL part removed (deprecated) - static ColorData __READONLY_DATA aColTab[] = + static ColorData const aColTab[] = { COL_BLACK, COL_BLUE, @@ -546,3 +537,5 @@ Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/) } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index dd6bf8f17d19..f5c71a65200a 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,8 +31,6 @@ // include --------------------------------------------------------------- -#ifndef SVX_LIGHT - #include <com/sun/star/container/XNameContainer.hpp> #include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> @@ -39,7 +38,6 @@ #include "xmlxtexp.hxx" #include "xmlxtimp.hxx" -#endif #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> @@ -65,7 +63,8 @@ #include <basegfx/polygon/b2dpolygon.hxx> using namespace com::sun::star; -using namespace rtl; + +using ::rtl::OUString; #define GLOBALOVERFLOW @@ -376,3 +375,5 @@ Bitmap* XDashList::CreateBitmapForUI( long nIndex, sal_Bool bDelete ) ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index 02b35fb27f33..87709fd57399 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,8 +31,6 @@ // include --------------------------------------------------------------- -#ifndef SVX_LIGHT - #include <com/sun/star/container/XNameContainer.hpp> #include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> @@ -39,8 +38,6 @@ #include "xmlxtexp.hxx" #include "xmlxtimp.hxx" -#endif - #include <tools/urlobj.hxx> #include <vcl/virdev.hxx> #include <svl/itemset.hxx> @@ -63,7 +60,8 @@ #define GLOBALOVERFLOW using namespace com::sun::star; -using namespace rtl; + +using ::rtl::OUString; sal_Unicode const pszExtGradient[] = {'s','o','g'}; @@ -370,3 +368,5 @@ Bitmap* XGradientList::CreateBitmapForUI( long nIndex, sal_Bool bDelete ) ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index b62909fda71a..ef83d3a8b78a 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,8 +31,6 @@ // include --------------------------------------------------------------- -#ifndef SVX_LIGHT - #include <com/sun/star/container/XNameContainer.hpp> #include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> @@ -40,8 +39,6 @@ #include "xmlxtexp.hxx" #include "xmlxtimp.hxx" -#endif - #include <tools/urlobj.hxx> #include <vcl/virdev.hxx> #include <svl/itemset.hxx> @@ -372,3 +369,5 @@ Bitmap* XHatchList::CreateBitmapForUI( long nIndex, sal_Bool bDelete ) ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index e0e0a1c7aa69..42fe9043accc 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,7 +35,7 @@ #define GLOBALOVERFLOW // Vergleichsstrings -sal_Unicode __FAR_DATA pszStandard[] = { 's', 't', 'a', 'n', 'd', 'a', 'r', 'd', 0 }; +sal_Unicode pszStandard[] = { 's', 't', 'a', 'n', 'd', 'a', 'r', 'd', 0 }; // Konvertiert in echte RGB-Farben, damit in den Listboxen // endlich mal richtig selektiert werden kann. @@ -509,3 +510,4 @@ void XPropertyList::SetName( const String& rString ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx index 4a984b2a5bfb..89818aaae434 100644 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,8 +31,6 @@ // include --------------------------------------------------------------- -#ifndef SVX_LIGHT - #include <com/sun/star/container/XNameContainer.hpp> #include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> @@ -39,13 +38,10 @@ #include "xmlxtexp.hxx" #include "xmlxtimp.hxx" -#endif #include <tools/urlobj.hxx> #include <vcl/virdev.hxx> -#ifndef _SV_APP_HXX #include <vcl/svapp.hxx> -#endif #include <svl/itemset.hxx> #include <sfx2/docfile.hxx> @@ -75,7 +71,8 @@ #define GLOBALOVERFLOW using namespace com::sun::star; -using namespace rtl; + +using ::rtl::OUString; sal_Unicode const pszExtLineEnd[] = {'s','o','e'}; @@ -393,3 +390,5 @@ Bitmap* XLineEndList::CreateBitmapForUI( long nIndex, sal_Bool bDelete ) ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/uiconfig/layout/delzip b/svx/uiconfig/layout/delzip index 7b4d68d70fca..7b4d68d70fca 100644..100755 --- a/svx/uiconfig/layout/delzip +++ b/svx/uiconfig/layout/delzip diff --git a/svx/uiconfig/layout/layout.mk b/svx/uiconfig/layout/layout.mk index f6bea876d898..f6bea876d898 100644..100755 --- a/svx/uiconfig/layout/layout.mk +++ b/svx/uiconfig/layout/layout.mk diff --git a/svx/uiconfig/layout/makefile.mk b/svx/uiconfig/layout/makefile.mk index e75ae5e8d255..e75ae5e8d255 100644..100755 --- a/svx/uiconfig/layout/makefile.mk +++ b/svx/uiconfig/layout/makefile.mk diff --git a/svx/uiconfig/layout/zoom.xml b/svx/uiconfig/layout/zoom.xml index 78e30ee11dfd..78e30ee11dfd 100644..100755 --- a/svx/uiconfig/layout/zoom.xml +++ b/svx/uiconfig/layout/zoom.xml diff --git a/svx/util/gal.dxp b/svx/util/gal.dxp index e8f2e0a94819..e8f2e0a94819 100644..100755 --- a/svx/util/gal.dxp +++ b/svx/util/gal.dxp diff --git a/svx/util/hidother.hrc b/svx/util/hidother.hrc index 68bb57a274b3..68bb57a274b3 100644..100755 --- a/svx/util/hidother.hrc +++ b/svx/util/hidother.hrc diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk new file mode 100755 index 000000000000..2e756b5aa369 --- /dev/null +++ b/svx/util/makefile.mk @@ -0,0 +1,197 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +PRJ=.. + +PRJNAME=svx +TARGET=svx +GEN_HID=TRUE +GEN_HID_OTHER=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +RSCLOCINC+=-I$(PRJ)$/source$/svdraw + +HELPIDFILES= ..$/inc$/helpid.hrc + +# svxcore +SHL1TARGET= svxcore$(DLLPOSTFIX) +SHL1IMPLIB= isvxcore +SHL1USE_EXPORTS=name + +SHL1OBJS= \ + $(SLO)$/coreservices.obj + + +SHL1LIBS= \ + $(SLB)$/animation.lib \ + $(SLB)$/attribute.lib \ + $(SLB)$/contact.lib \ + $(SLB)$/customshapes-core.lib \ + $(SLB)$/dialogs-core.lib \ + $(SLB)$/engine3d-core.lib \ + $(SLB)$/event.lib \ + $(SLB)$/fmcomp-core.lib \ + $(SLB)$/form-core.lib \ + $(SLB)$/gal.lib \ + $(SLB)$/items-core.lib \ + $(SLB)$/overlay.lib \ + $(SLB)$/primitive2d.lib \ + $(SLB)$/primitive3d.lib \ + $(SLB)$/properties.lib \ + $(SLB)$/svdraw-core.lib \ + $(SLB)$/table-core.lib \ + $(SLB)$/tbxctrls-core.lib \ + $(SLB)$/toolbars.lib \ + $(SLB)$/unodraw-core.lib \ + $(SLB)$/xml.lib \ + $(SLB)$/xout.lib + + +SHL1STDLIBS= \ + $(EDITENGLIB) \ + $(AVMEDIALIB) \ + $(SFX2LIB) \ + $(XMLOFFLIB) \ + $(BASEGFXLIB) \ + $(DRAWINGLAYERLIB) \ + $(LNGLIB) \ + $(BASICLIB) \ + $(SVTOOLLIB) \ + $(TKLIB) \ + $(VCLLIB) \ + $(SVLLIB) \ + $(SOTLIB) \ + $(UNOTOOLSLIB) \ + $(TOOLSLIB) \ + $(I18NISOLANGLIB) \ + $(I18NPAPERLIB) \ + $(COMPHELPERLIB) \ + $(UCBHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(SALLIB) \ + $(ICUUCLIB) + +SHL1DEF= $(MISC)$/$(SHL1TARGET).def +DEF1NAME= $(SHL1TARGET) +DEFLIB1NAME=$(SHL1LIBS:b) + +# svx +SHL2TARGET= svx$(DLLPOSTFIX) +SHL2IMPLIB= i$(TARGET) +SHL2USE_EXPORTS=name +SHL2DEPN=$(SHL1TARGETN) + +SHL2LIBS= \ + $(SLB)$/svdraw.lib \ + $(SLB)$/form.lib \ + $(SLB)$/items.lib \ + $(SLB)$/dialogs.lib \ + $(SLB)$/mnuctrls.lib \ + $(SLB)$/stbctrls.lib \ + $(SLB)$/tbxctrls.lib \ + $(SLB)$/smarttags.lib \ + $(SLB)$/unodraw.lib \ + $(SLB)$/unogallery.lib\ + $(SLB)$/accessibility.lib \ + $(SLB)$/customshapes.lib \ + $(SLB)$/fmcomp.lib \ + $(SLB)$/engine3d.lib \ + $(SLB)$/table.lib + +.IF "(GUIBASE)" == "WIN" +SHL2LIBS+=$(SLB)$/ibrwimp.lib +.ENDIF # (WIN) + +SHL2STDLIBS= \ + $(EDITENGLIB) \ + $(SVXCORELIB) \ + $(SFX2LIB) \ + $(XMLOFFLIB) \ + $(BASEGFXLIB) \ + $(DRAWINGLAYERLIB) \ + $(BASICLIB) \ + $(SVTOOLLIB) \ + $(TKLIB) \ + $(VCLLIB) \ + $(SVLLIB) \ + $(SOTLIB) \ + $(UNOTOOLSLIB) \ + $(TOOLSLIB) \ + $(I18NISOLANGLIB) \ + $(XMLSCRIPTLIB) \ + $(COMPHELPERLIB) \ + $(UCBHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(SALLIB) \ + $(SALHELPERLIB) \ + $(ICUUCLIB) + +.IF "$(GUI)"=="WNT" +SHL2STDLIBS+=$(SHELLLIB) +.ENDIF # WNT + +SHL2DEF= $(MISC)$/$(SHL2TARGET).def +DEF2NAME= $(SHL2TARGET) +DEFLIB2NAME=$(SHL2LIBS:b) + +.IF "$(debug)$(dbgutil)"!="" +SHL2STDLIBS += $(CPPUHELPERLIB) +.ENDIF # "$(debug)$(dbgutil)"!="" + +# ------------------------------------------------------------------------------ + +# Resource files +SRSFILELIST=\ + $(SRS)$/svdstr.srs \ + $(SRS)$/dialogs.srs \ + $(SRS)$/drawdlgs.srs \ + $(SRS)$/mnuctrls.srs \ + $(SRS)$/stbctrls.srs \ + $(SRS)$/tbxctrls.srs \ + $(SRS)$/svxitems.srs \ + $(SRS)$/form.srs \ + $(SRS)$/fmcomp.srs \ + $(SRS)$/engine3d.srs \ + $(SRS)$/unodraw.srs \ + $(SRS)$/accessibility.srs \ + $(SRS)$/table.srs \ + $(SRS)$/toolbars.srs \ + $(SOLARCOMMONRESDIR)$/sfx.srs + +RESLIB1NAME=svx +RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw +RESLIB1SRSFILES= $(SRSFILELIST) + +# --- Targets ------------------------------------------------------- + +.INCLUDE : target.mk + diff --git a/svx/util/svx.component b/svx/util/svx.component index 5907d69fef50..5907d69fef50 100644..100755 --- a/svx/util/svx.component +++ b/svx/util/svx.component diff --git a/svx/util/svx.dxp b/svx/util/svx.dxp index f0e1c69934bc..f0e1c69934bc 100644..100755 --- a/svx/util/svx.dxp +++ b/svx/util/svx.dxp diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component index 2f829cb52a77..d266e06188c1 100644..100755 --- a/svx/util/svxcore.component +++ b/svx/util/svxcore.component @@ -25,9 +25,7 @@ * for a copy of the LGPLv3 License. * **********************************************************************--> - -<component loader="com.sun.star.loader.SharedLibrary" - xmlns="http://openoffice.org/2010/uno-components"> +<component xmlns="http://openoffice.org/2010/uno-components" loader="com.sun.star.loader.SharedLibrary"> <implementation name="com.sun.star.comp.svx.ExtrusionDepthController"> <service name="com.sun.star.frame.PopupMenuController"/> </implementation> @@ -40,10 +38,10 @@ <implementation name="com.sun.star.comp.svx.ExtrusionSurfaceController"> <service name="com.sun.star.frame.ToolbarController"/> </implementation> - <implementation name="com.sun.star.comp.svx.FontWorkAlignmentController"> + <implementation name="com.sun.star.comp.svx.FontworkAlignmentController"> <service name="com.sun.star.frame.ToolbarController"/> </implementation> - <implementation name="com.sun.star.comp.svx.FontWorkCharacterSpacingController"> + <implementation name="com.sun.star.comp.svx.FontworkCharacterSpacingController"> <service name="com.sun.star.frame.ToolbarController"/> </implementation> </component> diff --git a/svx/util/svxpch.cxx b/svx/util/svxpch.cxx index b8f6b92b38db..978fa44c542f 100644 --- a/svx/util/svxpch.cxx +++ b/svx/util/svxpch.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,4 @@ #include <sfx.hrc> +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/util/textconversiondlgs.component b/svx/util/textconversiondlgs.component index 184743583645..184743583645 100644..100755 --- a/svx/util/textconversiondlgs.component +++ b/svx/util/textconversiondlgs.component diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx index 9b2f4f2e2aac..3f92f9bedb82 100644 --- a/svx/workben/edittest.cxx +++ b/svx/workben/edittest.cxx @@ -54,7 +54,6 @@ #include <dialdll.hxx> - #define SERVICE_SIMPLEREGISTRY "com.sun.star.registry.SimpleRegistry" #include <comphelper/processfactory.hxx> #include <comphelper/regpathhelper.hxx> @@ -356,7 +355,6 @@ BOOL __EXPORT MyView::QueryDrop( DropEvent& rEvt ) } // --- class EditMainWindow -------------------------------------------- -DECLARE_LIST( ViewList, MyView* ); class EditViewWindow : public Window { @@ -366,7 +364,6 @@ private: Pointer aStdPtr; Pointer aURLPtr; WorkWindow* pTmpWindow; - ViewList aViewList; XubString aTestStr; @@ -1396,15 +1393,6 @@ IMPL_LINK( EditMainWindow, ShowStatus, EditStatus *, pStat ) EditViewWindow::~EditViewWindow() { - // erst die angemeldeten Views zerstoeren - // (melden sich selbst ab) - MyView* pView = aViewList.First(); - while ( pView ) - { - delete pView; - pView = aViewList.Next(); - } - pEditEngine->RemoveView( pEditView ); delete pEditView; // Beim Zerstoeren der Styles am Ende, EditEngine noch nicht kaputt, diff --git a/svx/workben/msview/makefile.mk b/svx/workben/msview/makefile.mk index ee4d384399d7..2ce9d573de1c 100644..100755 --- a/svx/workben/msview/makefile.mk +++ b/svx/workben/msview/makefile.mk @@ -58,7 +58,6 @@ APP1STDLIBS= $(CPPULIB) \ $(TOOLSLIB) \ $(SVTOOLLIB) \ $(SALLIB) \ - $(VOSLIB) \ $(SOTLIB) \ $(VCLLIB) \ $(SVXLIB) \ diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index baee57ad75dc..a19838eec26b 100644 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ #include <algorithm> #include <boost/shared_ptr.hpp> #include <sot/storage.hxx> -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif #include <sal/main.h> #include <vcl/event.hxx> @@ -389,7 +388,6 @@ const Atom* Atom::findNextChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstanc Atom* Atom::findFirstEqualAtom( Atom* pCompare, Atom* pContainer, Atom* pSearch, int& nDistance ) { nDistance = 0; - Atom* pRet = 0; while( pSearch ) { @@ -516,48 +514,7 @@ public: SvLBoxString::Paint( rPos, rOutDev, nViewDataEntryFlags, pEntry ); rOutDev.SetTextColor( aOldTextColor ); - -/* - Color aOldFillColor = rOutDev.GetFillColor(); - - SvTreeListBox* pTreeBox = static_cast< SvTreeListBox* >( &rOutDev ); - long nX = pTreeBox->GetSizePixel().Width(); - - ScrollBar* pVScroll = pTreeBox->GetVScroll(); - if ( pVScroll->IsVisible() ) - { - nX -= pVScroll->GetSizePixel().Width(); - } - - SvViewDataItem* pItem = rOutDev.GetViewDataItem( pEntry, this ); - nX -= pItem->aSize.Height(); - - long nSize = pItem->aSize.Height() / 2; - long nHalfSize = nSize / 2; - long nY = rPos.Y() + nHalfSize; - - if ( aOldFillColor == COL_WHITE ) - { - rOutDev.SetFillColor( Color( COL_BLACK ) ); - } - else - { - rOutDev.SetFillColor( Color( COL_WHITE ) ); - } - - long n = 0; - while ( n <= nHalfSize ) - { - rOutDev.DrawRect( Rectangle( nX+n, nY+n, nX+n, nY+nSize-n ) ); - n++; - } - - rOutDev.SetFillColor( aOldFillColor ); -*/ } - -private: - Image* mpImage; }; @@ -1146,7 +1103,7 @@ void MSViewerWorkWindow::Resize() uno::Reference< uno::XComponentContext > xCtx( cppu::defaultBootstrap_InitialComponentContext() ); if ( !xCtx.is() ) { - DBG_ERROR( "Error creating initial component context!" ); + OSL_FAIL( "Error creating initial component context!" ); return -1; } @@ -1154,25 +1111,25 @@ void MSViewerWorkWindow::Resize() if ( !xMSF.is() ) { - DBG_ERROR( "No service manager!" ); + OSL_FAIL( "No service manager!" ); return -1; } // Init UCB uno::Sequence< uno::Any > aArgs( 2 ); - aArgs[ 0 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL ); - aArgs[ 1 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE ); + aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL )); + aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE )); sal_Bool bSuccess = ::ucb::ContentBroker::initialize( xMSF, aArgs ); if ( !bSuccess ) { - DBG_ERROR( "Error creating UCB!" ); + OSL_FAIL( "Error creating UCB!" ); return -1; } } catch ( uno::Exception const & ) { - DBG_ERROR( "Exception during creation of initial component context!" ); + OSL_FAIL( "Exception during creation of initial component context!" ); return -1; } comphelper::setProcessServiceFactory( xMSF ); @@ -1222,3 +1179,5 @@ void MSViewerWorkWindow::Resize() return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/workben/msview/msview.xml b/svx/workben/msview/msview.xml index 6daffa62be2d..6daffa62be2d 100644..100755 --- a/svx/workben/msview/msview.xml +++ b/svx/workben/msview/msview.xml diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx index 92ac7a402851..1ee7475cc2d3 100644 --- a/svx/workben/msview/xmlconfig.cxx +++ b/svx/workben/msview/xmlconfig.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -327,7 +328,7 @@ void load_config( const OUString& rPath ) // get parser Reference< XParser > xParser( comphelper::getProcessServiceFactory()->createInstance( - OUString::createFromAscii("com.sun.star.xml.sax.Parser") ), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ), UNO_QUERY_THROW ); // get filter @@ -342,7 +343,7 @@ void load_config( const OUString& rPath ) } catch( Exception& r ) { - DBG_ERROR( + OSL_FAIL( (rtl::OString("load_config(), " "exception caught: ") + rtl::OUStringToOString( @@ -573,3 +574,4 @@ rtl::OUString SwitchElementConfig::format( SvStream& rStream, sal_Size& nLength return ElementConfig::dump_hex( rStream, nLength ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/workben/msview/xmlconfig.hxx b/svx/workben/msview/xmlconfig.hxx index d3d4eeb937e8..3bc270fe820d 100644 --- a/svx/workben/msview/xmlconfig.hxx +++ b/svx/workben/msview/xmlconfig.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef _XMLCONFIG_HXX_ #define _XMLCONFIG_HXX_ @@ -106,3 +107,5 @@ typedef std::map< UINT16, ElementConfigPtr > AtomConfigMap; extern AtomConfigMap gAtomConfigMap; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/xml/AccessibleControlShape.xml b/svx/xml/AccessibleControlShape.xml index cc889988363b..cc889988363b 100644..100755 --- a/svx/xml/AccessibleControlShape.xml +++ b/svx/xml/AccessibleControlShape.xml diff --git a/svx/xml/AccessibleEditableTextPara.xml b/svx/xml/AccessibleEditableTextPara.xml index affb15f4dd55..affb15f4dd55 100644..100755 --- a/svx/xml/AccessibleEditableTextPara.xml +++ b/svx/xml/AccessibleEditableTextPara.xml diff --git a/svx/xml/AccessibleGraphicShape.xml b/svx/xml/AccessibleGraphicShape.xml index 74e41df3a77d..74e41df3a77d 100644..100755 --- a/svx/xml/AccessibleGraphicShape.xml +++ b/svx/xml/AccessibleGraphicShape.xml diff --git a/svx/xml/AccessibleImageBullet.xml b/svx/xml/AccessibleImageBullet.xml index c6a2afdba95e..c6a2afdba95e 100644..100755 --- a/svx/xml/AccessibleImageBullet.xml +++ b/svx/xml/AccessibleImageBullet.xml diff --git a/svx/xml/AccessibleOLEShape.xml b/svx/xml/AccessibleOLEShape.xml index 27a9cafd4669..27a9cafd4669 100644..100755 --- a/svx/xml/AccessibleOLEShape.xml +++ b/svx/xml/AccessibleOLEShape.xml diff --git a/svx/xml/AccessibleShape.xml b/svx/xml/AccessibleShape.xml index 6469448e5479..6469448e5479 100644..100755 --- a/svx/xml/AccessibleShape.xml +++ b/svx/xml/AccessibleShape.xml diff --git a/svx/xml/SvxDrawPage.xml b/svx/xml/SvxDrawPage.xml index 29ea110a0094..29ea110a0094 100644..100755 --- a/svx/xml/SvxDrawPage.xml +++ b/svx/xml/SvxDrawPage.xml diff --git a/svx/xml/SvxGraphCtrlAccessibleContext.xml b/svx/xml/SvxGraphCtrlAccessibleContext.xml index ad436f5dc297..ad436f5dc297 100644..100755 --- a/svx/xml/SvxGraphCtrlAccessibleContext.xml +++ b/svx/xml/SvxGraphCtrlAccessibleContext.xml diff --git a/svx/xml/SvxGraphicExporter.xml b/svx/xml/SvxGraphicExporter.xml index 6a4d9fef2f47..6a4d9fef2f47 100644..100755 --- a/svx/xml/SvxGraphicExporter.xml +++ b/svx/xml/SvxGraphicExporter.xml diff --git a/svx/xml/SvxGraphicObject.xml b/svx/xml/SvxGraphicObject.xml index 7c756ad3e06e..7c756ad3e06e 100644..100755 --- a/svx/xml/SvxGraphicObject.xml +++ b/svx/xml/SvxGraphicObject.xml diff --git a/svx/xml/SvxShape.xml b/svx/xml/SvxShape.xml index 6cf5e00a1ac1..6cf5e00a1ac1 100644..100755 --- a/svx/xml/SvxShape.xml +++ b/svx/xml/SvxShape.xml diff --git a/svx/xml/SvxShapeCircle.xml b/svx/xml/SvxShapeCircle.xml index fc37a09e93e3..fc37a09e93e3 100644..100755 --- a/svx/xml/SvxShapeCircle.xml +++ b/svx/xml/SvxShapeCircle.xml diff --git a/svx/xml/SvxShapeCollection.xml b/svx/xml/SvxShapeCollection.xml index ad9781dfd367..ad9781dfd367 100644..100755 --- a/svx/xml/SvxShapeCollection.xml +++ b/svx/xml/SvxShapeCollection.xml diff --git a/svx/xml/SvxShapeConnector.xml b/svx/xml/SvxShapeConnector.xml index e80596b91d60..e80596b91d60 100644..100755 --- a/svx/xml/SvxShapeConnector.xml +++ b/svx/xml/SvxShapeConnector.xml diff --git a/svx/xml/SvxShapeControl.xml b/svx/xml/SvxShapeControl.xml index c2c95e1abed7..c2c95e1abed7 100644..100755 --- a/svx/xml/SvxShapeControl.xml +++ b/svx/xml/SvxShapeControl.xml diff --git a/svx/xml/SvxShapeDimensioning.xml b/svx/xml/SvxShapeDimensioning.xml index 4a3096010771..4a3096010771 100644..100755 --- a/svx/xml/SvxShapeDimensioning.xml +++ b/svx/xml/SvxShapeDimensioning.xml diff --git a/svx/xml/SvxShapeGroup.xml b/svx/xml/SvxShapeGroup.xml index e24fa8c703aa..e24fa8c703aa 100644..100755 --- a/svx/xml/SvxShapeGroup.xml +++ b/svx/xml/SvxShapeGroup.xml diff --git a/svx/xml/SvxShapePolyPolygon.xml b/svx/xml/SvxShapePolyPolygon.xml index 203bc1df98f5..203bc1df98f5 100644..100755 --- a/svx/xml/SvxShapePolyPolygon.xml +++ b/svx/xml/SvxShapePolyPolygon.xml diff --git a/svx/xml/SvxShapePolyPolygonBezier.xml b/svx/xml/SvxShapePolyPolygonBezier.xml index aadabb6df6f7..aadabb6df6f7 100644..100755 --- a/svx/xml/SvxShapePolyPolygonBezier.xml +++ b/svx/xml/SvxShapePolyPolygonBezier.xml diff --git a/svx/xml/SvxUnoNumberingRules.xml b/svx/xml/SvxUnoNumberingRules.xml index fe5b13ed490e..fe5b13ed490e 100644..100755 --- a/svx/xml/SvxUnoNumberingRules.xml +++ b/svx/xml/SvxUnoNumberingRules.xml diff --git a/svx/xml/SvxUnoText.xml b/svx/xml/SvxUnoText.xml index c3b26aa74321..c3b26aa74321 100644..100755 --- a/svx/xml/SvxUnoText.xml +++ b/svx/xml/SvxUnoText.xml diff --git a/svx/xml/SvxUnoTextContent.xml b/svx/xml/SvxUnoTextContent.xml index 2732d480b5ec..2732d480b5ec 100644..100755 --- a/svx/xml/SvxUnoTextContent.xml +++ b/svx/xml/SvxUnoTextContent.xml diff --git a/svx/xml/SvxUnoTextContentEnum.xml b/svx/xml/SvxUnoTextContentEnum.xml index ecbc78b5d3d3..ecbc78b5d3d3 100644..100755 --- a/svx/xml/SvxUnoTextContentEnum.xml +++ b/svx/xml/SvxUnoTextContentEnum.xml diff --git a/svx/xml/SvxUnoTextCursor.xml b/svx/xml/SvxUnoTextCursor.xml index fbebd7cf17a5..fbebd7cf17a5 100644..100755 --- a/svx/xml/SvxUnoTextCursor.xml +++ b/svx/xml/SvxUnoTextCursor.xml diff --git a/svx/xml/SvxUnoTextField.xml b/svx/xml/SvxUnoTextField.xml index fa64d6b1230c..fa64d6b1230c 100644..100755 --- a/svx/xml/SvxUnoTextField.xml +++ b/svx/xml/SvxUnoTextField.xml diff --git a/svx/xml/SvxUnoTextRange.xml b/svx/xml/SvxUnoTextRange.xml index 04b4610fb5d5..04b4610fb5d5 100644..100755 --- a/svx/xml/SvxUnoTextRange.xml +++ b/svx/xml/SvxUnoTextRange.xml diff --git a/svx/xml/SvxUnoTextRangeEnumeration.xml b/svx/xml/SvxUnoTextRangeEnumeration.xml index c8fc25adf539..c8fc25adf539 100644..100755 --- a/svx/xml/SvxUnoTextRangeEnumeration.xml +++ b/svx/xml/SvxUnoTextRangeEnumeration.xml |