From 0d57871daaed1de47199e56e869f8a89350f80f3 Mon Sep 17 00:00:00 2001 From: Alexandre Vicenzi Date: Wed, 29 Jan 2014 22:17:38 -0200 Subject: fdo#63154 Removed unused solar.h ref. in svx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1671746d6c433fa3b770eb58bc418e4eddbe8dd4 Reviewed-on: https://gerrit.libreoffice.org/7737 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- include/svx/databaseregistrationui.hxx | 6 ------ include/svx/dbtoolsclient.hxx | 32 ++------------------------------ include/svx/def3d.hxx | 5 +---- include/svx/fmglob.hxx | 3 +-- include/svx/gallery.hxx | 3 +-- include/svx/globl3d.hxx | 2 -- include/svx/langbox.hxx | 3 +-- include/svx/msdffdef.hxx | 5 +---- include/svx/svdattr.hxx | 1 - include/svx/svdtypes.hxx | 7 ------- include/svx/svdviter.hxx | 5 ----- include/svx/xpoly.hxx | 21 ++++----------------- 12 files changed, 11 insertions(+), 82 deletions(-) diff --git a/include/svx/databaseregistrationui.hxx b/include/svx/databaseregistrationui.hxx index c4bd91669e30..80df7133279b 100644 --- a/include/svx/databaseregistrationui.hxx +++ b/include/svx/databaseregistrationui.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_DATABASEREGISTRATIONUI_HXX #include -#include class Window; @@ -29,18 +28,13 @@ class Window; #define SID_SB_DRIVER_TIMEOUTS (RID_OFA_START + 248) #define SID_SB_DB_REGISTER (RID_OFA_START + 249) -//........................................................................ namespace svx { -//........................................................................ - /** opens a dialog which allows the user to administrate the database registrations */ sal_uInt16 SVX_DLLPUBLIC administrateDatabaseRegistration( Window* _parentWindow ); -//........................................................................ } // namespace svx -//........................................................................ #endif // INCLUDED_SVX_DATABASEREGISTRATIONUI_HXX diff --git a/include/svx/dbtoolsclient.hxx b/include/svx/dbtoolsclient.hxx index 6d8722dc13ea..1818e10e8dc0 100644 --- a/include/svx/dbtoolsclient.hxx +++ b/include/svx/dbtoolsclient.hxx @@ -23,20 +23,14 @@ #include #include #include +#include #include #include -#include -//........................................................................ namespace svxform { -//........................................................................ - typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection; - //==================================================================== - //= ODbtoolsClient - //==================================================================== /** base class for classes which want to use dbtools features with load-on-call of the dbtools lib. */ @@ -68,9 +62,6 @@ namespace svxform static void revokeClient(); }; - //==================================================================== - //= OStaticDataAccessTools - //==================================================================== class SVX_DLLPUBLIC OStaticDataAccessTools : public ODbtoolsClient { protected: @@ -84,19 +75,16 @@ namespace svxform const ::rtl::Reference< ::connectivity::simple::IDataAccessTools >& getDataAccessTools() const { return m_xDataAccessTools; } - // ------------------------------------------------ ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn, sal_Bool _bAllowDefault ) const; - // ------------------------------------------------ sal_Int32 getDefaultNumberFormat( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes >& _xTypes, const ::com::sun::star::lang::Locale& _rLocale ); - // ------------------------------------------------ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback( const OUString& _rDataSourceName, const OUString& _rUser, @@ -104,7 +92,6 @@ namespace svxform const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) ); - // ------------------------------------------------ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> connectRowset( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext, @@ -113,49 +100,41 @@ namespace svxform , ::com::sun::star::lang::WrappedTargetException , ::com::sun::star::uno::RuntimeException) ); - // ------------------------------------------------ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getRowSetConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet) const SAL_THROW ( (::com::sun::star::uno::RuntimeException) ); - // ------------------------------------------------ void TransferFormComponentProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxOld, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxNew, const ::com::sun::star::lang::Locale& _rLocale ) const; - // ------------------------------------------------ OUString quoteName( const OUString& _rQuote, const OUString& _rName ) const; - // ------------------------------------------------ OUString composeTableNameForSelect( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable ) const; - // ------------------------------------------------ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource( const OUString& _rsRegisteredName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ) const; - // ------------------------------------------------ /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT @param _rxCursorSet the property set */ sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const; - // ------------------------------------------------ /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE @param _rxCursorSet the property set */ sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const; - // ------------------------------------------------ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getFieldsByCommandDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, @@ -165,28 +144,22 @@ namespace svxform ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL ) SAL_THROW( ( ) ); - // ------------------------------------------------ bool isEmbeddedInDatabase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxActualConnection ); - // ------------------------------------------------ bool isEmbeddedInDatabase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); }; - //==================================================================== - //= DBToolsObjectFactory - //==================================================================== class SVX_DLLPUBLIC DBToolsObjectFactory : public ODbtoolsClient { public: DBToolsObjectFactory(); ~DBToolsObjectFactory(); - // ------------------------------------------------ ::std::auto_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue( const css::uno::Reference& _rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet, @@ -194,9 +167,8 @@ namespace svxform ); }; -//........................................................................ } // namespace svxform -//........................................................................ + #endif // INCLUDED_SVX_DBTOOLSCLIENT_HXX diff --git a/include/svx/def3d.hxx b/include/svx/def3d.hxx index 5225d0c9a140..7dcbb2165dd9 100644 --- a/include/svx/def3d.hxx +++ b/include/svx/def3d.hxx @@ -21,16 +21,13 @@ #define INCLUDED_SVX_DEF3D_HXX #include -#include const double fPiDiv180 = 0.01745329251994; const double EPSILON = 1e-06; #define DEG2RAD(fAngle) (fPiDiv180 * (fAngle)) -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -//+++ 3D helper functions ++++++++++++++++++++++++++++++++++++++++++++++++ -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// 3D helper functions enum E3dDragConstraint { E3DDRAG_CONSTR_X = 0x0001, E3DDRAG_CONSTR_Y = 0x0002, diff --git a/include/svx/fmglob.hxx b/include/svx/fmglob.hxx index 88943f4c61ae..968a7c77e0c9 100644 --- a/include/svx/fmglob.hxx +++ b/include/svx/fmglob.hxx @@ -20,9 +20,8 @@ #ifndef INCLUDED_SVX_FMGLOB_HXX #define INCLUDED_SVX_FMGLOB_HXX -#include -#include #include +#include const sal_uInt32 FmFormInventor = sal_uInt32('F')*0x00000001+ sal_uInt32('M')*0x00000100+ diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx index 3be97a5adb53..830d64c0f333 100644 --- a/include/svx/gallery.hxx +++ b/include/svx/gallery.hxx @@ -20,10 +20,9 @@ #ifndef INCLUDED_SVX_GALLERY_HXX #define INCLUDED_SVX_GALLERY_HXX -#include +#include #include #include -#include // Defines for preinstalled themes // Has to be in sync with svx/inc/galtheme.hrc diff --git a/include/svx/globl3d.hxx b/include/svx/globl3d.hxx index 3d81b3370ddf..233a64196742 100644 --- a/include/svx/globl3d.hxx +++ b/include/svx/globl3d.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_SVX_GLOBL3D_HXX #define INCLUDED_SVX_GLOBL3D_HXX -#include - const sal_uInt32 E3dInventor = sal_uInt32('E')*0x00000001+ sal_uInt32('3')*0x00000100+ sal_uInt32('D')*0x00010000+ diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index dd6950c1ffa8..64ae54f201ef 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -20,10 +20,9 @@ #define INCLUDED_SVX_LANGBOX_HXX #include -#include #include #include -#include +#include class SvtLanguageTable; diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx index 7ac2bad6fe72..631163dc5b4e 100644 --- a/include/svx/msdffdef.hxx +++ b/include/svx/msdffdef.hxx @@ -21,9 +21,8 @@ #define INCLUDED_SVX_MSDFFDEF_HXX #include -#include -#include #include +#include #define DFF_COMMON_RECORD_HEADER_SIZE 8 @@ -572,9 +571,7 @@ enum DFF_TextHeader { // properties of the second property set #define DFF_Prop_metroBlob 937 // XML ZipPackage* -//--------------------------------------------------------------------------- // linchpin: the shape type -//--------------------------------------------------------------------------- typedef enum { mso_sptMin = 0, diff --git a/include/svx/svdattr.hxx b/include/svx/svdattr.hxx index 10368f09e880..5bc2767bb53b 100644 --- a/include/svx/svdattr.hxx +++ b/include/svx/svdattr.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_SVDATTR_HXX #include -#include #include #include #include diff --git a/include/svx/svdtypes.hxx b/include/svx/svdtypes.hxx index 1db3e7dcf836..694ea9a54ec0 100644 --- a/include/svx/svdtypes.hxx +++ b/include/svx/svdtypes.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_SVX_SVDTYPES_HXX #define INCLUDED_SVX_SVDTYPES_HXX -#include - /* * SdrObject */ @@ -62,14 +60,12 @@ enum SdrConvertType {SDRCONVERT_POLY, // reines Polygon erzeugen /* * Layer */ -//////////////////////////////////////////////////////////////////////////////////////////////////// // Bei der Identifikation eines Layer kann es vorkommen, das dieser nicht // vorhanden ist. SdrLayerAdmin::GetLayerID(const String&) liefert // dann diesen Wert: #define SDRLAYER_NOTFOUND 0xFF // Man kann diesen Wert jodoch ohne Bedenken den Methoden des SdrLayerSet // zuwerfen, bekommt dann jedoch immer sal_False, bzw. tut die Methode nix. -//////////////////////////////////////////////////////////////////////////////////////////////////// // Typdeklaration fuer Layer-IDs typedef sal_uInt8 SdrLayerID; @@ -90,7 +86,6 @@ enum SdrObjListKind {SDROBJLIST_UNKNOWN =0x00, // Unbekannt inline bool SdrIsPageKind(SdrObjListKind eK) { return eK>=SDROBJLIST_DRAWPAGE && eK<=0x1A; } - /* * Repeat */ @@ -127,8 +122,6 @@ enum SdrRepeatFunc {SDRREPFUNC_OBJ_NONE, SDRREPFUNC_PAGE_DELETE, SDRREPFUNC_LAST}; -//////////////////////////////////////////////////////////////////////////////////////////////////// - #endif // INCLUDED_SVX_SVDTYPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdviter.hxx b/include/svx/svdviter.hxx index 554aa01dbdaa..8bee35f2c424 100644 --- a/include/svx/svdviter.hxx +++ b/include/svx/svdviter.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVX_SVDVITER_HXX #define INCLUDED_SVX_SVDVITER_HXX -#include #include #include @@ -53,8 +52,6 @@ Not considered are: */ -//////////////////////////////////////////////////////////////////////////////////////////////////// - class OutputDevice; class Window; class SdrView; @@ -64,8 +61,6 @@ class SdrPage; class SdrObject; class SetOfByte; -//////////////////////////////////////////////////////////////////////////////////////////////////// - class SVX_DLLPUBLIC SdrViewIter { const SdrModel* mpModel; diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx index d274be12c33c..a60e69c53536 100644 --- a/include/svx/xpoly.hxx +++ b/include/svx/xpoly.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SVX_XPOLY_HXX #define INCLUDED_SVX_XPOLY_HXX -#include #include #include @@ -30,14 +29,11 @@ class Polygon; class PolyPolygon; class OutputDevice; -/************************************************************************/ - #define XPOLYPOLY_APPEND 0xFFFF #define XPOLY_APPEND 0xFFFF #define XPOLY_MAXPOINTS 0xFFF0 /* Auch fuer die 32-Bitter etwas Luft lassen */ -/************************************************************************/ // Punktstile im XPolygon: // NORMAL : Anfangs- oder Endpunkt einer Kurve oder Linie // SMOOTH : Glatter Uebergang zwischen Kurven @@ -46,13 +42,8 @@ class OutputDevice; enum XPolyFlags { XPOLY_NORMAL, XPOLY_SMOOTH, XPOLY_CONTROL, XPOLY_SYMMTR }; - -/************************************************************************* -|* -|* Klasse XPolygon; hat neben dem Point-Array noch ein Array mit Flags, -|* die Informationen ueber den jeweiligen Punkt enthalten -|* -\************************************************************************/ +// Klasse XPolygon; hat neben dem Point-Array noch ein Array mit Flags, +// die Informationen ueber den jeweiligen Punkt enthalten class ImpXPolygon; @@ -125,12 +116,8 @@ public: explicit XPolygon(const basegfx::B2DPolygon& rPolygon); }; -/************************************************************************* -|* -|* Klasse XPolyPolygon; wie PolyPolygon, nur statt aus Polygonen aus -|* XPolygonen bestehend -|* -\************************************************************************/ +// Klasse XPolyPolygon; wie PolyPolygon, nur statt aus Polygonen aus +// XPolygonen bestehend class ImpXPolyPolygon; -- cgit v1.2.3