diff options
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/fmhelp.hrc | 165 | ||||
| -rw-r--r-- | svx/inc/svx/msvbahelper.hxx | 58 | ||||
| -rw-r--r-- | svx/inc/svx/numitem.hxx | 30 | ||||
| -rw-r--r-- | svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx | 5 | ||||
| -rw-r--r-- | svx/inc/svx/selectioncontroller.hxx | 11 | ||||
| -rw-r--r-- | svx/inc/svx/svdedxv.hxx | 17 |
6 files changed, 164 insertions, 122 deletions
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index c7f172cbe5db..b5089d663c72 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -33,106 +33,75 @@ // include ----------------------------------------------------------- #include <svtools/solar.hrc> -// in solar.hrc -//#define HID_FORMS_START (HID_LIB_START+4000) -//#define HID_FORMS_END (HID_LIB_START+4999) - // Help-Ids -------------------------------------------------------------- -// insgesamt 200 -#define HID_DLG_DBINFO (HID_FORMS_START + 0) -#define HID_DLG_DBMSG (HID_FORMS_START + 1) - -#define HID_FM_OTHER_START (HID_FORMS_START + 300) -#define HID_FORM_NAVIGATOR (HID_FM_OTHER_START + 0) -#define HID_FORM_NAVIGATOR_WIN (HID_FM_OTHER_START + 1) -#define HID_FIELD_SEL (HID_FM_OTHER_START + 2) -#define HID_FIELD_SEL_WIN (HID_FM_OTHER_START + 3) -#define HID_FILTER_NAVIGATOR (HID_FM_OTHER_START + 4) -#define HID_FILTER_NAVIGATOR_WIN (HID_FM_OTHER_START + 5) - -#define HID_FORM_DLG_START (HID_FORMS_START + 400) -// FREE -// FREE -// FREE -#define HID_FM_PROPDLG_WINDOW (HID_FORM_DLG_START + 3) -#define HID_FM_PROPDLG_CONTAINER (HID_FORM_DLG_START + 4) -#define HID_FM_PROPDLG_TABCTR (HID_FORM_DLG_START + 5) -#define HID_FM_PROPDLG_TAB_GENERAL (HID_FORM_DLG_START + 6) -#define HID_FM_PROPDLG_TAB_DATA (HID_FORM_DLG_START + 7) -#define HID_FM_PROPDLG_TAB_EVT (HID_FORM_DLG_START + 8) -#define HID_FM_DLG_SEARCH (HID_FORM_DLG_START + 9) - -#define HID_SEARCH_TEXT (HID_FORM_DLG_START + 10) -#define HID_SEARCH_ALLFIELDS (HID_FORM_DLG_START + 11) -#define HID_SEARCH_SINGLEFIELD (HID_FORM_DLG_START + 12) -#define HID_SEARCH_FIELDSELECTION (HID_FORM_DLG_START + 13) -#define HID_SEARCH_POSITION (HID_FORM_DLG_START + 14) -#define HID_SEARCH_FORMATTER (HID_FORM_DLG_START + 15) -#define HID_SEARCH_CASE (HID_FORM_DLG_START + 16) -#define HID_SEARCH_BACKWARD (HID_FORM_DLG_START + 17) -#define HID_SEARCH_STARTOVER (HID_FORM_DLG_START + 18) -#define HID_SEARCH_WILDCARD (HID_FORM_DLG_START + 19) -#define HID_SEARCH_REGULAR (HID_FORM_DLG_START + 20) -#define HID_SEARCH_APPROX (HID_FORM_DLG_START + 21) -#define HID_SEARCH_APPROXSETTINGS (HID_FORM_DLG_START + 22) -#define HID_SEARCH_BTN_SEARCH (HID_FORM_DLG_START + 23) -#define HID_SEARCH_BTN_CLOSE (HID_FORM_DLG_START + 24) - -#define HID_TABORDER_CONTROLS (HID_FORM_DLG_START + 25) - -#define HID_CONTROLS_DATE_N_TIME (HID_FORM_DLG_START + 26) -#define HID_FM_DLG_PARAM (HID_FORM_DLG_START + 27) - -#define HID_GRID_TRAVEL_FIRST (HID_FORM_DLG_START + 28) -#define HID_GRID_TRAVEL_PREV (HID_FORM_DLG_START + 29) -#define HID_GRID_TRAVEL_NEXT (HID_FORM_DLG_START + 30) -#define HID_GRID_TRAVEL_LAST (HID_FORM_DLG_START + 31) -#define HID_GRID_TRAVEL_NEW (HID_FORM_DLG_START + 32) -#define HID_GRID_TRAVEL_ABSOLUTE (HID_FORM_DLG_START + 33) -#define HID_GRID_NUMBEROFRECORDS (HID_FORM_DLG_START + 34) - -#define UID_SEARCH_RECORDSTATUS (HID_FORM_DLG_START + 35) - -#define UID_FORMPROPBROWSER_FRAME (HID_FORM_DLG_START + 37) -#define UID_ABSOLUTE_RECORD_WINDOW (HID_FORM_DLG_START + 38) - -#define HID_DATA_NAVIGATOR_WIN (HID_FM_OTHER_START + 39) -#define HID_XFORMS_ADDDATAITEM_DLG (HID_FM_OTHER_START + 40) -#define HID_XFORMS_ADDCONDITION_DLG (HID_FM_OTHER_START + 41) -#define HID_XFORMS_NAMESPACEITEM_DLG (HID_FM_OTHER_START + 42) -#define HID_XFORMS_NAMESPACEITEM_LIST (HID_FM_OTHER_START + 43) -#define HID_XFORMS_MANAGENAMESPACE_DLG (HID_FM_OTHER_START + 44) - -#define HID_TP_XFORMS_INSTANCE (HID_FM_OTHER_START + 45) -#define HID_TP_XFORMS_SUBMISSION (HID_FM_OTHER_START + 46) -#define HID_TP_XFORMS_BINDING (HID_FM_OTHER_START + 47) - -#define HID_MN_XFORMS_MODELS_ADD (HID_FM_OTHER_START + 48) -#define HID_MN_XFORMS_MODELS_EDIT (HID_FM_OTHER_START + 49) -#define HID_MN_XFORMS_MODELS_REMOVE (HID_FM_OTHER_START + 50) -#define HID_MN_XFORMS_INSTANCES_ADD (HID_FM_OTHER_START + 51) -#define HID_MN_XFORMS_INSTANCES_EDIT (HID_FM_OTHER_START + 52) -#define HID_MN_XFORMS_INSTANCES_REMOVE (HID_FM_OTHER_START + 53) -#define HID_MN_XFORMS_SHOW_DETAILS (HID_FM_OTHER_START + 54) -#define HID_XFORMS_TOOLBOX (HID_FM_OTHER_START + 55) -#define HID_XFORMS_TOOLBOX_ITEM_ADD (HID_FM_OTHER_START + 56) -#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT (HID_FM_OTHER_START + 57) -#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE (HID_FM_OTHER_START + 58) -#define HID_XFORMS_TOOLBOX_ITEM_EDIT (HID_FM_OTHER_START + 59) -#define HID_XFORMS_TOOLBOX_ITEM_REMOVE (HID_FM_OTHER_START + 60) -#define HID_XFORMS_ITEMS_LIST (HID_FM_OTHER_START + 61) -#define HID_XFORMS_MODELS_LIST (HID_FM_OTHER_START + 62) -#define HID_XFORMS_MODELS_MENUBTN (HID_FM_OTHER_START + 63) -#define HID_XFORMS_INSTANCES_MENUBTN (HID_FM_OTHER_START + 64) -#define HID_XFORMS_ADDSUBMISSION_DLG (HID_FM_OTHER_START + 65) -#define HID_XFORMS_ADDMODEL_DLG (HID_FM_OTHER_START + 66) -#define HID_XFORMS_ADDINSTANCE_DLG (HID_FM_OTHER_START + 67) -#define HID_XFORMS_MID_INSERT_CONTROL (HID_FM_OTHER_START + 68) -#define HID_XFORMS_TAB_CONTROL (HID_FM_OTHER_START + 69) - -// if you add a new define here, please adjust the overflow check -// at the end of the file!! +#define HID_DLG_DBMSG ( HID_FORMS_START + 1) +#define HID_FORM_NAVIGATOR ( HID_FORMS_START + 2) +#define HID_FORM_NAVIGATOR_WIN ( HID_FORMS_START + 3) +#define HID_FIELD_SEL ( HID_FORMS_START + 4) +#define HID_FIELD_SEL_WIN ( HID_FORMS_START + 5) +#define HID_FILTER_NAVIGATOR ( HID_FORMS_START + 6) +#define HID_FILTER_NAVIGATOR_WIN ( HID_FORMS_START + 7) +#define HID_FM_DLG_SEARCH ( HID_FORMS_START + 8) +#define HID_SEARCH_TEXT ( HID_FORMS_START + 9) +#define HID_SEARCH_ALLFIELDS ( HID_FORMS_START + 10) +#define HID_SEARCH_SINGLEFIELD ( HID_FORMS_START + 11) +#define HID_SEARCH_FIELDSELECTION ( HID_FORMS_START + 12) +#define HID_SEARCH_POSITION ( HID_FORMS_START + 13) +#define HID_SEARCH_FORMATTER ( HID_FORMS_START + 14) +#define HID_SEARCH_CASE ( HID_FORMS_START + 15) +#define HID_SEARCH_BACKWARD ( HID_FORMS_START + 16) +#define HID_SEARCH_STARTOVER ( HID_FORMS_START + 17) +#define HID_SEARCH_WILDCARD ( HID_FORMS_START + 18) +#define HID_SEARCH_REGULAR ( HID_FORMS_START + 19) +#define HID_SEARCH_APPROX ( HID_FORMS_START + 20) +#define HID_SEARCH_APPROXSETTINGS ( HID_FORMS_START + 21) +#define HID_SEARCH_BTN_SEARCH ( HID_FORMS_START + 22) +#define HID_SEARCH_BTN_CLOSE ( HID_FORMS_START + 23) +#define HID_CONTROLS_DATE_N_TIME ( HID_FORMS_START + 24) +#define HID_GRID_TRAVEL_FIRST ( HID_FORMS_START + 25) +#define HID_GRID_TRAVEL_PREV ( HID_FORMS_START + 26) +#define HID_GRID_TRAVEL_NEXT ( HID_FORMS_START + 27) +#define HID_GRID_TRAVEL_LAST ( HID_FORMS_START + 28) +#define HID_GRID_TRAVEL_NEW ( HID_FORMS_START + 29) +#define HID_GRID_TRAVEL_ABSOLUTE ( HID_FORMS_START + 30) +#define HID_GRID_NUMBEROFRECORDS ( HID_FORMS_START + 31) +#define UID_SEARCH_RECORDSTATUS ( HID_FORMS_START + 32) +#define UID_FORMPROPBROWSER_FRAME ( HID_FORMS_START + 33) +#define UID_ABSOLUTE_RECORD_WINDOW ( HID_FORMS_START + 34) +#define HID_DATA_NAVIGATOR_WIN ( HID_FORMS_START + 35) +#define HID_XFORMS_ADDDATAITEM_DLG ( HID_FORMS_START + 36) +#define HID_XFORMS_ADDCONDITION_DLG ( HID_FORMS_START + 37) +#define HID_XFORMS_NAMESPACEITEM_DLG ( HID_FORMS_START + 38) +#define HID_XFORMS_NAMESPACEITEM_LIST ( HID_FORMS_START + 39) +#define HID_XFORMS_MANAGENAMESPACE_DLG ( HID_FORMS_START + 40) +#define HID_TP_XFORMS_INSTANCE ( HID_FORMS_START + 41) +#define HID_TP_XFORMS_SUBMISSION ( HID_FORMS_START + 42) +#define HID_TP_XFORMS_BINDING ( HID_FORMS_START + 43) +#define HID_MN_XFORMS_MODELS_ADD ( HID_FORMS_START + 44) +#define HID_MN_XFORMS_MODELS_EDIT ( HID_FORMS_START + 45) +#define HID_MN_XFORMS_MODELS_REMOVE ( HID_FORMS_START + 46) +#define HID_MN_XFORMS_INSTANCES_ADD ( HID_FORMS_START + 47) +#define HID_MN_XFORMS_INSTANCES_EDIT ( HID_FORMS_START + 48) +#define HID_MN_XFORMS_INSTANCES_REMOVE ( HID_FORMS_START + 49) +#define HID_MN_XFORMS_SHOW_DETAILS ( HID_FORMS_START + 50) +#define HID_XFORMS_TOOLBOX ( HID_FORMS_START + 51) +#define HID_XFORMS_TOOLBOX_ITEM_ADD ( HID_FORMS_START + 52) +#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT ( HID_FORMS_START + 53) +#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE ( HID_FORMS_START + 54) +#define HID_XFORMS_TOOLBOX_ITEM_EDIT ( HID_FORMS_START + 55) +#define HID_XFORMS_TOOLBOX_ITEM_REMOVE ( HID_FORMS_START + 56) +#define HID_XFORMS_ITEMS_LIST ( HID_FORMS_START + 57) +#define HID_XFORMS_MODELS_LIST ( HID_FORMS_START + 58) +#define HID_XFORMS_MODELS_MENUBTN ( HID_FORMS_START + 59) +#define HID_XFORMS_INSTANCES_MENUBTN ( HID_FORMS_START + 60) +#define HID_XFORMS_ADDSUBMISSION_DLG ( HID_FORMS_START + 61) +#define HID_XFORMS_ADDMODEL_DLG ( HID_FORMS_START + 62) +#define HID_XFORMS_ADDINSTANCE_DLG ( HID_FORMS_START + 63) +#define HID_XFORMS_MID_INSERT_CONTROL ( HID_FORMS_START + 64) +#define HID_XFORMS_TAB_CONTROL ( HID_FORMS_START + 65) + // if you add a new define here, please adjust the overflow check + // at the end of the file!! // ----------------------------------------------------------------------- diff --git a/svx/inc/svx/msvbahelper.hxx b/svx/inc/svx/msvbahelper.hxx new file mode 100644 index 000000000000..b1db44237fa6 --- /dev/null +++ b/svx/inc/svx/msvbahelper.hxx @@ -0,0 +1,58 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: + * $Revision: + * + * 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 _MSVBAHELPER_HXX +#define _MSVBAHELPER_HXX + +#include <sfx2/objsh.hxx> +#include "svx/svxdllapi.h" + +namespace ooo { namespace vba +{ + class SVX_DLLPUBLIC VBAMacroResolvedInfo + { + SfxObjectShell* mpDocContext; + bool mbFound; + String msResolvedMacro; + public: + VBAMacroResolvedInfo() : mpDocContext(NULL), mbFound( false ){} + void SetResolved( bool bRes ) { mbFound = bRes; } + bool IsResolved() { return mbFound; } + void SetMacroDocContext(SfxObjectShell* pShell ) { mpDocContext = pShell; } + SfxObjectShell* MacroDocContext() { return mpDocContext; } + String ResolvedMacro() { return msResolvedMacro; } + void SetResolvedMacro(const String& sMacro ) { msResolvedMacro = sMacro; } + }; + + SVX_DLLPUBLIC String makeMacroURL( const String& sMacroName ); + SVX_DLLPUBLIC VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& sMod, bool bSearchGlobalTemplates = false ); + SVX_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller ); +} } + +#endif diff --git a/svx/inc/svx/numitem.hxx b/svx/inc/svx/numitem.hxx index 17eb3d62630c..9840ec1688ac 100644 --- a/svx/inc/svx/numitem.hxx +++ b/svx/inc/svx/numitem.hxx @@ -76,12 +76,6 @@ namespace com{namespace sun{ namespace star{ #define SVX_NO_NUM 200 // Markierung fuer keine Numerierung #define SVX_NO_NUMLEVEL 0x20 -// --> OD 2008-01-10 #newlistlevelattrs# - no longer used -//#define NUMITEM_VERSION_01 0x01 -//#define NUMITEM_VERSION_02 0x02 -//#define NUMITEM_VERSION_03 0x03 -// <-- - #define LINK_TOKEN 0x80 //indicate linked bitmaps - for use in dialog only class SVX_DLLPUBLIC SvxNumberType { @@ -191,14 +185,10 @@ public: SvxNumPositionAndSpaceMode ePositionAndSpaceMode = LABEL_WIDTH_AND_POSITION ); // <-- SvxNumberFormat(const SvxNumberFormat& rFormat); - // --> OD 2008-01-09 #newlistlevelattrs# - no longer used -// SvxNumberFormat(SvStream &rStream); - // <-- + SvxNumberFormat(SvStream &rStream); virtual ~SvxNumberFormat(); - // --> OD 2008-01-09 #newlistlevelattrs# - no longer used -// SvStream& Store(SvStream &rStream, FontToSubsFontConverter pConverter); - // <-- + SvStream& Store(SvStream &rStream, FontToSubsFontConverter pConverter); SvxNumberFormat& operator=( const SvxNumberFormat& ); BOOL operator==( const SvxNumberFormat& ) const; @@ -304,9 +294,7 @@ public: = SvxNumberFormat::LABEL_WIDTH_AND_POSITION ); // <-- SvxNumRule(const SvxNumRule& rCopy); - // --> OD 2008-01-09 #newlistlevelattrs# - no longer used -// SvxNumRule(SvStream &rStream); - // <-- + SvxNumRule(SvStream &rStream); virtual ~SvxNumRule(); int operator==( const SvxNumRule& ) const; @@ -314,9 +302,7 @@ public: SvxNumRule& operator=( const SvxNumRule& ); - // --> OD 2008-01-09 #newlistlevelattrs# - no longer used -// SvStream& Store(SvStream &rStream); - // <-- + SvStream& Store(SvStream &rStream); const SvxNumberFormat* Get(USHORT nLevel)const; const SvxNumberFormat& GetLevel(USHORT nLevel)const; @@ -354,11 +340,9 @@ public: virtual ~SvxNumBulletItem(); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - // --> OD 2008-01-09 #newlistlevelattrs# - no longer used -// virtual SfxPoolItem* Create(SvStream &, USHORT) const; -// virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; -// virtual USHORT GetVersion( USHORT nFileVersion ) const; - // <-- + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + USHORT GetVersion( USHORT nFileVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; virtual int operator==( const SfxPoolItem& ) const; SvxNumRule* GetNumRule() const {return pNumRule;} diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx index 87a1de55ec0a..f6cc2abf32f6 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -105,8 +105,11 @@ namespace sdr { namespace contact { // support for Primitive2D virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + // visibility check + virtual bool isPrimitiveVisible( const DisplayInfo& _rDisplayInfo ) const; + private: - ViewObjectContactOfUnoControl(); // never implemented + ViewObjectContactOfUnoControl(); // never implemented ViewObjectContactOfUnoControl( const ViewObjectContactOfUnoControl& ); // never implemented ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& ); // never implemented }; diff --git a/svx/inc/svx/selectioncontroller.hxx b/svx/inc/svx/selectioncontroller.hxx index 5cf8c294a1bb..b9c04b54c0dc 100644 --- a/svx/inc/svx/selectioncontroller.hxx +++ b/svx/inc/svx/selectioncontroller.hxx @@ -33,6 +33,8 @@ #include "svx/svxdllapi.h" +#include <boost/shared_ptr.hpp> + #include <cppuhelper/weak.hxx> class KeyEvent; @@ -70,6 +72,15 @@ public: virtual bool GetMarkedObjModel( SdrPage* pNewPage ); virtual bool PasteObjModel( const SdrModel& rModel ); + + /** returns a format paint brush set from the current selection */ + virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet ); + + /** applies a format paint brush set from the current selection. + if bNoCharacterFormats is true, no character attributes are changed. + if bNoParagraphFormats is true, no paragraph attributes are changed. + */ + virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats ); }; } diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx index 17333ad74459..293e50896044 100644 --- a/svx/inc/svx/svdedxv.hxx +++ b/svx/inc/svx/svdedxv.hxx @@ -41,6 +41,8 @@ // Vorausdeklarationen //************************************************************ +#include <boost/shared_ptr.hpp> + class SdrOutliner; class OutlinerView; class EditStatus; @@ -282,6 +284,21 @@ public: rtl::Reference< sdr::SelectionController > getSelectionController() const { return mxSelectionController; } + /** returns true if the shape identified by its inventor and identifier supports format paint brush operation */ + virtual bool SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const; + + /** returns a format paint brush set from the current selection */ + virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet ); + + /** applies a format paint brush set from the current selection. + if bNoCharacterFormats is true, no character attributes are changed. + if bNoParagraphFormats is true, no paragraph attributes are changed. + */ + virtual void ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats ); + + /** helper function for selections with multiple SdrText for one SdrTextObj (f.e. tables ) */ + void ApplyFormatPaintBrushToText( SfxItemSet& rFormatSet, SdrTextObj& rTextObj, SdrText* pText, bool bNoCharacterFormats, bool bNoParagraphFormats ); + protected: virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ); virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ); |