diff options
Diffstat (limited to 'include/svx')
290 files changed, 1121 insertions, 1141 deletions
diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx index 2544e51f3f41..9fa2c20e5a4f 100644 --- a/include/svx/AccessibleTextHelper.hxx +++ b/include/svx/AccessibleTextHelper.hxx @@ -375,7 +375,7 @@ namespace accessibility virtual sal_Bool IsSelected() const; // XAccessibleContext child handling methods - //----------------------------------------------------------------- + /** Implements getAccessibleChildCount @attention Don't call with locked mutexes. You may hold @@ -390,7 +390,7 @@ namespace accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChild( sal_Int32 i ) SAL_THROW((::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)); // XAccessibleEventBroadcaster child related methods - //----------------------------------------------------------------- + /** Implements addEventListener @attention Don't call with locked mutexes @@ -403,7 +403,7 @@ namespace accessibility virtual void RemoveEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) SAL_THROW((::com::sun::star::uno::RuntimeException)); // XAccessibleComponent child related methods - //----------------------------------------------------------------- + /** Implements getAccessibleAt @attention Don't call with locked mutexes. You may hold diff --git a/include/svx/ActionDescriptionProvider.hxx b/include/svx/ActionDescriptionProvider.hxx index 574ebbbb6eec..bacbe7e8d733 100644 --- a/include/svx/ActionDescriptionProvider.hxx +++ b/include/svx/ActionDescriptionProvider.hxx @@ -25,7 +25,7 @@ // header for class OUString #include <rtl/ustring.hxx> -//----------------------------------------------------------------------------- + /** This class provides localized descriptions for some basic actions done with objects. The strings are intended to be provided to the user e.g. as description for undo actions in the menu. The name of the object acted on and the type of action needs to be given as input parameter. diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx index b5480b0ac827..2f1746281b61 100644 --- a/include/svx/AffineMatrixItem.hxx +++ b/include/svx/AffineMatrixItem.hxx @@ -23,9 +23,9 @@ #include <svl/poolitem.hxx> #include <com/sun/star/geometry/AffineMatrix2D.hpp> -//--------------------- + // class AffineMatrixItem -//--------------------- + class SVX_DLLPUBLIC AffineMatrixItem : public SfxPoolItem { diff --git a/include/svx/ParseContext.hxx b/include/svx/ParseContext.hxx index d7ccad9ad00b..40aae99f363d 100644 --- a/include/svx/ParseContext.hxx +++ b/include/svx/ParseContext.hxx @@ -27,9 +27,9 @@ namespace svxform { - //========================================================================== + //= OSystemParseContext - //========================================================================== + class SVX_DLLPUBLIC OSystemParseContext : public ::connectivity::IParseContext { private: @@ -56,9 +56,9 @@ namespace svxform }; - //========================================================================== + //= OParseContextClient - //========================================================================== + /** helper class which needs access to a (shared and ref-counted) OSystemParseContext instance. */ diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx index 11e97ea26a98..a51955066883 100644 --- a/include/svx/SvxColorValueSet.hxx +++ b/include/svx/SvxColorValueSet.hxx @@ -22,11 +22,11 @@ #include <svtools/valueset.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + class XColorList; -////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SvxColorValueSet : public ValueSet { @@ -47,7 +47,7 @@ public: Size layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount); }; -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVXCOLORVALUESET_HXX diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx index 1f6c43c6e7b3..9859fc061caa 100644 --- a/include/svx/XPropertyEntry.hxx +++ b/include/svx/XPropertyEntry.hxx @@ -23,7 +23,7 @@ #include <svx/svxdllapi.h> #include <vcl/bitmap.hxx> -// --------------------- + // class XPropertyEntry class SVX_DLLPUBLIC XPropertyEntry diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index 58caee409342..b7edcd5f70ab 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -27,7 +27,7 @@ class SvStream; -//------------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxOrientationItem: public SfxEnumItem { @@ -69,7 +69,7 @@ public: void SetFromRotation( sal_Int32 nRotation, sal_Bool bStacked ); }; -//------------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxMarginItem: public SfxPoolItem { diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx index 5d00482f26d9..296fccca34d6 100644 --- a/include/svx/charthelper.hxx +++ b/include/svx/charthelper.hxx @@ -27,12 +27,12 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <com/sun/star/embed/XEmbeddedObject.hpp> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace svt { class EmbeddedObjectRef; } -////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC ChartHelper { @@ -60,7 +60,7 @@ public: bool bNoLineStyle = true); }; -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_CHARTHELPER_HXX diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 54c4ab0a5a4e..f1d193d5dc3d 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -22,7 +22,7 @@ #include <svl/eitem.hxx> #include <svx/svxdllapi.h> -//------------------------------------------------------------------------ + enum SvxChartStyle { @@ -162,7 +162,7 @@ enum SvxChartRegress #define CHREGRESS_COUNT (CHREGRESS_MOVING_AVERAGE + 1) -//------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxChartStyleItem : public SfxEnumItem { @@ -180,7 +180,7 @@ public: { return (SvxChartStyle)SfxEnumItem::GetValue(); } }; -//------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxChartRegressItem : public SfxEnumItem { @@ -199,7 +199,7 @@ public: sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; }; -//------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxChartDataDescrItem : public SfxEnumItem { @@ -216,7 +216,7 @@ public: { return (SvxChartDataDescr)SfxEnumItem::GetValue(); } }; -//------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxChartTextOrderItem : public SfxEnumItem { @@ -238,7 +238,7 @@ public: { return (SvxChartTextOrder)SfxEnumItem::GetValue(); } }; -//------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxChartTextOrientItem : public SfxEnumItem { @@ -255,7 +255,7 @@ public: { return (SvxChartTextOrient)SfxEnumItem::GetValue(); } }; -//------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxChartKindErrorItem : public SfxEnumItem { @@ -276,7 +276,7 @@ public: sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; }; -//------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxChartIndicateItem : public SfxEnumItem { @@ -297,7 +297,7 @@ public: sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; }; -//------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxDoubleItem : public SfxPoolItem { diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index a1eb813c7a2a..0c05252034a3 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -151,9 +151,9 @@ public: }; -//================================================================== + // Filter- Tabpage -//================================================================== + class SVX_DLLPUBLIC SvxTPFilter: public TabPage { private: @@ -284,9 +284,9 @@ public: }; -//================================================================== + // View- Tabpage -//================================================================== + class SVX_DLLPUBLIC SvxTPView: public TabPage { @@ -356,9 +356,9 @@ public: virtual void DeactivatePage(); }; -//================================================================== + // Redlining - Control (Accept- Changes) -//================================================================== + class SVX_DLLPUBLIC SvxAcceptChgCtr : public TabControl diff --git a/include/svx/dataaccessdescriptor.hxx b/include/svx/dataaccessdescriptor.hxx index 4fb5b0cdd49f..da89069cd00a 100644 --- a/include/svx/dataaccessdescriptor.hxx +++ b/include/svx/dataaccessdescriptor.hxx @@ -24,16 +24,16 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <svx/svxdllapi.h> -//........................................................................ + namespace svx { -//........................................................................ + class ODADescriptorImpl; - //==================================================================== + //= DataAccessDescriptorProperty - //==================================================================== + enum DataAccessDescriptorProperty { daDataSource, /// data source name (string) @@ -56,9 +56,9 @@ namespace svx daComponent /// component name (XContent) }; - //==================================================================== + //= ODataAccessDescriptor - //==================================================================== + /** class encapsulating the com::sun::star::sdb::DataAccessDescriptor service. */ class SVX_DLLPUBLIC ODataAccessDescriptor @@ -126,9 +126,9 @@ namespace svx void setDataSource(const OUString& _sDataSourceNameOrLocation); }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_DATAACCESSDESCRIPTOR_HXX diff --git a/include/svx/databaselocationinput.hxx b/include/svx/databaselocationinput.hxx index 6a04e6f69d8a..b5af04f558a4 100644 --- a/include/svx/databaselocationinput.hxx +++ b/include/svx/databaselocationinput.hxx @@ -28,14 +28,14 @@ namespace svt { class OFileURLControl; } #include <memory> -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= DatabaseLocationInputController - //==================================================================== + class DatabaseLocationInputController_Impl; /** helper class to control controls needed to input a database location @@ -78,9 +78,9 @@ namespace svx m_pImpl; }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_DATABASELOCATIONINPUT_HXX diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx index 5b535cb7c019..b874ca8ac338 100644 --- a/include/svx/dbaexchange.hxx +++ b/include/svx/dbaexchange.hxx @@ -27,19 +27,19 @@ #include <com/sun/star/uno/Sequence.hxx> #include <svx/svxdllapi.h> -//........................................................................ + namespace svx { -//........................................................................ + // column transfer formats #define CTF_FIELD_DESCRIPTOR 0x0001 // the field descriptor format #define CTF_CONTROL_EXCHANGE 0x0002 // the control exchange format #define CTF_COLUMN_DESCRIPTOR 0x0004 // data access descriptor for a column - //==================================================================== + //= OColumnTransferable - //==================================================================== + class SVX_DLLPUBLIC OColumnTransferable : public TransferableHelper { protected: @@ -161,9 +161,9 @@ namespace svx ); }; - //==================================================================== + //= ODataAccessObjectTransferable - //==================================================================== + /** class for transfering data access objects (tables, queries, statements ...) */ class SVX_DLLPUBLIC ODataAccessObjectTransferable : public TransferableHelper @@ -249,9 +249,9 @@ namespace svx ,const OUString& _sActiveCommand); }; - //==================================================================== + //= OMultiColumnTransferable - //==================================================================== + /** class for transfering multiple columns */ class SVX_DLLPUBLIC OMultiColumnTransferable : public TransferableHelper @@ -280,9 +280,9 @@ namespace svx static sal_uInt32 getDescriptorFormatId(); }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_DBAEXCHANGE_HXX diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx index d8058483b76d..81374279069f 100644 --- a/include/svx/dbaobjectex.hxx +++ b/include/svx/dbaobjectex.hxx @@ -28,14 +28,14 @@ #include <com/sun/star/uno/Sequence.hxx> #include <svx/svxdllapi.h> -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= OComponentTransferable - //==================================================================== + class SVX_DLLPUBLIC OComponentTransferable : public TransferableHelper { protected: @@ -68,9 +68,9 @@ namespace svx static sal_uInt32 getDescriptorFormatId(sal_Bool _bExtractForm); }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_DBAOBJECTEX_HXX diff --git a/include/svx/dbcharsethelper.hxx b/include/svx/dbcharsethelper.hxx index a60310835c89..000cb405e0be 100644 --- a/include/svx/dbcharsethelper.hxx +++ b/include/svx/dbcharsethelper.hxx @@ -22,14 +22,14 @@ #include <svx/svxdllapi.h> #include <svx/dbtoolsclient.hxx> -//........................................................................ + namespace svxform { -//........................................................................ - //==================================================================== + + //= ODataAccessCharsetHelper - //==================================================================== + class SVX_DLLPUBLIC ODataAccessCharsetHelper : public ODbtoolsClient { protected: @@ -49,9 +49,9 @@ namespace svxform } }; -//........................................................................ + } // namespace svxform -//........................................................................ + #endif // SVX_DBCHARSETCLIENT_HXX diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index b8ea3153b29e..9c9b92bcab8d 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -31,7 +31,7 @@ class NumericField; namespace svx { -// ============================================================================ + class DialControlBmp : public VirtualDevice { @@ -166,7 +166,7 @@ private: DECL_LINK( LinkedFieldModifyHdl, NumericField* ); }; -// ============================================================================ + /** Wrapper for usage of a DialControl in item connections. */ class SVX_DLLPUBLIC DialControlWrapper : public sfx::SingleControlWrapper< DialControl, sal_Int32 > @@ -181,12 +181,12 @@ public: virtual void SetControlValue( sal_Int32 nValue ); }; -// ---------------------------------------------------------------------------- + /** An item<->control connection for a DialControl. */ typedef sfx::ItemControlConnection< sfx::Int32ItemWrapper, DialControlWrapper > DialControlConnection; -// ============================================================================ + } // namespace svx diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 65eb7c30145a..6871f8f99542 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -138,7 +138,7 @@ #define SID_SD_TP_MISC (RID_OFA_START + 231) #define RID_SC_TP_DEFAULTS (RID_OFA_START + 253) -//--------------------------------------------------------------------- + // ResId's fuer Dialoge aus StarDraw #define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289) @@ -993,7 +993,7 @@ // !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new RIDs for Strings !!! #define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1270) -// ---------------------------------------------------------------------------- + // if we have _a_lot_ time, we should group the resource ids by type, instead // of grouping them by semantics. The reason is that resource ids have to be // unique relative to a fixed type (you can't have two dialogs with the same @@ -1002,16 +1002,16 @@ // I suggest sticking to per-type ids instead of per-semantic ids, this is // better maintainable (IMO), and does not waste that much ids -// ---------------------------------------------------------------------------- + // "Window" resource ids -// ---------------------------------------------------------------------------- + // "ModalDialog" resource ids #define RID_SVX_MDLG_FONTWORK_GALLERY ( RID_SVX_START + 2 ) -// ---------------------------------------------------------------------------- + // "Menu" resource ids #define RID_SVX_MDLG_FONTWORK_CHARSPACING ( RID_SVX_START + 19 ) @@ -1025,7 +1025,7 @@ #define RID_SVXPAGE_DOCRECOVERY_SAVE ( RID_SVX_START + 8 ) #define RID_SVXPAGE_DOCRECOVERY_RECOVER ( RID_SVX_START + 9 ) -// ---------------------------------------------------------------------------- + // !!!! double defined ID's (see below) !!! #define RID_OFA_AUTOCORR_DLG (RID_OFA_START + 101) diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index 6f37b018f743..dddd4b8f4a00 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -27,7 +27,7 @@ #include <svx/svxdllapi.h> #include <basegfx/vector/b3dvector.hxx> -////////////////////////////////////////////////////////////////////////////// + class FmFormModel; class FmFormPage; @@ -35,12 +35,12 @@ class E3dView; class E3dPolyScene; class E3dObject; -////////////////////////////////////////////////////////////////////////////// + #define PREVIEW_OBJECTTYPE_SPHERE 0x0000 #define PREVIEW_OBJECTTYPE_CUBE 0x0001 -////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC Svx3DPreviewControl : public Control { @@ -70,7 +70,7 @@ public: virtual void Set3DAttributes(const SfxItemSet& rAttr); }; -////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC Svx3DLightControl : public Svx3DPreviewControl { @@ -149,7 +149,7 @@ public: basegfx::B3DVector GetLightDirection(sal_uInt32 nNum) const; }; -////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SvxLightCtl3D : public Control { diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 38c0efd4cd99..f13d78744c82 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -353,7 +353,7 @@ public: void Modify( const XLineEndEntry& rEntry, sal_uInt16 nPos, const Bitmap& rBitmap, bool bStart = true ); }; -////////////////////////////////////////////////////////////////////////////// + class SdrObject; class SdrPathObj; diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx index a1b07f8f6eee..1de3e4609446 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -25,9 +25,9 @@ #include <com/sun/star/drawing/LineDash.hpp> #include <svx/svxdllapi.h> -//================================================================== + // SvxColorListItem -//================================================================== + class SVX_DLLPUBLIC SvxColorListItem: public SfxPoolItem { @@ -55,9 +55,9 @@ public: }; -//================================================================== + // SvxGradientListItem -//================================================================== + class SVX_DLLPUBLIC SvxGradientListItem: public SfxPoolItem { @@ -86,9 +86,9 @@ public: }; -//================================================================== + // SvxHatchListItem -//================================================================== + class SVX_DLLPUBLIC SvxHatchListItem: public SfxPoolItem { XHatchListRef pHatchList; @@ -117,9 +117,9 @@ public: -//================================================================== + // SvxBitmapListItem -//================================================================== + class SVX_DLLPUBLIC SvxBitmapListItem: public SfxPoolItem { XBitmapListRef pBitmapList; @@ -148,9 +148,9 @@ public: -//================================================================== + // SvxDashListItem -//================================================================== + class SVX_DLLPUBLIC SvxDashListItem: public SfxPoolItem { XDashListRef pDashList; @@ -176,9 +176,9 @@ public: }; -//================================================================== + // SvxLineEndListItem -//================================================================== + class SVX_DLLPUBLIC SvxLineEndListItem: public SfxPoolItem { XLineEndListRef pLineEndList; diff --git a/include/svx/e3dsceneupdater.hxx b/include/svx/e3dsceneupdater.hxx index 039617a52905..54e5dcc040e5 100644 --- a/include/svx/e3dsceneupdater.hxx +++ b/include/svx/e3dsceneupdater.hxx @@ -22,7 +22,7 @@ #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObject; @@ -31,7 +31,7 @@ namespace drawinglayer { namespace geometry { class ViewInformation3D; }} -////////////////////////////////////////////////////////////////////////////// + // This class is a helper to encapsulate 3D object changes which shall change the // scene's 2D geometry. E.g. when moving one 3D object in a scene, the visualisation // would not change since the scene's 2D attributes are defined by it's 2D object diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index 8998024db140..7f0d647fa3d2 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -68,7 +68,7 @@ public: virtual Window* CreateItemWindow( Window *pParent ); }; -//======================================================================== + class FillControl : public Window { diff --git a/include/svx/flagsdef.hxx b/include/svx/flagsdef.hxx index 4868d7618e49..a3e637bea94f 100644 --- a/include/svx/flagsdef.hxx +++ b/include/svx/flagsdef.hxx @@ -90,7 +90,7 @@ enum SvxModeType #define TABFILL_SPECIAL 0x0100 #define TABFILL_ALL 0x01F0 -//----- + #endif diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index 50a3fe405a76..3cd18c485e6c 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -50,7 +50,7 @@ class SdrPageView; class Svx3DCtrlItem; class SvxConvertTo3DItem; -//------------------------------------------------------------------------ + struct Svx3DWinImpl; class SVX_DLLPUBLIC Svx3DWin : public SfxDockingWindow @@ -209,7 +209,7 @@ private: sal_Bool bOnly3DChanged; - //------------------------------------ + DECL_LINK( ClickViewTypeHdl, void * ); DECL_LINK( ClickUpdateHdl, void * ); diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx index 8770b0269780..e91a393a1bec 100644 --- a/include/svx/fmdpage.hxx +++ b/include/svx/fmdpage.hxx @@ -24,9 +24,9 @@ #include <comphelper/uno3.hxx> #include <svx/svxdllapi.h> -//================================================================== + // SvxFmDrawPage -//================================================================== + class SVX_DLLPUBLIC SvxFmDrawPage :public SvxDrawPage ,public ::com::sun::star::form::XFormsSupplier2 { diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index 62ef3aede68e..e89241619563 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -26,9 +26,9 @@ #include <svtools/transfer.hxx> #include <svx/svxdllapi.h> -//================================================================== + // FmGridHeader -//================================================================== + struct FmGridHeaderData; class SVX_DLLPUBLIC FmGridHeader :public ::svt::EditBrowserHeader @@ -87,9 +87,9 @@ private: DECL_LINK( OnAsyncExecuteDrop, void* ); }; -//================================================================== + // FmGridControl -//================================================================== + class FmXGridPeer; class SVX_DLLPUBLIC FmGridControl : public DbGridControl diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 453788df3e0a..28537fd89091 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -69,9 +69,9 @@ public: virtual void SAL_CALL release() throw() { m_rParent.release(); } }; -//================================================================== + // FmXModifyMultiplexer -//================================================================== + class FmXModifyMultiplexer :public OWeakSubObject ,public ::cppu::OInterfaceContainerHelper ,public ::com::sun::star::util::XModifyListener @@ -92,9 +92,9 @@ public: void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); } }; -//================================================================== + // FmXUpdateMultiplexer -//================================================================== + class FmXUpdateMultiplexer : public OWeakSubObject, public ::cppu::OInterfaceContainerHelper, public ::com::sun::star::form::XUpdateListener @@ -117,9 +117,9 @@ public: void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); } }; -//================================================================== + // FmXSelectionMultiplexer -//================================================================== + class FmXSelectionMultiplexer :public OWeakSubObject ,public ::cppu::OInterfaceContainerHelper ,public ::com::sun::star::view::XSelectionChangeListener @@ -141,9 +141,9 @@ public: void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); } }; -//================================================================== + // FmXGridControlMultiplexer -//================================================================== + class FmXGridControlMultiplexer :public OWeakSubObject ,public ::cppu::OInterfaceContainerHelper ,public ::com::sun::star::form::XGridControlListener @@ -165,9 +165,9 @@ public: void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); } }; -//================================================================== + // FmXContainerMultiplexer -//================================================================== + class FmXContainerMultiplexer : public OWeakSubObject, public ::cppu::OInterfaceContainerHelper, public ::com::sun::star::container::XContainerListener @@ -190,9 +190,9 @@ public: void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); } }; -//================================================================== + // FmXGridControl -//================================================================== + typedef ::cppu::ImplHelper10< ::com::sun::star::form::XBoundComponent, ::com::sun::star::form::XGridControl, ::com::sun::star::util::XModifyBroadcaster, @@ -314,9 +314,9 @@ protected: }; -//================================================================== + // FmXGridPeer -> Peer for the Gridcontrol -//================================================================== + typedef ::comphelper::ImplHelper19 < ::com::sun::star::form::XGridPeer, ::com::sun::star::form::XBoundComponent, ::com::sun::star::form::XGridControl, diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index 7ec00279768c..b749efe137d2 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -33,7 +33,7 @@ #include <svx/ifaceids.hxx> -//======================================================================== + class FmFormModel; class FmFormPage; class FmXFormShell; @@ -54,7 +54,7 @@ namespace svx class ISdrObjectFilter; } -//======================================================================== + class SVX_DLLPUBLIC FmDesignModeChangedHint : public SfxHint { sal_Bool m_bDesignMode; @@ -67,7 +67,7 @@ public: sal_Bool GetDesignMode() const { return m_bDesignMode; } }; -//======================================================================== + class SVX_DLLPUBLIC FmFormShell : public SfxShell { friend class FmFormView; diff --git a/include/svx/fmsrccfg.hxx b/include/svx/fmsrccfg.hxx index f807f2f99631..e3f6e0c7549c 100644 --- a/include/svx/fmsrccfg.hxx +++ b/include/svx/fmsrccfg.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <svx/svxdllapi.h> -// =================================================================================================== + #define MATCHING_ANYWHERE 0 #define MATCHING_BEGINNING 1 @@ -37,14 +37,14 @@ // to be adapted) -//........................................................................ + namespace svxform { -//........................................................................ - // =================================================================================================== + + // = struct FmSearchParams - parameters of a search - // =================================================================================================== + struct SVX_DLLPUBLIC FmSearchParams { @@ -75,7 +75,7 @@ namespace svxform sal_Bool bSoundsLikeCJK; - // ...................................... + FmSearchParams(); sal_Bool isIgnoreWidthCJK( ) const; @@ -87,9 +87,9 @@ namespace svxform void setCaseSensitive( sal_Bool _bCase ); }; - // =================================================================================================== + // = class FmSearchConfigItem - a ConfigItem, that remembers search parameters - // =================================================================================================== + class SVX_DLLPUBLIC FmSearchConfigItem :protected FmSearchParams @@ -136,11 +136,11 @@ namespace svxform SVX_DLLPRIVATE void implTranslateToConfig( ); }; -//........................................................................ + } // namespace svxform -//........................................................................ -// =================================================================================================== + + #endif // INCLUDED_SVX_FMSRCCFG_HXX diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index e881ff73fd95..70ad5ef0b991 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -232,7 +232,7 @@ class SVX_DLLPUBLIC FmSearchEngine sal_Int32 m_nTransliterationFlags; -// ------------- + // member access private: SVX_DLLPRIVATE sal_Bool CancelRequested(); // provides a through m_aCancelAsynchAccess backed interpretation of m_bCancelAsynchRequest diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index f0e5c201eaf8..1756cbc36b18 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -72,9 +72,9 @@ class Window; -//================================================================== + // common types -//================================================================== + // displaying a database exception for the user // display info about a simple ::com::sun::star::sdbc::SQLException void displayException(const ::com::sun::star::sdbc::SQLException&, Window* _pParent = NULL); @@ -87,10 +87,10 @@ sal_Int32 getElementPos(const ::com::sun::star::uno::Reference< ::com::sun::star SVX_DLLPUBLIC OUString getLabelName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xControlModel); -// =================================================================================================== + // = class CursorWrapper - a helper class which works in common with a ::com::sun::star::uno::Reference<XDatabaseUpdateCursor>, // XDatabaseBookmarkCursor and XDatabaseDirectCursor each -// =================================================================================================== + class CursorWrapper { @@ -188,7 +188,7 @@ protected: void setAdapter(FmXDisposeMultiplexer* pAdapter); }; -//============================================================================== + class FmXDisposeMultiplexer :public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener> { @@ -206,16 +206,16 @@ public: void dispose(); }; -// ================================================================== + sal_Int16 getControlTypeByObject(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo>& _rxObject); // get the object type (OBJ_FM_...) from the services the object supports -//================================================================== + sal_Bool isRowSetAlive(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxRowSet); // checks if the ::com::sun::star::sdbcx::XColumnsSupplier provided by _rxRowSet supllies any columns -//================================================================== + typedef ::std::set < ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > , ::comphelper::OInterfaceCompare< ::com::sun::star::uno::XInterface > > InterfaceBag; diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx index 185d1c172072..63fd156a72f6 100644 --- a/include/svx/fontlb.hxx +++ b/include/svx/fontlb.hxx @@ -25,7 +25,7 @@ #include <vcl/virdev.hxx> #include <svx/svxdllapi.h> -// ============================================================================ + /** A list box string item which stores its text and font. */ class SvLBoxFontString : public SvLBoxString @@ -56,7 +56,7 @@ public: }; -// ============================================================================ + /** A list box supporting formatted string entries. */ class SVX_DLLPUBLIC SvxFontListBox : public SvTabListBox @@ -98,7 +98,7 @@ protected: SvLBoxButtonKind eButtonKind); }; -// ============================================================================ + #endif diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index 1105bd677b5c..d792b135a7c4 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -43,7 +43,7 @@ class SdrModel; class SfxBindings; -//------------------------------------------------------------------------ + namespace svx { @@ -62,7 +62,7 @@ public: virtual SfxPopupWindow* CreatePopupWindow(); }; -//------------------------------------------------------------------------ + class FontworkCharacterSpacingDialog : public ModalDialog { diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx index 71ab3585889c..b603c8876356 100644 --- a/include/svx/formatpaintbrushctrl.hxx +++ b/include/svx/formatpaintbrushctrl.hxx @@ -26,12 +26,12 @@ #include <vcl/timer.hxx> #include <svx/svxdllapi.h> -//............................................................................. + namespace svx { -//............................................................................. -//----------------------------------------------------------------------------- + + /** */ @@ -59,9 +59,9 @@ private: Timer m_aDoubleClickTimer; }; -//............................................................................. + } //namespace svx -//............................................................................. + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/framebordertype.hxx b/include/svx/framebordertype.hxx index 17dae9073335..e54b2eb7ef6d 100644 --- a/include/svx/framebordertype.hxx +++ b/include/svx/framebordertype.hxx @@ -24,7 +24,7 @@ namespace svx { -// ============================================================================ + /** Enumerates all borders a frame selection control can contain. */ enum FrameBorderType @@ -49,7 +49,7 @@ SVX_DLLPUBLIC FrameBorderType GetFrameBorderTypeFromIndex( size_t nIndex ); /** Returns the zero-based index of a valid frame border type. */ size_t GetIndexFromFrameBorderType( FrameBorderType eBorder ); -// ============================================================================ + } // namespace svx diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index b8f2bfcd0b18..c4121f3fe9a0 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -36,9 +36,9 @@ class OutputDevice; namespace svx { namespace frame { -// ============================================================================ + // Enums -// ============================================================================ + /** Specifies how the reference points for frame borders are used. */ @@ -62,9 +62,9 @@ enum RefMode REFMODE_END }; -// ============================================================================ + // Classes -// ============================================================================ + /** Contains the widths of primary and secondary line of a frame style. @@ -180,7 +180,7 @@ inline bool operator>( const Style& rL, const Style& rR ) { return rR < rL; } inline bool operator<=( const Style& rL, const Style& rR ) { return !(rR < rL); } inline bool operator>=( const Style& rL, const Style& rR ) { return !(rL < rR); } -// ---------------------------------------------------------------------------- + /** Extends the Style struct with an angle for diagonal frame borders. @@ -206,9 +206,9 @@ private: double mfAngle; /// Angle between this and hor. or vert. border. }; -// ============================================================================ + // Various helper functions -// ============================================================================ + /** Returns the angle between horizontal border of a rectangle and its diagonal. @@ -244,7 +244,7 @@ inline double GetHorDiagAngle( const Point& rP1, const Point& rP2 ) inline double GetHorDiagAngle( const Rectangle& rRect ) { return GetHorDiagAngle( rRect.GetWidth(), rRect.GetHeight() ); } -// ---------------------------------------------------------------------------- + /** Returns the angle between vertical border of a rectangle and its diagonal. @@ -281,7 +281,7 @@ inline double GetVerDiagAngle( const Point& rP1, const Point& rP2 ) inline double GetVerDiagAngle( const Rectangle& rRect ) { return GetVerDiagAngle( rRect.GetWidth(), rRect.GetHeight() ); } -// ============================================================================ + /** Returns an X coordinate for a diagonal frame border in the specified height. @@ -397,7 +397,7 @@ long GetBRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle ); */ long GetTRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle ); -// ============================================================================ + /** Checks whether two horizontal frame borders are "connectable". @@ -440,9 +440,9 @@ SVX_DLLPUBLIC bool CheckFrameBorderConnectable( const Style& rBFromBR /// Horizontal frame border from bottom-right to connection point. ); -// ============================================================================ + // Drawing functions -// ============================================================================ + /** Draws a horizontal frame border, regards all connected frame styles. @@ -580,7 +580,7 @@ SVX_DLLPUBLIC void DrawHorFrameBorder( const Color* pForceColor = 0 /// If specified, overrides frame border color. ); -// ============================================================================ + /** Draws a vertical frame border, regards all connected frame styles. @@ -651,7 +651,7 @@ SVX_DLLPUBLIC void DrawVerFrameBorder( const Color* pForceColor = 0 /// If specified, overrides frame border color. ); -// ============================================================================ + /** Draws both diagonal frame borders, regards all connected frame styles. @@ -680,7 +680,7 @@ SVX_DLLPUBLIC void DrawDiagFrameBorders( bool bDiagDblClip = false /// true = Use clipping for crossing double frame borders. ); -// ============================================================================ + } // namespace frame } // namespace svx diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx index caf0623efac8..f177215ed8c7 100644 --- a/include/svx/framelinkarray.hxx +++ b/include/svx/framelinkarray.hxx @@ -377,7 +377,7 @@ public: If not NULL, only this color will be used to draw all frame borders. */ void DrawArray( OutputDevice& rDev, const Color* pForceColor = 0 ) const; - // ------------------------------------------------------------------------ + private: typedef boost::scoped_ptr<ArrayImpl> ArrayImplPtr; @@ -385,7 +385,7 @@ private: ArrayImplPtr mxImpl; }; -// ============================================================================ + } // namespace frame } // namespace svx diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx index dd13fc72044e..080a89ccec5d 100644 --- a/include/svx/frmdirlbox.hxx +++ b/include/svx/frmdirlbox.hxx @@ -29,7 +29,7 @@ class SvxFrameDirectionItem; namespace svx { -// ============================================================================ + /** This listbox contains entries to select horizontal text direction. @@ -66,7 +66,7 @@ private: typedef FrameDirectionListBox FrameDirListBox; -// ============================================================================ + /** Wrapper for usage of a FrameDirectionListBox in item connections. */ class SVX_DLLPUBLIC FrameDirListBoxWrapper : public sfx::SingleControlWrapper< FrameDirListBox, SvxFrameDirection > @@ -87,7 +87,7 @@ typedef sfx::ValueItemWrapper< SvxFrameDirectionItem, SvxFrameDirection, sal_uIn /** An item<->control connection for a FrameDirectionListBox. */ typedef sfx::ItemControlConnection< FrameDirItemWrapper, FrameDirListBoxWrapper > FrameDirListBoxConnection; -// ============================================================================ + } // namespace svx diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index c5d249e444a6..9c0db3010855 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -36,7 +36,7 @@ namespace svx { struct FrameSelectorImpl; -// ============================================================================ + typedef int FrameSelFlags; @@ -68,7 +68,7 @@ const FrameSelFlags FRAMESEL_DIAGONAL = FRAMESEL_DIAG_TLBR|FRAMESEL_DIAG_BLTR; /** If set, all frame borders will support the don't care state. */ const FrameSelFlags FRAMESEL_DONTCARE = 0x0100; -// ---------------------------------------------------------------------------- + /** All possible states of a frame border. */ enum FrameBorderState @@ -78,7 +78,7 @@ enum FrameBorderState FRAMESTATE_DONTCARE /// Frame border is in don't care state (if enabled). }; -// ============================================================================ + class SVX_DLLPUBLIC FrameSelector : public Control { @@ -178,7 +178,7 @@ public: /** Returns the bounding rectangle of the specified frame border (if enabled). */ Rectangle GetClickBoundRect( FrameBorderType eBorder ) const; - // ------------------------------------------------------------------------ + protected: virtual void Paint( const Rectangle& rRect ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); @@ -193,7 +193,7 @@ private: std::auto_ptr< FrameSelectorImpl > mxImpl; }; -// ============================================================================ + } // namespace svx diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index 1d7ac1f5eb29..74ce015345e6 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -28,9 +28,9 @@ #include <cstdio> #include <vector> -// --------------------- + // - GalleryThemeEntry - -// --------------------- + class SvStream; @@ -86,9 +86,9 @@ public: typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList; -// ----------- + // - Gallery - -// ----------- + class SfxListener; class GalleryTheme; diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index 0f76524abfec..c996c4589fbb 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -33,12 +33,12 @@ #include <svx/galmisc.hxx> #include <vector> -// ----------------- + // - GalleryObject - -// ----------------- -// -------------- + + // - SgaObjKind - -// -------------- + struct GalleryObject { @@ -61,9 +61,9 @@ class SgaObject; class FmFormModel; class ListBox; -// ----------------- + // - GalDragParams - -// ----------------- + struct GalDragParams { @@ -74,9 +74,9 @@ struct GalDragParams SgaObjKind eObjKind; }; -// ---------------- + // - GalleryTheme - -// ---------------- + class Gallery; class GalleryProgress; diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx index f8c118637166..fa86b2787141 100644 --- a/include/svx/grafctrl.hxx +++ b/include/svx/grafctrl.hxx @@ -25,9 +25,9 @@ #include <sfx2/tbxctrl.hxx> #include <svx/svxdllapi.h> -// ---------------- + // - TbxImageItem - -// ---------------- + class SVX_DLLPUBLIC TbxImageItem : public SfxUInt16Item { @@ -39,9 +39,9 @@ public: virtual bool operator==( const SfxPoolItem& ) const; }; -// ------------------------------- + // - SvxGrafFilterToolBoxControl - -// ------------------------------- + class SVX_DLLPUBLIC SvxGrafFilterToolBoxControl : public SfxToolBoxControl { @@ -57,9 +57,9 @@ public: virtual SfxPopupWindow* CreatePopupWindow(); }; -// ------------------------- + // - SvxGrafToolBoxControl - -// ------------------------- + class SvxGrafToolBoxControl : public SfxToolBoxControl { @@ -71,9 +71,9 @@ public: virtual Window* CreateItemWindow( Window *pParent ); }; -// ---------------------------- + // - SvxGrafRedToolBoxControl - -// ---------------------------- + class SVX_DLLPUBLIC SvxGrafRedToolBoxControl : public SvxGrafToolBoxControl { @@ -82,9 +82,9 @@ public: SvxGrafRedToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -// ------------------------------ + // - SvxGrafGreenToolBoxControl - -// ------------------------------ + class SVX_DLLPUBLIC SvxGrafGreenToolBoxControl : public SvxGrafToolBoxControl { @@ -93,9 +93,9 @@ public: SvxGrafGreenToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -// ----------------------------- + // - SvxGrafBlueToolBoxControl - -// ----------------------------- + class SVX_DLLPUBLIC SvxGrafBlueToolBoxControl : public SvxGrafToolBoxControl { @@ -104,9 +104,9 @@ public: SvxGrafBlueToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -// ---------------------------------- + // - SvxGrafLuminanceToolBoxControl - -// ---------------------------------- + class SVX_DLLPUBLIC SvxGrafLuminanceToolBoxControl : public SvxGrafToolBoxControl { @@ -115,9 +115,9 @@ public: SvxGrafLuminanceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -// --------------------------------- + // - SvxGrafContrastToolBoxControl - -// --------------------------------- + class SVX_DLLPUBLIC SvxGrafContrastToolBoxControl : public SvxGrafToolBoxControl { @@ -126,9 +126,9 @@ public: SvxGrafContrastToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -// ------------------------------ + // - SvxGrafGammaToolBoxControl - -// ------------------------------ + class SVX_DLLPUBLIC SvxGrafGammaToolBoxControl : public SvxGrafToolBoxControl { @@ -137,9 +137,9 @@ public: SvxGrafGammaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -// ------------------------------------- + // - SvxGrafTransparenceToolBoxControl - -// ------------------------------------- + class SVX_DLLPUBLIC SvxGrafTransparenceToolBoxControl : public SvxGrafToolBoxControl { @@ -148,9 +148,9 @@ public: SvxGrafTransparenceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -// ----------------------------- + // - SvxGrafModeToolBoxControl - -// ----------------------------- + class SVX_DLLPUBLIC SvxGrafModeToolBoxControl : public SfxToolBoxControl, public SfxListener { @@ -163,9 +163,9 @@ public: virtual Window* CreateItemWindow( Window *pParent ); }; -// --------------------- + // - SvxGrafAttrHelper - -// --------------------- + class SdrView; class SfxRequest; diff --git a/include/svx/grfflt.hxx b/include/svx/grfflt.hxx index 6d21e22f8b5c..ecc5b3abfa6f 100644 --- a/include/svx/grfflt.hxx +++ b/include/svx/grfflt.hxx @@ -33,17 +33,17 @@ #include <svx/rectenum.hxx> #include <svx/svxdllapi.h> -// --------------- + // - Error codes - -// --------------- + #define SVX_GRAPHICFILTER_ERRCODE_NONE 0x00000000 #define SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE 0x00000001 #define SVX_GRAPHICFILTER_UNSUPPORTED_SLOT 0x00000002 -// -------------------- + // - SvxGraphicFilter - -// -------------------- + class SfxRequest; class SfxItemSet; diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 9c457b8ec818..d534eff00e0d 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -57,9 +57,9 @@ enum GridRowStatus GRS_INVALID }; -//================================================================== + // DbGridRow, description of rows -//================================================================== + class DbGridRow : public SvRefBase { @@ -92,13 +92,13 @@ public: SV_DECL_REF(DbGridRow) -//================================================================== + // DbGridControl -//================================================================== + class DbGridColumn; typedef ::std::vector< DbGridColumn* > DbGridColumns; -//================================================================== + class FmGridListener { public: @@ -111,9 +111,9 @@ protected: #define GRID_COLUMN_NOT_FOUND SAL_MAX_UINT16 -//================================================================== + // InitWindowFacet, describing which aspect of a column's Window to (re-)initialize -//================================================================== + enum InitWindowFacet { InitFont = 0x01, @@ -123,7 +123,7 @@ enum InitWindowFacet InitAll = 0xFF }; -//================================================================== + class FmXGridSourcePropListener; class DisposeListenerGridBridge; typedef ::svt::EditBrowseBox DbGridControl_Base; @@ -134,9 +134,9 @@ class SVX_DLLPUBLIC DbGridControl : public DbGridControl_Base friend class DisposeListenerGridBridge; public: - //================================================================== + // NavigationBar - //================================================================== + class NavigationBar: public Control { class AbsolutePos : public NumericField diff --git a/include/svx/helperhittest3d.hxx b/include/svx/helperhittest3d.hxx index 39b129e0e083..fa3b2b193c48 100644 --- a/include/svx/helperhittest3d.hxx +++ b/include/svx/helperhittest3d.hxx @@ -24,7 +24,7 @@ #include <sal/types.h> #include <vector> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { @@ -38,7 +38,7 @@ namespace drawinglayer { namespace geometry { class E3dCompoundObject; class E3dScene; -////////////////////////////////////////////////////////////////////////////// + /** support for getting a ViewInformation3D for a given CompoudObject3D with correct ObjectTransformation filled out @@ -95,7 +95,7 @@ bool checkHitSingle3DObject( const basegfx::B2DPoint& rPoint, const E3dCompoundObject& rCandidate); -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_HELPERHITTEST3D_HXX diff --git a/include/svx/ifaceids.hxx b/include/svx/ifaceids.hxx index bdd4bd133621..04a9bbe4b546 100644 --- a/include/svx/ifaceids.hxx +++ b/include/svx/ifaceids.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SVX_IFACEIDS_HXX #define INCLUDED_SVX_IFACEIDS_HXX -// ----------------------------------------------------------------------- + #include <sfx2/shell.hxx> diff --git a/include/svx/ipolypolygoneditorcontroller.hxx b/include/svx/ipolypolygoneditorcontroller.hxx index 7107c3c89060..ac885ac7c4aa 100644 --- a/include/svx/ipolypolygoneditorcontroller.hxx +++ b/include/svx/ipolypolygoneditorcontroller.hxx @@ -23,9 +23,9 @@ #include <svx/svxdllapi.h> #include <svx/svdedtv.hxx> -//************************************************************ + // Defines -//************************************************************ + enum SdrPathSmoothKind {SDRPATHSMOOTH_DONTCARE, // only for status query SDRPATHSMOOTH_ANGULAR, // angular diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx index f1016d97cd64..ef7aec6b409c 100644 --- a/include/svx/lboxctrl.hxx +++ b/include/svx/lboxctrl.hxx @@ -28,7 +28,7 @@ class ToolBox; class SvxPopupWindowListBox; -///////////////////////////////////////////////////////////////// + class SvxListBoxControl : public SfxToolBoxControl { @@ -52,7 +52,7 @@ public: const SfxPoolItem* pState ); }; -///////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SvxUndoRedoControl : public SvxListBoxControl { diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index 2e34aadec167..0744085c59ff 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -32,9 +32,9 @@ class SvxLineBox; class SvxMetricField; class SvxColorBox; -//======================================================================== + // SvxLineStyleController: -//======================================================================== + class SVX_DLLPUBLIC SvxLineStyleToolBoxControl : public SfxToolBoxControl { @@ -56,9 +56,9 @@ public: virtual Window* CreateItemWindow( Window *pParent ); }; -//======================================================================== + // SvxLineWidthController: -//======================================================================== + class SVX_DLLPUBLIC SvxLineWidthToolBoxControl : public SfxToolBoxControl { @@ -73,9 +73,9 @@ public: virtual Window* CreateItemWindow( Window *pParent ); }; -//======================================================================== + // SvxLineColorController: -//======================================================================== + class SVX_DLLPUBLIC SvxLineColorToolBoxControl : public SfxToolBoxControl { @@ -91,9 +91,9 @@ public: virtual Window* CreateItemWindow( Window *pParent ); }; -//======================================================================== + // class SvxLineEndWindow -//======================================================================== + class SvxLineEndWindow : public SfxPopupWindow { using FloatingWindow::StateChanged; @@ -144,9 +144,9 @@ public: virtual SfxPopupWindow* Clone() const; }; -//======================================================================== + // class SvxLineEndToolBoxControl -//======================================================================== + class SVX_DLLPUBLIC SvxLineEndToolBoxControl : public SfxToolBoxControl { diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx index 631163dc5b4e..924ac986b272 100644 --- a/include/svx/msdffdef.hxx +++ b/include/svx/msdffdef.hxx @@ -785,10 +785,10 @@ typedef enum } MSO_SPT; // different enums from the OfficeDraw documentation, Appendix D - beginning -// + // 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 mso_shapeLinesClosed, // A closed polygonal object diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index 6b97a8b3262a..2cfe27c99f9e 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -36,9 +36,9 @@ #include <basegfx/vector/b2enums.hxx> #include <svx/svxdllapi.h> -//************************************************************ + // Forward declaration -//************************************************************ + class SfxPoolItem; class Viewport3D; diff --git a/include/svx/orienthelper.hxx b/include/svx/orienthelper.hxx index 271e87a61d3e..44e69a0d9293 100644 --- a/include/svx/orienthelper.hxx +++ b/include/svx/orienthelper.hxx @@ -32,7 +32,7 @@ namespace svx { class DialControl; -// ============================================================================ + struct OrientationHelper_Impl; @@ -92,7 +92,7 @@ private: std::auto_ptr< OrientationHelper_Impl > mpImpl; }; -// ============================================================================ + /** Wrapper for usage of the stacked attribute of an OrientationHelper in item connections. */ class SVX_DLLPUBLIC OrientStackedWrapper : public sfx::SingleControlWrapper< OrientationHelper, bool > @@ -107,12 +107,12 @@ public: virtual void SetControlValue( bool bValue ); }; -// ---------------------------------------------------------------------------- + /** An item<->control connection for the stacked attribute of an OrientationHelper. */ typedef sfx::ItemControlConnection< sfx::BoolItemWrapper, OrientStackedWrapper > OrientStackedConnection; -// ============================================================================ + } // namespace diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index a61b7c6f3caa..f81adb3e918d 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -23,7 +23,7 @@ #include <svl/eitem.hxx> #include <svx/svxdllapi.h> -//---------------------------------------------------------------------------- + // Alignment with rotated text enum SvxRotateMode diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index 87c242527d7f..f6c354da6786 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -23,9 +23,9 @@ #include <svx/svxdllapi.h> -//------------------------------------------------------------ + // class SdrAngleItem -//------------------------------------------------------------ + class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item { public: TYPEINFO(); diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index ce48d3697c02..354a94fd6126 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -109,18 +109,18 @@ class SdrCustomShapeReplacementURLItem : public SfxStringItem SdrCustomShapeReplacementURLItem(); }; -//--------------------------- + // class SdrTextWordWrapItem -//--------------------------- + class SdrTextWordWrapItem : public SdrOnOffItem { public: SdrTextWordWrapItem( sal_Bool bAuto = sal_False ): SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, bAuto ) {} SdrTextWordWrapItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, rIn ) {} }; -//------------------------------- + // class SdrTextAutoGrowSizeItem -//------------------------------- + class SdrTextAutoGrowSizeItem : public SdrOnOffItem { public: SdrTextAutoGrowSizeItem( sal_Bool bAuto = sal_False ): SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, bAuto ) {} diff --git a/include/svx/sdgcoitm.hxx b/include/svx/sdgcoitm.hxx index 9f49655b3126..7d313ff91d51 100644 --- a/include/svx/sdgcoitm.hxx +++ b/include/svx/sdgcoitm.hxx @@ -24,9 +24,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//----------------- + // SdrGrafRedItem - -//----------------- + class SVX_DLLPUBLIC SdrGrafRedItem : public SdrSignedPercentItem { @@ -41,9 +41,9 @@ public: virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; -//------------------- + // SdrGrafGreenItem - -//------------------- + class SVX_DLLPUBLIC SdrGrafGreenItem : public SdrSignedPercentItem { @@ -58,9 +58,9 @@ public: virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; -//------------------- + // SdrGrafBlueItem - -//------------------- + class SVX_DLLPUBLIC SdrGrafBlueItem : public SdrSignedPercentItem { diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx index c995dc1d49be..9fad5fd89a01 100644 --- a/include/svx/sdgcpitm.hxx +++ b/include/svx/sdgcpitm.hxx @@ -23,9 +23,9 @@ #include <svx/grfcrop.hxx> #include <svx/svddef.hxx> -//------------------ + // SdrGrafCropItem - -//------------------ + class SVX_DLLPUBLIC SdrGrafCropItem : public SvxGrfCrop { diff --git a/include/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx index e2cf192417d4..4930937c96cc 100644 --- a/include/svx/sdggaitm.hxx +++ b/include/svx/sdggaitm.hxx @@ -24,9 +24,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//---------------------- + // SdrGrafGamma100Item - -//---------------------- + class SVX_DLLPUBLIC SdrGrafGamma100Item : public SfxUInt32Item { diff --git a/include/svx/sdginitm.hxx b/include/svx/sdginitm.hxx index 7eb90e895845..1e6ce5ec48d9 100644 --- a/include/svx/sdginitm.hxx +++ b/include/svx/sdginitm.hxx @@ -24,9 +24,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//-------------------- + // SdrGrafInvertItem - -//-------------------- + class SVX_DLLPUBLIC SdrGrafInvertItem : public SdrOnOffItem { diff --git a/include/svx/sdgluitm.hxx b/include/svx/sdgluitm.hxx index 2c192f37153e..32d0064595ed 100644 --- a/include/svx/sdgluitm.hxx +++ b/include/svx/sdgluitm.hxx @@ -24,9 +24,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//----------------------- + // SdrGrafLuminanceItem - -//----------------------- + class SVX_DLLPUBLIC SdrGrafLuminanceItem : public SdrSignedPercentItem { @@ -41,9 +41,9 @@ public: virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; -//---------------------- + // SdrGrafContrastItem - -//---------------------- + class SVX_DLLPUBLIC SdrGrafContrastItem : public SdrSignedPercentItem { diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index 8bf9eaeca5d4..8936ee629e62 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -25,9 +25,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//------------------ + // SdrGrafModeItem - -//------------------ + class SVX_DLLPUBLIC SdrGrafModeItem : public SfxEnumItem { diff --git a/include/svx/sdgtritm.hxx b/include/svx/sdgtritm.hxx index 4f794f5963ce..076bb2af8c36 100644 --- a/include/svx/sdgtritm.hxx +++ b/include/svx/sdgtritm.hxx @@ -24,9 +24,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//-------------------------- + // SdrGrafTransparenceItem - -//-------------------------- + class SVX_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem { diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index 2de0246f6e22..3e85dc790a35 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -23,11 +23,11 @@ #include <svx/svxdllapi.h> -//------------------------------------------------------------ + // class SdrAngleItem // For all metrics. GetPresentation returns for example for // Value=2500 a "25mm". -//------------------------------------------------------------ + class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item { public: TYPEINFO(); diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx index d4c80caa8f59..8b86de71a176 100644 --- a/include/svx/sdooitm.hxx +++ b/include/svx/sdooitm.hxx @@ -23,11 +23,11 @@ #include <svx/svxdllapi.h> -//------------------------------------------------------------ + // class SdrOnOffItem // here GetValueTextByVal() returns "an" or "aus" instead // of "TRUE" or "FALSE" -//------------------------------------------------------------ + class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem { public: TYPEINFO(); diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index 591d5ab1423e..65890a53a42c 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -23,10 +23,10 @@ #include <svx/svxdllapi.h> -//------------------------------------------------------------ + // class SdrPercentItem // Integer percents of 0 -//------------------------------------------------------------ + class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item { @@ -41,10 +41,10 @@ public: virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; -//------------------------------------------------------------ + // class SdrSignedPercentItem // Integer percents of +/- -//------------------------------------------------------------ + class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item { diff --git a/include/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx index 971829978201..847f855069ca 100644 --- a/include/svx/sdr/animation/animationstate.hxx +++ b/include/svx/sdr/animation/animationstate.hxx @@ -25,7 +25,7 @@ #include <svx/sdr/animation/scheduler.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace sdr @@ -36,7 +36,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -68,7 +68,7 @@ namespace sdr } // end of namespace animation } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ANIMATION_ANIMATIONSTATE_HXX diff --git a/include/svx/sdr/animation/objectanimator.hxx b/include/svx/sdr/animation/objectanimator.hxx index c5d463763faf..11f86d37001d 100644 --- a/include/svx/sdr/animation/objectanimator.hxx +++ b/include/svx/sdr/animation/objectanimator.hxx @@ -26,7 +26,7 @@ #include <svx/sdr/animation/scheduler.hxx> #include <svx/sdr/animation/animationstate.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -42,7 +42,7 @@ namespace sdr } // end of namespace animation } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ANIMATION_OBJECTANIMATOR_HXX diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx index d26ad67b4b90..90f13245ba31 100644 --- a/include/svx/sdr/animation/scheduler.hxx +++ b/include/svx/sdr/animation/scheduler.hxx @@ -24,7 +24,7 @@ #include <vcl/timer.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // event class namespace sdr @@ -58,7 +58,7 @@ namespace sdr } // end of namespace animation } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + // eventlist class namespace sdr @@ -88,7 +88,7 @@ namespace sdr } // end of namespace animation } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + // scheduler class namespace sdr @@ -141,7 +141,7 @@ namespace sdr } // end of namespace animation } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ANIMATION_SCHEDULER_HXX diff --git a/include/svx/sdr/attribute/sdrfilltextattribute.hxx b/include/svx/sdr/attribute/sdrfilltextattribute.hxx index 1125c8e236a0..1f398abdd65c 100644 --- a/include/svx/sdr/attribute/sdrfilltextattribute.hxx +++ b/include/svx/sdr/attribute/sdrfilltextattribute.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/attribute/fillgradientattribute.hxx> #include <svx/sdr/attribute/sdrtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -58,7 +58,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX diff --git a/include/svx/sdr/attribute/sdrformtextattribute.hxx b/include/svx/sdr/attribute/sdrformtextattribute.hxx index 025fba473334..970fbb50872c 100644 --- a/include/svx/sdr/attribute/sdrformtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrformtextattribute.hxx @@ -24,7 +24,7 @@ #include <svx/xenum.hxx> #include <tools/color.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines class SfxItemSet; @@ -34,7 +34,7 @@ namespace drawinglayer { namespace attribute { class SdrFormTextOutlineAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -76,7 +76,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX diff --git a/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx b/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx index d610ab41bb1a..03b58180ceb1 100644 --- a/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx +++ b/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace drawinglayer { namespace attribute { @@ -31,7 +31,7 @@ namespace drawinglayer { namespace attribute { class StrokeAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -67,7 +67,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX diff --git a/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx index d7be38c7b279..2cdc7c0a7103 100644 --- a/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/attribute/sdrfillattribute.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -62,7 +62,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX diff --git a/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx index fae7b5203c98..a1b074487569 100644 --- a/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/attribute/sdrlineattribute.hxx> #include <drawinglayer/attribute/sdrlinestartendattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -60,7 +60,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX diff --git a/include/svx/sdr/attribute/sdrshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrshadowtextattribute.hxx index 81903b6c47b4..4e208cdd385b 100644 --- a/include/svx/sdr/attribute/sdrshadowtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrshadowtextattribute.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/attribute/sdrshadowattribute.hxx> #include <svx/sdr/attribute/sdrtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -57,7 +57,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX diff --git a/include/svx/sdr/attribute/sdrtextattribute.hxx b/include/svx/sdr/attribute/sdrtextattribute.hxx index 2fd04ac5c264..637b769faa97 100644 --- a/include/svx/sdr/attribute/sdrtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrtextattribute.hxx @@ -25,7 +25,7 @@ #include <editeng/outlobj.hxx> #include <svx/sdtaitm.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines class SdrText; @@ -42,7 +42,7 @@ namespace drawinglayer { namespace attribute { class ImpSdrTextAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -115,7 +115,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX diff --git a/include/svx/sdr/contact/displayinfo.hxx b/include/svx/sdr/contact/displayinfo.hxx index 40b799790517..98ce34519a6f 100644 --- a/include/svx/sdr/contact/displayinfo.hxx +++ b/include/svx/sdr/contact/displayinfo.hxx @@ -100,7 +100,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_DISPLAYINFO_HXX diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx index b586927a4750..fd48a475d32e 100644 --- a/include/svx/sdr/contact/objectcontact.hxx +++ b/include/svx/sdr/contact/objectcontact.hxx @@ -24,7 +24,7 @@ #include <svx/svxdllapi.h> #include <drawinglayer/geometry/viewinformation2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SetOfByte; @@ -47,7 +47,7 @@ namespace basegfx { class B2DHomMatrix; } -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -214,7 +214,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACT_HXX diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx index 07c028f0b72a..39ac83044e53 100644 --- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -24,13 +24,13 @@ #include <svx/svxdllapi.h> #include <svx/svdpage.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrPage; class SdrObject; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -51,7 +51,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -102,7 +102,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -138,7 +138,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX diff --git a/include/svx/sdr/contact/objectcontactofpageview.hxx b/include/svx/sdr/contact/objectcontactofpageview.hxx index be94ea5eb678..a11770d7d74b 100644 --- a/include/svx/sdr/contact/objectcontactofpageview.hxx +++ b/include/svx/sdr/contact/objectcontactofpageview.hxx @@ -22,13 +22,13 @@ #include <svx/sdr/contact/objectcontact.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrPageWindow; class SdrPage; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -137,7 +137,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx index 8a7bc69d6446..4e2d022d17b9 100644 --- a/include/svx/sdr/contact/viewcontact.hxx +++ b/include/svx/sdr/contact/viewcontact.hxx @@ -24,7 +24,7 @@ #include <svx/svxdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SetOfByte; @@ -40,7 +40,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -161,7 +161,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACT_HXX diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx index cd09684932d1..9a0610b1debe 100644 --- a/include/svx/sdr/contact/viewcontactofe3d.hxx +++ b/include/svx/sdr/contact/viewcontactofe3d.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/contact/viewcontactofsdrobj.hxx> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace sdr { namespace contact { @@ -41,7 +41,7 @@ namespace basegfx { class E3dObject; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -69,7 +69,7 @@ namespace sdr drawinglayer::primitive2d::Primitive2DSequence impCreateWithGivenPrimitive3DSequence( const drawinglayer::primitive3d::Primitive3DSequence& rxContent3D) const; - ////////////////////////////////////////////////////////////////////////////// + // primitive stuff protected: @@ -102,7 +102,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3D_HXX diff --git a/include/svx/sdr/contact/viewcontactofe3dcube.hxx b/include/svx/sdr/contact/viewcontactofe3dcube.hxx index 3f46438b65e0..4aa9b34013cc 100644 --- a/include/svx/sdr/contact/viewcontactofe3dcube.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dcube.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofe3d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class E3dCubeObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -54,7 +54,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX diff --git a/include/svx/sdr/contact/viewcontactofe3dextrude.hxx b/include/svx/sdr/contact/viewcontactofe3dextrude.hxx index c6fb95a3ee01..8ae3a8cebe09 100644 --- a/include/svx/sdr/contact/viewcontactofe3dextrude.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dextrude.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofe3d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class E3dExtrudeObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -54,7 +54,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX diff --git a/include/svx/sdr/contact/viewcontactofe3dlathe.hxx b/include/svx/sdr/contact/viewcontactofe3dlathe.hxx index ec57695301d0..cfcb59e02369 100644 --- a/include/svx/sdr/contact/viewcontactofe3dlathe.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dlathe.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofe3d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class E3dLatheObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -54,7 +54,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX diff --git a/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx index 40b3a8be8f22..49c750e332a5 100644 --- a/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofe3d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class E3dPolygonObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -54,7 +54,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX diff --git a/include/svx/sdr/contact/viewcontactofe3dscene.hxx b/include/svx/sdr/contact/viewcontactofe3dscene.hxx index 9fa4393abb62..db21a6c8c849 100644 --- a/include/svx/sdr/contact/viewcontactofe3dscene.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dscene.hxx @@ -27,7 +27,7 @@ #include <drawinglayer/geometry/viewinformation3d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class E3dScene; @@ -36,7 +36,7 @@ namespace basegfx { class B3DRange; } -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -107,7 +107,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSCENE_HXX diff --git a/include/svx/sdr/contact/viewcontactofe3dsphere.hxx b/include/svx/sdr/contact/viewcontactofe3dsphere.hxx index feb2b5e81b0f..3059bea07b24 100644 --- a/include/svx/sdr/contact/viewcontactofe3dsphere.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dsphere.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofe3d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class E3dSphereObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -54,7 +54,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX diff --git a/include/svx/sdr/contact/viewcontactofgraphic.hxx b/include/svx/sdr/contact/viewcontactofgraphic.hxx index 9b9e775b1b83..519dede43d8a 100644 --- a/include/svx/sdr/contact/viewcontactofgraphic.hxx +++ b/include/svx/sdr/contact/viewcontactofgraphic.hxx @@ -23,14 +23,14 @@ #include <sal/types.h> #include <svx/sdr/contact/viewcontactoftextobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrGrafObj; namespace drawinglayer { namespace attribute { class SdrLineFillShadowTextAttribute; }} class GraphicAttr; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -78,7 +78,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX diff --git a/include/svx/sdr/contact/viewcontactofgroup.hxx b/include/svx/sdr/contact/viewcontactofgroup.hxx index 47749d06de13..da388004f837 100644 --- a/include/svx/sdr/contact/viewcontactofgroup.hxx +++ b/include/svx/sdr/contact/viewcontactofgroup.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofsdrobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObjGroup; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -60,7 +60,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX diff --git a/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx index ece81f73a8e4..b52926738b99 100644 --- a/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx +++ b/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx @@ -24,13 +24,13 @@ #include <svx/sdr/contact/viewcontact.hxx> #include <svx/sdrmasterpagedescriptor.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SfxItemSet; class Bitmap; class MapMode; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -70,7 +70,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx index 40b280af72dd..d2d1505060ca 100644 --- a/include/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx @@ -23,13 +23,13 @@ #include <svx/sdr/contact/viewcontactofsdrobj.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrPageObj; class SdrPage; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -61,7 +61,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx index 967dabc76a1e..2100d827d7dd 100644 --- a/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofsdrrectobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrCaptionObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx index 6bf6f91bcea1..5e5c68d3caaf 100644 --- a/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofsdrrectobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrCircObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx index a31a8b30ae98..a83b48257e49 100644 --- a/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactoftextobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrEdgeObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx index fe37170178d8..7fc3e8f532a4 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactoftextobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrMeasureObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index 2e9f3fef54cd..a51edca45ad1 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -24,13 +24,13 @@ #include <svx/svxdllapi.h> #include <tools/gen.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrMediaObj; namespace avmedia { class MediaItem; } -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -76,7 +76,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx index 5ea75eb48e91..9b1d2b0c5e49 100644 --- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx @@ -25,14 +25,14 @@ #include <svx/sdtakitm.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObject; class GeoStat; class Bitmap; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -75,7 +75,7 @@ namespace sdr // overload for acessing the SdrObject virtual SdrObject* TryToGetSdrObject() const; - ////////////////////////////////////////////////////////////////////////////// + // primitive stuff // add Gluepoints (if available) @@ -89,7 +89,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx index 0d5c79be4a60..f4845e8411f9 100644 --- a/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactoftextobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObjCustomShape; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -58,7 +58,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx index 89e51bf453b8..56b5d4007abf 100644 --- a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx @@ -23,13 +23,13 @@ #include <svx/sdr/contact/viewcontactofsdrrectobj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrOle2Obj; class Graphic; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -77,7 +77,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrpage.hxx b/include/svx/sdr/contact/viewcontactofsdrpage.hxx index b18f37a77144..29a86a31c826 100644 --- a/include/svx/sdr/contact/viewcontactofsdrpage.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrpage.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> #include <svx/sdr/contact/viewcontact.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrPage; @@ -31,7 +31,7 @@ namespace sdr { namespace contact { class ViewContactOfSdrPage; }} -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -52,7 +52,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -71,7 +71,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -90,7 +90,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -109,7 +109,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -128,7 +128,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -147,7 +147,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -166,7 +166,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -188,7 +188,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -212,7 +212,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -236,7 +236,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -296,7 +296,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx index 0318cb240666..0a7b75ad5f74 100644 --- a/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactoftextobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrPathObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx index d5d64cfbce99..51fae3e1b1dc 100644 --- a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactoftextobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrRectObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactoftextobj.hxx b/include/svx/sdr/contact/viewcontactoftextobj.hxx index 8ec1dc44667f..3fa4639e5e42 100644 --- a/include/svx/sdr/contact/viewcontactoftextobj.hxx +++ b/include/svx/sdr/contact/viewcontactoftextobj.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofsdrobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrTextObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -50,7 +50,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofunocontrol.hxx b/include/svx/sdr/contact/viewcontactofunocontrol.hxx index 0dab8315923f..7c180cfa81a3 100644 --- a/include/svx/sdr/contact/viewcontactofunocontrol.hxx +++ b/include/svx/sdr/contact/viewcontactofunocontrol.hxx @@ -36,13 +36,13 @@ namespace com { namespace sun { namespace star { } } } } -//........................................................................ + namespace sdr { namespace contact { -//........................................................................ - //==================================================================== + + //= ViewContactOfUnoControl - //==================================================================== + class ViewContactOfUnoControl_Impl; class SVX_DLLPRIVATE ViewContactOfUnoControl : public ViewContactOfSdrObj { @@ -83,9 +83,9 @@ namespace sdr { namespace contact { virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; }; -//........................................................................ + } } // namespace sdr::contact -//........................................................................ + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX diff --git a/include/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx index 168bd0b32964..8ec989e9f8e9 100644 --- a/include/svx/sdr/contact/viewcontactofvirtobj.hxx +++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx @@ -22,11 +22,11 @@ #include <svx/sdr/contact/viewcontactofsdrobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrVirtObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFVIRTOBJ_HXX diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx index d68c6f9138d4..bac055dc6911 100644 --- a/include/svx/sdr/contact/viewobjectcontact.hxx +++ b/include/svx/sdr/contact/viewobjectcontact.hxx @@ -26,7 +26,7 @@ #include <svx/svxdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class Region; @@ -42,7 +42,7 @@ namespace sdr { namespace animation { class PrimitiveAnimation; }} -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -140,7 +140,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACT_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofe3d.hxx b/include/svx/sdr/contact/viewobjectcontactofe3d.hxx index 1165b93f8e69..49997367aee6 100644 --- a/include/svx/sdr/contact/viewobjectcontactofe3d.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofe3d.hxx @@ -23,14 +23,14 @@ #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace sdr { namespace contact { class ViewObjectContactOfE3dScene; }} -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -67,7 +67,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx index 8fd5c2e74d05..be505f326b57 100644 --- a/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -47,7 +47,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx index cb34c65045aa..7072b9bbaab5 100644 --- a/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrGrafObj; @@ -30,7 +30,7 @@ namespace sdr { namespace event { class AsynchGraphicLoadingEvent; }} -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -66,7 +66,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofgroup.hxx b/include/svx/sdr/contact/viewobjectcontactofgroup.hxx index ed68a5bfa616..2419c4c3b9f8 100644 --- a/include/svx/sdr/contact/viewobjectcontactofgroup.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofgroup.hxx @@ -22,10 +22,10 @@ #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -47,7 +47,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx index 62e2fe766f0b..7d7bab75110f 100644 --- a/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx @@ -22,14 +22,14 @@ #include <svx/sdr/contact/viewobjectcontact.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace sdr { class MasterPageDescriptor; } -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -50,7 +50,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx index 39f3a0047127..2e489e758edf 100644 --- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace sdr { namespace contact { @@ -31,7 +31,7 @@ namespace sdr { namespace contact { class SdrPage; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -56,7 +56,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx index 1386d5b77727..f770a341fcc0 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx @@ -59,7 +59,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx index cedb879371af..548378731ba4 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewobjectcontact.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObject; class SetOfByte; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx index 7ca2d079704c..5b03e267c5c6 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx @@ -22,11 +22,11 @@ #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrOle2Obj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -47,7 +47,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx index f2bddb9bbe39..3a81301bb2b3 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewobjectcontact.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrPage; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -48,7 +48,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -68,7 +68,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -86,7 +86,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -106,7 +106,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -123,7 +123,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -140,7 +140,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -157,7 +157,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -174,7 +174,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -194,7 +194,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -214,7 +214,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -231,7 +231,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx index dc99d95a6f3e..8194d1c91c73 100644 --- a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -36,15 +36,15 @@ namespace com { namespace sun { namespace star { } } } } -//........................................................................ + namespace sdr { namespace contact { -//........................................................................ + class ViewContactOfUnoControl; class ObjectContactOfPageView; - //==================================================================== + //= ViewObjectContactOfUnoControl - //==================================================================== + class ViewObjectContactOfUnoControl_Impl; class SVX_DLLPRIVATE ViewObjectContactOfUnoControl : public ViewObjectContactOfSdrObj { @@ -105,9 +105,9 @@ namespace sdr { namespace contact { ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& ); // never implemented }; - //==================================================================== + //= UnoControlPrintOrPreviewContact - //==================================================================== + class SVX_DLLPRIVATE UnoControlPrintOrPreviewContact : public ViewObjectContactOfUnoControl { public: @@ -122,9 +122,9 @@ namespace sdr { namespace contact { virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const; }; -//........................................................................ + } } // namespace sdr::contact -//........................................................................ + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx index 4105510cdb64..40f4e617413d 100644 --- a/include/svx/sdr/contact/viewobjectcontactredirector.hxx +++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx @@ -23,7 +23,7 @@ #include <svx/svxdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace sdr { namespace contact { @@ -31,7 +31,7 @@ namespace sdr { namespace contact { class ViewObjectContact; }} -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -59,7 +59,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX diff --git a/include/svx/sdr/event/eventhandler.hxx b/include/svx/sdr/event/eventhandler.hxx index 66d8f7a07e71..3ab923e9ee94 100644 --- a/include/svx/sdr/event/eventhandler.hxx +++ b/include/svx/sdr/event/eventhandler.hxx @@ -25,7 +25,7 @@ #include <vector> #include <vcl/timer.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace sdr @@ -40,7 +40,7 @@ namespace sdr } // end of namespace event } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -64,7 +64,7 @@ namespace sdr } // end of namespace event } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -101,7 +101,7 @@ namespace sdr } // end of namespace event } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -125,7 +125,7 @@ namespace sdr } // end of namespace event } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_EVENT_EVENTHANDLER_HXX diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx index 5182f93a8f48..57605a4e165e 100644 --- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <vcl/bitmapex.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -92,7 +92,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYANIMATEDBITMAPEX_HXX diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx index c984c3093345..13feeec1eb1b 100644 --- a/include/svx/sdr/overlay/overlaybitmapex.hxx +++ b/include/svx/sdr/overlay/overlaybitmapex.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <vcl/bitmapex.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -69,7 +69,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYBITMAPEX_HXX diff --git a/include/svx/sdr/overlay/overlaycrosshair.hxx b/include/svx/sdr/overlay/overlaycrosshair.hxx index b56fe2e9ded1..10625aa8c198 100644 --- a/include/svx/sdr/overlay/overlaycrosshair.hxx +++ b/include/svx/sdr/overlay/overlaycrosshair.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -44,7 +44,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX diff --git a/include/svx/sdr/overlay/overlayhatchrect.hxx b/include/svx/sdr/overlay/overlayhatchrect.hxx index e5395533ef57..e69c61b87849 100644 --- a/include/svx/sdr/overlay/overlayhatchrect.hxx +++ b/include/svx/sdr/overlay/overlayhatchrect.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <vcl/hatch.hxx> -////////////////////////////////////////////////////////////////////////////// + class PolyPolygon; @@ -64,7 +64,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYHATCHRECT_HXX diff --git a/include/svx/sdr/overlay/overlayhelpline.hxx b/include/svx/sdr/overlay/overlayhelpline.hxx index 3b9e91587357..3eff8fee6aa9 100644 --- a/include/svx/sdr/overlay/overlayhelpline.hxx +++ b/include/svx/sdr/overlay/overlayhelpline.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <svx/svdhlpln.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -53,7 +53,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYHELPLINE_HXX diff --git a/include/svx/sdr/overlay/overlayline.hxx b/include/svx/sdr/overlay/overlayline.hxx index 4794cf9d598a..4561a2bafe75 100644 --- a/include/svx/sdr/overlay/overlayline.hxx +++ b/include/svx/sdr/overlay/overlayline.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -52,7 +52,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYLINE_HXX diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx index 8b480e58fde4..a2ab50d79122 100644 --- a/include/svx/sdr/overlay/overlaymanager.hxx +++ b/include/svx/sdr/overlay/overlaymanager.hxx @@ -31,7 +31,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class OutputDevice; @@ -45,7 +45,7 @@ namespace basegfx { class B2DRange; } -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -144,7 +144,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGER_HXX diff --git a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx index c95a0f2e32d5..6e219193f62c 100644 --- a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx +++ b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx @@ -24,7 +24,7 @@ #include <basegfx/range/b2irange.hxx> #include <vcl/virdev.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -91,7 +91,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx index 420b5aff0da7..e4effa946efa 100644 --- a/include/svx/sdr/overlay/overlayobject.hxx +++ b/include/svx/sdr/overlay/overlayobject.hxx @@ -30,7 +30,7 @@ #include <vector> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class OutputDevice; @@ -50,7 +50,7 @@ namespace basegfx class B2DRange; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -169,7 +169,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -192,7 +192,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECT_HXX diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx index 3ef85ddf05db..75c334b974c5 100644 --- a/include/svx/sdr/overlay/overlayobjectcell.hxx +++ b/include/svx/sdr/overlay/overlayobjectcell.hxx @@ -24,7 +24,7 @@ #include <vector> -////////////////////////////////////////////////////////////////////////////// + // #114409# namespace sdr @@ -55,7 +55,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTCELL_HXX diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx index f1d21fa10ab7..a3bda78589cd 100644 --- a/include/svx/sdr/overlay/overlayobjectlist.hxx +++ b/include/svx/sdr/overlay/overlayobjectlist.hxx @@ -24,11 +24,11 @@ #include <sal/types.h> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + #define DEFAULT_VALUE_FOR_HITTEST_PIXEL (2L) -////////////////////////////////////////////////////////////////////////////// + class Point; @@ -71,7 +71,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTLIST_HXX diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx index 026a9608187f..c5f3d08376de 100644 --- a/include/svx/sdr/overlay/overlaypolypolygon.hxx +++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx @@ -24,7 +24,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -54,7 +54,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYPOLYPOLYGON_HXX diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx index 78cf4d97dcb2..f888e480a0cf 100644 --- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx +++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYPRIMITIVE2DSEQUENCEOBJECT_HXX diff --git a/include/svx/sdr/overlay/overlayrectangle.hxx b/include/svx/sdr/overlay/overlayrectangle.hxx index 36230b4e9c30..cdb49c174274 100644 --- a/include/svx/sdr/overlay/overlayrectangle.hxx +++ b/include/svx/sdr/overlay/overlayrectangle.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <tools/gen.hxx> -////////////////////////////////////////////////////////////////////////////// + class PolyPolygon; @@ -77,7 +77,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYRECTANGLE_HXX diff --git a/include/svx/sdr/overlay/overlayrollingrectangle.hxx b/include/svx/sdr/overlay/overlayrollingrectangle.hxx index 22df07292943..0f7399a84762 100644 --- a/include/svx/sdr/overlay/overlayrollingrectangle.hxx +++ b/include/svx/sdr/overlay/overlayrollingrectangle.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -68,7 +68,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYROLLINGRECTANGLE_HXX diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx index dbe521b2557d..c4ab9a345ff5 100644 --- a/include/svx/sdr/overlay/overlayselection.hxx +++ b/include/svx/sdr/overlay/overlayselection.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <vcl/region.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -80,7 +80,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYSELECTION_HXX diff --git a/include/svx/sdr/overlay/overlaytools.hxx b/include/svx/sdr/overlay/overlaytools.hxx index 181f8950db9f..85b0c0b1732e 100644 --- a/include/svx/sdr/overlay/overlaytools.hxx +++ b/include/svx/sdr/overlay/overlaytools.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/primitive2d/primitivetools2d.hxx> #include <vcl/bitmapex.hxx> -////////////////////////////////////////////////////////////////////////////// + // Overlay helper class which holds a BotmapEx which is to be visualized // at the given logic position with the Bitmap's pixel size, unscaled and // unrotated (like a marker). The discrete pixel on the bitmap assocciated @@ -78,7 +78,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // Overlay helper class for a crosshair namespace drawinglayer { @@ -119,7 +119,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // Overlay helper class for a hatch rectangle as used e.g. for text object // selection hilighting namespace drawinglayer @@ -171,7 +171,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // Overlay helper class for a striped helpline namespace drawinglayer @@ -225,7 +225,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // Overlay helper class for rolling rectangle helplines. This primitive is // only for the extended lines to the ends of the view @@ -268,7 +268,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYTOOLS_HXX diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx index b463a27beb17..4f7b29b95c31 100644 --- a/include/svx/sdr/overlay/overlaytriangle.hxx +++ b/include/svx/sdr/overlay/overlaytriangle.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYTRIANGLE_HXX diff --git a/include/svx/sdr/primitive2d/sdrattributecreator.hxx b/include/svx/sdr/primitive2d/sdrattributecreator.hxx index 498aee924579..1d9ef5a8ff9e 100644 --- a/include/svx/sdr/primitive2d/sdrattributecreator.hxx +++ b/include/svx/sdr/primitive2d/sdrattributecreator.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predefines class SfxItemSet; class SdrText; @@ -49,7 +49,7 @@ namespace basegfx { class B2DRange; } -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -127,7 +127,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX diff --git a/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx index de6d3b8b2de9..dc2840109bec 100644 --- a/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx @@ -25,10 +25,10 @@ #include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -72,7 +72,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx index 2191aaf5ab4a..45c382517711 100644 --- a/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx @@ -24,10 +24,10 @@ #include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -61,7 +61,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx index 0bc3af68214a..4ef0090978a2 100644 --- a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx @@ -24,10 +24,10 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/attribute/sdrshadowtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -82,7 +82,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCUSTOMSHAPEPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx index 61ded2f6676a..63a8ea4c67a4 100644 --- a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx +++ b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { class B2DPolygon; @@ -39,7 +39,7 @@ namespace drawinglayer { namespace attribute { class SdrTextAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -73,7 +73,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX diff --git a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx index 6dca6d6abc5c..4d133cb57931 100644 --- a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx @@ -24,10 +24,10 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -61,7 +61,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -105,7 +105,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx index 2eb0f53909d1..fafa633a843f 100644 --- a/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx @@ -25,10 +25,10 @@ #include <svtools/grfmgr.hxx> #include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -69,7 +69,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx index e663c5dd90b9..39783b1e487e 100644 --- a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace drawinglayer { namespace primitive2d { @@ -40,7 +40,7 @@ namespace drawinglayer { namespace attribute { class SdrLineAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -118,7 +118,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx index 064614b4826f..cbab4e6b7534 100644 --- a/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx @@ -24,10 +24,10 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -63,7 +63,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx index f760396bd862..3215c6f375d7 100644 --- a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx @@ -24,12 +24,12 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/svdobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefinitions class SdrOle2Obj; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -73,7 +73,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx index 20b5fe9d1bc8..d5bf6d35769a 100644 --- a/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx @@ -25,10 +25,10 @@ #include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -65,7 +65,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrprimitivetools.hxx b/include/svx/sdr/primitive2d/sdrprimitivetools.hxx index f82c19df040d..a81aa0b12d7d 100644 --- a/include/svx/sdr/primitive2d/sdrprimitivetools.hxx +++ b/include/svx/sdr/primitive2d/sdrprimitivetools.hxx @@ -23,14 +23,14 @@ #include <vcl/bitmapex.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { class BColor; } -////////////////////////////////////////////////////////////////////////////// + // helper methods namespace drawinglayer @@ -42,7 +42,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX diff --git a/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx index 55590fa0b5ad..4082b446ab51 100644 --- a/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx @@ -24,10 +24,10 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -74,7 +74,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx index 37b9433ae34c..45a48d771d58 100644 --- a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -30,11 +30,11 @@ #include <tools/weakbase.hxx> #include <svx/sdtaitm.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines class SdrText; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -102,7 +102,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -144,7 +144,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -186,7 +186,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -248,7 +248,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -290,7 +290,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -331,7 +331,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx b/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx index fee435c612fa..0fae52a763c4 100644 --- a/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx +++ b/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> -////////////////////////////////////////////////////////////////////////////// + #define PRIMITIVE2D_ID_SDRCAPTIONPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 0) #define PRIMITIVE2D_ID_SDRCONNECTORPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 1) @@ -49,7 +49,7 @@ #define PRIMITIVE2D_ID_SDROLECONTENTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 22) #define PRIMITIVE2D_ID_SDRAUTOFITTEXTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 23) -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SVX_PRIMITIVETYPES2D_HXX diff --git a/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx b/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx index c41e6c35edaf..4a7270690a1f 100644 --- a/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx +++ b/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> -////////////////////////////////////////////////////////////////////////////// + // predefines class SfxItemSet; @@ -34,7 +34,7 @@ namespace basegfx { class B2DRange; } -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -48,7 +48,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX diff --git a/include/svx/sdr/properties/attributeproperties.hxx b/include/svx/sdr/properties/attributeproperties.hxx index dce031bc6a23..3309500871c3 100644 --- a/include/svx/sdr/properties/attributeproperties.hxx +++ b/include/svx/sdr/properties/attributeproperties.hxx @@ -25,7 +25,7 @@ #include <svx/sdr/properties/defaultproperties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -89,7 +89,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/captionproperties.hxx b/include/svx/sdr/properties/captionproperties.hxx index 764ad0e99038..1ce6903d3da9 100644 --- a/include/svx/sdr/properties/captionproperties.hxx +++ b/include/svx/sdr/properties/captionproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/rectangleproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -60,7 +60,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX diff --git a/include/svx/sdr/properties/circleproperties.hxx b/include/svx/sdr/properties/circleproperties.hxx index c0304a9407b9..4ac0dc5bfc63 100644 --- a/include/svx/sdr/properties/circleproperties.hxx +++ b/include/svx/sdr/properties/circleproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/rectangleproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -60,7 +60,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/connectorproperties.hxx b/include/svx/sdr/properties/connectorproperties.hxx index f05ef2846293..dbd3b49b52c5 100644 --- a/include/svx/sdr/properties/connectorproperties.hxx +++ b/include/svx/sdr/properties/connectorproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/textproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -56,7 +56,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX diff --git a/include/svx/sdr/properties/customshapeproperties.hxx b/include/svx/sdr/properties/customshapeproperties.hxx index 62a68bf2b6e8..14a558414b99 100644 --- a/include/svx/sdr/properties/customshapeproperties.hxx +++ b/include/svx/sdr/properties/customshapeproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/textproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -79,7 +79,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx index 305aeab859c7..4e372c2042c6 100644 --- a/include/svx/sdr/properties/defaultproperties.hxx +++ b/include/svx/sdr/properties/defaultproperties.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/properties/properties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/include/svx/sdr/properties/e3dcompoundproperties.hxx b/include/svx/sdr/properties/e3dcompoundproperties.hxx index 9fd7126db913..db04b384c1bc 100644 --- a/include/svx/sdr/properties/e3dcompoundproperties.hxx +++ b/include/svx/sdr/properties/e3dcompoundproperties.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/properties/e3dproperties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -64,7 +64,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_E3DCOMPOUNDPROPERTIES_HXX diff --git a/include/svx/sdr/properties/e3dextrudeproperties.hxx b/include/svx/sdr/properties/e3dextrudeproperties.hxx index 2524ad4651e0..b5d64068a9f5 100644 --- a/include/svx/sdr/properties/e3dextrudeproperties.hxx +++ b/include/svx/sdr/properties/e3dextrudeproperties.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/properties/e3dcompoundproperties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -51,7 +51,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/e3dlatheproperties.hxx b/include/svx/sdr/properties/e3dlatheproperties.hxx index f65729a02084..e88c4964f217 100644 --- a/include/svx/sdr/properties/e3dlatheproperties.hxx +++ b/include/svx/sdr/properties/e3dlatheproperties.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/properties/e3dcompoundproperties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -51,7 +51,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/e3dproperties.hxx b/include/svx/sdr/properties/e3dproperties.hxx index 5b1fe27ad2e3..c2ba41c9bf2f 100644 --- a/include/svx/sdr/properties/e3dproperties.hxx +++ b/include/svx/sdr/properties/e3dproperties.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/properties/attributeproperties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -57,7 +57,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_E3DPROPERTIES_HXX diff --git a/include/svx/sdr/properties/e3dsceneproperties.hxx b/include/svx/sdr/properties/e3dsceneproperties.hxx index 437bdac87480..9d14a5ae8529 100644 --- a/include/svx/sdr/properties/e3dsceneproperties.hxx +++ b/include/svx/sdr/properties/e3dsceneproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/e3dproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -81,7 +81,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/e3dsphereproperties.hxx b/include/svx/sdr/properties/e3dsphereproperties.hxx index 058e9f6488f2..2481af6a6007 100644 --- a/include/svx/sdr/properties/e3dsphereproperties.hxx +++ b/include/svx/sdr/properties/e3dsphereproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/e3dcompoundproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -50,7 +50,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX diff --git a/include/svx/sdr/properties/emptyproperties.hxx b/include/svx/sdr/properties/emptyproperties.hxx index 0de77d69304c..7498f0422b55 100644 --- a/include/svx/sdr/properties/emptyproperties.hxx +++ b/include/svx/sdr/properties/emptyproperties.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/properties/properties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/include/svx/sdr/properties/graphicproperties.hxx b/include/svx/sdr/properties/graphicproperties.hxx index 36274a9c8980..1232ec7e9f9b 100644 --- a/include/svx/sdr/properties/graphicproperties.hxx +++ b/include/svx/sdr/properties/graphicproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/rectangleproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -60,7 +60,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX diff --git a/include/svx/sdr/properties/groupproperties.hxx b/include/svx/sdr/properties/groupproperties.hxx index 31868f087b61..ee12bd2a0bfd 100644 --- a/include/svx/sdr/properties/groupproperties.hxx +++ b/include/svx/sdr/properties/groupproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/defaultproperties.hxx> -///////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -114,7 +114,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_GROUPPROPERTIES_HXX diff --git a/include/svx/sdr/properties/itemsettools.hxx b/include/svx/sdr/properties/itemsettools.hxx index 3e6372fe1647..6c4ce0e59d20 100644 --- a/include/svx/sdr/properties/itemsettools.hxx +++ b/include/svx/sdr/properties/itemsettools.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObject; @@ -30,7 +30,7 @@ class SfxItemSet; class Rectangle; class Fraction; -////////////////////////////////////////////////////////////////////////////// + // class to remember broadcast start positions namespace sdr { @@ -51,7 +51,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -61,7 +61,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_ITEMSETTOOLS_HXX diff --git a/include/svx/sdr/properties/measureproperties.hxx b/include/svx/sdr/properties/measureproperties.hxx index eba0baa00f82..234aca895e8d 100644 --- a/include/svx/sdr/properties/measureproperties.hxx +++ b/include/svx/sdr/properties/measureproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/textproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -60,7 +60,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_MEASUREPROPERTIES_HXX diff --git a/include/svx/sdr/properties/oleproperties.hxx b/include/svx/sdr/properties/oleproperties.hxx index 0ca98a919857..5a10f87bd771 100644 --- a/include/svx/sdr/properties/oleproperties.hxx +++ b/include/svx/sdr/properties/oleproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/rectangleproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -51,7 +51,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_OLEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/pageproperties.hxx b/include/svx/sdr/properties/pageproperties.hxx index f085e168fd86..08f583b5842b 100644 --- a/include/svx/sdr/properties/pageproperties.hxx +++ b/include/svx/sdr/properties/pageproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/emptyproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -66,7 +66,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_PAGEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx index 80663f403a60..e754d9e4c081 100644 --- a/include/svx/sdr/properties/properties.hxx +++ b/include/svx/sdr/properties/properties.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObject; @@ -42,7 +42,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -186,7 +186,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_PROPERTIES_HXX diff --git a/include/svx/sdr/properties/rectangleproperties.hxx b/include/svx/sdr/properties/rectangleproperties.hxx index c47f03a156ba..aa464546c7e4 100644 --- a/include/svx/sdr/properties/rectangleproperties.hxx +++ b/include/svx/sdr/properties/rectangleproperties.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/properties/textproperties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -54,7 +54,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_RECTANGLEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/textproperties.hxx b/include/svx/sdr/properties/textproperties.hxx index 69e598a09e82..0894af0d6d80 100644 --- a/include/svx/sdr/properties/textproperties.hxx +++ b/include/svx/sdr/properties/textproperties.hxx @@ -24,7 +24,7 @@ #include <svx/sdr/properties/attributeproperties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -86,7 +86,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_TEXTPROPERTIES_HXX diff --git a/include/svx/sdrhittesthelper.hxx b/include/svx/sdrhittesthelper.hxx index 43ba26578706..63e0dec21b1b 100644 --- a/include/svx/sdrhittesthelper.hxx +++ b/include/svx/sdrhittesthelper.hxx @@ -23,7 +23,7 @@ #include <svx/svxdllapi.h> #include <tools/gen.hxx> -///////////////////////////////////////////////////////////////////// + // #i101872# new Object HitTest as View-tooling class SdrObject; @@ -33,7 +33,7 @@ class SdrObjList; namespace sdr { namespace contact { class ViewObjectContact; }} namespace basegfx { class B2DPoint; } -///////////////////////////////////////////////////////////////////// + // Wrappers for classic Sdr* Mode/View classes SVX_DLLPUBLIC SdrObject* SdrObjectPrimitiveHit( @@ -52,7 +52,7 @@ SVX_DLLPUBLIC SdrObject* SdrObjListPrimitiveHit( const SetOfByte* pVisiLayer, bool bTextOnly); -///////////////////////////////////////////////////////////////////// + // the pure HitTest based on a VOC SVX_DLLPUBLIC bool ViewObjectContactPrimitiveHit( @@ -61,7 +61,7 @@ SVX_DLLPUBLIC bool ViewObjectContactPrimitiveHit( double fLogicHitTolerance, bool bTextOnly); -///////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDRHITTESTHELPER_HXX diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx index 6ffb8df0e251..424b16ee8a11 100644 --- a/include/svx/sdrmasterpagedescriptor.hxx +++ b/include/svx/sdrmasterpagedescriptor.hxx @@ -23,7 +23,7 @@ #include <svx/sdrpageuser.hxx> #include <svx/svdsob.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObject; class SfxItemSet; @@ -37,7 +37,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -87,7 +87,7 @@ namespace sdr }; } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDRMASTERPAGEDESCRIPTOR_HXX diff --git a/include/svx/sdrobjectfilter.hxx b/include/svx/sdrobjectfilter.hxx index d1e81c67a175..c7398ccc1fe0 100644 --- a/include/svx/sdrobjectfilter.hxx +++ b/include/svx/sdrobjectfilter.hxx @@ -24,14 +24,14 @@ class SdrObject; -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= SdrObjectFilter - //==================================================================== + /** specifies a boolean predicate on the set of all SdrObjects - vulgo a filter. */ class SVX_DLLPUBLIC SAL_NO_VTABLE ISdrObjectFilter @@ -42,9 +42,9 @@ namespace svx virtual ~ISdrObjectFilter() = 0; }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_SDROBJECTFILTER_HXX diff --git a/include/svx/sdrobjectuser.hxx b/include/svx/sdrobjectuser.hxx index fbaa278632af..b480257fe274 100644 --- a/include/svx/sdrobjectuser.hxx +++ b/include/svx/sdrobjectuser.hxx @@ -22,11 +22,11 @@ #include <vector> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObject; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // To make things more safe, allow users of an object to register at it. The users need to be derived // from sdr::ObjectUser to get a call. The users do not need to call RemoveObjectUser() at the page // when they get called from ObjectInDestruction(). @@ -49,7 +49,7 @@ namespace sdr typedef ::std::vector< ObjectUser* > ObjectUserVector; } // end of namespace sdr -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDROBJECTUSER_HXX diff --git a/include/svx/sdrpageuser.hxx b/include/svx/sdrpageuser.hxx index d537861ced0b..d4eae047ac8b 100644 --- a/include/svx/sdrpageuser.hxx +++ b/include/svx/sdrpageuser.hxx @@ -22,11 +22,11 @@ #include <vector> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrPage; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // To make things more safe, allow users of the page to register at it. The users need to be derived // from sdr::PageUser to get a call. The users do not need to call RemovePageUser() at the page // when they get called from PageInDestruction(). @@ -49,7 +49,7 @@ namespace sdr typedef ::std::vector< PageUser* > PageUserVector; } // end of namespace sdr -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDRPAGEUSER_HXX diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx index af07e5477da9..36ea6b864137 100644 --- a/include/svx/sdrpagewindow.hxx +++ b/include/svx/sdrpagewindow.hxx @@ -32,7 +32,7 @@ #include <vector> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // predeclarations class Region; @@ -62,7 +62,7 @@ namespace basegfx class SdrPaintWindow; class Link; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrPageWindow { @@ -124,7 +124,7 @@ public: // typedefs for a list of SdrPageWindow typedef ::std::vector< SdrPageWindow* > SdrPageWindowVector; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDRPAGEWINDOW_HXX diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx index 741ebb90f280..27c546063c78 100644 --- a/include/svx/sdrpaintwindow.hxx +++ b/include/svx/sdrpaintwindow.hxx @@ -24,7 +24,7 @@ #include <vcl/virdev.hxx> #include <svx/svxdllapi.h> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrPaintView; @@ -39,7 +39,7 @@ namespace sdr #ifdef _MSC_VER // broken msvc template instantiation #include <svx/sdr/overlay/overlaymanager.hxx> #endif -//////////////////////////////////////////////////////////////////////////////////////////////////// + /// paint the transparent children of rWin that overlap rPixelRect /// (for example, transparent form controls like check boxes) @@ -66,7 +66,7 @@ public: OutputDevice& GetPreRenderDevice() { return maPreRenderDevice; } }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrPaintWindow { @@ -150,7 +150,7 @@ public: // typedefs for a list of SdrPaintWindows typedef ::std::vector< SdrPaintWindow* > SdrPaintWindowVector; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDRPAINTWINDOW_HXX diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx index 1cb2ef116551..3f3739d56958 100755 --- a/include/svx/sdrundomanager.hxx +++ b/include/svx/sdrundomanager.hxx @@ -24,7 +24,7 @@ #include <editeng/editund2.hxx> #include <tools/link.hxx> -////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrUndoManager : public EditUndoManager { @@ -63,7 +63,7 @@ public: bool isEndTextEditTriggeredFromUndo() { return mbEndTextEditTriggeredFromUndo; } }; -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDRUNDOMANAGER_HXX // eof diff --git a/include/svx/sdsxyitm.hxx b/include/svx/sdsxyitm.hxx index 432fdbc50a77..e8653d8b56cd 100644 --- a/include/svx/sdsxyitm.hxx +++ b/include/svx/sdsxyitm.hxx @@ -22,18 +22,18 @@ #include <svx/sdmetitm.hxx> #include <svx/svddef.hxx> -//--------------------- + // class SdrShadowXDistItem -//--------------------- + class SdrShadowXDistItem: public SdrMetricItem { public: SdrShadowXDistItem(long nDist=0) : SdrMetricItem(SDRATTR_SHADOWXDIST,nDist) {} SdrShadowXDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_SHADOWXDIST,rIn) {} }; -//--------------------- + // class SdrShadowYDistItem -//--------------------- + class SdrShadowYDistItem: public SdrMetricItem { public: SdrShadowYDistItem(long nDist=0) : SdrMetricItem(SDRATTR_SHADOWYDIST,nDist) {} diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 07e123314887..54ded50680f9 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -23,9 +23,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//------------------------------ + // class SdrTextAniDirectionItem -//------------------------------ + enum SdrTextAniDirection {SDRTEXTANI_LEFT, SDRTEXTANI_RIGHT, diff --git a/include/svx/sdtagitm.hxx b/include/svx/sdtagitm.hxx index e576d48d60f9..f51b1b10a355 100644 --- a/include/svx/sdtagitm.hxx +++ b/include/svx/sdtagitm.hxx @@ -22,18 +22,18 @@ #include <svx/sdooitm.hxx> #include <svx/svddef.hxx> -//------------------------------------ + // class SdrTextAutoGrowHeightItem -//------------------------------------ + class SdrTextAutoGrowHeightItem: public SdrOnOffItem { public: SdrTextAutoGrowHeightItem(sal_Bool bAuto=sal_True): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,bAuto) {} SdrTextAutoGrowHeightItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,rIn) {} }; -//------------------------------------ + // class SdrTextAutoGrowWidthItem -//------------------------------------ + class SdrTextAutoGrowWidthItem: public SdrOnOffItem { public: SdrTextAutoGrowWidthItem(sal_Bool bAuto=sal_False): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,bAuto) {} diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index cab0d069ade3..b6fd1c680672 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -23,9 +23,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//------------------------------ + // class SdrTextVertAdjustItem -//------------------------------ + enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // aligned to top (normally used) SDRTEXTVERTADJUST_CENTER, // centered (for example for the title texts in Draw) @@ -51,9 +51,9 @@ public: virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; -//------------------------------ + // class SdrTextHorzAdjustItem -//------------------------------ + enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted SDRTEXTHORZADJUST_CENTER, // centered (for example for title texts in Draw) diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index bb3deb37bd24..3d1e6c11ccd9 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -23,9 +23,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//------------------------------ + // class SdrTextAniKindItem -//------------------------------ + enum SdrTextAniKind {SDRTEXTANI_NONE, SDRTEXTANI_BLINK, @@ -42,7 +42,7 @@ enum SdrTextAniKind {SDRTEXTANI_NONE, // (Only if count! = 0) // - SDRTEXTANI_SCROLL: // Text just scrolls all the way through, and starts over when it is done. -// + // Delay in ms: (except delay = 0 means 50ms (20Hz) default) // Count = number of passes (0 = go forever) // Direction: the direction to scroll diff --git a/include/svx/sdtditm.hxx b/include/svx/sdtditm.hxx index 01f2e3307d5a..223fa3051150 100644 --- a/include/svx/sdtditm.hxx +++ b/include/svx/sdtditm.hxx @@ -22,9 +22,9 @@ #include <svx/sdmetitm.hxx> #include <svx/svddef.hxx> -//---------------------------------------------- + // class SdrTextLeft/Right/Upper/LowerDistItem -//---------------------------------------------- + class SdrTextLeftDistItem: public SdrMetricItem { public: SdrTextLeftDistItem(long nHgt=0): SdrMetricItem(SDRATTR_TEXT_LEFTDIST,nHgt) {} diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index a6a7782d23cc..5defc601c6c0 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -39,9 +39,9 @@ enum SdrFitToSizeType { // No automatic line breaks for AutoGrowingWidth as well (only if // TextMaxFrameWidth is reached). -//-------------------------------- + // class SdrTextFitToSizeTypeItem -//-------------------------------- + class SVX_DLLPUBLIC SdrTextFitToSizeTypeItem: public SfxEnumItem { public: TYPEINFO(); diff --git a/include/svx/sdtmfitm.hxx b/include/svx/sdtmfitm.hxx index 5be20e768e34..a3e3b6641e0e 100644 --- a/include/svx/sdtmfitm.hxx +++ b/include/svx/sdtmfitm.hxx @@ -22,36 +22,36 @@ #include <svx/sdmetitm.hxx> #include <svx/svddef.hxx> -//------------------------------ + // class SdrTextMinFrameHeighItem -//------------------------------ + class SdrTextMinFrameHeightItem: public SdrMetricItem { public: SdrTextMinFrameHeightItem(long nHgt=0): SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT,nHgt) {} SdrTextMinFrameHeightItem(SvStream& rIn): SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT,rIn) {} }; -//------------------------------ + // class SdrTextMaxFrameHeightItem -//------------------------------ + class SdrTextMaxFrameHeightItem: public SdrMetricItem { public: SdrTextMaxFrameHeightItem(long nHgt=0): SdrMetricItem(SDRATTR_TEXT_MAXFRAMEHEIGHT,nHgt) {} SdrTextMaxFrameHeightItem(SvStream& rIn): SdrMetricItem(SDRATTR_TEXT_MAXFRAMEHEIGHT,rIn) {} }; -//------------------------------ + // class SdrTextMinFrameWidthItem -//------------------------------ + class SdrTextMinFrameWidthItem: public SdrMetricItem { public: SdrTextMinFrameWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_TEXT_MINFRAMEWIDTH,nWdt) {} SdrTextMinFrameWidthItem(SvStream& rIn): SdrMetricItem(SDRATTR_TEXT_MINFRAMEWIDTH,rIn) {} }; -//------------------------------ + // class SdrTextMaxFrameWidthItem -//------------------------------ + class SdrTextMaxFrameWidthItem: public SdrMetricItem { public: SdrTextMaxFrameWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_TEXT_MAXFRAMEWIDTH,nWdt) {} diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index adb8ea6e0229..aebed63b3245 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -23,7 +23,7 @@ #include <svx/svxdllapi.h> -//------------------------------------------------------------ + // class SdrYesNoItem // GetValueTextByVal() returns "yes" or "no" // instead of "TRUE" and "FALSE" diff --git a/include/svx/shapeproperty.hxx b/include/svx/shapeproperty.hxx index 06e45f9f3b22..6fd58bd82063 100644 --- a/include/svx/shapeproperty.hxx +++ b/include/svx/shapeproperty.hxx @@ -20,14 +20,14 @@ #ifndef INCLUDED_SVX_SHAPEPROPERTY_HXX #define INCLUDED_SVX_SHAPEPROPERTY_HXX -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= ShapeProperty - //==================================================================== + enum ShapeProperty { // generic (UNO) shape properties @@ -42,9 +42,9 @@ namespace svx eInvalidShapeProperty }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_SHAPEPROPERTY_HXX diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx index 2c7047e62ba3..93140d670039 100644 --- a/include/svx/shapepropertynotifier.hxx +++ b/include/svx/shapepropertynotifier.hxx @@ -35,14 +35,14 @@ namespace cppu class OWeakObject; } -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= IPropertyValueProvider - //==================================================================== + /** a provider for a property value */ class SVX_DLLPUBLIC IPropertyValueProvider @@ -60,9 +60,9 @@ namespace svx }; typedef ::boost::shared_ptr< IPropertyValueProvider > PPropertyValueProvider; - //==================================================================== + //= PropertyValueProvider - //==================================================================== + /** default implementation of a IPropertyValueProvider This default implementation queries the object which it is constructed with for the XPropertySet interface, @@ -88,9 +88,9 @@ namespace svx const OUString m_sPropertyName; }; - //==================================================================== + //= PropertyChangeNotifier - //==================================================================== + struct PropertyChangeNotifier_Data; /** helper class for notifying XPropertyChangeListeners @@ -132,9 +132,9 @@ namespace svx ::std::auto_ptr< PropertyChangeNotifier_Data > m_pData; }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_SHAPEPROPERTYNOTIFIER_HXX diff --git a/include/svx/subtoolboxcontrol.hxx b/include/svx/subtoolboxcontrol.hxx index f20191acf9c5..0d18ac803b28 100644 --- a/include/svx/subtoolboxcontrol.hxx +++ b/include/svx/subtoolboxcontrol.hxx @@ -22,9 +22,9 @@ #include <svx/svxdllapi.h> #include <sfx2/tbxctrl.hxx> -//---------------------------------------------------------------------------- -// -//---------------------------------------------------------------------------- + + + class SVX_DLLPUBLIC SvxSubToolBoxControl : public SfxToolBoxControl { @@ -39,8 +39,8 @@ public: virtual SfxPopupWindow* CreatePopupWindow(); }; -// -//---------------------------------------------------------------------------- + + #endif diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index 9dc09bce6a1a..92af4e19d514 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -158,7 +158,7 @@ public: // incompatible with the rest of the Create functionality of SvDraw, needs // to set the following flag. It affects the following object types: // OBJ_POLY, OBJ_PLIN, OBJ_PATHLINE, OBJ_PATHFILL - // + // This flag should be regarded as temporary. The affected applications should // be changed soon. // Default = sal_False; diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx index 91a1fd0b4bb0..0e92e7f72654 100644 --- a/include/svx/svddef.hxx +++ b/include/svx/svddef.hxx @@ -42,7 +42,7 @@ // SdrItemPool V4+++, 07-06-1999 // 15 new Items for NotPersist (Reserve) // 15 new Items for GrafItems -// + // WhichMapping: // V1 Range = 1000..1065 (66) // V2 Range = 1000..1123 (124) (58 neue Whiches) diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 6b81fc498ad1..fc45d3f1a6ca 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -47,7 +47,7 @@ public: bool getAddToTransparent() const { return mbAddToTransparent; } }; -////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrDragEntryPolyPolygon : public SdrDragEntry { @@ -61,7 +61,7 @@ public: virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod); }; -////////////////////////////////////////////////////////////////////////////// + class SdrDragEntrySdrObject : public SdrDragEntry { @@ -84,7 +84,7 @@ public: virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod); }; -////////////////////////////////////////////////////////////////////////////// + class SdrDragEntryPrimitive2DSequence : public SdrDragEntry { @@ -100,7 +100,7 @@ public: virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod); }; -////////////////////////////////////////////////////////////////////////////// + class SdrDragEntryPointGlueDrag : public SdrDragEntry { @@ -115,7 +115,7 @@ public: virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod); }; -////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrDragMethod { @@ -219,7 +219,7 @@ inline const Rectangle& SdrDragMethod::GetMarkedRect() const getSdrDragView().GetMarkedObjRect(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // SdrDragMove class SVX_DLLPUBLIC SdrDragMove : public SdrDragMethod @@ -249,7 +249,7 @@ public: virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // SdrDragResize class SVX_DLLPUBLIC SdrDragResize : public SdrDragMethod @@ -272,7 +272,7 @@ public: virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // SdrDragObjOwn class SVX_DLLPUBLIC SdrDragObjOwn : public SdrDragMethod diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 10b198da4bae..376c78d3a0c9 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -292,7 +292,7 @@ public: // aStr+=" ersetzen"; // BegUndo(aStr); // ReplaceObject(...); - // ... + // EndUndo(); void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark=sal_True); diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index d1a9963fd944..2fbbe6c6ff1f 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -49,11 +49,11 @@ enum SdrEndTextEditKind {SDRENDTEXTEDIT_UNCHANGED, // Textobjekt unveraendert SDRENDTEXTEDIT_DELETED, // Textobjekt implizit geloescht SDRENDTEXTEDIT_SHOULDBEDELETED}; // Fuer Writer: Textobjekt sollte geloescht werden -//////////////////////////////////////////////////////////////////////////////////////////////////// + // - Allgemeines Edit fuer objektspeziefische Eigenschaften // - Textedit fuer alle vom SdrTextObj abgeleiteten Zeichenobjekte // - Macromodus -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrObjEditView: public SdrGlueEditView { @@ -134,7 +134,7 @@ protected: virtual ~SdrObjEditView(); public: - //////////////////////////////////////////////////////////////////////////////////////////////////// + // used to call the old ImpPaintOutlinerView. Will be replaced when the // outliner will be displayed on the overlay in edit mode. void TextEditDrawing(SdrPaintWindow& rPaintWindow) const; @@ -150,9 +150,9 @@ public: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); virtual void ModelHasChanged(); - //************************************************************************ + // TextEdit ueber einen Outliner - //************************************************************************ + // QuickTextEditMode bedeutet, dass Objekte mit Text sofort beim Anklicken // editiert werden sollen. Default=TRUE. Persistent. void SetQuickTextEditMode(sal_Bool bOn) { bQuickTextEditMode=bOn; } @@ -237,9 +237,9 @@ public: sal_uInt16 GetSelectionLevel() const; - //************************************************************************ + // Object-MacroModus (z.B. Rect als Button oder sowas): - //************************************************************************ + // Persistent. Default TRUE. SvDraw wertet das Flag u.a. bei // SdrView::GetPreferredPointer() aus. Hat nur Wirkung, wenn das Dokument // Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==sal_True). diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 87406f76304d..a2da4f39a7d8 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -26,7 +26,7 @@ #include <tools/shl.hxx> #include <vcl/outdev.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // ExchangeFormat-Id der DrawingEngine holen. Daten koennen dann per // static sal_Bool CopyData(pData,nLen,nFormat); @@ -108,7 +108,7 @@ class SfxItemSet; // Bei XFILL_NONE gibt's sal_False und rCol bleibt unveraendert. SVX_DLLPUBLIC bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Ein ItemSet auf Outliner- bzw. EditEngine-Items durchsuchen // Liefert sal_True, wenn der Set solchen Items enthaelt. @@ -118,7 +118,7 @@ sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal // man dann irgendwann mit delete platthauen muss. sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRangeBeg, sal_uInt16 nRangeEnd); -//////////////////////////////////////////////////////////////////////////////////////////////////// + class Link; @@ -250,13 +250,13 @@ namespace sdr SVX_DLLPUBLIC OUString GetResourceString(sal_uInt16 nResID); } -///////////////////////////////////////////////////////////////////// + // #i101872# isolated GetTextEditBackgroundColor for tooling class SdrObjEditView; SVX_DLLPUBLIC Color GetTextEditBackgroundColor(const SdrObjEditView& rView); -///////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDETC_HXX diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx index 89199ef77d2e..8576da69e678 100644 --- a/include/svx/svdglev.hxx +++ b/include/svx/svdglev.hxx @@ -25,9 +25,9 @@ class SdrGluePoint; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Editieren von Klebepunkten an den Objekten (Klebepunkte fuer Verbinder) -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrGlueEditView: public SdrPolyEditView { diff --git a/include/svx/svdglob.hxx b/include/svx/svdglob.hxx index 3a5e555f3e85..b2bc406dd3b8 100644 --- a/include/svx/svdglob.hxx +++ b/include/svx/svdglob.hxx @@ -24,9 +24,9 @@ #include <sal/config.h> #include <svx/svxdllapi.h> -//************************************************************ + // forward declaration -//************************************************************ + class ResMgr; @@ -40,7 +40,7 @@ ResMgr* ImpGetResMgr(); // See also SvdStr.Hrc SVX_DLLPUBLIC OUString ImpGetResStr(sal_uInt16 nResID); -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDGLOB_HXX diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx index 386d84c67d91..d49e71b0ede4 100644 --- a/include/svx/svdglue.hxx +++ b/include/svx/svdglue.hxx @@ -29,7 +29,7 @@ class SdrObject; #include <svx/svxdllapi.h> #include <vector> -//////////////////////////////////////////////////////////////////////////////////////////////////// + #define SDRESC_SMART 0x0000 #define SDRESC_LEFT 0x0001 @@ -140,7 +140,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDGLUE_HXX diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index fc7382d417a9..fd7cdf65c1dd 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -43,7 +43,7 @@ class SdrObject; class SdrPageView; class MouseEvent; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Jedes Objekt muss in der Lage seine Handles zu erzeugen. Diese werden dann // bei einer Selektion abgeholt, bei der View angemeldet und sichtbar gemacht. @@ -87,7 +87,7 @@ enum SdrHdlKind HDL_SMARTTAG }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + enum BitmapColorIndex { @@ -99,7 +99,7 @@ enum BitmapColorIndex Yellow }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + enum BitmapMarkerKind { @@ -135,7 +135,7 @@ enum BitmapMarkerKind Customshape_11x11 }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrHdl { @@ -246,7 +246,7 @@ public: static BitmapEx createGluePointBitmap() { return ImpGetBitmapEx(Glue_Deselected, 0); } }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #define SDR_HANDLE_COLOR_SIZE_NORMAL Size(13, 13) #define SDR_HANDLE_COLOR_SIZE_SELECTED Size(17, 17) @@ -290,7 +290,7 @@ public: const Link& GetColorChangeHdl() const { return aColorChangeHdl; } }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SdrHdlGradient : public SdrHdl { @@ -339,7 +339,7 @@ public: void SetMoveFirstHandle(bool bNew) { bMoveFirstHandle = bNew; } }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Spiegelachse class SdrHdlLine: public SdrHdl @@ -375,7 +375,7 @@ public: virtual ~SdrHdlBezWgt(); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class E3dVolumeMarker : public SdrHdl { @@ -388,7 +388,7 @@ public: explicit E3dVolumeMarker(const basegfx::B2DPolyPolygon& rWireframePoly); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class ImpEdgeHdl: public SdrHdl { @@ -407,7 +407,7 @@ public: virtual Pointer GetPointer() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class ImpMeasureHdl: public SdrHdl { @@ -421,7 +421,7 @@ public: virtual Pointer GetPointer() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class ImpTextframeHdl: public SdrHdl { @@ -434,9 +434,9 @@ public: explicit ImpTextframeHdl(const Rectangle& rRect); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + + class SVX_DLLPUBLIC SdrHdlList { @@ -498,7 +498,7 @@ public: SdrHdl* GetHdl(SdrHdlKind eKind1) const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrCropHdl : public SdrHdl { @@ -524,7 +524,7 @@ protected: static BitmapEx GetHandlesBitmap(); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrCropViewHdl : public SdrHdl { @@ -550,7 +550,7 @@ protected: virtual void CreateB2dIAObject(); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDHDL_HXX diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx index 88c49b88c917..4a23d575da01 100644 --- a/include/svx/svdhlpln.hxx +++ b/include/svx/svdhlpln.hxx @@ -28,7 +28,7 @@ #include <svx/svxdllapi.h> class OutputDevice; -//////////////////////////////////////////////////////////////////////////////////////////////////// + enum SdrHelpLineKind {SDRHELPLINE_POINT,SDRHELPLINE_VERTICAL,SDRHELPLINE_HORIZONTAL}; @@ -100,7 +100,7 @@ public: sal_uInt16 HitTest(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDHLPLN_HXX diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index e43800885d36..fc9417d572fd 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -254,7 +254,7 @@ public: void operator=(const SdrMarkList& rLst); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // migrate selections namespace sdr diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index a624e852b9fc..16603fbf2764 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -85,7 +85,7 @@ namespace sfx2 { class LinkManager; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + #define SDR_SWAPGRAPHICSMODE_NONE 0x00000000 #define SDR_SWAPGRAPHICSMODE_TEMP 0x00000001 @@ -93,7 +93,7 @@ namespace sfx2 #define SDR_SWAPGRAPHICSMODE_PURGE 0x00000100 #define SDR_SWAPGRAPHICSMODE_DEFAULT (SDR_SWAPGRAPHICSMODE_TEMP|SDR_SWAPGRAPHICSMODE_DOC|SDR_SWAPGRAPHICSMODE_PURGE) -//////////////////////////////////////////////////////////////////////////////////////////////////// + enum SdrHintKind { @@ -138,7 +138,7 @@ public: SdrHintKind GetKind() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Flag um nach dem Laden des Pools Aufzuraeumen (d.h. die RefCounts // neu zu bestimmen und unbenutztes wegzuwerfen). sal_False == aktiv @@ -211,7 +211,7 @@ protected: sal_uInt32 nMaxUndoCount; -////////////////////////////////////////////////////////////////////////////// + // sdr::Comment interface private: // the next unique comment ID, used for counting added comments. Initialized @@ -682,11 +682,11 @@ public: typedef tools::WeakReference< SdrModel > SdrModelWeakRef; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDMODEL_HXX -/* ///////////////////////////////////////////////////////////////////////////////////////////////// +/* +-----------+ | SdrModel | +--+------+-+ diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 80518cca0be0..5dd5f9177f7c 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -230,7 +230,7 @@ public: sal_Bool HasMarkableObj() const; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // migrate selections protected: @@ -260,7 +260,7 @@ public: const SdrMarkList& GetMarkedEdgesOfMarkedNodes() const { return mpSdrViewSelection->GetMarkedEdgesOfMarkedNodes(); } const std::vector<SdrObject*>& GetTransitiveHullOfMarkedObjects() const { return mpSdrViewSelection->GetAllMarkedObjects(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // mechanism to complete disable handles at the view. Handles will be hidden and deleted // when set, no new ones created, no interaction allowed. Handles will be recreated and shown @@ -463,8 +463,8 @@ public: void UnmarkObj(SdrObject* pObj); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// -// + + // - Hit tolarances: // It have to be declared in logical coordinates. So please translate the // wanted pixel value with PixelToLogic in Logical values. @@ -478,8 +478,8 @@ public: // 2*Tol (200 units for this example) is created around the object. // When an object is directly hit, the Edit method is called. // In opposite, a hit in the surrounding sensitive area enables Dragging. -// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + #endif // INCLUDED_SVX_SVDMRKV_HXX diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index ac78bc5b940a..ca6be6ca6f7f 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -29,9 +29,9 @@ #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> #include <svx/svxdllapi.h> -//************************************************************ + // Initial Declarations -//************************************************************ + class SdrObjList; class SdrObjListIter; @@ -71,9 +71,9 @@ struct SdrCustomShapeInteraction sal_Int32 nMode; }; -//************************************************************ + // SdrObjCustomShape -//************************************************************ + class SVX_DLLPUBLIC SdrObjCustomShape : public SdrTextObj { diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx index dfbf6b601d50..daae14673dd1 100644 --- a/include/svx/svdoattr.hxx +++ b/include/svx/svdoattr.hxx @@ -28,9 +28,9 @@ #include <svx/svdattr.hxx> #include <svx/svxdllapi.h> -//************************************************************ + // Initial Declarations -//************************************************************ + class SfxPoolItem; class SfxSetItem; @@ -38,9 +38,9 @@ class SdrOutliner; class SfxItemSet; class SfxItemPool; -//************************************************************ + // SdrAttrObj -//************************************************************ + class SVX_DLLPUBLIC SdrAttrObj : public SdrObject { @@ -76,7 +76,7 @@ public: virtual void SetModel(SdrModel* pNewModel); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDOATTR_HXX diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index 7b922dd31a48..f87ea5d06f93 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -23,9 +23,9 @@ #include <svx/svdorect.hxx> #include <svx/svxdllapi.h> -//************************************************************ + // Forward Declarations -//************************************************************ + class ImpCaptParams; @@ -33,9 +33,9 @@ namespace sdr { namespace properties { class CaptionProperties; }} -//************************************************************ + // Helper Class SdrCaptObjGeoData -//************************************************************ + // #109872# class SdrCaptObjGeoData : public SdrTextObjGeoData @@ -44,9 +44,9 @@ public: Polygon aTailPoly; }; -//************************************************************ + // SdrCaptionObj -//************************************************************ + class SVX_DLLPUBLIC SdrCaptionObj : public SdrRectObj { @@ -154,7 +154,7 @@ public: ::basegfx::B2DPolygon getTailPolygon() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif //_SVDOCAPT_HXX diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 48c509adf2dc..51417e5ca439 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -24,9 +24,9 @@ #include <svx/svdglue.hxx> #include <svx/svxdllapi.h> -//************************************************************ + // Vorausdeklarationen -//************************************************************ + class SdrDragMethod; class SdrPageView; @@ -35,9 +35,9 @@ namespace sdr { namespace properties { class ConnectorProperties; }} -//************************************************************ + // Hilfsklasse SdrObjConnection -//************************************************************ + class SdrObjConnection { @@ -79,9 +79,9 @@ public: inline SdrObject* GetObject() const { return pObj; } }; -//************************************************************ + // Hilfsklasse SdrEdgeInfoRec -//************************************************************ + enum SdrEdgeLineCode {OBJ1LINE2,OBJ1LINE3,OBJ2LINE2,OBJ2LINE3,MIDDLELINE}; @@ -123,9 +123,9 @@ public: long ImpGetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; }; -//************************************************************ + // Hilfsklasse SdrEdgeObjGeoData -//************************************************************ + class SdrEdgeObjGeoData : public SdrTextObjGeoData { @@ -142,9 +142,9 @@ public: virtual ~SdrEdgeObjGeoData(); }; -//************************************************************ + // Hilfsklasse SdrEdgeObj -//************************************************************ + class SVX_DLLPUBLIC SdrEdgeObj : public SdrTextObj { @@ -317,8 +317,6 @@ public: basegfx::B2DPolygon ImplAddConnectorOverlay(SdrDragMethod& rDragMethod, bool bTail1, bool bTail2, bool bDetail) const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// -// // Zur Bestimmung der Verlaufslinie werden folgende Item-Parameter des SdrItemPool verwendet: // // sal_uInt16 EdgeFlowAngle Default 9000 (=90.00 Deg), min 0, max 9000 @@ -430,8 +428,6 @@ public: // das gesamte Objekt umfasst, so versucht der // Verbinder von den 4 Scheitelpunktklebepunkten (und // zwar nur von denen) den guenstigsten herauszufinden. -// -////////////////////////////////////////////////////////////////////////////////////////////////// #endif // INCLUDED_SVX_SVDOEDGE_HXX diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx index 917f3d1b748d..4e0883c61ba2 100644 --- a/include/svx/svdogrp.hxx +++ b/include/svx/svdogrp.hxx @@ -23,17 +23,17 @@ #include <svx/svdobj.hxx> #include <svx/svxdllapi.h> -//************************************************************ + // Vorausdeklarationen -//************************************************************ + class SdrObjList; class SdrObjListIter; class SfxItemSet; -//************************************************************ + // SdrObjGroup -//************************************************************ + class SVX_DLLPUBLIC SdrObjGroup : public SdrObject { diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index 8167685d3d01..da1aa4ec0f6c 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -24,9 +24,9 @@ #include <svx/svxdllapi.h> #include <editeng/measfld.hxx> -//************************************************************ + // Initial Declarations -//************************************************************ + class SdrOutliner; struct ImpMeasureRec; @@ -36,9 +36,9 @@ namespace sdr { namespace properties { class MeasureProperties; }} -//************************************************************ + // Auxiliary Class SdrMeasureObjGeoData -//************************************************************ + class SdrMeasureObjGeoData : public SdrTextObjGeoData { @@ -51,9 +51,9 @@ public: virtual ~SdrMeasureObjGeoData(); }; -//************************************************************ + // SdrMeasureObj -//************************************************************ + class SVX_DLLPUBLIC SdrMeasureObj : public SdrTextObj { @@ -152,8 +152,6 @@ public: virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); }; -///////////////////////////////////////////////////////////////////////////////////////////////// -// // Creating: // ~~~~~~~~~ // dragging reference point 1 to reference point 2 -> reference edge @@ -202,8 +200,6 @@ public: // Connecting to a maximum of two objects // -> during Copy, etc. use the respective code of the connectors?!? // this probably will be pretty complicated ... -// -///////////////////////////////////////////////////////////////////////////////////////////////// #endif // INCLUDED_SVX_SVDOMEAS_HXX diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index 018adfe5e2b6..2e1d55103c10 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -28,9 +28,9 @@ class Graphic; namespace sdr { namespace contact { class ViewContactOfSdrMediaObj; } } -// --------------- + // - SdrMediaObj - -// --------------- + class SVX_DLLPUBLIC SdrMediaObj : public SdrRectObj { diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index e909990aff33..5efa9e84e242 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -31,9 +31,9 @@ #include <sot/storage.hxx> #include <svx/svxdllapi.h> -//************************************************************ + // SdrOle2Obj -//************************************************************ + class SvxUnoShapeModifyListener; class SdrOle2ObjImpl; diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx index 8b2eeaae26b6..59f959c28cf2 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -63,7 +63,7 @@ public: virtual OUString TakeObjNamePlural() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDOPAGE_HXX diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx index d23621d01bcc..021394e72789 100644 --- a/include/svx/svdorect.hxx +++ b/include/svx/svdorect.hxx @@ -23,9 +23,9 @@ #include <svx/svdotext.hxx> #include <svx/svxdllapi.h> -//************************************************************ + // Vorausdeklarationen -//************************************************************ + class XPolygon; @@ -33,12 +33,12 @@ namespace sdr { namespace properties { class RectangleProperties; }} -//************************************************************ + // SdrRectObj -// + // Rechteck-Objekte (Rechteck,Kreis,...) -// -//************************************************************ + + class SVX_DLLPUBLIC SdrRectObj : public SdrTextObj { diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 42411d8eaf90..b679d4a6e150 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -27,7 +27,7 @@ #include <svx/svdotext.hxx> #include <svx/svxdllapi.h> -//------------------------------------------------------------------------ + class SvStream; class SfxStyleSheet; @@ -46,9 +46,9 @@ struct ImplTableShadowPaintInfo; typedef rtl::Reference< Cell > CellRef; #endif -//------------------------------------------------------------------------ + // SdrTableHitKind -//------------------------------------------------------------------------ + enum TableHitKind { @@ -59,7 +59,7 @@ enum TableHitKind SDRTABLEHIT_VERTICAL_BORDER }; -//------------------------------------------------------------------------ + struct CellPos { @@ -73,9 +73,9 @@ struct CellPos bool operator!=( const CellPos& r ) const { return (r.mnCol != mnCol) || (r.mnRow != mnRow); } }; -//------------------------------------------------------------------------ + // TableStyleSettings -//------------------------------------------------------------------------ + struct SVX_DLLPUBLIC TableStyleSettings { @@ -93,9 +93,9 @@ struct SVX_DLLPUBLIC TableStyleSettings bool operator==( const TableStyleSettings& r ) const; }; -//------------------------------------------------------------------------ + // SdrTableObj -//------------------------------------------------------------------------ + class SdrTableObjImpl; @@ -268,14 +268,14 @@ public: virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ); - //////////////////////////////////////////////////////////////////////////////////////////////////// - // + + // transformation interface for StarOfficeAPI. This implements support for // homogen 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear // transforms like Scale, ShearX, ShearY, Rotate and Translate are supported. - // - //////////////////////////////////////////////////////////////////////////////////////////////////// + + // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; @@ -319,7 +319,7 @@ private: SdrTableObjImpl* mpImpl; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + } } diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 2ce1358186fb..2329d16e339b 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -33,9 +33,9 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <svx/svdpagv.hxx> -//************************************************************ + // Vorausdeklarationen -//************************************************************ + class OutlinerParaObject; class SdrOutliner; @@ -70,15 +70,15 @@ namespace sdr { namespace table { class SdrTableRTFParser; }} -//************************************************************ + // Defines -//************************************************************ + #define SDRUSERDATA_OBJTEXTLINK (1) -//************************************************************ + // Hilfsklasse SdrTextObjGeoData -//************************************************************ + class SdrTextObjGeoData : public SdrObjGeoData { @@ -87,9 +87,9 @@ public: GeoStat aGeo; }; -//************************************************************ + // Hilfsklasse ImpSdrObjTextLinkUserData -//************************************************************ + class ImpSdrObjTextLinkUserData : public SdrObjUserData { @@ -120,9 +120,9 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -//************************************************************ + // SdrTextObj -//************************************************************ + class SVX_DLLPUBLIC SdrTextObj : public SdrAttrObj, public svx::ITextProvider { @@ -518,14 +518,14 @@ public: /** called from the SdrObjEditView during text edit when the status of the edit outliner changes */ virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ); - //////////////////////////////////////////////////////////////////////////////////////////////////// - // + + // transformation interface for StarOfficeAPI. This implements support for // homogen 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear // transforms like Scale, ShearX, ShearY, Rotate and Translate are supported. - // - //////////////////////////////////////////////////////////////////////////////////////////////////// + + // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; @@ -555,7 +555,7 @@ public: void SetObjectItemNoBroadcast(const SfxPoolItem& rItem); public: - ////////////////////////////////////////////////////////////////////////////// + // text primitive decomposition helpers void impDecomposeContourTextPrimitive( drawinglayer::primitive2d::Primitive2DSequence& rTarget, @@ -578,7 +578,7 @@ public: const drawinglayer::primitive2d::SdrStretchTextPrimitive2D& rSdrStretchTextPrimitive, const drawinglayer::geometry::ViewInformation2D& aViewInformation) const; - ////////////////////////////////////////////////////////////////////////////// + // timing generators void impGetBlinkTextTiming(drawinglayer::animation::AnimationEntryList& rAnimList) const; void impGetScrollTextTiming(drawinglayer::animation::AnimationEntryList& rAnimList, double fFrameLength, double fTextLength) const; @@ -590,7 +590,7 @@ public: static bool HasTextImpl( SdrOutliner* pOutliner ); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDOTEXT_HXX diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index b8cbf8560476..32180a86c1ae 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -27,9 +27,9 @@ #include <svx/svxdllapi.h> #include <svx/svdorect.hxx> -//************************************************************ + // Vorausdeklarationen -//************************************************************ + class SdrView; class SdrPageWindow; @@ -39,9 +39,9 @@ namespace sdr { namespace contact { class ViewContactOfUnoControl; }} -//************************************************************ + // SdrUnoObj -//************************************************************ + struct SdrUnoObjDataHolder; class SVX_DLLPUBLIC SdrUnoObj : public SdrRectObj diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index b97b36412927..79347b99c484 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -23,15 +23,15 @@ #include <svx/svdobj.hxx> #include <svx/svxdllapi.h> -//////////////////////////////////////////////////////////////////////////////////////////////////// -// + + // SdrVirtObj -// + // Achtung! Das virtuelle Objekt ist noch nicht bis in alle Feinheiten // durchprogrammiert und getestet. Z.Zt. kommt es nur in abgeleiteter // beim Writer zum Einsatz. -// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + class SVX_DLLPUBLIC SdrVirtObj : public SdrObject { @@ -150,7 +150,7 @@ public: virtual const Point GetOffset() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDOVIRT_HXX diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index c6cfea4defbc..bfab233f158f 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -38,7 +38,7 @@ #include <svx/svdobj.hxx> #include <boost/scoped_ptr.hpp> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace reportdesign { class OSection; } @@ -72,7 +72,7 @@ public: SdrInsertReasonKind GetReason() const { return eReason; } }; -////////////////////////////////////////////////////////////////////////////// + // class SdrObjList class SVX_DLLPUBLIC SdrObjList @@ -313,7 +313,7 @@ Objektes abgefragt sowie direkt gesetzt werden. // Used for all methods which return a page number #define SDRPAGE_NOTFOUND 0xFFFF -////////////////////////////////////////////////////////////////////////////// + // class SdrPageGridFrame // Fuer das Fangraster/Punkgitter im Writer @@ -366,7 +366,7 @@ public: const SdrPageGridFrame& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); } }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // class SdrPageProperties class SVX_DLLPUBLIC SdrPageProperties : public SfxListener, public svl::StyleSheetUser @@ -405,12 +405,12 @@ public: SfxStyleSheet* GetStyleSheet() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // class SdrPage class SVX_DLLPUBLIC SdrPage : public SdrObjList, public tools::WeakBase< SdrPage > { - /////////////////////////////////////////////////////////////////////////////// + // start PageUser section private: // #111111# PageUser section @@ -420,10 +420,10 @@ public: void AddPageUser(sdr::PageUser& rNewUser); void RemovePageUser(sdr::PageUser& rOldUser); - /////////////////////////////////////////////////////////////////////////////// + // end PageUser section - /////////////////////////////////////////////////////////////////////////////// + // #110094# DrawContact section private: sdr::contact::ViewContact* mpViewContact; @@ -582,7 +582,7 @@ public: typedef tools::WeakReference< SdrPage > SdrPageWeakRef; -////////////////////////////////////////////////////////////////////////////// + // use new redirector instead of pPaintProc class SVX_DLLPUBLIC StandardCheckVisisbilityRedirector : public ::sdr::contact::ViewObjectContactRedirector @@ -598,7 +598,7 @@ public: const sdr::contact::DisplayInfo& rDisplayInfo); }; -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDPAGE_HXX diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 8e63d3b060ee..ae516010d1c9 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -33,7 +33,7 @@ #include <vector> #include <basegfx/polygon/b2dpolypolygon.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + class Region; class SdrObjList; @@ -60,7 +60,7 @@ namespace sdr class SdrPageWindow; typedef ::std::vector< SdrPageWindow* > SdrPageWindowVector; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrPageView { @@ -262,7 +262,7 @@ public: Color GetApplicationDocumentColor() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDPAGV_HXX diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 89ce07a243d7..c7c61bad46ae 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -35,9 +35,9 @@ #include <svtools/optionsdrawinglayer.hxx> #include <unotools/options.hxx> -//************************************************************ + // Pre-Defines -//************************************************************ + class SdrPageWindow; @@ -61,9 +61,9 @@ namespace sdr { namespace contact { class ViewObjectContactRedirector; }} -//************************************************************ + // Defines for AnimationMode -//************************************************************ + enum SdrAnimationMode { @@ -72,9 +72,9 @@ enum SdrAnimationMode SDR_ANIMATION_DISABLE }; -//************************************************************ + // Typedef's und defines -//************************************************************ + typedef unsigned char TRISTATE; #define FUZZY (2) @@ -83,7 +83,7 @@ typedef unsigned char TRISTATE; #define SDRVIEWWIN_NOTFOUND (0xFFFF) -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SdrPaintView; namespace sdr @@ -94,7 +94,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SvxViewHint : public SfxHint @@ -113,7 +113,7 @@ private: class SdrPaintWindow; typedef ::std::vector< SdrPaintWindow* > SdrPaintWindowVector; -////////////////////////////////////////////////////////////////////////////// + // helper to convert any GDIMetaFile to a good quality BitmapEx, // using default parameters and graphic::XPrimitive2DRenderer @@ -122,7 +122,7 @@ BitmapEx SVX_DLLPUBLIC convertMetafileToBitmapEx( const basegfx::B2DRange& rTargetRange, const sal_uInt32 nMaximumQuadraticPixels = 500000); -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, public SfxBroadcaster, public ::utl::ConfigurationListener { @@ -365,12 +365,12 @@ public: // PrePaint call forwarded from app windows void PrePaint(); - //////////////////////////////////////////////////////////////////////////////////////////////////// + // used internally for Draw/Impress/sch/chart2 virtual void CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0); // #i72889# used from CompleteRedraw() implementation internally, added to be able to do a complete redraw in single steps - // + // BeginCompleteRedraw returns (or even creates) a SdrPaintWindow which shall then be used as // target for paints. Since paints may be buffered, use it's GetTargetOutputDevice() method which will // return the buffer in case of bufered. @@ -381,7 +381,7 @@ public: virtual void DoCompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0); virtual void EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer); - //////////////////////////////////////////////////////////////////////////////////////////////////// + // used for the other applications basctl/sc/sw which call DrawLayer at PageViews // #i74769# Interface change to use common BeginCompleteRedraw/EndCompleteRedraw // #i76114# bDisableIntersect disables intersecting rReg with the Window's paint region @@ -391,7 +391,7 @@ public: void EndDrawLayers(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer); protected: - //////////////////////////////////////////////////////////////////////////////////////////////////// + // used to paint the form layer after the PreRender device is flushed (painted) to the window. void ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const; diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index ad026128e385..d2fd7799e2dd 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -27,7 +27,7 @@ class XLineAttrSetItem; class XFillAttrSetItem; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrItemPool : public XOutdevItemPool { diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index 6c290cf96137..879a72423b03 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -262,8 +262,6 @@ public: long GetEliminatePolyPointLimitAngle() const { return nEliminatePolyPointLimitAngle; } }; -//////////////////////////////////////////////////////////////////////////////////////////////////// -// // Begriffsdefinition: // - Etwas fangen=Gefangen werden kann z.B. der Mauszeiger oder die z.Zt. im // Drag befindlichen markierten Objekte. @@ -306,8 +304,6 @@ public: // // Beim Resize, ... wird immer nur der logisch-umschliessende Rahmen der // markierten Objekte gefangen. -// -//////////////////////////////////////////////////////////////////////////////////////////////////// #endif // INCLUDED_SVX_SVDSNPV_HXX diff --git a/include/svx/svdsob.hxx b/include/svx/svdsob.hxx index 150d29a3dd73..e049b5b96294 100644 --- a/include/svx/svdsob.hxx +++ b/include/svx/svdsob.hxx @@ -25,7 +25,7 @@ #include <svx/svxdllapi.h> -//////////////////////////////////////////////////////////////////////////////////////////////////// + /* Deklaration eines statischen Mengentyps. Die Menge kann die Elemente 0..255 aufnehmen und verbraucht stets 32 Bytes. diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx index 8a36426f5561..f228a69fdec3 100644 --- a/include/svx/svdtext.hxx +++ b/include/svx/svdtext.hxx @@ -24,7 +24,7 @@ #include <svx/svxdllapi.h> #include <tools/weakbase.hxx> -// -------------------------------------------------------------------- + class OutlinerParaObject; class SdrOutliner; diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index c275e81399f4..3cd736c63233 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -28,7 +28,7 @@ #include <vcl/field.hxx> #include <vcl/mapmod.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Winkelangaben der DrawingEngine sind 1/100 Degree // #i19054# nowhere used, removed // const int nWinkDiv=100; @@ -295,7 +295,7 @@ public: static OUString GetUnitStr(FieldUnit eUnit) { OUString aStr; TakeUnitStr(eUnit,aStr); return aStr; } }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDTRANS_HXX diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index b02f1204152d..c51e77ed3e33 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -394,7 +394,7 @@ public: virtual OUString GetComment() const; }; -////////////////////////////////////////////////////////////////////////////// + // #i11702# class SVX_DLLPUBLIC SdrUndoObjectLayerChange : public SdrUndoObj @@ -725,7 +725,7 @@ public: virtual OUString GetComment() const; }; -/////////////////////////////////////////////////////////////////////// + /** * The SdrUndoFactory can be set and retrieved from the SdrModel. diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index 3fe604ddf27a..3da285411b55 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -31,8 +31,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// -// // Klassenhierarchie der View: // SfxListener // SdrPaintView PntV Action ModChg Attr Notify @@ -50,8 +48,6 @@ // // SdrCreateView CrtV Action // SdrView View -// -//////////////////////////////////////////////////////////////////////////////////////////////////// class SvxURLField; @@ -258,8 +254,6 @@ public: #endif // INCLUDED_SVX_SVDVIEW_HXX -//////////////////////////////////////////////////////////////////////////////////////////////////// -// // Die App macht sich zunaechst ein SdrModel. // Anschliessend oeffnet sie ein Win und erzeugt dann eine SdrView. // An der SdrView meldet sie dann mit der Methode ShowSdrPage() eine Seite an. @@ -299,7 +293,5 @@ public: // ~~~~~~~~~~ // Pointer GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nTol=0) const; // OUString GetStatusText(); -// -///////////////////////////////////////////////////////////////////////////////////////////////// */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx index f5c7a85711b1..22aa67014ddc 100644 --- a/include/svx/svx3ditems.hxx +++ b/include/svx/svx3ditems.hxx @@ -325,7 +325,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; -////////////////////////////////////////////////////////////////////////////// + // #107245# Item to replace bExtrudeSmoothed and bLatheSmoothed class Svx3DSmoothNormalsItem : public SfxBoolItem { public: diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index a845b693a1c1..a67f349e1839 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -80,7 +80,7 @@ class AbstractSvxZoomDialog : public VclAbstractDialog virtual const SfxItemSet* GetOutputItemSet() const = 0 ; }; -class AbstractSpellDialog : public VclAbstractDialog // +class AbstractSpellDialog : public VclAbstractDialog { public: virtual void SetLanguage( sal_uInt16 nLang ) = 0; diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 1e3f829dc5b4..ae66d26b5e79 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -32,9 +32,9 @@ #undef SID_INSERT_FRAME #endif -// -------------------------------------------------------------------------- + // Member-Id's -// -------------------------------------------------------------------------- + #define MID_APPFLAG 0x20 #define MID_AUTOBREAK 0x21 @@ -88,23 +88,23 @@ #define MID_ZOOMSLIDER_MINZOOM 0x7b #define MID_ZOOMSLIDER_MAXZOOM 0x7c -// -------------------------------------------------------------------------- + // Event-Id's Block 1 -// -------------------------------------------------------------------------- + #define SVX_EVENT_COLUM_WINDOW_EXECUTE (EVENT_SVX_START) -// -------------------------------------------------------------------------- + // Event-Id's Block 2 -// -------------------------------------------------------------------------- + #define SVX_EVENT_IMAGE_LOAD (SID_LIB_START) #define SVX_EVENT_IMAGE_ABORT (SID_LIB_START + 1) #define SVX_EVENT_IMAGE_ERROR (SID_LIB_START + 2) -// -------------------------------------------------------------------------- + // Function-Id's -// -------------------------------------------------------------------------- + // Function-Id's #define FID_SVX_START (SID_LIB_START + 500) @@ -118,9 +118,9 @@ #define FID_SEARCH_SEARCHSET (FID_SVX_START + 4) #define FID_SEARCH_REPLACESET (FID_SVX_START + 5) -// -------------------------------------------------------------------------- + // SFX-Id's -// -------------------------------------------------------------------------- + #define SID_POLY_MERGE (SID_SFX_START + 679) #define SID_POLY_SUBSTRACT (SID_SFX_START + 680) @@ -128,9 +128,9 @@ #define SID_POLY_FORMEN (SID_SFX_START + 682) #define SID_DISTRIBUTE_DLG (SID_SFX_START + 683) -// -------------------------------------------------------------------------- + // Basic IDE-Id's -// -------------------------------------------------------------------------- + #define SID_BASICIDE_TOGGLEBRKPNT ( SID_BASICIDE_START + 0 ) #define SID_BASICIDE_ADDWATCH ( SID_BASICIDE_START + 1 ) @@ -174,17 +174,17 @@ #define SID_BASICIDE_IMAGESTART ( SID_BASICIDE_START + 50 ) #define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862) -// -------------------------------------------------------------------------- + // StarBase-Id's -// -------------------------------------------------------------------------- + #define SID_SBA_BRW_UPDATE (SID_SBA_START+100) // Daten in Felder #define SID_SBA_BRW_INSERT (SID_SBA_START+101) // Daten in Text #define SID_SBA_BRW_MERGE (SID_SBA_START+102) // Serienbrief -// -------------------------------------------------------------------------- + // SD-Id's -// -------------------------------------------------------------------------- + #define SID_RULER (SID_SD_START+40) #define SID_BEZIER_CONVERT (SID_SD_START+65) @@ -232,9 +232,9 @@ #define ID_VAL_USELASTCOLUMNSTYLE (SID_SD_START+327) #define ID_VAL_USEBANDINGCOLUMNSTYLE (SID_SD_START+328) -// -------------------------------------------------------------------------- + // Writer-Id's -// -------------------------------------------------------------------------- + #define FN_EDIT (SID_SW_START + 100) #define FN_NUM_BULLET_OFF (FN_EDIT + 37) /* Numerierung aus */ #define FN_NUM_BULLET_ON (FN_EDIT + 38) /* Numerierung mit Bullets an */ @@ -267,12 +267,12 @@ #define FN_PGPREVIEW (SID_SW_START + 1250) #define FN_SHOW_MULTIPLE_PAGES (FN_PGPREVIEW + 2) -// -------------------------------------------------------------------------- + // Svx-Id's // When adding new entries here, note that other SID_SVX_START entries exist in // include/editeng/editids.hrc and include/sfx2/sfxsids.hrc so don't use the // same id for two different attributes -// -------------------------------------------------------------------------- + #define SID_ATTR_BORDER_INNER ( SID_SVX_START + 23 ) @@ -963,9 +963,9 @@ // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id #define SID_SVX_FIRSTFREE (SID_ATTR_BORDER_STYLES + 1) -// -------------------------------------------------------------------------- + // Overflow check for slot IDs -// -------------------------------------------------------------------------- + #if SID_SVX_FIRSTFREE > SID_SVX_END #error Resource-Ueberlauf in #line, #file diff --git a/include/svx/sxallitm.hxx b/include/svx/sxallitm.hxx index 730576529e04..95ebc0ff8d43 100644 --- a/include/svx/sxallitm.hxx +++ b/include/svx/sxallitm.hxx @@ -22,36 +22,36 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -//------------------------------ + // class SdrAllPositionXItem -//------------------------------ + class SdrAllPositionXItem: public SdrMetricItem { public: SdrAllPositionXItem(long nPosX=0): SdrMetricItem(SDRATTR_ALLPOSITIONX,nPosX) {} SdrAllPositionXItem(SvStream& rIn): SdrMetricItem(SDRATTR_ALLPOSITIONX,rIn) {} }; -//------------------------------ + // class SdrAllPositionYItem -//------------------------------ + class SdrAllPositionYItem: public SdrMetricItem { public: SdrAllPositionYItem(long nPosY=0): SdrMetricItem(SDRATTR_ALLPOSITIONY,nPosY) {} SdrAllPositionYItem(SvStream& rIn): SdrMetricItem(SDRATTR_ALLPOSITIONY,rIn) {} }; -//------------------------------ + // class SdrAllSizeWidthItem -//------------------------------ + class SdrAllSizeWidthItem: public SdrMetricItem { public: SdrAllSizeWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_ALLSIZEWIDTH,nWdt) {} SdrAllSizeWidthItem(SvStream& rIn): SdrMetricItem(SDRATTR_ALLSIZEWIDTH,rIn) {} }; -//------------------------------ + // class SdrAllSizeWidthItem -//------------------------------ + class SdrAllSizeHeightItem: public SdrMetricItem { public: SdrAllSizeHeightItem(long nHgt=0): SdrMetricItem(SDRATTR_ALLSIZEHEIGHT,nHgt) {} diff --git a/include/svx/sxcaitm.hxx b/include/svx/sxcaitm.hxx index c1eacf718f5a..9dac27b82f0b 100644 --- a/include/svx/sxcaitm.hxx +++ b/include/svx/sxcaitm.hxx @@ -24,23 +24,23 @@ #include <svx/sdangitm.hxx> #include <svx/sdooitm.hxx> -//------------------------------------ + // class SdrCaptionFixedAngleItem // sal_True=Winkel durch SdrCaptionAngleItem vorgegeben // sal_False=Freier Winkel -//------------------------------------ + class SdrCaptionFixedAngleItem: public SdrOnOffItem { public: SdrCaptionFixedAngleItem(sal_Bool bFix=sal_True): SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,bFix) {} SdrCaptionFixedAngleItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,rIn) {} }; -//------------------------------ + // class SdrCaptionAngleItem // Winkelangabe in 1/100 Degree // Nur bei Type2, Type3 und Type4 // und nur wenn SdrCaptionIsFixedAngleItem=TRUE -//------------------------------ + class SdrCaptionAngleItem: public SdrAngleItem { public: SdrCaptionAngleItem(long nAngle=0): SdrAngleItem(SDRATTR_CAPTIONANGLE,nAngle) {} diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index 3812017feae8..af4e816db746 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -27,9 +27,9 @@ enum SdrCaptionEscDir {SDRCAPT_ESCHORIZONTAL,SDRCAPT_ESCVERTICAL,SDRCAPT_ESCBESTFIT}; -//------------------------------ + // class SdrCaptionEscDirItem -//------------------------------ + class SVX_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem { public: TYPEINFO(); @@ -45,37 +45,37 @@ public: virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; -//------------------------------------ + // class SdrCaptionEscIsRelItem // sal_True=Linienaustrittsposition relativ // sal_False=Linienaustrittsposition absolut -//------------------------------------ + class SdrCaptionEscIsRelItem: public SdrYesNoItem { public: SdrCaptionEscIsRelItem(sal_Bool bRel=sal_True): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {} SdrCaptionEscIsRelItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONESCISREL,rIn) {} }; -//------------------------------------ + // class SdrCaptionEscRelItem // Relativer Linienaustritt // 0 = 0.00% = oben bzw. links, // 10000 = 100.00% = rechts bzw. unten // nur wenn SdrCaptionEscIsRelItem=TRUE -//------------------------------------ + class SdrCaptionEscRelItem: public SfxInt32Item { public: SdrCaptionEscRelItem(long nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL,nEscRel) {} SdrCaptionEscRelItem(SvStream& rIn) : SfxInt32Item(SDRATTR_CAPTIONESCREL,rIn) {} }; -//------------------------------------ + // class SdrCaptionEscAbsItem // Absoluter Linienaustritt // 0 = oben bzw. links, // >0 = in Richtung rechts bzw. unten // nur wenn SdrCaptionEscIsRelItem=FALSE -//------------------------------------ + class SdrCaptionEscAbsItem: public SdrMetricItem { public: SdrCaptionEscAbsItem(long nEscAbs=0): SdrMetricItem(SDRATTR_CAPTIONESCABS,nEscAbs) {} diff --git a/include/svx/sxciaitm.hxx b/include/svx/sxciaitm.hxx index cb611d0ef35b..1ce901e7eb3b 100644 --- a/include/svx/sxciaitm.hxx +++ b/include/svx/sxciaitm.hxx @@ -22,18 +22,18 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -//------------------------------ + // class SdrCircStartAngleItem -//------------------------------ + class SdrCircStartAngleItem: public SdrAngleItem { public: SdrCircStartAngleItem(long nAngle=0): SdrAngleItem(SDRATTR_CIRCSTARTANGLE,nAngle) {} SdrCircStartAngleItem(SvStream& rIn): SdrAngleItem(SDRATTR_CIRCSTARTANGLE,rIn) {} }; -//------------------------------ + // class SdrCircEndAngleItem -//------------------------------ + class SdrCircEndAngleItem: public SdrAngleItem { public: SdrCircEndAngleItem(long nAngle=36000): SdrAngleItem(SDRATTR_CIRCENDANGLE,nAngle) {} diff --git a/include/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx index 9b674a4ef01a..a8233cee25e8 100644 --- a/include/svx/sxcllitm.hxx +++ b/include/svx/sxcllitm.hxx @@ -23,24 +23,24 @@ #include <svx/sdynitm.hxx> #include <svx/sdmetitm.hxx> -//------------------------------------ + // class SdrCaptionLineLenItem // Laenge der ersten Austrittslinie // Nur bei Type3 und Type4 // Nur relevant, wenn SdrCaptionFitLineLenItem=FALSE -//------------------------------------ + class SdrCaptionLineLenItem: public SdrMetricItem { public: SdrCaptionLineLenItem(long nLineLen=0): SdrMetricItem(SDRATTR_CAPTIONLINELEN,nLineLen) {} SdrCaptionLineLenItem(SvStream& rIn) : SdrMetricItem(SDRATTR_CAPTIONLINELEN,rIn) {} }; -//------------------------------------ + // class SdrCaptionFitLineLenItem // Laenge der ersten Austrittslinie automatisch berechnen oder // Vorgabe (SdrCaptionLineLenItem) verwenden. // Nur bei Type3 und Type4 -//------------------------------------ + class SdrCaptionFitLineLenItem: public SdrYesNoItem { public: SdrCaptionFitLineLenItem(sal_Bool bBestFit=sal_True): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {} diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index c081c466d7fa..c7ead86ea3db 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -25,9 +25,9 @@ enum SdrCaptionType {SDRCAPT_TYPE1,SDRCAPT_TYPE2,SDRCAPT_TYPE3,SDRCAPT_TYPE4}; -//------------------------------ + // class SdrCaptionTypeItem -//------------------------------ + class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem { public: TYPEINFO(); diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index 1b8a2b6af651..30ce02a68666 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -29,9 +29,9 @@ enum SdrEdgeKind {SDREDGE_ORTHOLINES, SDREDGE_BEZIER, SDREDGE_ARC}; -//------------------------------ + // class SdrEdgeKindItem -//------------------------------ + class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem { public: TYPEINFO(); diff --git a/include/svx/sxlayitm.hxx b/include/svx/sxlayitm.hxx index 40a88891b495..cff0f7914fe7 100644 --- a/include/svx/sxlayitm.hxx +++ b/include/svx/sxlayitm.hxx @@ -24,9 +24,9 @@ #include <svl/intitem.hxx> #include <svx/svdtypes.hxx> -//------------------------------ + // class SdrLayerIdItem -//------------------------------ + class SdrLayerIdItem: public SfxUInt16Item { public: SdrLayerIdItem(sal_uInt16 nId=0): SfxUInt16Item(SDRATTR_LAYERID,nId) {} @@ -34,9 +34,9 @@ public: SdrLayerID GetValue() const { return (SdrLayerID)SfxUInt16Item::GetValue(); } }; -//------------------------------ + // class SdrLayerNameItem -//------------------------------ + class SdrLayerNameItem: public SfxStringItem { public: diff --git a/include/svx/sxlogitm.hxx b/include/svx/sxlogitm.hxx index aeb65a257d00..dbf87753cf13 100644 --- a/include/svx/sxlogitm.hxx +++ b/include/svx/sxlogitm.hxx @@ -22,18 +22,18 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -//------------------------------ + // class SdrLogicSizeWidthItem -//------------------------------ + class SdrLogicSizeWidthItem: public SdrMetricItem { public: SdrLogicSizeWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_LOGICSIZEWIDTH,nWdt) {} SdrLogicSizeWidthItem(SvStream& rIn): SdrMetricItem(SDRATTR_LOGICSIZEWIDTH,rIn) {} }; -//------------------------------ + // class SdrLogicSizeWidthItem -//------------------------------ + class SdrLogicSizeHeightItem: public SdrMetricItem { public: SdrLogicSizeHeightItem(long nHgt=0): SdrMetricItem(SDRATTR_LOGICSIZEHEIGHT,nHgt) {} diff --git a/include/svx/sxmkitm.hxx b/include/svx/sxmkitm.hxx index 607ba62cb834..afc0f24abcd2 100644 --- a/include/svx/sxmkitm.hxx +++ b/include/svx/sxmkitm.hxx @@ -24,9 +24,9 @@ enum SdrMeasureKind {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i. -//------------------------------ + // class SdrMeasureKindItem (n.i.) -//------------------------------ + class SdrMeasureKindItem: public SfxEnumItem { public: TYPEINFO(); diff --git a/include/svx/sxmovitm.hxx b/include/svx/sxmovitm.hxx index 7c377fc2fb44..551e51252aa4 100644 --- a/include/svx/sxmovitm.hxx +++ b/include/svx/sxmovitm.hxx @@ -22,18 +22,18 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -//------------------------------ + // class SdrMoveXItem -//------------------------------ + class SdrMoveXItem: public SdrMetricItem { public: SdrMoveXItem(long n=0): SdrMetricItem(SDRATTR_MOVEX,n) {} SdrMoveXItem(SvStream& rIn): SdrMetricItem(SDRATTR_MOVEX,rIn) {} }; -//------------------------------ + // class SdrMoveYItem -//------------------------------ + class SdrMoveYItem: public SdrMetricItem { public: SdrMoveYItem(long n=0): SdrMetricItem(SDRATTR_MOVEY,n) {} diff --git a/include/svx/sxmspitm.hxx b/include/svx/sxmspitm.hxx index 03d09bd402c0..6cfd5b2ca752 100644 --- a/include/svx/sxmspitm.hxx +++ b/include/svx/sxmspitm.hxx @@ -22,18 +22,18 @@ #include <svx/svddef.hxx> #include <svx/sdynitm.hxx> -//------------------------------ + // class SdrMoveProtectItem -//------------------------------ + class SdrObjMoveProtectItem: public SdrYesNoItem { public: SdrObjMoveProtectItem(bool bOn=false): SdrYesNoItem(SDRATTR_OBJMOVEPROTECT,bOn) {} SdrObjMoveProtectItem(SvStream& rIn): SdrYesNoItem(SDRATTR_OBJMOVEPROTECT,rIn) {} }; -//------------------------------ + // class SdrSizeProtectItem -//------------------------------ + class SdrObjSizeProtectItem: public SdrYesNoItem { public: SdrObjSizeProtectItem(bool bOn=false): SdrYesNoItem(SDRATTR_OBJSIZEPROTECT,bOn) {} diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index 2a98ad941a74..824278ae70eb 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -26,9 +26,9 @@ enum SdrMeasureTextHPos {SDRMEASURE_TEXTHAUTO,SDRMEASURE_TEXTLEFTOUTSIDE,SDRMEASURE_TEXTINSIDE,SDRMEASURE_TEXTRIGHTOUTSIDE}; enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_BREAKEDLINE,SDRMEASURE_BELOW,SDRMEASURETEXT_VERTICALCENTERED}; -//------------------------------ + // class SdrMeasureTextHPosItem -//------------------------------ + class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem { public: TYPEINFO(); @@ -46,9 +46,9 @@ public: virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; -//------------------------------ + // class SdrMeasureTextVPosItem -//------------------------------ + class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem { public: TYPEINFO(); diff --git a/include/svx/sxoneitm.hxx b/include/svx/sxoneitm.hxx index 08d183bc39ac..5249345ca7cb 100644 --- a/include/svx/sxoneitm.hxx +++ b/include/svx/sxoneitm.hxx @@ -22,36 +22,36 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -//------------------------------ + // class SdrOnePositionXItem -//------------------------------ + class SdrOnePositionXItem: public SdrMetricItem { public: SdrOnePositionXItem(long nPosX=0): SdrMetricItem(SDRATTR_ONEPOSITIONX,nPosX) {} SdrOnePositionXItem(SvStream& rIn): SdrMetricItem(SDRATTR_ONEPOSITIONX,rIn) {} }; -//------------------------------ + // class SdrOnePositionYItem -//------------------------------ + class SdrOnePositionYItem: public SdrMetricItem { public: SdrOnePositionYItem(long nPosY=0): SdrMetricItem(SDRATTR_ONEPOSITIONY,nPosY) {} SdrOnePositionYItem(SvStream& rIn): SdrMetricItem(SDRATTR_ONEPOSITIONY,rIn) {} }; -//------------------------------ + // class SdrOneSizeWidthItem -//------------------------------ + class SdrOneSizeWidthItem: public SdrMetricItem { public: SdrOneSizeWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_ONESIZEWIDTH,nWdt) {} SdrOneSizeWidthItem(SvStream& rIn): SdrMetricItem(SDRATTR_ONESIZEWIDTH,rIn) {} }; -//------------------------------ + // class SdrOneSizeWidthItem -//------------------------------ + class SdrOneSizeHeightItem: public SdrMetricItem { public: SdrOneSizeHeightItem(long nHgt=0): SdrMetricItem(SDRATTR_ONESIZEHEIGHT,nHgt) {} diff --git a/include/svx/sxopitm.hxx b/include/svx/sxopitm.hxx index b12ab64670a6..72bd6ec99be4 100644 --- a/include/svx/sxopitm.hxx +++ b/include/svx/sxopitm.hxx @@ -22,9 +22,9 @@ #include <svx/svddef.hxx> #include <svx/sdynitm.hxx> -//------------------------------ + // class SdrObjPrintableItem -//------------------------------ + class SdrObjPrintableItem: public SdrYesNoItem { public: SdrObjPrintableItem(bool bOn=false): SdrYesNoItem(SDRATTR_OBJPRINTABLE,bOn) {} diff --git a/include/svx/sxreaitm.hxx b/include/svx/sxreaitm.hxx index 686dc98ea797..9dd78ac68682 100644 --- a/include/svx/sxreaitm.hxx +++ b/include/svx/sxreaitm.hxx @@ -23,9 +23,9 @@ #include <svx/sxfiitm.hxx> -//------------------------------ + // class SdrResizeXAllItem -//------------------------------ + class SdrResizeXAllItem: public SdrFractionItem { public: SdrResizeXAllItem(): SdrFractionItem(SDRATTR_RESIZEXALL,Fraction(1,1)) {} @@ -33,9 +33,9 @@ public: SdrResizeXAllItem(SvStream& rIn): SdrFractionItem(SDRATTR_RESIZEXALL,rIn) {} }; -//------------------------------ + // class SdrResizeYAllItem -//------------------------------ + class SdrResizeYAllItem: public SdrFractionItem { public: SdrResizeYAllItem(): SdrFractionItem(SDRATTR_RESIZEYALL,Fraction(1,1)) {} diff --git a/include/svx/sxreoitm.hxx b/include/svx/sxreoitm.hxx index 3b507c7b1ff3..2d664a1b57b2 100644 --- a/include/svx/sxreoitm.hxx +++ b/include/svx/sxreoitm.hxx @@ -23,9 +23,9 @@ #include <svx/sxfiitm.hxx> -//------------------------------ + // class SdrResizeXOneItem -//------------------------------ + class SdrResizeXOneItem: public SdrFractionItem { public: SdrResizeXOneItem(): SdrFractionItem(SDRATTR_RESIZEXONE,Fraction(1,1)) {} @@ -33,9 +33,9 @@ public: SdrResizeXOneItem(SvStream& rIn): SdrFractionItem(SDRATTR_RESIZEXONE,rIn) {} }; -//------------------------------ + // class SdrResizeYOneItem -//------------------------------ + class SdrResizeYOneItem: public SdrFractionItem { public: SdrResizeYOneItem(): SdrFractionItem(SDRATTR_RESIZEYONE,Fraction(1,1)) {} diff --git a/include/svx/sxsalitm.hxx b/include/svx/sxsalitm.hxx index 9ced5fe85c98..fe5f665444c3 100644 --- a/include/svx/sxsalitm.hxx +++ b/include/svx/sxsalitm.hxx @@ -22,18 +22,18 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -//------------------------------ + // class SdrHorzShearAllItem -//------------------------------ + class SdrHorzShearAllItem: public SdrAngleItem { public: SdrHorzShearAllItem(long nAngle=0): SdrAngleItem(SDRATTR_HORZSHEARALL,nAngle) {} SdrHorzShearAllItem(SvStream& rIn): SdrAngleItem(SDRATTR_HORZSHEARALL,rIn) {} }; -//------------------------------ + // class SdrVertShearAllItem -//------------------------------ + class SdrVertShearAllItem: public SdrAngleItem { public: SdrVertShearAllItem(long nAngle=0): SdrAngleItem(SDRATTR_VERTSHEARALL,nAngle) {} diff --git a/include/svx/sxsoitm.hxx b/include/svx/sxsoitm.hxx index 17745902fa1a..1a63c9305ae6 100644 --- a/include/svx/sxsoitm.hxx +++ b/include/svx/sxsoitm.hxx @@ -22,18 +22,18 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -//------------------------------ + // class SdrHorzShearOneItem -//------------------------------ + class SdrHorzShearOneItem: public SdrAngleItem { public: SdrHorzShearOneItem(long nAngle=0): SdrAngleItem(SDRATTR_HORZSHEARONE,nAngle) {} SdrHorzShearOneItem(SvStream& rIn): SdrAngleItem(SDRATTR_HORZSHEARONE,rIn) {} }; -//------------------------------ + // class SdrVertShearOneItem -//------------------------------ + class SdrVertShearOneItem: public SdrAngleItem { public: SdrVertShearOneItem(long nAngle=0): SdrAngleItem(SDRATTR_VERTSHEARONE,nAngle) {} diff --git a/include/svx/sxtraitm.hxx b/include/svx/sxtraitm.hxx index d46faa1f6249..59bb5970ef45 100644 --- a/include/svx/sxtraitm.hxx +++ b/include/svx/sxtraitm.hxx @@ -22,36 +22,36 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -//------------------------------ + // class SdrTransformRef1XItem -//------------------------------ + class SdrTransformRef1XItem: public SdrMetricItem { public: SdrTransformRef1XItem(long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF1X,nHgt) {} SdrTransformRef1XItem(SvStream& rIn): SdrMetricItem(SDRATTR_TRANSFORMREF1X,rIn) {} }; -//------------------------------ + // class SdrTransformRef1YItem -//------------------------------ + class SdrTransformRef1YItem: public SdrMetricItem { public: SdrTransformRef1YItem(long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF1Y,nHgt) {} SdrTransformRef1YItem(SvStream& rIn): SdrMetricItem(SDRATTR_TRANSFORMREF1Y,rIn) {} }; -//------------------------------ + // class SdrTransformRef2XItem -//------------------------------ + class SdrTransformRef2XItem: public SdrMetricItem { public: SdrTransformRef2XItem(long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF2X,nHgt) {} SdrTransformRef2XItem(SvStream& rIn): SdrMetricItem(SDRATTR_TRANSFORMREF2X,rIn) {} }; -//------------------------------ + // class SdrTransformRef2YItem -//------------------------------ + class SdrTransformRef2YItem: public SdrMetricItem { public: SdrTransformRef2YItem(long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF2Y,nHgt) {} diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index a5d7ee6c8282..f4de176b9614 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -162,11 +162,11 @@ namespace svx { class ToolboxButtonColorUpdater; } -//######################################################################## -//======================================================================== + + // class SvxStyleToolBoxControl ------------------------------------------ -//======================================================================== + class SVX_DLLPUBLIC SvxStyleToolBoxControl : public SfxToolBoxControl { struct Impl; @@ -215,9 +215,9 @@ friend class SfxStyleControllerItem_Impl; SVX_DLLPRIVATE SfxStyleFamily GetActFamily (); }; -//======================================================================== + // class SvxFontNameToolBoxControl --------------------------------------- -//======================================================================== + class SVX_DLLPUBLIC SvxFontNameToolBoxControl : public SfxToolBoxControl @@ -233,9 +233,9 @@ public: -//======================================================================== + // class SvxFontColorToolBoxControl -------------------------------------- -//======================================================================== + @@ -257,9 +257,9 @@ public: -//======================================================================== + // class SvxColorExtToolBoxControl -------------------------------------- -//======================================================================== + @@ -286,9 +286,9 @@ public: -//======================================================================== + // class SvxColorToolBoxControl ------------------------------------------ -//======================================================================== + class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl @@ -308,9 +308,9 @@ public: -//======================================================================== + // class SvxFrameToolBoxControl ------------------------------------------ -//======================================================================== + class SVX_DLLPUBLIC SvxFrameToolBoxControl : public SfxToolBoxControl @@ -328,9 +328,9 @@ public: -//======================================================================== + // class SvxLineStyleToolBoxControl -------------------------------------- -//======================================================================== + class SVX_DLLPUBLIC SvxFrameLineStyleToolBoxControl : public SfxToolBoxControl @@ -347,9 +347,9 @@ public: -//======================================================================== + // class SvxFrameLineColorToolBoxControl --------------------------------- -//======================================================================== + class SVX_DLLPUBLIC SvxFrameLineColorToolBoxControl : public SfxToolBoxControl diff --git a/include/svx/tbxcolor.hxx b/include/svx/tbxcolor.hxx index eaa8413b970c..23467408d489 100644 --- a/include/svx/tbxcolor.hxx +++ b/include/svx/tbxcolor.hxx @@ -22,14 +22,14 @@ #include <com/sun/star/frame/XLayoutManager.hpp> #include <svx/svxdllapi.h> -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= ToolboxAccess - //==================================================================== + class SVX_DLLPUBLIC ToolboxAccess { private: @@ -55,9 +55,9 @@ namespace svx inline void forceDocking() { m_bDocking = true; } }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_TBXCOLOR_HXX diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx index 4c6b87815e9e..343d0fe768f5 100644 --- a/include/svx/tbxcolorupdate.hxx +++ b/include/svx/tbxcolorupdate.hxx @@ -28,14 +28,14 @@ class ToolBox; class VirtualDevice; -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= ToolboxButtonColorUpdater - //==================================================================== + /** helper class to update a color in a toolbox button image formerly known as SvxTbxButtonColorUpdater_Impl, residing in svx/source/tbxctrls/colorwindow.hxx. @@ -60,9 +60,9 @@ namespace svx bool mbWasHiContrastMode; }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_TBXCOLORUPDATE_HXX diff --git a/include/svx/txenctab.hxx b/include/svx/txenctab.hxx index 6b5e88805089..fde0c81fe0d0 100644 --- a/include/svx/txenctab.hxx +++ b/include/svx/txenctab.hxx @@ -25,9 +25,9 @@ #include <tools/resary.hxx> -//======================================================================== + // class SvxTextEncodingTable -//======================================================================== + class SVX_DLLPUBLIC SvxTextEncodingTable : public ResStringArray { diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx index 883a8aace267..cd6b5bfffd16 100644 --- a/include/svx/viewlayoutitem.hxx +++ b/include/svx/viewlayoutitem.hxx @@ -23,7 +23,7 @@ #include <svx/svxids.hrc> #include <svx/svxdllapi.h> -//------------------------------------------------------------------------- + class SVX_DLLPUBLIC SvxViewLayoutItem: public SfxUInt16Item { @@ -48,7 +48,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // leer }; -//------------------------------------------------------------------------ + #endif diff --git a/include/svx/wrapfield.hxx b/include/svx/wrapfield.hxx index 073d2080dfde..ea7966a4afd0 100644 --- a/include/svx/wrapfield.hxx +++ b/include/svx/wrapfield.hxx @@ -25,7 +25,7 @@ namespace svx { -// ============================================================================ + /** A numeric spin field that wraps around the value on limits. @descr Note: Use type "NumericField" in resources. */ @@ -41,7 +41,7 @@ protected: virtual void Down(); }; -// ============================================================================ + } // namespace svx diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index bbfcf7b08219..d2729dc772d3 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -27,13 +27,13 @@ class SdrModel; class BitmapColor; -////////////////////////////////////////////////////////////////////////////// + // helper to construct historical 8x8 bitmaps with two colors Bitmap SVX_DLLPUBLIC createHistorical8x8FromArray(const sal_uInt16* pArray, Color aColorPix, Color aColorBack); bool SVX_DLLPUBLIC isHistorical8x8(const BitmapEx& rBitmapEx, BitmapColor& o_rBack, BitmapColor& o_rFront); -////////////////////////////////////////////////////////////////////////////// + // class XFillBitmapItem class SVX_DLLPUBLIC XFillBitmapItem : public NameOrIndex diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx index 0ed9e49bdfe8..0ba0ea7a0410 100644 --- a/include/svx/xcolit.hxx +++ b/include/svx/xcolit.hxx @@ -27,9 +27,9 @@ class XColorList; -//----------------- + // class XColorItem -//----------------- + class SVX_DLLPUBLIC XColorItem : public NameOrIndex { Color aColor; diff --git a/include/svx/xdash.hxx b/include/svx/xdash.hxx index a92ce638b205..837f64a7b3f9 100644 --- a/include/svx/xdash.hxx +++ b/include/svx/xdash.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_SVX_XDASH_HXX #define INCLUDED_SVX_XDASH_HXX -//------------- + // class XDash -//------------- + #include <svx/xenum.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index 3b6cca667dc1..a4d3336f56f7 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -26,9 +26,9 @@ #include <svx/xenum.hxx> #include <svx/svxdllapi.h> -//--------------------- + // class XFillStyleItem -//--------------------- + class SVX_DLLPUBLIC XFillStyleItem : public SfxEnumItem { diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx index cccd32fbf67b..34784616108b 100644 --- a/include/svx/xflclit.hxx +++ b/include/svx/xflclit.hxx @@ -27,9 +27,9 @@ // Fuellattribute //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -//--------------------- + // class XFillColorItem -//--------------------- + class SVX_DLLPUBLIC XFillColorItem : public XColorItem { public: diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index 8db65315aa10..55c9a201a3e6 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -23,9 +23,9 @@ #include <svx/xflgrit.hxx> #include <svx/svxdllapi.h> -//----------------------------------- + // class XFillFloatTransparenceItem - -//----------------------------------- + class SVX_DLLPUBLIC XFillFloatTransparenceItem : public XFillGradientItem { diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index 592e11033549..34152b122310 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -26,9 +26,9 @@ class SdrModel; -//------------------------ + // class XFillGradientItem -//------------------------ + class SVX_DLLPUBLIC XFillGradientItem : public NameOrIndex { XGradient aGradient; diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index 6b5115daf43c..84be34942e7d 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -26,9 +26,9 @@ class SdrModel; -//--------------------- + // class XFillHatchItem -//--------------------- + class SVX_DLLPUBLIC XFillHatchItem : public NameOrIndex { XHatch aHatch; diff --git a/include/svx/xgrad.hxx b/include/svx/xgrad.hxx index 1df95ee575ef..30c1741f31eb 100644 --- a/include/svx/xgrad.hxx +++ b/include/svx/xgrad.hxx @@ -26,9 +26,9 @@ class Gradient; -//----------------- + // class XGradient -//----------------- + class SVX_DLLPUBLIC XGradient { diff --git a/include/svx/xhatch.hxx b/include/svx/xhatch.hxx index 0f5a0e1b9526..9dc725d84354 100644 --- a/include/svx/xhatch.hxx +++ b/include/svx/xhatch.hxx @@ -24,9 +24,9 @@ #include <tools/color.hxx> #include <svx/svxdllapi.h> -//-------------- + // class XHatch -//-------------- + class SVX_DLLPUBLIC XHatch { diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx index e314154f67eb..337467971ad4 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -32,9 +32,9 @@ class NameOrIndex; typedef sal_Bool (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 ); -//------------------- + // class NameOrIndex -//------------------- + class SVX_DLLPUBLIC NameOrIndex : public SfxStringItem { sal_Int32 nPalIndex; diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx index c2106a00305e..d202d7f1a10d 100644 --- a/include/svx/xlineit0.hxx +++ b/include/svx/xlineit0.hxx @@ -22,9 +22,9 @@ #include <svx/xenum.hxx> #include <svl/eitem.hxx> -//--------------------- + // class LineStyleItem -//--------------------- + #include <svx/svxdllapi.h> class SVX_DLLPUBLIC XLineStyleItem : public SfxEnumItem diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx index 462e797a6a65..5feb31837809 100644 --- a/include/svx/xlinjoit.hxx +++ b/include/svx/xlinjoit.hxx @@ -25,9 +25,9 @@ #include <svx/svxdllapi.h> #include <com/sun/star/drawing/LineJoint.hpp> -//--------------------- + // class XLineJointItem -//--------------------- + class SVX_DLLPUBLIC XLineJointItem : public SfxEnumItem { diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx index a2c14af45cab..335cd5d8307b 100644 --- a/include/svx/xlncapit.hxx +++ b/include/svx/xlncapit.hxx @@ -25,9 +25,9 @@ #include <svx/xenum.hxx> #include <com/sun/star/drawing/LineCap.hpp> -//--------------------- + // class XLineCapItem -//--------------------- + class SVX_DLLPUBLIC XLineCapItem : public SfxEnumItem { diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx index 3ca6a873cea3..d6bafc4c9b2f 100644 --- a/include/svx/xlnclit.hxx +++ b/include/svx/xlnclit.hxx @@ -23,9 +23,9 @@ #include <svx/xcolit.hxx> #include <svx/svxdllapi.h> -//--------------------- + // class XLineColorItem -//--------------------- + class SVX_DLLPUBLIC XLineColorItem : public XColorItem { public: diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index bf4c63ced38c..21809d5ad9fe 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -27,9 +27,9 @@ class SdrModel; -//-------------------- + // class XLineDashItem -//-------------------- + class SVX_DLLPUBLIC XLineDashItem : public NameOrIndex { XDash aDash; diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx index 13f622891e98..8ef4e4eaf3f5 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -23,9 +23,9 @@ #include <svl/eitem.hxx> #include <svx/svxdllapi.h> -//---------------------------- + // class XLineEndCenterItem -//---------------------------- + class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem { public: diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index e5e3ff1b22fd..5c53f801c5d9 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -26,9 +26,9 @@ class SdrModel; -//---------------------- + // class XLineEndItem -//---------------------- + class SVX_DLLPUBLIC XLineEndItem : public NameOrIndex { basegfx::B2DPolyPolygon maPolyPolygon; diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx index c5775c4d5358..fd272c14ff4d 100644 --- a/include/svx/xlnedwit.hxx +++ b/include/svx/xlnedwit.hxx @@ -25,9 +25,9 @@ #define LINE_END_WIDTH_DEFAULT (200) -//--------------------------- + // class XLineEndWidthItem -//--------------------------- + class SVX_DLLPUBLIC XLineEndWidthItem : public SfxMetricItem { diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index e289311577c2..0ac4b0917402 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -23,9 +23,9 @@ #include <svl/eitem.hxx> #include <svx/svxdllapi.h> -//------------------------------ + // class XLineStartCenterItem -//------------------------------ + class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem { public: diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index e784ff5380da..66275c61faf7 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -26,9 +26,9 @@ class SdrModel; -//------------------------ + // class XLineStartItem -//------------------------ + class SVX_DLLPUBLIC XLineStartItem : public NameOrIndex { basegfx::B2DPolyPolygon maPolyPolygon; diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx index d663411820cf..0db83c5c4559 100644 --- a/include/svx/xlnstwit.hxx +++ b/include/svx/xlnstwit.hxx @@ -25,9 +25,9 @@ #define LINE_START_WIDTH_DEFAULT (200) -//----------------------------- + // class XLineStartWidthItem -//----------------------------- + class SVX_DLLPUBLIC XLineStartWidthItem : public SfxMetricItem { public: diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx index 69495224273c..d819adaee8a0 100644 --- a/include/svx/xlnwtit.hxx +++ b/include/svx/xlnwtit.hxx @@ -23,9 +23,9 @@ #include <svl/metitem.hxx> #include <svx/svxdllapi.h> -//--------------------- + // class XLineWidthItem -//--------------------- + class SVX_DLLPUBLIC XLineWidthItem : public SfxMetricItem { public: diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index c8935d83be25..2773d8ef3260 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -30,9 +30,9 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <svx/svxdllapi.h> -// ----------------------------- + // - SvXMLEmbeddedObjectHelper - -// ----------------------------- + enum SvXMLEmbeddedObjectHelperMode { @@ -40,9 +40,9 @@ enum SvXMLEmbeddedObjectHelperMode EMBEDDEDOBJECTHELPER_MODE_WRITE = 1 }; -// ----------------------------- + // - SvXMLEmbeddedObjectHelper - -// ----------------------------- + namespace comphelper { class IEmbeddedHelper; diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx index 64de636dc1bb..441aac77d26e 100644 --- a/include/svx/xmlexchg.hxx +++ b/include/svx/xmlexchg.hxx @@ -34,15 +34,15 @@ namespace com { } } -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= OXFormsDescriptor - //==================================================================== + struct SVX_DLLPUBLIC OXFormsDescriptor { @@ -60,9 +60,9 @@ namespace svx } }; - //==================================================================== + //= OXFormsTransferable - //==================================================================== + class SVX_DLLPUBLIC OXFormsTransferable : public TransferableHelper { protected: @@ -85,9 +85,9 @@ namespace svx }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_XMLEXCHG_HXX diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx index 35b1219689a8..7cd55a33fac2 100644 --- a/include/svx/xsflclit.hxx +++ b/include/svx/xsflclit.hxx @@ -22,9 +22,9 @@ #include <svx/xcolit.hxx> -//------------------------------ + // class XSecondaryFillColorItem -//------------------------------ + class SVX_DLLPUBLIC XSecondaryFillColorItem : public XColorItem { public: diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx index 71f0db76e78b..791583da7ed2 100644 --- a/include/svx/xtable.hxx +++ b/include/svx/xtable.hxx @@ -51,9 +51,9 @@ extern sal_Unicode pszStandard[]; // "standard" // enum COL_NAME nicht verglichen werden kann. SVX_DLLPUBLIC Color RGB_Color( ColorData nColorName ); -// ------------------ + // class XColorEntry -// ------------------ + class SVX_DLLPUBLIC XColorEntry : public XPropertyEntry { @@ -70,9 +70,9 @@ public: } }; -// -------------------- + // class XLineEndEntry -// -------------------- + class SVX_DLLPUBLIC XLineEndEntry : public XPropertyEntry { @@ -89,9 +89,9 @@ public: } }; -// ------------------ + // class XDashEntry -// ------------------ + class SVX_DLLPUBLIC XDashEntry : public XPropertyEntry { @@ -108,9 +108,9 @@ public: } }; -// ------------------ + // class XHatchEntry -// ------------------ + class SVX_DLLPUBLIC XHatchEntry : public XPropertyEntry { @@ -127,9 +127,9 @@ public: } }; -// --------------------- + // class XGradientEntry -// --------------------- + class SVX_DLLPUBLIC XGradientEntry : public XPropertyEntry { @@ -146,9 +146,9 @@ public: } }; -// --------------------- + // class XBitmapEntry -// --------------------- + class SVX_DLLPUBLIC XBitmapEntry : public XPropertyEntry { @@ -165,9 +165,9 @@ public: } }; -// -------------------- + // class XPropertyList -// -------------------- + enum XPropertyListType { XCOLOR_LIST, @@ -272,9 +272,9 @@ public: inline XGradientListRef AsGradientList(); }; -// ------------------ + // class XColorList -// ------------------ + class SVX_DLLPUBLIC XColorList : public XPropertyList { @@ -298,9 +298,9 @@ public: static XColorListRef GetStdColorList(); // returns a singleton }; -// ------------------- + // class XLineEndList -// ------------------- + class SVX_DLLPUBLIC XLineEndList : public XPropertyList { @@ -319,9 +319,9 @@ public: virtual bool Create(); }; -// ------------------- + // class XDashList -// ------------------- + class SVX_DLLPUBLIC XDashList : public XPropertyList { @@ -358,9 +358,9 @@ public: OUString GetStringForUiNoLine() const; }; -// ------------------- + // class XHatchList -// ------------------- + class SVX_DLLPUBLIC XHatchList : public XPropertyList { @@ -381,9 +381,9 @@ public: virtual bool Create(); }; -// ------------------- + // class XGradientList -// ------------------- + class SVX_DLLPUBLIC XGradientList : public XPropertyList { protected: @@ -403,9 +403,9 @@ public: virtual bool Create(); }; -// ------------------- + // class XBitmapList -// ------------------- + class SVX_DLLPUBLIC XBitmapList : public XPropertyList { diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx index ff881917bc4b..6aa2ca8afb17 100644 --- a/include/svx/zoomslideritem.hxx +++ b/include/svx/zoomslideritem.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <svx/svxdllapi.h> -//------------------------------------------------------------------------- + class SVX_DLLPUBLIC SvxZoomSliderItem: public SfxUInt16Item { @@ -53,7 +53,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; -//------------------------------------------------------------------------ + #endif |