mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#63154 Removed unused solar.h ref. in svx

Browse Source 
Change-Id: I1671746d6c433fa3b770eb58bc418e4eddbe8dd4
Reviewed-on: https://gerrit.libreoffice.org/7737
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Alexandre Vicenzi 2014-01-29 22:17:38 -02:00 committed by Caolán McNamara
parent c97b226b5a
commit 0d57871daa
12 changed files with 11 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/svx/databaseregistrationui.hxx
View File

@ -21,7 +21,6 @@
#define INCLUDED_SVX_DATABASEREGISTRATIONUI_HXX
#include <svx/svxdllapi.h>
#include <tools/solar.h>
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

32
include/svx/dbtoolsclient.hxx
View File

@ -23,20 +23,14 @@
#include <connectivity/virtualdbtools.hxx>
#include <osl/mutex.hxx>
#include <osl/module.h>
#include <svx/svxdllapi.h>
#include <tools/solar.h>
#include <unotools/sharedunocomponent.hxx>
#include <svx/svxdllapi.h>
//........................................................................
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<css::uno::XComponentContext>& _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

5
include/svx/def3d.hxx
View File

@ -21,16 +21,13 @@
#define INCLUDED_SVX_DEF3D_HXX
#include <math.h>
#include <tools/solar.h>
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,

3
include/svx/fmglob.hxx
View File

@ -20,9 +20,8 @@
#ifndef INCLUDED_SVX_FMGLOB_HXX
#define INCLUDED_SVX_FMGLOB_HXX
#include <tools/solar.h>
#include <svx/svdobj.hxx>
#include <com/sun/star/form/FormComponentType.hpp>
#include <svx/svdobj.hxx>
const sal_uInt32 FmFormInventor = sal_uInt32('F')*0x00000001+
sal_uInt32('M')*0x00000100+

3
include/svx/gallery.hxx
View File

@ -20,10 +20,9 @@
#ifndef INCLUDED_SVX_GALLERY_HXX
#define INCLUDED_SVX_GALLERY_HXX
#include <tools/solar.h>
#include <svx/svxdllapi.h>
#include <tools/urlobj.hxx>
#include <vector>
#include <svx/svxdllapi.h>
// Defines for preinstalled themes
// Has to be in sync with svx/inc/galtheme.hrc

2
include/svx/globl3d.hxx
View File

@ -20,8 +20,6 @@
#ifndef INCLUDED_SVX_GLOBL3D_HXX
#define INCLUDED_SVX_GLOBL3D_HXX
#include <tools/solar.h>
const sal_uInt32 E3dInventor = sal_uInt32('E')*0x00000001+
sal_uInt32('3')*0x00000100+
sal_uInt32('D')*0x00010000+

3
include/svx/langbox.hxx
View File

@ -20,10 +20,9 @@
#define INCLUDED_SVX_LANGBOX_HXX
#include <com/sun/star/uno/Sequence.hxx>
#include <vcl/lstbox.hxx>
#include <svx/svxdllapi.h>
#include <vcl/image.hxx>
#include <tools/solar.h>
#include <vcl/lstbox.hxx>
class SvtLanguageTable;

5
include/svx/msdffdef.hxx
View File

@ -21,9 +21,8 @@
#define INCLUDED_SVX_MSDFFDEF_HXX
#include <sal/types.h>
#include <tools/solar.h>
#include <tools/stream.hxx>
#include <svx/svxdllapi.h>
#include <tools/stream.hxx>
#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,

1
include/svx/svdattr.hxx
View File

@ -21,7 +21,6 @@
#define INCLUDED_SVX_SVDATTR_HXX
#include <svl/solar.hrc>
#include <tools/solar.h>
#include <svx/sdangitm.hxx>
#include <svx/sderitm.hxx>
#include <svx/sdmetitm.hxx>

7
include/svx/svdtypes.hxx
View File

@ -20,8 +20,6 @@
#ifndef INCLUDED_SVX_SVDTYPES_HXX
#define INCLUDED_SVX_SVDTYPES_HXX
#include <tools/solar.h>
/*
* 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: */

5
include/svx/svdviter.hxx
View File

@ -20,7 +20,6 @@
#ifndef INCLUDED_SVX_SVDVITER_HXX
#define INCLUDED_SVX_SVDVITER_HXX
#include <tools/solar.h>
#include <sal/types.h>
#include <svx/svxdllapi.h>
@ -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;

21
include/svx/xpoly.hxx
View File

@ -19,7 +19,6 @@
#ifndef INCLUDED_SVX_XPOLY_HXX
#define INCLUDED_SVX_XPOLY_HXX
#include <tools/solar.h>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <svx/svxdllapi.h>
@ -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;