[Libreoffice-commits] core.git: dbaccess/source editeng/source filter/source framework/inc framework/source include/formula lotuswordpro/source reportdesign/inc rsc/inc rsc/source uui/source
Alexandre Vicenzi
vicenzi.alexandre at gmail.com
Fri Feb 28 13:01:27 PST 2014
dbaccess/source/ui/inc/propertystorage.hxx | 3 ---
editeng/source/accessibility/AccessibleHyperlink.hxx | 2 --
filter/source/graphicfilter/icgm/cgm.hxx | 1 -
framework/inc/pch/precompiled_fwk.hxx | 1 -
framework/inc/uielement/commandinfo.hxx | 2 --
framework/source/uielement/menubarwrapper.cxx | 3 ---
include/formula/opcode.hxx | 2 +-
lotuswordpro/source/filter/lwpheader.hxx | 5 ++---
reportdesign/inc/RptDef.hxx | 2 --
rsc/inc/rscerror.h | 8 +++++---
rsc/inc/rscpar.hxx | 5 ++---
rsc/inc/rsctools.hxx | 19 +++++++++----------
rsc/source/res/rsctop.cxx | 4 +---
uui/source/iahndl.hxx | 7 +------
14 files changed, 21 insertions(+), 43 deletions(-)
New commits:
commit e218663251425f5dd6d56c7273b9e1e93748981f
Author: Alexandre Vicenzi <vicenzi.alexandre at gmail.com>
Date: Tue Feb 18 22:53:08 2014 -0300
fdo#63154 Remove unused solar.h
Removed from dbaccess. editeng, filter,
framwork, formula, lotuswordpro, reportdesing, rsc,
uui
Conflicts:
framework/source/uielement/menubarwrapper.cxx
reportdesign/inc/RptDef.hxx
uui/source/iahndl.hxx
Change-Id: Ia6f1d8679736c3de99bd8060d8a7f76975268273
Reviewed-on: https://gerrit.libreoffice.org/8118
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/dbaccess/source/ui/inc/propertystorage.hxx b/dbaccess/source/ui/inc/propertystorage.hxx
index f9b33e8..75cdbab 100644
--- a/dbaccess/source/ui/inc/propertystorage.hxx
+++ b/dbaccess/source/ui/inc/propertystorage.hxx
@@ -21,9 +21,6 @@
#define INCLUDED_DBACCESS_SOURCE_UI_INC_PROPERTYSTORAGE_HXX
#include <com/sun/star/uno/Any.hxx>
-
-#include <tools/solar.h>
-
#include <boost/shared_ptr.hpp>
#include <map>
diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx b/editeng/source/accessibility/AccessibleHyperlink.hxx
index 6871432..28bdc2f 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.hxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.hxx
@@ -29,8 +29,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
-#include <tools/solar.h>
-
class SvxFieldItem;
class SvxAccessibleTextAdapter;
diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx
index 7cc8fc0..d81ade2 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -28,7 +28,6 @@
#define CGM_EXPORT_IMPRESS 0x00000100
#define CGM_EXPORT_META 0x00000200
-#include <tools/solar.h>
#include <rtl/ustring.hxx>
#include <vector>
#include "cgmtypes.hxx"
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx
index ed9ceea..ae4b767 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -322,7 +322,6 @@
#include <tools/gen.hxx>
#include <tools/rcid.h>
#include <tools/resmgr.hxx>
-#include <tools/solar.h>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
#include <tools/wintypes.hxx>
diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx
index 8b7d6f7..358565c 100644
--- a/framework/inc/uielement/commandinfo.hxx
+++ b/framework/inc/uielement/commandinfo.hxx
@@ -23,8 +23,6 @@
#include <macros/generic.hxx>
#include <stdtypes.h>
-#include <tools/solar.h>
-
namespace framework
{
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index f7ef370..8153825 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -33,7 +33,6 @@
#include <com/sun/star/util/URLTransformer.hpp>
#include <comphelper/processfactory.hxx>
-#include <tools/solar.h>
#include <vcl/svapp.hxx>
using namespace com::sun::star;
@@ -49,9 +48,7 @@ using namespace ::com::sun::star::ui;
namespace framework
{
-
// XInterface, XTypeProvider
-
DEFINE_XINTERFACE_11 ( MenuBarWrapper ,
UIConfigElementWrapperBase ,
DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ),
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 168fa75..c754dc7 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_FORMULA_OPCODE_HXX
#include <formula/compiler.hrc>
-#include <tools/solar.h>
+#include <sal/types.h>
enum OpCodeEnum
{
diff --git a/lotuswordpro/source/filter/lwpheader.hxx b/lotuswordpro/source/filter/lwpheader.hxx
index 27da926..711f9a9 100644
--- a/lotuswordpro/source/filter/lwpheader.hxx
+++ b/lotuswordpro/source/filter/lwpheader.hxx
@@ -53,10 +53,10 @@
*
*
************************************************************************/
-/*************************************************************************
+/*
* @file
* For LWP filter architecture prototype
- ************************************************************************/
+ */
#ifndef _LWPHEADERS_HXX
#define _LWPHEADERS_HXX
@@ -71,7 +71,6 @@
#include <string>
#include <sal/types.h>
-#include <tools/solar.h>
#include <sal/config.h>
#include <rtl/ustring.hxx>
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index b258625..918412f 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -25,7 +25,6 @@
#include <map>
#include "dllapi.h"
-#include <tools/solar.h>
#include <svx/svdobj.hxx>
#include <comphelper/uno3.hxx>
#include <svx/fmglob.hxx>
@@ -102,7 +101,6 @@ typedef std::map<OUString, TPropertyConverter> TPropertyNamePair;
REPORTDESIGN_DLLPUBLIC const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId);
REPORTDESIGN_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle> getUsedStyle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport);
-
template < typename T> T getStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const OUString& _sPropertyName)
{
T nReturn = T();
diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h
index 418cb85..4e7706c 100644
--- a/rsc/inc/rscerror.h
+++ b/rsc/inc/rscerror.h
@@ -16,11 +16,13 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
+#include <sal/types.h>
+
#ifndef _RSCERROR_H
#define _RSCERROR_H
-/****************** D E F I N I T I O N S ********************************/
-/******************* R e t u r n E r r o r s *******************/
+// Return errors
#define ERR_OK 0xFFFFFFFF
#define ERR_ERROR 0x0100
@@ -100,7 +102,7 @@ public:
void Clear(){ nError = ERR_OK; }
};
-/****************** R s c E r r o r **************************************/
+// Rsc Error
class RscId;
class RscTop;
diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx
index 98a3944..78f64fc 100644
--- a/rsc/inc/rscpar.hxx
+++ b/rsc/inc/rscpar.hxx
@@ -21,12 +21,12 @@
#include <rsctools.hxx>
#include <rscerror.h>
+#include <tools/solar.h>
-/****************** C L A S S E S ****************************************/
class RscTypCont;
-/*********** R s c F i l e I n s t ***************************************/
#define READBUFFER_MAX 256
+
class RscFileInst
{
ERRTYPE aFirstError;// Erster Fehler
@@ -74,7 +74,6 @@ public:
sal_uInt32 GetErrorPos() { return nErrorPos; }
};
-/******************* F u n c t i o n *************************************/
void IncludeParser( RscFileInst * pFileInst );
ERRTYPE parser( RscFileInst * pFileInst );
diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
index 296ca4f..7fd1068 100644
--- a/rsc/inc/rsctools.hxx
+++ b/rsc/inc/rsctools.hxx
@@ -27,44 +27,44 @@ class RscPtrPtr;
#endif
#include <stdio.h>
#include <vector>
-#include <tools/solar.h>
#include <rtl/ustring.hxx>
+#include <osl/endian.h>
-/******************* T y p e s *******************************************/
// Zeichensatz
enum COMPARE { LESS = -1, EQUAL = 0, GREATER = 1 };
enum RSCBYTEORDER_TYPE { RSC_BIGENDIAN, RSC_LITTLEENDIAN, RSC_SYSTEMENDIAN };
-/******************* M A K R O S *****************************************/
#define ALIGNED_SIZE( nSize ) \
(nSize + sizeof( void * ) -1) / sizeof( void * ) * sizeof( void * )
-/******************* F u n c t i o n F o r w a r d s *******************/
+
+// Function Forwards
OString GetTmpFileName();
+
bool Append(const OString &rDestFile, const OString &rSourceFile);
+
bool Append(FILE * fDest, OString &raSourceFile);
+
OString OutputFile(const OString &rInput, const char * ext);
+
char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv,
sal_uInt32 nArgc );
+
void RscExit( sal_uInt32 nExit );
-/********* A n s i - F u n c t i o n F o r w a r d s *******************/
+// Ansi-Function Forwards
int rsc_strnicmp( const char *string1, const char *string2, size_t count );
int rsc_stricmp( const char *string1, const char *string2 );
char* rsc_strdup( const char* );
-/****************** C L A S S E S ****************************************/
-
typedef ::std::vector< OString* > RscStrList;
-/*********** R s c C h a r ***********************************************/
class RscChar
{
public:
static char * MakeUTF8( char * pStr, sal_uInt16 nTextEncoding );
};
-/****************** R s c P t r P t r ************************************/
class RscPtrPtr
{
sal_uInt32 nCount;
@@ -82,7 +82,6 @@ public:
void ** GetBlock(){ return( pMem ); };
};
-/****************** R s c W r i t e R c **********************************/
class RscWriteRc
{
sal_uInt32 nLen;
diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx
index 7c4d80c..d91626e 100644
--- a/rsc/source/res/rsctop.cxx
+++ b/rsc/source/res/rsctop.cxx
@@ -20,10 +20,8 @@
#include <stdio.h>
#include <string.h>
-
-// Solar Definitionen
-#include <tools/solar.h>
#include <rsctop.hxx>
+
RscTop::RscTop( Atom nId, sal_uInt32 nTypIdent, RscTop * pSuperCl )
: RefNode( nId )
, pSuperClass( pSuperCl )
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 91cced6..be740d0 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -32,7 +32,6 @@
#include "com/sun/star/beans/Optional.hpp"
#include "com/sun/star/task/InteractionClassification.hpp"
-#include "tools/solar.h"
#include "tools/errcode.hxx"
#include "tools/rc.hxx"
#include "tools/wintypes.hxx"
@@ -65,7 +64,6 @@ namespace com { namespace sun { namespace star {
class Window;
-
struct InteractionHandlerData
{
/** The UNO service name to use to instanciate the content provider.
@@ -83,7 +81,6 @@ typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com
typedef ::boost::unordered_map< OUString, OUString, OUStringHash > StringHashMap;
-
class UUIInteractionHelper
{
private:
@@ -190,8 +187,6 @@ private:
com::sun::star::task::XInteractionContinuation > > const &
rContinuations);
-
-
bool
handleInteractiveIOException(
com::sun::star::uno::Reference<
@@ -330,7 +325,7 @@ private:
com::sun::star::task::XInteractionRequest > const & rRequest)
SAL_THROW((::com::sun::star::uno::RuntimeException));
- bool handleCustomRequest(
+ bool handleCustomRequest(
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& i_rRequest,
const OUString& i_rServiceName
) const;
More information about the Libreoffice-commits
mailing list