[Libreoffice-commits] core.git: sc/source
Alexandre Vicenzi
vicenzi.alexandre at gmail.com
Sat Feb 15 06:05:33 CET 2014
sc/source/core/inc/jumpmatrix.hxx | 1 -
sc/source/filter/inc/excdoc.hxx | 12 ++----------
sc/source/filter/inc/excscen.hxx | 1 -
sc/source/filter/inc/expbase.hxx | 4 ----
sc/source/filter/inc/formel.hxx | 8 --------
sc/source/filter/inc/lotattr.hxx | 4 ----
sc/source/filter/inc/lotfntbf.hxx | 3 ---
sc/source/filter/inc/lotrange.hxx | 20 +-------------------
sc/source/filter/inc/op.h | 1 -
sc/source/filter/inc/otlnbuff.hxx | 1 -
sc/source/filter/inc/root.hxx | 7 ++-----
sc/source/filter/inc/scfobj.hxx | 3 ---
sc/source/filter/inc/scmem.h | 2 --
sc/source/filter/lotus/filter.cxx | 7 ++-----
sc/source/filter/lotus/op.cxx | 16 ----------------
sc/source/filter/lotus/tool.cxx | 34 ++--------------------------------
sc/source/ui/inc/drawutil.hxx | 3 ---
sc/source/ui/inc/editable.hxx | 2 --
sc/source/ui/inc/gridmerg.hxx | 4 ----
sc/source/ui/inc/refundo.hxx | 4 +---
sc/source/ui/inc/undoolk.hxx | 4 ----
sc/source/ui/inc/undoutil.hxx | 3 ---
sc/source/ui/inc/viewutil.hxx | 8 --------
23 files changed, 10 insertions(+), 142 deletions(-)
New commits:
commit a357ef4546eccf6dcebb44e9d460f6028c335d2b
Author: Alexandre Vicenzi <vicenzi.alexandre at gmail.com>
Date: Fri Feb 14 20:02:02 2014 -0200
fdo#63154 Remove unused solar.h reference in sc.
Conflicts:
sc/source/filter/inc/lotrange.hxx
sc/source/filter/lotus/tool.cxx
Change-Id: If6bae56b3afa560a5ab13d6465a80d384e9cccae
diff --git a/sc/source/core/inc/jumpmatrix.hxx b/sc/source/core/inc/jumpmatrix.hxx
index 959a865..4c4c3e5 100644
--- a/sc/source/core/inc/jumpmatrix.hxx
+++ b/sc/source/core/inc/jumpmatrix.hxx
@@ -22,7 +22,6 @@
#include "formula/token.hxx"
#include "formula/errorcodes.hxx"
-#include <tools/solar.h>
#include <vector>
#include "types.hxx"
#include "address.hxx"
diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx
index 4b7bd7c..b71cca6 100644
--- a/sc/source/filter/inc/excdoc.hxx
+++ b/sc/source/filter/inc/excdoc.hxx
@@ -20,14 +20,13 @@
#ifndef SC_EXCDOC_HXX
#define SC_EXCDOC_HXX
-#include <tools/solar.h>
#include "excrecds.hxx"
#include "xeroot.hxx"
#include "root.hxx"
#include "xeescher.hxx"
#include <boost/shared_ptr.hpp>
-//------------------------------------------------------------------ Forwards -
+// Forwards -
class SvStream;
@@ -35,8 +34,7 @@ class NameBuffer;
class XclExpChangeTrack;
-
-//------------------------------------------------------------ class ExcTable -
+// class ExcTable -
class XclExpCellTable;
@@ -76,9 +74,6 @@ public:
void WriteXml( XclExpXmlStream& );
};
-
-//--------------------------------------------------------- class ExcDocument -
-
class ExcDocument : protected XclExpRoot
{
friend class ExcTable;
@@ -105,9 +100,6 @@ public:
void WriteXml( XclExpXmlStream& );
};
-
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/inc/excscen.hxx b/sc/source/filter/inc/excscen.hxx
index 44d9fc9..41e4f08 100644
--- a/sc/source/filter/inc/excscen.hxx
+++ b/sc/source/filter/inc/excscen.hxx
@@ -22,7 +22,6 @@
#include <boost/ptr_container/ptr_vector.hpp>
#include <rtl/ustring.hxx>
-#include <tools/solar.h>
struct RootData;
class XclImpRoot;
diff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxx
index 39d659f..9cc55cb 100644
--- a/sc/source/filter/inc/expbase.hxx
+++ b/sc/source/filter/inc/expbase.hxx
@@ -20,11 +20,9 @@
#ifndef SC_EXPBASE_HXX
#define SC_EXPBASE_HXX
-#include <tools/solar.h>
#include "global.hxx"
#include "address.hxx"
-
class SvStream;
class ScFieldEditEngine;
@@ -59,10 +57,8 @@ public:
bool IsEmptyTable( SCTAB nTab ) const;
ScFieldEditEngine& GetEditEngine() const;
-
};
-
#endif // SC_EXPBASE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx
index f397067..101575e 100644
--- a/sc/source/filter/inc/formel.hxx
+++ b/sc/source/filter/inc/formel.hxx
@@ -20,8 +20,6 @@
#ifndef SC_FORMEL_HXX
#define SC_FORMEL_HXX
-#include <tools/solar.h>
-
#include <compiler.hxx>
#include <global.hxx>
@@ -90,8 +88,6 @@ protected:
void Reset();
};
-
-
class ExcelConverterBase : public ConverterBase
{
protected:
@@ -108,8 +104,6 @@ public:
const FORMULA_TYPE eFT = FT_CellFormula ) = 0;
};
-
-
class LotusConverterBase : public ConverterBase
{
protected:
@@ -137,7 +131,6 @@ protected:
using ConverterBase::Reset;
};
-
inline void LotusConverterBase::Ignore( const long nSeekRel )
{
aIn.SeekRel( nSeekRel );
@@ -182,5 +175,4 @@ inline void LotusConverterBase::Read( sal_uInt32& nUINT32 )
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxx
index a608be5..38847ae 100644
--- a/sc/source/filter/inc/lotattr.hxx
+++ b/sc/source/filter/inc/lotattr.hxx
@@ -22,8 +22,6 @@
#include <boost/ptr_container/ptr_vector.hpp>
-#include <tools/solar.h>
-
#include "address.hxx"
#include "scitems.hxx"
@@ -107,7 +105,6 @@ private:
LOTUS_ROOT* mpLotusRoot;
};
-
class LotAttrCol
{
public:
@@ -126,7 +123,6 @@ private:
boost::ptr_vector<ENTRY> aEntries;
};
-
class LotAttrTable
{
public:
diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx
index 21fb956..084fa50 100644
--- a/sc/source/filter/inc/lotfntbf.hxx
+++ b/sc/source/filter/inc/lotfntbf.hxx
@@ -20,14 +20,11 @@
#ifndef SC_LOTFNTBF_HXX
#define SC_LOTFNTBF_HXX
-#include <tools/solar.h>
#include "scitems.hxx"
#include <editeng/fontitem.hxx>
#include <editeng/fhgtitem.hxx>
#include <editeng/colritem.hxx>
-// ---------------------------------------------------- class LotusFontBuffer -
-
// Code in fontbuff.cxx (excel)
class LotusFontBuffer
diff --git a/sc/source/filter/inc/lotrange.hxx b/sc/source/filter/inc/lotrange.hxx
index 492abef..1e77090 100644
--- a/sc/source/filter/inc/lotrange.hxx
+++ b/sc/source/filter/inc/lotrange.hxx
@@ -20,14 +20,12 @@
#ifndef SC_LOTRANGE_HXX
#define SC_LOTRANGE_HXX
-#include <tools/solar.h>
#include <compiler.hxx>
-// --------------------------------------------------------- class LotusRange -
-
class LotusRangeList;
typedef sal_uInt16 LR_ID;
+
#define ID_FAIL 0xFFFF
class LotusRange
@@ -53,7 +51,6 @@ public:
inline bool IsSingle( void ) const;
};
-
inline void LotusRange::Copy( const LotusRange& rCpy )
{
nColStart = rCpy.nColStart;
@@ -62,20 +59,17 @@ inline void LotusRange::Copy( const LotusRange& rCpy )
nRowEnd = rCpy.nRowEnd;
}
-
inline void LotusRange::SetId( LR_ID nNewId )
{
nId = nNewId;
}
-
inline LotusRange &LotusRange::operator =( const LotusRange& rCpy )
{
Copy( rCpy );
return *this;
}
-
inline bool LotusRange::operator ==( const LotusRange& rRef ) const
{
return ( nHash == rRef.nHash && nColStart == rRef.nColStart &&
@@ -83,7 +77,6 @@ inline bool LotusRange::operator ==( const LotusRange& rRef ) const
nRowEnd == rRef.nRowEnd );
}
-
inline bool LotusRange::operator !=( const LotusRange& rRef ) const
{
return ( nHash != rRef.nHash || nColStart != rRef.nColStart ||
@@ -91,16 +84,11 @@ inline bool LotusRange::operator !=( const LotusRange& rRef ) const
nRowEnd != rRef.nRowEnd );
}
-
inline bool LotusRange::IsSingle( void ) const
{
return ( nColStart == nColEnd && nRowStart == nRowEnd );
}
-
-
-// ----------------------------------------------------- class LotusRangeList -
-
class LotusRangeList
{
private:
@@ -122,33 +110,28 @@ public:
inline static void SetEing( const SCCOL nCol, const SCROW nRow );
};
-
inline LR_ID LotusRangeList::GetIndex( SCCOL nCol, SCROW nRow )
{
LotusRange aRef( nCol, nRow );
return GetIndex( aRef );
}
-
inline LR_ID LotusRangeList::GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE )
{
LotusRange aRef( nColS, nRowS, nColE, nRowE );
return GetIndex( aRef );
}
-
inline void LotusRangeList::Append( SCCOL nCol, SCROW nRow, const OUString& rName )
{
Append( new LotusRange( nCol, nRow ), rName );
}
-
inline void LotusRangeList::Append( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE, const OUString& r )
{
Append( new LotusRange( nColS, nRowS, nColE, nRowE ), r );
}
-
inline void LotusRangeList::SetEing( const SCCOL nCol, const SCROW nRow )
{
nEingCol = nCol;
@@ -158,5 +141,4 @@ inline void LotusRangeList::SetEing( const SCCOL nCol, const SCROW nRow )
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/inc/op.h b/sc/source/filter/inc/op.h
index 8078b02..21865b7 100644
--- a/sc/source/filter/inc/op.h
+++ b/sc/source/filter/inc/op.h
@@ -20,7 +20,6 @@
#ifndef SC_OP_H
#define SC_OP_H
-#include <tools/solar.h>
#include <patattr.hxx>
// OP-Code-Funktionen
diff --git a/sc/source/filter/inc/otlnbuff.hxx b/sc/source/filter/inc/otlnbuff.hxx
index a6869b1..6f9d0c6 100644
--- a/sc/source/filter/inc/otlnbuff.hxx
+++ b/sc/source/filter/inc/otlnbuff.hxx
@@ -20,7 +20,6 @@
#ifndef SC_OTLNBUFF_HXX
#define SC_OTLNBUFF_HXX
-#include <tools/solar.h>
#include <mdds/flat_segment_tree.hpp>
#include <set>
diff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx
index 8cb446d..f114031 100644
--- a/sc/source/filter/inc/root.hxx
+++ b/sc/source/filter/inc/root.hxx
@@ -20,7 +20,6 @@
#ifndef SC_ROOT_HXX
#define SC_ROOT_HXX
-#include <tools/solar.h>
#include "global.hxx"
#include "address.hxx"
#include "flttypes.hxx"
@@ -45,7 +44,7 @@ class XclExpUserBViewList;
class XclImpRoot;
class XclExpRoot;
-// ---------------------------------------------------------- Excel Imp~/Exp~ -
+// Excel Imp~/Exp~ -
struct RootData // -> Inkarnation jeweils im ImportExcel-Objekt!
{
@@ -80,7 +79,7 @@ protected:
inline ExcRoot( const ExcRoot& rCopy ) : pExcRoot( rCopy.pExcRoot ) {}
};
-// ---------------------------------------------------------- Lotus Imp~/Exp~ -
+// Lotus Imp~/Exp~ -
class LotusRangeList;
class LotusFontBuffer;
@@ -106,8 +105,6 @@ struct LOTUS_ROOT
extern LOTUS_ROOT* pLotusRoot; // -> Inkarn. in filter.cxx
-// ----------------------------------------------------------------------------
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/inc/scfobj.hxx b/sc/source/filter/inc/scfobj.hxx
index 72e27ed..e481cc6 100644
--- a/sc/source/filter/inc/scfobj.hxx
+++ b/sc/source/filter/inc/scfobj.hxx
@@ -20,8 +20,6 @@
#ifndef SC_SCFOBJ_HXX
#define SC_SCFOBJ_HXX
-#include <tools/solar.h>
-
class ScDocument;
class Rectangle;
@@ -32,7 +30,6 @@ public:
SCTAB nSrcTab, sal_uInt16 nX1, sal_uInt16 nY1, sal_uInt16 nX2, sal_uInt16 nY2 );
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/inc/scmem.h b/sc/source/filter/inc/scmem.h
index 3818cc1..1fd91fe 100644
--- a/sc/source/filter/inc/scmem.h
+++ b/sc/source/filter/inc/scmem.h
@@ -20,8 +20,6 @@
#ifndef SC_SCMEM_H
#define SC_SCMEM_H
-#include <tools/solar.h>
-
sal_Bool MemNew( void );
void MemDelete( void );
diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx
index dc1a8ad..4965855 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -20,9 +20,6 @@
// Das geht: Versionserkennung WKS, WK1 und WK3
// ...Rest steht in op.cpp
-//------------------------------------------------------------------------
-
-#include <tools/solar.h>
#include <string.h>
#include <map>
@@ -42,12 +39,12 @@
#include "op.h"
-// Konstanten ------------------------------------------------------------
+// Konstanten
const sal_uInt16 nBOF = 0x0000;
-// externe Variablen -----------------------------------------------------
+// externe Variablen
extern WKTYP eTyp; // Typ der gerade in bearbeitung befindlichen Datei
WKTYP eTyp;
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index 644d8dd..062a7b2 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/solar.h>
#include <rtl/math.hxx>
#include <stdio.h>
@@ -69,19 +68,16 @@ void NI( SvStream& r, sal_uInt16 n )
r.SeekRel( n );
}
-
void OP_BOF( SvStream& r, sal_uInt16 /*n*/ )
{
r.SeekRel( 2 ); // Versionsnummer ueberlesen
}
-
void OP_EOF( SvStream& /*r*/, sal_uInt16 /*n*/ )
{
bEOF = sal_True;
}
-
void OP_Integer( SvStream& r, sal_uInt16 /*n*/ )
{
sal_uInt8 nFormat;
@@ -101,7 +97,6 @@ void OP_Integer( SvStream& r, sal_uInt16 /*n*/ )
}
}
-
void OP_Number( SvStream& r, sal_uInt16 /*n*/ )
{
sal_uInt8 nFormat;
@@ -121,7 +116,6 @@ void OP_Number( SvStream& r, sal_uInt16 /*n*/ )
}
}
-
void OP_Label( SvStream& r, sal_uInt16 n )
{
sal_uInt8 nFormat;
@@ -179,7 +173,6 @@ void OP_Formula( SvStream& r, sal_uInt16 /*n*/ )
}
}
-
void OP_ColumnWidth( SvStream& r, sal_uInt16 /*n*/ )
{
sal_uInt16 nCol, nBreite;
@@ -203,7 +196,6 @@ void OP_ColumnWidth( SvStream& r, sal_uInt16 /*n*/ )
}
}
-
void OP_NamedRange( SvStream& r, sal_uInt16 /*n*/ )
{
// POST: waren Koordinaten ungueltig, wird nicht gespeichert
@@ -242,7 +234,6 @@ void OP_NamedRange( SvStream& r, sal_uInt16 /*n*/ )
}
}
-
void OP_SymphNamedRange( SvStream& r, sal_uInt16 /*n*/ )
{
// POST: waren Koordinaten ungueltig, wird nicht gespeichert
@@ -281,25 +272,21 @@ void OP_SymphNamedRange( SvStream& r, sal_uInt16 /*n*/ )
}
}
-
void OP_Footer( SvStream& r, sal_uInt16 n )
{
r.SeekRel( n );
}
-
void OP_Header( SvStream& r, sal_uInt16 n )
{
r.SeekRel( n );
}
-
void OP_Margins( SvStream& r, sal_uInt16 n )
{
r.SeekRel( n );
}
-
void OP_HiddenCols( SvStream& r, sal_uInt16 /*n*/ )
{
sal_uInt16 nByte, nBit;
@@ -322,7 +309,6 @@ void OP_HiddenCols( SvStream& r, sal_uInt16 /*n*/ )
}
}
-
void OP_Window1( SvStream& r, sal_uInt16 n )
{
r.SeekRel( 4 ); // Cursor Pos ueberspringen
@@ -342,7 +328,6 @@ void OP_Window1( SvStream& r, sal_uInt16 n )
pDoc->SetColWidth( nCol, 0, nDefWidth );
}
-
void OP_Blank( SvStream& r, sal_uInt16 /*n*/ )
{
sal_uInt16 nCol, nRow;
@@ -357,7 +342,6 @@ void OP_BOF123( SvStream& r, sal_uInt16 /*n*/ )
r.SeekRel( 26 );
}
-
void OP_EOF123( SvStream& /*r*/, sal_uInt16 /*n*/ )
{
bEOF = sal_True;
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index e0d98aa..d0c136a 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -21,7 +21,6 @@
#include <svx/algitem.hxx>
#include <editeng/justifyitem.hxx>
#include <svl/zforlist.hxx>
-#include <tools/solar.h>
#include "rangenam.hxx"
#include "compiler.hxx"
@@ -37,11 +36,11 @@
#include <math.h>
-//--------------------------------------------------------- EXTERNE VARIABLEN -
+// External variable
extern WKTYP eTyp; // -> filter.cxx, aktueller Dateityp
extern ScDocument* pDoc; // -> filter.cxx, Aufhaenger zum Dokumentzugriff
-//--------------------------------------------------------- GLOBALE VARIABLEN -
+// Global variable
sal_uInt8 nDefaultFormat; // -> op.cpp, Standard-Zellenformat
extern SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter, *pAttrRepeat, *pAttrStandard;
@@ -58,9 +57,6 @@ FormCache* pValueFormCache;
SCCOL LotusRangeList::nEingCol;
SCROW LotusRangeList::nEingRow;
-
-
-
void PutFormString( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char* pString )
{
// Label-Format-Auswertung
@@ -104,9 +100,6 @@ void PutFormString( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char* pString )
pDoc->SetString(ScAddress(nCol,nRow,nTab), OUString(pString, strlen(pString), pLotusRoot->eCharsetQ), &aParam);
}
-
-
-
void SetFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt8 nFormat, sal_uInt8 nSt )
{
// PREC: nSt = Standard-Dezimalstellenanzahl
@@ -124,7 +117,6 @@ void InitPage( void )
//scGetPageFormat( 0, &aPage );
}
-
double SnumToDouble( sal_Int16 nVal )
{
const double pFacts[ 8 ] = {
@@ -169,7 +161,6 @@ double Snum32ToDouble( sal_uInt32 nValue )
return fValue;
}
-
FormCache::FormCache( ScDocument* pDoc1, sal_uInt8 nNewDefaultFormat )
{ // Default-Format ist 'Default'
nDefaultFormat = nNewDefaultFormat;
@@ -179,14 +170,12 @@ FormCache::FormCache( ScDocument* pDoc1, sal_uInt8 nNewDefaultFormat )
eLanguage = ScGlobal::eLnge;
}
-
FormCache::~FormCache()
{
for( sal_uInt16 nC = 0 ; nC < __nSize ; nC++ )
delete aIdents[ nC ].GetAttr();
}
-
SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt )
{
// neues Format erzeugen
@@ -369,9 +358,6 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt )
return new SfxUInt32Item( ATTR_VALUE_FORMAT, ( sal_uInt32 ) nHandle );
}
-
-
-
void LotusRange::MakeHash( void )
{
// 33222222222211111111110000000000
@@ -386,7 +372,6 @@ void LotusRange::MakeHash( void )
nHash += static_cast<sal_uInt32>(nRowEnd ) << 16;
}
-
LotusRange::LotusRange( SCCOL nCol, SCROW nRow )
{
nColStart = nColEnd = nCol;
@@ -395,7 +380,6 @@ LotusRange::LotusRange( SCCOL nCol, SCROW nRow )
MakeHash();
}
-
LotusRange::LotusRange( SCCOL nCS, SCROW nRS, SCCOL nCE, SCROW nRE )
{
nColStart = nCS;
@@ -406,16 +390,11 @@ LotusRange::LotusRange( SCCOL nCS, SCROW nRS, SCCOL nCE, SCROW nRE )
MakeHash();
}
-
LotusRange::LotusRange( const LotusRange& rCpy )
{
Copy( rCpy );
}
-
-
-
-
LotusRangeList::LotusRangeList( void )
{
aComplRef.InitFlags();
@@ -455,7 +434,6 @@ LR_ID LotusRangeList::GetIndex( const LotusRange &rRef )
return ID_FAIL;
}
-
void LotusRangeList::Append( LotusRange* pLR, const OUString& rName )
{
OSL_ENSURE( pLR, "*LotusRangeList::Append(): das wird nichts!" );
@@ -488,22 +466,17 @@ void LotusRangeList::Append( LotusRange* pLR, const OUString& rName )
nIdCnt++;
}
-
-
-
RangeNameBufferWK3::RangeNameBufferWK3( void )
{
pScTokenArray = new ScTokenArray;
nIntCount = 1;
}
-
RangeNameBufferWK3::~RangeNameBufferWK3()
{
delete pScTokenArray;
}
-
void RangeNameBufferWK3::Add( const OUString& rOrgName, const ScComplexRefData& rCRD )
{
OUString aScName = ScfTools::ConvertToScDefinedName(rOrgName);
@@ -537,7 +510,6 @@ void RangeNameBufferWK3::Add( const OUString& rOrgName, const ScComplexRefData&
pLotusRoot->pScRangeName->insert( pData );
}
-
bool RangeNameBufferWK3::FindRel( const OUString& rRef, sal_uInt16& rIndex )
{
StringHashEntry aRef( rRef );
@@ -555,7 +527,6 @@ bool RangeNameBufferWK3::FindRel( const OUString& rRef, sal_uInt16& rIndex )
return false;
}
-
bool RangeNameBufferWK3::FindAbs( const OUString& rRef, sal_uInt16& rIndex )
{
OUString aTmp( rRef );
@@ -606,5 +577,4 @@ bool RangeNameBufferWK3::FindAbs( const OUString& rRef, sal_uInt16& rIndex )
return false;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/drawutil.hxx b/sc/source/ui/inc/drawutil.hxx
index 7cdab10..7b751ab 100644
--- a/sc/source/ui/inc/drawutil.hxx
+++ b/sc/source/ui/inc/drawutil.hxx
@@ -21,7 +21,6 @@
#define SC_DRAWUTIL_HXX
#include "address.hxx"
-#include <tools/solar.h>
class Fraction;
class OutputDevice;
@@ -37,8 +36,6 @@ public:
Fraction& rScaleX, Fraction& rScaleY );
};
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/editable.hxx b/sc/source/ui/inc/editable.hxx
index 2760c04..b6d0f45 100644
--- a/sc/source/ui/inc/editable.hxx
+++ b/sc/source/ui/inc/editable.hxx
@@ -21,14 +21,12 @@
#define SC_EDITABLE_HXX
#include "address.hxx"
-#include <tools/solar.h>
class ScDocument;
class ScViewFunc;
class ScMarkData;
class ScRange;
-
class ScEditableTester
{
bool mbIsEditable;
diff --git a/sc/source/ui/inc/gridmerg.hxx b/sc/source/ui/inc/gridmerg.hxx
index 616fde6..62bcd67 100644
--- a/sc/source/ui/inc/gridmerg.hxx
+++ b/sc/source/ui/inc/gridmerg.hxx
@@ -20,8 +20,6 @@
#ifndef SC_GRIDMERG_HXX
#define SC_GRIDMERG_HXX
-#include <tools/solar.h>
-
class OutputDevice;
class ScGridMerger
@@ -49,8 +47,6 @@ public:
void Flush();
};
-
-
#endif
diff --git a/sc/source/ui/inc/refundo.hxx b/sc/source/ui/inc/refundo.hxx
index 7881e4e..4538957 100644
--- a/sc/source/ui/inc/refundo.hxx
+++ b/sc/source/ui/inc/refundo.hxx
@@ -20,7 +20,7 @@
#ifndef SC_REFUNDO_HXX
#define SC_REFUNDO_HXX
-#include <tools/solar.h>
+#include <sal/types.h>
class ScDocument;
class ScDBCollection;
@@ -52,8 +52,6 @@ public:
void DoUndo( ScDocument* pDoc, sal_Bool bUndoRefFirst );
};
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/undoolk.hxx b/sc/source/ui/inc/undoolk.hxx
index 2e9a73a..0658c5a 100644
--- a/sc/source/ui/inc/undoolk.hxx
+++ b/sc/source/ui/inc/undoolk.hxx
@@ -20,8 +20,6 @@
#ifndef SC_UNDOOLK_HXX
#define SC_UNDOOLK_HXX
-#include <tools/solar.h>
-
class SdrUndoAction;
class ScDocument;
@@ -31,8 +29,6 @@ void RedoSdrUndoAction ( SdrUndoAction* pUndoAction );
void DeleteSdrUndoAction ( SdrUndoAction* pUndoAction );
void EnableDrawAdjust ( ScDocument* pDoc, sal_Bool bEnable );
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/undoutil.hxx b/sc/source/ui/inc/undoutil.hxx
index 05137e9..532fe66 100644
--- a/sc/source/ui/inc/undoutil.hxx
+++ b/sc/source/ui/inc/undoutil.hxx
@@ -21,15 +21,12 @@
#define SC_UNDOUTIL_HXX
#include "address.hxx"
-#include <tools/solar.h>
class ScRange;
class ScDocShell;
class ScDBData;
class ScDocument;
-//----------------------------------------------------------------------------
-
class ScUndoUtil
{
public:
diff --git a/sc/source/ui/inc/viewutil.hxx b/sc/source/ui/inc/viewutil.hxx
index f0985a9..7339854 100644
--- a/sc/source/ui/inc/viewutil.hxx
+++ b/sc/source/ui/inc/viewutil.hxx
@@ -20,7 +20,6 @@
#define SC_VIEWUTIL_HXX
#include "address.hxx"
-#include <tools/solar.h>
#include <sal/types.h>
class SfxItemSet;
@@ -38,8 +37,6 @@ class ScMarkData;
enum ScUpdateMode { SC_UPDATE_ALL, SC_UPDATE_CHANGED, SC_UPDATE_MARKS };
-// ---------------------------------------------------------------------------
-
class SC_DLLPUBLIC ScViewUtil
{
public:
@@ -73,8 +70,6 @@ public:
static void SetFullScreen( SfxViewShell& rViewShell, bool bSet );
};
-// ---------------------------------------------------------------------------
-
class ScUpdateRect
{
private:
@@ -92,9 +87,6 @@ public:
sal_Bool GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
};
-
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list