summaryrefslogtreecommitdiff
path: root/rsc
diff options
context:
space:
mode:
authorAlexandre Vicenzi <vicenzi.alexandre@gmail.com>2014-02-18 22:53:08 -0300
committerMichael Stahl <mstahl@redhat.com>2014-02-28 15:01:05 -0600
commite218663251425f5dd6d56c7273b9e1e93748981f (patch)
tree4960ac382a3a60a6fadeec1efe705fc82137fcba /rsc
parent1994ab92c8ca0d068b73017e641807fc7782e8da (diff)
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@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'rsc')
-rw-r--r--rsc/inc/rscerror.h8
-rw-r--r--rsc/inc/rscpar.hxx5
-rw-r--r--rsc/inc/rsctools.hxx19
-rw-r--r--rsc/source/res/rsctop.cxx4
4 files changed, 17 insertions, 19 deletions
diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h
index 418cb85d39d7..4e7706cae70b 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 98a3944ae360..78f64fc6b83a 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 296ca4f09848..7fd10682b39c 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 7c4d80cda8d7..d91626e2f667 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 )