[Libreoffice-commits] .: 10 commits - binfilter/bf_sw binfilter/inc lotuswordpro/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue May 24 01:02:34 PDT 2011
binfilter/bf_sw/source/core/bastyp/makefile.mk | 2
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx | 2
binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx | 48 +-
binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx | 4
binfilter/bf_sw/source/core/edit/makefile.mk | 2
binfilter/bf_sw/source/core/makefile.mk | 2
binfilter/bf_sw/source/core/ole/makefile.mk | 2
binfilter/bf_sw/source/core/ole/sw_ndole.cxx | 22 -
binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx | 2
binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx | 2
binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx | 21 -
binfilter/bf_sw/source/core/tox/makefile.mk | 2
binfilter/bf_sw/source/core/tox/sw_tox.cxx | 51 +--
binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx | 11
binfilter/bf_sw/source/core/view/makefile.mk | 2
binfilter/bf_sw/source/ui/uiview/makefile.mk | 78 ----
binfilter/bf_sw/source/ui/uiview/pview.hrc | 72 ----
binfilter/bf_sw/source/ui/uiview/sw_pview.src | 175 ----------
binfilter/bf_sw/source/ui/uiview/sw_view.src | 361 ----------------------
binfilter/bf_sw/source/ui/uiview/view.hrc | 61 ---
binfilter/bf_sw/source/ui/web/makefile.mk | 2
binfilter/inc/bf_sw/fmteiro.hxx | 2
binfilter/inc/bf_sw/fmtline.hxx | 2
binfilter/inc/bf_sw/tgrditem.hxx | 2
lotuswordpro/source/filter/lwpdrawobj.cxx | 216 ++++++-------
25 files changed, 201 insertions(+), 945 deletions(-)
New commits:
commit c2461b6499a0c17b2e54d6daaf0ee7b4c46a791f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 23 23:10:21 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/bastyp/makefile.mk b/binfilter/bf_sw/source/core/bastyp/makefile.mk
index f9ce9d8..4760935 100644
--- a/binfilter/bf_sw/source/core/bastyp/makefile.mk
+++ b/binfilter/bf_sw/source/core/bastyp/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
index 428fc8d..91f97f8 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
@@ -452,7 +452,7 @@ static int
/*?*/ case CALC_SYNTAX : return RESOURCE->aCalc_Syntax;
/*?*/ case CALC_ZERODIV : return RESOURCE->aCalc_ZeroDiv;
/*?*/ case CALC_BRACK : return RESOURCE->aCalc_Brack;
-/*?*/ case CALC_POW : return RESOURCE->aCalc_Pow;
+/*?*/ case CALC_POWERR : return RESOURCE->aCalc_Pow;
/*?*/ case CALC_VARNFND : return RESOURCE->aCalc_VarNFnd;
/*?*/ case CALC_OVERFLOW : return RESOURCE->aCalc_Overflow;
/*?*/ case CALC_WRONGTIME : return RESOURCE->aCalc_WrongTime;
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx b/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
index 7cf1886..02cf70c 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
@@ -104,29 +104,29 @@ namespace binfilter {
/*N*/ #ifdef DBG_UTIL
/*N*/ , const ByteString &rNm
/*N*/ #endif
-/*N*/ ) :
-/*N*/ SwCacheObjArr( (BYTE)nInitSize, (BYTE)nGrowSize ),
-/*N*/ aFreePositions( 5, 5 ),
-/*N*/ nMax( nInitSize ),
-/*N*/ nCurMax( nInitSize ),
-/*N*/ pRealFirst( 0 ),
-/*N*/ pFirst( 0 ),
-/*N*/ pLast( 0 )
+/*N*/ )
+/*N*/ : SwCacheObjArr( (BYTE)nInitSize, (BYTE)nGrowSize )
+/*N*/ , aFreePositions( 5, 5 )
+/*N*/ , pRealFirst( 0 )
+/*N*/ , pFirst( 0 )
+/*N*/ , pLast( 0 )
+/*N*/ , nMax( nInitSize )
+/*N*/ , nCurMax( nInitSize )
/*N*/ #ifdef DBG_UTIL
-/*N*/ , aName( rNm ),
-/*N*/ nAppend( 0 ),
-/*N*/ nInsertFree( 0 ),
-/*N*/ nReplace( 0 ),
-/*N*/ nGetSuccess( 0 ),
-/*N*/ nGetFail( 0 ),
-/*N*/ nToTop( 0 ),
-/*N*/ nDelete( 0 ),
-/*N*/ nGetSeek( 0 ),
-/*N*/ nAverageSeekCnt( 0 ),
-/*N*/ nFlushCnt( 0 ),
-/*N*/ nFlushedObjects( 0 ),
-/*N*/ nIncreaseMax( 0 ),
-/*N*/ nDecreaseMax( 0 )
+/*N*/ , aName( rNm )
+/*N*/ , nAppend( 0 )
+/*N*/ , nInsertFree( 0 )
+/*N*/ , nReplace( 0 )
+/*N*/ , nGetSuccess( 0 )
+/*N*/ , nGetFail( 0 )
+/*N*/ , nToTop( 0 )
+/*N*/ , nDelete( 0 )
+/*N*/ , nGetSeek( 0 )
+/*N*/ , nAverageSeekCnt( 0 )
+/*N*/ , nFlushCnt( 0 )
+/*N*/ , nFlushedObjects( 0 )
+/*N*/ , nIncreaseMax( 0 )
+/*N*/ , nDecreaseMax( 0 )
/*N*/ #endif
/*N*/ {
/*N*/ }
@@ -528,10 +528,10 @@ namespace binfilter {
/*N*/ SwCacheObj::SwCacheObj( const void *pOwn ) :
-/*N*/ nLock( 0 ),
-/*N*/ nCachePos( USHRT_MAX ),
/*N*/ pNext( 0 ),
/*N*/ pPrev( 0 ),
+/*N*/ nCachePos( USHRT_MAX ),
+/*N*/ nLock( 0 ),
/*N*/ pOwner( pOwn )
/*N*/ {
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx b/binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx
index 6ed5b8b..95cc2da 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx
@@ -286,9 +286,9 @@ namespace binfilter {
-/*N*/ SvStream &operator<<( SvStream &rStream, const SwRect &rRect )
+/*N*/ SvStream &operator<<( SvStream &rStream, const SwRect & )
/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
+/*N*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return rStream;
/*N*/ }
#endif
diff --git a/binfilter/inc/bf_sw/fmteiro.hxx b/binfilter/inc/bf_sw/fmteiro.hxx
index cc3ca0f..dddf4bc 100644
--- a/binfilter/inc/bf_sw/fmteiro.hxx
+++ b/binfilter/inc/bf_sw/fmteiro.hxx
@@ -47,7 +47,7 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
- virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const {}
+ virtual SvStream& Store(SvStream &rStream, USHORT) const { return rStream; }
virtual USHORT GetVersion( USHORT nFFVer ) const;
};
diff --git a/binfilter/inc/bf_sw/fmtline.hxx b/binfilter/inc/bf_sw/fmtline.hxx
index d8889fd..1d985a4 100644
--- a/binfilter/inc/bf_sw/fmtline.hxx
+++ b/binfilter/inc/bf_sw/fmtline.hxx
@@ -51,7 +51,7 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const;
- virtual SvStream& Store(SvStream &, USHORT nIVer) const {}
+ virtual SvStream& Store(SvStream &rStream, USHORT) const { return rStream;}
virtual USHORT GetVersion( USHORT nFFVer ) const;
virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
diff --git a/binfilter/inc/bf_sw/tgrditem.hxx b/binfilter/inc/bf_sw/tgrditem.hxx
index 1f1835a..5a4557f 100644
--- a/binfilter/inc/bf_sw/tgrditem.hxx
+++ b/binfilter/inc/bf_sw/tgrditem.hxx
@@ -58,7 +58,7 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const;
- virtual SvStream& Store(SvStream &, USHORT nIVer) const {}
+ virtual SvStream& Store(SvStream &rStream, USHORT) const { return rStream; }
virtual USHORT GetVersion( USHORT nFFVer ) const;
virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
commit c8547c20061b61de374cca8021dde6010917cc0e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 23 23:00:02 2011 +0100
WaE: throw out some warnings
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
index c93a881..c1f3c71 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
@@ -774,7 +774,7 @@ typedef const SwTxtFmtColl *Sw3TxtFmtCollPtrConst;
/*N*/ }
/*N*/ }
/*N*/ else if( bOutline && IsSw31Or40Export() &&
-/*N*/ (pFmt->GetAbsLSpace() > 0U ||
+/*N*/ (pFmt->GetAbsLSpace() > 0 ||
/*N*/ pFmt->GetFirstLineOffset() != 0) )
/*N*/ {
/*N*/ // Im 3.1- oder 4.0-Format gab es noch keinen linken Abstand
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx
index 5f2d78e..7a4733e 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx
@@ -445,7 +445,7 @@ xub_StrLen lcl_sw3io_getNodeOff( const SwNodeIndex& rNdIdx, xub_StrLen nCntntIdx
/*N*/ pPos->nNode = rNodeIdx;
/*N*/ xub_StrLen nLen = rNode.GetCntntNode()->Len();
/*N*/ xub_StrLen nIdx = static_cast< xub_StrLen >( nNodeOff+nCntntOff );
-/*N*/ OSL_ENSURE( nIdx>=0 && nIdx<=nLen, "ungueltiger Cntnt-Offset" );
+/*N*/ OSL_ENSURE( nIdx<=nLen, "ungueltiger Cntnt-Offset" );
/*N*/ if( nIdx > nLen )
/*N*/ {
/*N*/ bInvalid = sal_True;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
index 765d1d2..ec22bb2 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
@@ -150,6 +150,7 @@ class SwStyleSheetPool : public SfxStyleSheetBasePool {
SwDoc& rDoc; // Dokument
Sw3Fmts* pConvToSymbolFmts;
long nExpFFVersion; // FF-Version fuer Export
+ using SfxStyleSheetBasePool::Create;
virtual SfxStyleSheetBase* Create( const String&, SfxStyleFamily, USHORT nMask);
void Add( const SwFmt& rFmt, SfxStyleFamily eFam );
void CopyFromDoc( BOOL bUsed );
@@ -191,15 +192,16 @@ public:
/*N*/ SwStyleSheet::SwStyleSheet( const String& rName, SwStyleSheetPool& rPool1,
/*N*/ SfxStyleFamily eFam, USHORT nMask1 )
-/*N*/ : SfxStyleSheetBase( rName, rPool1, eFam, nMask1 ),
-/*N*/ rDoc( rPool1.rDoc ), aSet( rPool1.rPool,
+/*N*/ : SfxStyleSheetBase( rName, rPool1, eFam, nMask1 )
+/*N*/ , aSet( rPool1.rPool,
/*N*/ RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
/*N*/ RES_PARATR_BEGIN, RES_PARATR_END - 1,
/*N*/ RES_FRMATR_BEGIN, RES_FRMATR_END - 1,
-/*N*/ 0 ),
-/*N*/ cFlags( 0 ),
-/*N*/ pCondColls( 0 ),
-/*N*/ pNumLRSpace( 0 )
+/*N*/ 0 )
+/*N*/ , rDoc( rPool1.rDoc )
+/*N*/ , cFlags( 0 )
+/*N*/ , pCondColls( 0 )
+/*N*/ , pNumLRSpace( 0 )
/*N*/ {
/*N*/ nId = 0xFFFF;
/*N*/ nHelpId = UCHAR_MAX;
@@ -396,9 +398,10 @@ public:
/*N*/ SwStyleSheetPool::SwStyleSheetPool( SwDoc& r, SfxItemPool& rp, long nFFVersion,
/*N*/ Sw3Fmts *pConvFmts )
-/*N*/ : SfxStyleSheetBasePool( rp ), rDoc( r ),
-/*N*/ nExpFFVersion( nFFVersion ),
-/*N*/ pConvToSymbolFmts( pConvFmts )
+/*N*/ : SfxStyleSheetBasePool( rp )
+/*N*/ , rDoc( r )
+/*N*/ , pConvToSymbolFmts( pConvFmts )
+/*N*/ , nExpFFVersion( nFFVersion )
/*N*/ {}
/*N*/ SwStyleSheetPool::~SwStyleSheetPool()
commit 234986a3ea18e2a3895e3145278fc3e39299d213
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 23 22:52:52 2011 +0100
WaE: throw out some warnings
diff --git a/binfilter/bf_sw/source/core/tox/makefile.mk b/binfilter/bf_sw/source/core/tox/makefile.mk
index 7c8c278..9afc9d9 100644
--- a/binfilter/bf_sw/source/core/tox/makefile.mk
+++ b/binfilter/bf_sw/source/core/tox/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
commit 7946168835580b8904dd5f089d8d9e5fe2aca5f3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 23 22:52:11 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/tox/sw_tox.cxx b/binfilter/bf_sw/source/core/tox/sw_tox.cxx
index a802061..ee20bce 100644
--- a/binfilter/bf_sw/source/core/tox/sw_tox.cxx
+++ b/binfilter/bf_sw/source/core/tox/sw_tox.cxx
@@ -100,7 +100,7 @@ struct PatternIni
};
const PatternIni aPatternIni[] =
{
- {USHRT_MAX}, //Header - no pattern
+ {USHRT_MAX, USHRT_MAX, USHRT_MAX, USHRT_MAX, USHRT_MAX}, //Header - no pattern
{AUTH_FIELD_AUTHOR, AUTH_FIELD_TITLE, AUTH_FIELD_YEAR, USHRT_MAX, USHRT_MAX}, //AUTH_TYPE_ARTICLE,
{AUTH_FIELD_AUTHOR, AUTH_FIELD_TITLE, AUTH_FIELD_YEAR, USHRT_MAX, USHRT_MAX}, //AUTH_TYPE_BOOK,
{AUTH_FIELD_AUTHOR, AUTH_FIELD_TITLE, AUTH_FIELD_YEAR, USHRT_MAX, USHRT_MAX}, //AUTH_TYPE_BOOKLET,
@@ -199,15 +199,17 @@ String lcl_GetAuthPattern(USHORT nTypeId)
/*N*/ SwTOXMark::SwTOXMark( const SwTOXMark& rCopy )
-/*N*/ : SfxPoolItem( RES_TXTATR_TOXMARK ),
-/*N*/ SwClient((SwModify*)rCopy.GetRegisteredIn()),
-/*N*/ pTxtAttr( 0 ), nLevel( rCopy.nLevel ),
-/*N*/ aPrimaryKey( rCopy.aPrimaryKey ), aSecondaryKey( rCopy.aSecondaryKey ),
-/*N*/ aTextReading( rCopy.aTextReading ),
-/*N*/ aPrimaryKeyReading( rCopy.aPrimaryKeyReading ),
-/*N*/ aSecondaryKeyReading( rCopy.aSecondaryKeyReading ),
-/*N*/ bAutoGenerated( rCopy.bAutoGenerated),
-/*N*/ bMainEntry(rCopy.bMainEntry)
+/*N*/ : SfxPoolItem( RES_TXTATR_TOXMARK )
+/*N*/ , SwClient((SwModify*)rCopy.GetRegisteredIn())
+/*N*/ , aPrimaryKey( rCopy.aPrimaryKey )
+/*N*/ , aSecondaryKey( rCopy.aSecondaryKey )
+/*N*/ , aTextReading( rCopy.aTextReading )
+/*N*/ , aPrimaryKeyReading( rCopy.aPrimaryKeyReading )
+/*N*/ , aSecondaryKeyReading( rCopy.aSecondaryKeyReading )
+/*N*/ , pTxtAttr( 0 )
+/*N*/ , nLevel( rCopy.nLevel )
+/*N*/ , bAutoGenerated(rCopy.bAutoGenerated)
+/*N*/ , bMainEntry(rCopy.bMainEntry)
/*N*/ {
/*N*/ // AlternativString kopieren
/*N*/ aAltText = rCopy.aAltText;
@@ -654,6 +656,8 @@ void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; }
/*N*/ // no conversion available
/*?*/ sRet.AppendAscii( SwForm::aFormEntry );
/*?*/ break;
+/*?*/ default:
+/*?*/ break;
/*N*/ }
/*N*/ }
/*N*/ return sRet;
@@ -734,17 +738,17 @@ void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; }
/*N*/ SwTOXBase::SwTOXBase(const SwTOXType* pTyp, const SwForm& rForm,
/*N*/ USHORT nCreaType, const String& rTitle )
-/*N*/ : SwClient((SwModify*)pTyp),
-/*N*/ nCreateType(nCreaType),
-/*N*/ aTitle(rTitle),
-/*N*/ aForm(rForm),
-/*N*/ eCaptionDisplay(CAPTION_COMPLETE),
-/*N*/ eLanguage((LanguageType)::binfilter::GetAppLanguage()),
-/*N*/ bProtected( TRUE ),
-/*N*/ bFromChapter(FALSE),
-/*N*/ bFromObjectNames(FALSE),
-/*N*/ bLevelFromChapter(FALSE),
-/*N*/ nOLEOptions(0)
+/*N*/ : SwClient((SwModify*)pTyp)
+/*N*/ , aForm(rForm)
+/*N*/ , aTitle(rTitle)
+/*N*/ , eLanguage((LanguageType)::binfilter::GetAppLanguage())
+/*N*/ , nCreateType(nCreaType)
+/*N*/ , nOLEOptions(0)
+/*N*/ , eCaptionDisplay(CAPTION_COMPLETE)
+/*N*/ , bProtected( TRUE )
+/*N*/ , bFromChapter(FALSE)
+/*N*/ , bFromObjectNames(FALSE)
+/*N*/ , bLevelFromChapter(FALSE)
/*N*/ {
/*N*/ aData.nOptions = 0;
/*N*/ }
@@ -913,6 +917,9 @@ void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; }
/*N*/ case TOKEN_AUTHORITY:
/*?*/ eRet.nAuthorityField = sAuthFieldEnum.ToInt32();
/*?*/ break;
+/*?*/
+/*N*/ default:
+/*?*/ break;
/*N*/ }
/*N*/ return eRet;
/*N*/ }
@@ -1028,6 +1035,8 @@ void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; }
/*?*/ sRet.Insert( sTmp, 2 );
/*N*/ }
/*N*/ break;
+/*N*/ default:
+/*N*/ break;
/*N*/ }
/*N*/ sRet.Erase( sRet.Len() - 1 );
/*N*/ sRet += ' ';
diff --git a/binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx b/binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx
index 4438847..427b277 100644
--- a/binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx
+++ b/binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx
@@ -136,8 +136,13 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd,
const SwTxtTOXMark* pMark,
const SwTOXInternational* pInter,
const ::com::sun::star::lang::Locale* pLocale )
- : pTxtMark( pMark ), pTOXNd( 0 ), nPos( 0 ), nType( nTyp ),
- pTOXIntl( pInter ), bValidTxt( FALSE ), nCntPos( 0 )
+ : pTOXNd( 0 )
+ , pTxtMark( pMark )
+ , pTOXIntl( pInter )
+ , nPos( 0 )
+ , nCntPos( 0 )
+ , nType( nTyp )
+ , bValidTxt( FALSE )
{
if ( pLocale )
aLocale = *pLocale;
@@ -182,6 +187,8 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd,
else
nCntPos = n;
break;
+ default:
+ break;
}
}
}
commit 46d1b893e174c30a29799948b2dabfd23102ad87
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 23 22:43:44 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/view/makefile.mk b/binfilter/bf_sw/source/core/view/makefile.mk
index d032557..e7a6e91 100644
--- a/binfilter/bf_sw/source/core/view/makefile.mk
+++ b/binfilter/bf_sw/source/core/view/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
commit ae29b0f879c4540bc6bb5ebc8441fb9492b23334
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 23 22:07:28 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/edit/makefile.mk b/binfilter/bf_sw/source/core/edit/makefile.mk
index ae9a676..28497cf 100644
--- a/binfilter/bf_sw/source/core/edit/makefile.mk
+++ b/binfilter/bf_sw/source/core/edit/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
commit 5272e1228603fefbc385466d80dcab64369d67f5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 23 21:56:38 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/makefile.mk b/binfilter/bf_sw/source/core/makefile.mk
index a755996..272cf04 100644
--- a/binfilter/bf_sw/source/core/makefile.mk
+++ b/binfilter/bf_sw/source/core/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_sw/source/core/ole/makefile.mk b/binfilter/bf_sw/source/core/ole/makefile.mk
index 145e04f..4668743 100644
--- a/binfilter/bf_sw/source/core/ole/makefile.mk
+++ b/binfilter/bf_sw/source/core/ole/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/core/ole/sw_ndole.cxx b/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
index 9e970ff..923acae 100644
--- a/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
+++ b/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
@@ -252,17 +252,17 @@ SwOLELRUCache* SwOLEObj::pOLELRU_Cache = 0;
/*N*/ }
-/*N*/ SwOLEObj::SwOLEObj( SvInPlaceObject *pObj ) :
-/*N*/ pOLERef( new SvInPlaceObjectRef( pObj ) ),
-/*N*/ pOLENd( 0 )
+/*N*/ SwOLEObj::SwOLEObj( SvInPlaceObject *pObj )
+/*N*/ : pOLENd( 0 )
+/*N*/ , pOLERef( new SvInPlaceObjectRef( pObj ) )
/*N*/ {
/*N*/ }
-/*N*/ SwOLEObj::SwOLEObj( const String &rString ) :
-/*N*/ pOLERef( 0 ),
-/*N*/ pOLENd( 0 ),
-/*N*/ aName( rString )
+/*N*/ SwOLEObj::SwOLEObj( const String &rString )
+/*N*/ : pOLENd( 0 )
+/*N*/ , pOLERef( 0 )
+/*N*/ , aName( rString )
/*N*/ {
/*N*/ }
@@ -397,10 +397,10 @@ SwOLELRUCache* SwOLEObj::pOLELRU_Cache = 0;
/*N*/ }
/*N*/ SwOLELRUCache::SwOLELRUCache()
-/*N*/ : SvPtrarr( 64, 16 ),
-/*N*/ ::utl::ConfigItem( OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Cache" ))),
-/*N*/ bInUnload( sal_False ),
-/*N*/ nLRU_InitSize( 20 )
+/*N*/ : SvPtrarr( 64, 16 )
+/*N*/ , ::utl::ConfigItem( OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Cache" )))
+/*N*/ , nLRU_InitSize( 20 )
+/*N*/ , bInUnload( sal_False )
/*N*/ {
/*N*/ EnableNotification( GetPropertyNames() );
/*N*/ Load();
commit 3bb936bf4a4c84eb1cf492400743d5d5cc5de017
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 23 21:53:21 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/ui/web/makefile.mk b/binfilter/bf_sw/source/ui/web/makefile.mk
index 50807e1..d0af5b9 100644
--- a/binfilter/bf_sw/source/ui/web/makefile.mk
+++ b/binfilter/bf_sw/source/ui/web/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
commit d31c0ad3f9bbdc6a0a3ed0d6471e027d2fc7a820
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 23 21:52:23 2011 +0100
this dir is unused
diff --git a/binfilter/bf_sw/source/ui/uiview/makefile.mk b/binfilter/bf_sw/source/ui/uiview/makefile.mk
deleted file mode 100644
index be9ae7b..0000000
--- a/binfilter/bf_sw/source/ui/uiview/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
-PRJ=..$/..$/..$/..
-BFPRJ=..$/..$/..
-
-PRJNAME=binfilter
-TARGET=sw_uiview
-
-NO_HIDS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/inc$/bf_sw$/swpre.mk
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/inc$/bf_sw$/sw.mk
-
-INC+= -I$(PRJ)$/inc$/bf_sw
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
- sw_view.src \
- sw_pview.src
-
-SLOFILES = \
- $(SLO)$/sw_view0.obj \
- $(SLO)$/sw_view.obj \
- $(SLO)$/sw_view1.obj \
- $(SLO)$/sw_view2.obj \
- $(SLO)$/sw_viewdraw.obj \
- $(SLO)$/sw_viewmdi.obj \
- $(SLO)$/sw_pview.obj \
- $(SLO)$/sw_viewport.obj \
- $(SLO)$/sw_viewstat.obj \
- $(SLO)$/sw_viewtab.obj \
- $(SLO)$/sw_viewprt.obj \
- $(SLO)$/sw_scroll.obj \
- $(SLO)$/sw_swcli.obj \
- $(SLO)$/sw_srcview.obj \
- $(SLO)$/sw_uivwimp.obj
-
-EXCEPTIONSFILES= \
- $(SLO)$/sw_srcview.obj \
- $(SLO)$/sw_uivwimp.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(SRS)$/sw_uiview.srs: $(PRJ)$/inc$/bf_svx$/globlmn.hrc
-
diff --git a/binfilter/bf_sw/source/ui/uiview/pview.hrc b/binfilter/bf_sw/source/ui/uiview/pview.hrc
deleted file mode 100644
index d30f90e..0000000
--- a/binfilter/bf_sw/source/ui/uiview/pview.hrc
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "view.hrc"
-
-#define FT_COL 1
-#define FT_ROW 2
-#define ED_COL 4
-#define ED_ROW 5
-
-#define BT_OK 20
-#define BT_CANCEL 21
-#define BT_HELP 22
-
-// Grenzwerte fuers Zooming (werden auch im piew.cxx benutzt!)
-#define PVIEW_MIN_ROW 1
-#define PVIEW_MAX_ROW 10
-#define PVIEW_MIN_COL 1
-#define PVIEW_MAX_COL 20
-
-//Dialog Druckoptionen
-#define FL_ROWCOL 1
-#define FT_ROWS 2
-#define NF_ROWS 3
-#define FT_COLS 4
-#define NF_COLS 5
-#define FL_MARGINS 6
-#define FL_DISTANCE 7
-#define FL_ORIENTATION 8
-
-#define WIN_PREVIEW 11
-
-
-#define FT_LMARGIN 12
-#define MF_LMARGIN 13
-#define FT_RMARGIN 14
-#define MF_RMARGIN 15
-#define FT_TMARGIN 16
-#define MF_TMARGIN 17
-#define FT_BMARGIN 18
-#define MF_BMARGIN 19
-#define FT_HMARGIN 20
-#define MF_HMARGIN 21
-#define FT_VMARGIN 22
-#define MF_VMARGIN 23
-#define PB_STANDARD 24
-
-#define RB_LANDSCAPE 24
-#define RB_PORTRAIT 25
diff --git a/binfilter/bf_sw/source/ui/uiview/sw_pview.src b/binfilter/bf_sw/source/ui/uiview/sw_pview.src
deleted file mode 100644
index a3f7104..0000000
--- a/binfilter/bf_sw/source/ui/uiview/sw_pview.src
+++ /dev/null
@@ -1,175 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#define NO_LOCALIZE_EXPORT
-
-#include <bf_svx/svxids.hrc>
-#include "pview.hrc"
-#include "helpid.h"
-#include "cmdid.h"
-String RID_PVIEW_TOOLBOX
-{
- Text [ de ] = "Seitenansicht" ;
- Text [ en-US ] = "Page Preview" ;
- Text [ x-comment ] = " ";
- Text[ pt ] = "Ver página";
- Text[ ru ] = "Предварительный проÑмотр";
- Text[ el ] = "Î Ïοεπισκόπηση εκτÏπωσης";
- Text[ nl ] = "Afdrukvoorbeeld";
- Text[ fr ] = "Aperçu";
- Text[ es ] = "Vista preliminar";
- Text[ fi ] = "Esikatselu";
- Text[ ca ] = "Visualització prèvia de la pà gina";
- Text[ it ] = "Anteprima stampa";
- Text[ sk ] = "Náhľad stránky";
- Text[ da ] = "Sidevisning";
- Text[ sv ] = "Förhandsgranskning";
- Text[ pl ] = "PodglÄ…d wydruku";
- Text[ pt-BR ] = "Visualizar Página";
- Text[ th ] = "à¹à¸ªà¸”งตัวà¸à¸¢à¹ˆà¸²à¸‡à¸«à¸™à¹‰à¸²";
- Text[ ja ] = "å°åˆ·ãƒ—レビュー";
- Text[ ko ] = "ì¸ì‡„ 미리 보기";
- Text[ zh-CN ] = "页é¢è§†å›¾";
- Text[ zh-TW ] = "é é¢æª¢è¦–";
- Text[ tr ] = "Sayfa önizleme";
- Text[ hi-IN ] = "पृषà¥à¤ का पूरà¥à¤µà¤¦à¥ƒà¤¶à¥à¤¯";
- Text[ ar ] = "معاينة الصÙØØ©";
- Text[ he ] = "‮מבט כללי‬";
-};
-ToolBox RID_PVIEW_TOOLBOX
-{
- Border = TRUE ;
- SVLook = TRUE ;
- Dockable = TRUE ;
- Moveable = TRUE ;
- Sizeable = TRUE ;
- Closeable = TRUE ;
- Zoomable = TRUE ;
- LineSpacing = TRUE ;
- HideWhenDeactivate = TRUE ;
- Customize = TRUE ;
- HelpID = HID_PVIEW_TOOLBOX ;
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = FN_PAGEUP ;
- HelpID = FN_PAGEUP ;
- };
- ToolBoxItem
- {
- Identifier = FN_PAGEDOWN ;
- HelpID = FN_PAGEDOWN ;
- };
- ToolBoxItem
- {
- Identifier = FN_START_OF_DOCUMENT ;
- HelpID = FN_START_OF_DOCUMENT ;
- };
- ToolBoxItem
- {
- Identifier = FN_END_OF_DOCUMENT ;
- HelpID = FN_END_OF_DOCUMENT ;
- };
- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
- ToolBoxItem
- {
- Identifier = FN_SHOW_TWO_PAGES ;
- HelpID = FN_SHOW_TWO_PAGES ;
- };
- ToolBoxItem
- {
- Identifier = FN_SHOW_MULTIPLE_PAGES ;
- HelpID = FN_SHOW_MULTIPLE_PAGES ;
- DropDown = TRUE;
- };
- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
- ToolBoxItem
- {
- Identifier = SID_ZOOM_OUT;
- HelpID = SID_ZOOM_OUT ;
- };
- ToolBoxItem
- {
- Identifier = SID_ZOOM_IN;
- HelpID = SID_ZOOM_IN ;
- };
- ToolBoxItem
- {
- Identifier = FN_PREVIEW_ZOOM;
- HelpID = HID_PREVIEW_ZOOM ;
- };
- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
- ToolBoxItem
- {
- Identifier = SID_WIN_FULLSCREEN ;
- HelpID = SID_WIN_FULLSCREEN ;
- };
- ToolBoxItem
- {
- Identifier = FN_PRINT_PAGEPREVIEW ;
- HelpID = FN_PRINT_PAGEPREVIEW ;
- };
- ToolBoxItem
- {
- Identifier = FN_PREVIEW_PRINT_OPTIONS ;
- HelpID = FN_PREVIEW_PRINT_OPTIONS ;
- };
- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
- ToolBoxItem
- {
- Identifier = FN_CLOSE_PAGEPREVIEW;
- HelpID = SID_PRINTPREVIEW;
- };
- };
- Scroll = TRUE ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/binfilter/bf_sw/source/ui/uiview/sw_view.src b/binfilter/bf_sw/source/ui/uiview/sw_view.src
deleted file mode 100644
index 5445f02..0000000
--- a/binfilter/bf_sw/source/ui/uiview/sw_view.src
+++ /dev/null
@@ -1,361 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#define NO_LOCALIZE_EXPORT
-
-#include <bf_svx/svxids.hrc>
-#include <bf_svx/globlmn.hrc>
-#include "view.hrc"
-#include "shells.hrc"
-#include "globals.hrc"
-#include "popup.hrc"
-#include "helpid.h"
-#include "cmdid.h"
-
-
-String STR_NUM_LEVEL
-{
- Text [ de ] = "Ebene " ;
- Text [ en-US ] = "Level " ;
- Text [ x-comment ] = " ";
- Text[ pt ] = "NÃvel ";
- Text[ ru ] = "Уровень ";
- Text[ el ] = "Επίπεδο ";
- Text[ nl ] = "Niveau";
- Text[ fr ] = "Niveau ";
- Text[ es ] = "Nivel ";
- Text[ fi ] = "Taso ";
- Text[ ca ] = "Nivell ";
- Text[ it ] = "Livello ";
- Text[ sk ] = "Úroveň ";
- Text[ da ] = "Niveau ";
- Text[ sv ] = "Nivå ";
- Text[ pl ] = "Poziom ";
- Text[ pt-BR ] = "NÃvel";
- Text[ th ] = "ระดับ ";
- Text[ ja ] = "レベル ";
- Text[ ko ] = "수준 ";
- Text[ zh-CN ] = "级 ";
- Text[ zh-TW ] = "ç´š ";
- Text[ tr ] = "Düzey ";
- Text[ hi-IN ] = "सà¥à¤¤à¤°";
- Text[ ar ] = "المستوى";
- Text[ he ] = "Ebene";
-};
-
-String RID_TOOLS_TOOLBOX
-{
- Text [ de ] = "Werkzeugleiste" ;
- Text [ en-US ] = "Main Toolbar" ;
- Text [ x-comment ] = " ";
- Text[ pt ] = "Barra de ferramentas";
- Text[ ru ] = "Панель инÑтрументов";
- Text[ el ] = "ΚÏÏια γÏαμμή εÏγαλείων";
- Text[ nl ] = "Werktuigbalk";
- Text[ fr ] = "Barre d'instruments";
- Text[ es ] = "Barra de herramientas";
- Text[ fi ] = "Päätyökalurivi";
- Text[ ca ] = "Barra d'eines principal";
- Text[ it ] = "Barra degli strumenti";
- Text[ sk ] = "Hlavný panel nástrojov";
- Text[ da ] = "Værktøjslinje";
- Text[ sv ] = "Verktygslist";
- Text[ pl ] = "Główny pasek narzędzi";
- Text[ pt-BR ] = "Barra de Ferramentas Principal";
- Text[ th ] = "à¹à¸–บเครื่à¸à¸‡à¸¡à¸·à¸à¸«à¸¥à¸±à¸";
- Text[ ja ] = "標準ツールãƒãƒ¼";
- Text[ ko ] = "주 ë„구 모ìŒ";
- Text[ zh-CN ] = "主工具æ ";
- Text[ zh-TW ] = "主工具列";
- Text[ tr ] = "Ana araç çubuğu";
- Text[ hi-IN ] = "मà¥à¤–à¥à¤¯ औज़ार पटà¥à¤Ÿà¥€";
- Text[ ar ] = "شريط الأدوات";
- Text[ he ] = "‮סרגל ר×שי‬";
-};
-
-String STR_READONLY_SEL
-{
- Text [ de ] = "schreibgeschützt" ;
- Text [ en-US ] = "read-only";
- Text [ x-comment ] = " ";
- Text[ pt ] = "só leitura";
- Text[ ru ] = "только Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ";
- Text[ el ] = "μόνο για ανάγνωση";
- Text[ nl ] = "Alleen-lezen";
- Text[ fr ] = "en lecture seule";
- Text[ es ] = "sólo lectura";
- Text[ fi ] = "Vain luku";
- Text[ ca ] = "només de lectura";
- Text[ it ] = "a sola lettura";
- Text[ sk ] = "len na ÄÃtanie";
- Text[ da ] = "skrivebeskyttet";
- Text[ sv ] = "skrivskyddad";
- Text[ pl ] = "Tylko do odczytu";
- Text[ pt-BR ] = "somente leitura";
- Text[ th ] = "à¸à¹ˆà¸²à¸™à¸à¸¢à¹ˆà¸²à¸‡à¹€à¸”ียว";
- Text[ ja ] = "èªã¿å–り専用";
- Text[ ko ] = "ì½ê¸° ì „ìš©";
- Text[ zh-CN ] = "防改写";
- Text[ zh-TW ] = "唯讀";
- Text[ tr ] = "okuma amaçlı";
- Text[ hi-IN ] = "केवल पढ़ने केलिà¤";
- Text[ ar ] = "للقراءة Ùقط";
- Text[ he ] = "‮קרי××” בלבד‬";
-};
-
-String MN_SRCVIEW_POPUPMENU
-{
- Text [ de ] = "HTML - Quelltext" ;
- Text [ en-US ] = "HTML source" ;
- Text [ x-comment ] = " ";
- Text[ pt ] = "Fonte HTML";
- Text[ ru ] = "ИÑходный текÑÑ‚ в формате HTML";
- Text[ el ] = "ΑÏχείο Ï€ÏοÎλευσης HTML";
- Text[ nl ] = "HTML-brontekst";
- Text[ fr ] = "Texte source HTML";
- Text[ es ] = "Texto fuente HTML";
- Text[ fi ] = "HTML-lähde";
- Text[ ca ] = "Font HTML";
- Text[ it ] = "Testo sorgente HTML";
- Text[ sk ] = "Zdrojový HTML text";
- Text[ da ] = "HTML-kildetekst";
- Text[ sv ] = "HTML-källtext";
- Text[ pl ] = "Tekst źródłowy HTML";
- Text[ pt-BR ] = "Origem HTML";
- Text[ th ] = "à¹à¸«à¸¥à¹ˆà¸‡ HTML ";
- Text[ ja ] = "HTML ソーステã‚スト";
- Text[ ko ] = "HTML ì›ë³¸";
- Text[ zh-CN ] = "HTML æºæ–‡æœ¬";
- Text[ zh-TW ] = "HTML 原始檔";
- Text[ tr ] = "HTML kodu";
- Text[ hi-IN ] = "HTML मूल";
- Text[ ar ] = "نص مصدر HTML";
- Text[ he ] = "HTML‮קוד ‬";
-};
-
-ToolBox RID_TOOLS_TOOLBOX
-{
- HelpID = HID_TOOLS_TOOLBOX ;
- Border = TRUE ;
- SVLook = TRUE ;
- Dockable = TRUE ;
- Moveable = TRUE ;
- Sizeable = TRUE ;
- Closeable = TRUE ;
- Zoomable = TRUE ;
- LineSpacing = TRUE ;
- HideWhenDeactivate = TRUE ;
- Customize = TRUE ;
- MenuStrings = TRUE ;
- Scroll = TRUE ;
- Align = BOXALIGN_LEFT ;
- Hide = TRUE ;
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = FN_INSERT_CTRL ;
- HelpID = HID_INSERT_CTRL ;
- DropDown = TRUE ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = FN_INSERT_FIELD_CTRL ;
- HelpID = HID_INSERT_FIELD_CTRL ;
- DropDown = TRUE ;
- };
- ToolBoxItem
- {
- Identifier = FN_INSERT_OBJ_CTRL ;
- HelpID = HID_INSERT_OBJ_CTRL ;
- DropDown = TRUE ;
- };
- ToolBoxItem
- {
- ITEM_TOOLBAR_INSERT_DRAW
- };
- ToolBoxItem
- {
- ITEM_FORM_CONFIG
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = FN_GLOSSARY_DLG ;
- HelpID = FN_GLOSSARY_DLG ;
- DropDown = TRUE ;
- };
- ToolBoxItem
- {
- Identifier = FN_INSERT_CAPTION;
- HelpID = FN_INSERT_CAPTION ;
- Hide = TRUE ;
- };
- ToolBoxItem
- {
- Identifier = FN_INSERT_IDX_ENTRY_DLG;
- HelpId = FN_INSERT_IDX_ENTRY_DLG;
- Hide = TRUE;
- };
- ToolBoxItem
- {
- Identifier = FN_INSERT_REF_FIELD;
- HelpID = FN_INSERT_REF_FIELD ;
- Hide = TRUE ;
- };
- ToolBoxItem
- {
- Identifier = FN_SHADOWCURSOR ;
- HelpID = FN_SHADOWCURSOR ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = FN_SPELLING_DLG ;
- HelpID = FN_SPELLING_DLG ;
- };
- ToolBoxItem
- {
- ITEM_TOOLBAR_AUTOSPELL_CHECK
- };
- ToolBoxItem
- {
- Identifier = FN_HYPHENATE_OPT_DLG;
- HelpID = FN_HYPHENATE_OPT_DLG;
- Hide = TRUE;
- };
- ToolBoxItem
- {
- Identifier = FN_THESAURUS_DLG;
- HelpID = FN_THESAURUS_DLG;
- Hide = TRUE;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_SEARCH_DLG ;
- HelpID = SID_SEARCH_DLG ;
- };
- ToolBoxItem
- {
- Identifier = SID_VIEW_DATA_SOURCE_BROWSER ;
- HelpID = SID_VIEW_DATA_SOURCE_BROWSER ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_ATTR_ZOOM;
- HelpID = SID_ATTR_ZOOM ;
- Hide = TRUE;
- };
- ToolBoxItem
- {
- Identifier = FN_VIEW_META_CHARS ;
- HelpID = FN_VIEW_META_CHARS ;
- };
- ToolBoxItem
- {
- Identifier = FN_VIEW_FIELDNAME ;
- HelpID = FN_VIEW_FIELDNAME ;
- Hide = TRUE;
- };
- ToolBoxItem
- {
- Identifier = FN_VIEW_GRAPHIC ;
- HelpID = FN_VIEW_GRAPHIC ;
- };
- ToolBoxItem
- {
- Identifier = SID_BROWSER_MODE ;
- HelpID = SID_BROWSER_MODE ;
- };
- };
-};
-Menu MN_SRCVIEW_POPUPMENU
-{
- ItemList =
- {
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_FONT
- };
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT
- };
- MenuItem
- {
- Separator = TRUE ;
- };
- MenuItem
- {
- Identifier = SID_SOURCEVIEW ;
- HelpID = HID_SOURCEVIEW ;
- Text [ de ] = "HTML-Quelltext" ;
- Text [ en-US ] = "HTML Source" ;
- Text [ x-comment ] = " ";
- Text[ pt ] = "Fonte HTML";
- Text[ ru ] = "ИÑходный текÑÑ‚ в формате HTML";
- Text[ el ] = "Κείμενο Ï€ÏοÎλευσης HTML";
- Text[ nl ] = "HTML-brontekst";
- Text[ fr ] = "Texte source HTML";
- Text[ es ] = "Texto fuente HTML";
- Text[ fi ] = "HTML-lähde";
- Text[ ca ] = "Font HTML";
- Text[ it ] = "Testo sorgente HTML";
- Text[ sk ] = "Zdrojový HTML text";
- Text[ da ] = "HTML-kildetekst";
- Text[ sv ] = "HTML-källtext";
- Text[ pl ] = "Tekst źródłowy HTML";
- Text[ pt-BR ] = "Origem HTML";
- Text[ th ] = "à¹à¸«à¸¥à¹ˆà¸‡ HTML ";
- Text[ ja ] = "HTML ソーステã‚スト";
- Text[ ko ] = "HTML ì›ë³¸";
- Text[ zh-CN ] = "HTML æºæ–‡æœ¬";
- Text[ zh-TW ] = "HTML 原始檔";
- Text[ tr ] = "HTML kodu";
- Text[ hi-IN ] = "HTML मूल";
- Text[ ar ] = "نص مصدر HTML";
- Text[ he ] = "HTML‮קוד ‬";
- };
- };
-};
diff --git a/binfilter/bf_sw/source/ui/uiview/view.hrc b/binfilter/bf_sw/source/ui/uiview/view.hrc
deleted file mode 100644
index d0e5edd..0000000
--- a/binfilter/bf_sw/source/ui/uiview/view.hrc
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _VIEW_HRC
-#define _VIEW_HRC
-
-#include "rcid.hrc"
-
-// BTN -------------------------------------------------------------------
-
-
-// STR -------------------------------------------------------------------
-
-#define STR_NUM_LEVEL (RC_VIEW_BEGIN + 3)
-
-
-
-//#define RID_PVIEW_TOOLBOX (RC_VIEW_BEGIN + 15)
-
-
-
-#define STR_READONLY_SEL (RC_VIEW_BEGIN + 30)
-
-#define RID_PVIEW_TOOLBOX (RC_VIEW_BEGIN + 31)
-// MSG -------------------------------------------------------------------
-
-
-
-// DLG -------------------------------------------------------------------
-
-#define DLG_PAGEPREVIEW_ZOOM (RC_VIEW_BEGIN + 1)
-
-// Ueberlaufpruefung -----------------------------------------------------
-
-
-
-#endif
-
commit 68f07d2427180615370c7b90f7c6612ecb7b9d84
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 23 21:38:40 2011 +0100
fix up some more endian
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index cb4d526..2e1ac28 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -107,13 +107,13 @@ void LwpDrawObj::ReadObjHeaderRecord()
m_pStream->SeekRel(1);
//record Length
- m_pStream->Read(&m_aObjHeader.nRecLen, sizeof(m_aObjHeader.nRecLen));
+ *m_pStream >> m_aObjHeader.nRecLen;
//boundrect
- m_pStream->Read(&m_aObjHeader.nLeft, sizeof(m_aObjHeader.nLeft));
- m_pStream->Read(&m_aObjHeader.nTop, sizeof(m_aObjHeader.nTop));
- m_pStream->Read(&m_aObjHeader.nRight, sizeof(m_aObjHeader.nRight));
- m_pStream->Read(&m_aObjHeader.nBottom, sizeof(m_aObjHeader.nBottom));
+ *m_pStream >> m_aObjHeader.nLeft;
+ *m_pStream >> m_aObjHeader.nTop;
+ *m_pStream >> m_aObjHeader.nRight;
+ *m_pStream >> m_aObjHeader.nBottom;
//nextObj, prevObj
m_pStream->SeekRel(4);
@@ -129,30 +129,31 @@ void LwpDrawObj::ReadClosedObjStyle()
m_pStream->SeekRel(8);
}
- m_pStream->Read(&m_aClosedObjStyleRec.nLineWidth, sizeof(m_aClosedObjStyleRec.nLineWidth));
- m_pStream->Read(&m_aClosedObjStyleRec.nLineStyle, sizeof(m_aClosedObjStyleRec.nLineStyle));
+ *m_pStream >> m_aClosedObjStyleRec.nLineWidth;
+ *m_pStream >> m_aClosedObjStyleRec.nLineStyle;
// pen color
- m_pStream->Read(&m_aClosedObjStyleRec.aPenColor.nR, 1);
- m_pStream->Read(&m_aClosedObjStyleRec.aPenColor.nG, 1);
- m_pStream->Read(&m_aClosedObjStyleRec.aPenColor.nB, 1);
- m_pStream->Read(&m_aClosedObjStyleRec.aPenColor.unused, 1);
+ *m_pStream >> m_aClosedObjStyleRec.aPenColor.nR;
+ *m_pStream >> m_aClosedObjStyleRec.aPenColor.nG;
+ *m_pStream >> m_aClosedObjStyleRec.aPenColor.nB;
+ *m_pStream >> m_aClosedObjStyleRec.aPenColor.unused;
// foreground color
- m_pStream->Read(&m_aClosedObjStyleRec.aForeColor.nR, 1);
- m_pStream->Read(&m_aClosedObjStyleRec.aForeColor.nG, 1);
- m_pStream->Read(&m_aClosedObjStyleRec.aForeColor.nB, 1);
- m_pStream->Read(&m_aClosedObjStyleRec.aForeColor.unused, 1);
+ *m_pStream >> m_aClosedObjStyleRec.aForeColor.nR;
+ *m_pStream >> m_aClosedObjStyleRec.aForeColor.nG;
+ *m_pStream >> m_aClosedObjStyleRec.aForeColor.nB;
+ *m_pStream >> m_aClosedObjStyleRec.aForeColor.unused;
// background color
- m_pStream->Read(&m_aClosedObjStyleRec.aBackColor.nR, 1);
- m_pStream->Read(&m_aClosedObjStyleRec.aBackColor.nG, 1);
- m_pStream->Read(&m_aClosedObjStyleRec.aBackColor.nB, 1);
- m_pStream->Read(&m_aClosedObjStyleRec.aBackColor.unused, 1);
+ *m_pStream >> m_aClosedObjStyleRec.aBackColor.nR;
+ *m_pStream >> m_aClosedObjStyleRec.aBackColor.nG;
+ *m_pStream >> m_aClosedObjStyleRec.aBackColor.nB;
+ *m_pStream >> m_aClosedObjStyleRec.aBackColor.unused;
// fill style
- m_pStream->Read(&m_aClosedObjStyleRec.nFillType, sizeof(m_aClosedObjStyleRec.nFillType));
- m_pStream->Read(m_aClosedObjStyleRec.pFillPattern, sizeof(m_aClosedObjStyleRec.pFillPattern));
+ *m_pStream >> m_aClosedObjStyleRec.nFillType;
+ m_pStream->Read(m_aClosedObjStyleRec.pFillPattern,
+ sizeof(m_aClosedObjStyleRec.pFillPattern));
}
/**
@@ -421,18 +422,18 @@ LwpDrawLine::LwpDrawLine(SvStream * pStream, DrawingOffsetAndScale* pTransData)
*/
void LwpDrawLine::Read()
{
- m_pStream->Read(&m_aLineRec.nStartX, sizeof(m_aLineRec.nStartX));
- m_pStream->Read(&m_aLineRec.nStartY, sizeof(m_aLineRec.nStartY));
- m_pStream->Read(&m_aLineRec.nEndX, sizeof(m_aLineRec.nEndX));
- m_pStream->Read(&m_aLineRec.nEndY, sizeof(m_aLineRec.nEndY));
- m_pStream->Read(&m_aLineRec.nLineWidth, sizeof(m_aLineRec.nLineWidth));
- m_pStream->Read(&m_aLineRec.nLineEnd,sizeof(m_aLineRec.nLineEnd));
- m_pStream->Read(&m_aLineRec.nLineStyle, sizeof(m_aLineRec.nLineStyle));
+ *m_pStream >> m_aLineRec.nStartX;
+ *m_pStream >> m_aLineRec.nStartY;
+ *m_pStream >> m_aLineRec.nEndX;
+ *m_pStream >> m_aLineRec.nEndY;
+ *m_pStream >> m_aLineRec.nLineWidth;
+ *m_pStream >> m_aLineRec.nLineEnd;
+ *m_pStream >> m_aLineRec.nLineStyle;
- m_pStream->Read(&m_aLineRec.aPenColor.nR, 1);
- m_pStream->Read(&m_aLineRec.aPenColor.nG, 1);
- m_pStream->Read(&m_aLineRec.aPenColor.nB, 1);
- m_pStream->Read(&m_aLineRec.aPenColor.unused, 1);
+ *m_pStream >> m_aLineRec.aPenColor.nR;
+ *m_pStream >> m_aLineRec.aPenColor.nG;
+ *m_pStream >> m_aLineRec.aPenColor.nB;
+ *m_pStream >> m_aLineRec.aPenColor.unused;
}
rtl::OUString LwpDrawLine::RegisterStyle()
@@ -496,22 +497,22 @@ LwpDrawPolyLine::~LwpDrawPolyLine()
*/
void LwpDrawPolyLine::Read()
{
- m_pStream->Read(&m_aPolyLineRec.nLineWidth, 1);
- m_pStream->Read(&m_aPolyLineRec.nLineEnd, 1);
- m_pStream->Read(&m_aPolyLineRec.nLineStyle, 1);
- m_pStream->Read(&m_aPolyLineRec.aPenColor.nR, 1);
- m_pStream->Read(&m_aPolyLineRec.aPenColor.nG, 1);
- m_pStream->Read(&m_aPolyLineRec.aPenColor.nB, 1);
- m_pStream->Read(&m_aPolyLineRec.aPenColor.unused, 1);
- m_pStream->Read(&m_aPolyLineRec.nNumPoints, 2);
+ *m_pStream >> m_aPolyLineRec.nLineWidth;
+ *m_pStream >> m_aPolyLineRec.nLineEnd;
+ *m_pStream >> m_aPolyLineRec.nLineStyle;
+ *m_pStream >> m_aPolyLineRec.aPenColor.nR;
+ *m_pStream >> m_aPolyLineRec.aPenColor.nG;
+ *m_pStream >> m_aPolyLineRec.aPenColor.nB;
+ *m_pStream >> m_aPolyLineRec.aPenColor.unused;
+ *m_pStream >> m_aPolyLineRec.nNumPoints;
- m_pVector= new SdwPoint [m_aPolyLineRec.nNumPoints];
+ m_pVector= new SdwPoint [m_aPolyLineRec.nNumPoints];
- for (sal_uInt16 nC = 0; nC < m_aPolyLineRec.nNumPoints; nC++)
- {
- m_pStream->Read(&m_pVector[nC].x,2);
- m_pStream->Read(&m_pVector[nC].y,2);
- }
+ for (sal_uInt16 nC = 0; nC < m_aPolyLineRec.nNumPoints; nC++)
+ {
+ *m_pStream >> m_pVector[nC].x;
+ *m_pStream >> m_pVector[nC].y;
+ }
}
rtl::OUString LwpDrawPolyLine::RegisterStyle()
@@ -583,14 +584,14 @@ LwpDrawPolygon::~LwpDrawPolygon()
void LwpDrawPolygon::Read()
{
this->ReadClosedObjStyle();
- m_pStream->Read(&m_nNumPoints, sizeof(m_nNumPoints));
+ *m_pStream >> m_nNumPoints;
m_pVector = new SdwPoint [m_nNumPoints];
for (sal_uInt16 nC = 0; nC < m_nNumPoints; nC++)
{
- m_pStream->Read(&m_pVector[nC].x, 2);
- m_pStream->Read(&m_pVector[nC].y, 2);
+ *m_pStream >> m_pVector[nC].x;
+ *m_pStream >> m_pVector[nC].y;
}
}
@@ -656,7 +657,6 @@ void LwpDrawRectangle::Read()
{
this->ReadClosedObjStyle();
-
sal_uInt8 nPointsCount;
if (m_eType == OT_RNDRECT)
{
@@ -670,8 +670,8 @@ void LwpDrawRectangle::Read()
for (sal_uInt8 nC = 0; nC < nPointsCount; nC++)
{
- m_pStream->Read(&m_aVector[nC].x,2);
- m_pStream->Read(&m_aVector[nC].y,2);
+ *m_pStream >> m_aVector[nC].x;
+ *m_pStream >> m_aVector[nC].y;
}
}
@@ -829,8 +829,8 @@ void LwpDrawEllipse::Read()
for (sal_uInt8 nC = 0; nC < 13; nC++)
{
- m_pStream->Read(&m_aVector[nC].x,2);
- m_pStream->Read(&m_aVector[nC].y,2);
+ *m_pStream >> m_aVector[nC].x;
+ *m_pStream >> m_aVector[nC].y;
}
}
@@ -898,18 +898,18 @@ void LwpDrawArc::Read()
{
m_pStream->SeekRel(16);// arcRect, startPt, endPt
- m_pStream->Read(&m_aArcRec.nLineWidth, sizeof(m_aArcRec.nLineWidth));
- m_pStream->Read(&m_aArcRec.nLineStyle, sizeof(m_aArcRec.nLineStyle));
- m_pStream->Read(&m_aArcRec.aPenColor.nR, 1);
- m_pStream->Read(&m_aArcRec.aPenColor.nG, 1);
- m_pStream->Read(&m_aArcRec.aPenColor.nB, 1);
- m_pStream->Read(&m_aArcRec.aPenColor.unused, 1);
- m_pStream->Read(&m_aArcRec.nLineEnd, sizeof(m_aArcRec.nLineEnd));
+ *m_pStream >> m_aArcRec.nLineWidth;
+ *m_pStream >> m_aArcRec.nLineStyle;
+ *m_pStream >> m_aArcRec.aPenColor.nR;
+ *m_pStream >> m_aArcRec.aPenColor.nG;
+ *m_pStream >> m_aArcRec.aPenColor.nB;
+ *m_pStream >> m_aArcRec.aPenColor.unused;
+ *m_pStream >> m_aArcRec.nLineEnd;
for (sal_uInt8 nC = 0; nC < 4; nC++)
{
- m_pStream->Read(&m_aVector[nC].x,2);
- m_pStream->Read(&m_aVector[nC].y,2);
+ *m_pStream >> m_aVector[nC].x;
+ *m_pStream >> m_aVector[nC].y;
}
}
@@ -1020,43 +1020,41 @@ void LwpDrawTextBox::SetFontStyle(XFFont* pFont, SdwTextBoxRecord* pRec)
*/
void LwpDrawTextBox::Read()
{
- m_pStream->Read(&m_aVector.x, 2);
- m_pStream->Read(&m_aVector.y, 2);
- m_pStream->Read(&m_aTextRec.nTextWidth, sizeof(m_aTextRec.nTextWidth));
+ *m_pStream >> m_aVector.x;
+ *m_pStream >> m_aVector.y;
+ *m_pStream >> m_aTextRec.nTextWidth;
if (m_aTextRec.nTextWidth == 0)
- {
m_aTextRec.nTextWidth = 1;
- }
- m_pStream->Read(&m_aTextRec.nTextHeight, sizeof(m_aTextRec.nTextHeight));
+ *m_pStream >> m_aTextRec.nTextHeight;
m_pStream->Read(m_aTextRec.tmpTextFaceName, DRAW_FACESIZE);
m_pStream->SeekRel(1);// PitchAndFamily
- m_pStream->Read(&m_aTextRec.nTextSize, sizeof(m_aTextRec.nTextSize));
+ *m_pStream >> m_aTextRec.nTextSize;
if (m_aTextRec.nTextSize < 0)
m_aTextRec.nTextSize = -m_aTextRec.nTextSize;
//color
- m_pStream->Read(&m_aTextRec.aTextColor.nR, 1);
- m_pStream->Read(&m_aTextRec.aTextColor.nG, 1);
- m_pStream->Read(&m_aTextRec.aTextColor.nB, 1);
- m_pStream->Read(&m_aTextRec.aTextColor.unused, 1);
+ *m_pStream >> m_aTextRec.aTextColor.nR;
+ *m_pStream >> m_aTextRec.aTextColor.nG;
+ *m_pStream >> m_aTextRec.aTextColor.nB;
+ *m_pStream >> m_aTextRec.aTextColor.unused;
- m_pStream->Read(&m_aTextRec.nTextAttrs, sizeof(m_aTextRec.nTextAttrs));
- m_pStream->Read(&m_aTextRec.nTextCharacterSet, sizeof(m_aTextRec.nTextCharacterSet));
- m_pStream->Read(&m_aTextRec.nTextRotation, sizeof(m_aTextRec.nTextRotation));
- m_pStream->Read(&m_aTextRec.nTextExtraSpacing, sizeof(m_aTextRec.nTextExtraSpacing));
+ *m_pStream >> m_aTextRec.nTextAttrs;
+ *m_pStream >> m_aTextRec.nTextCharacterSet;
+ *m_pStream >> m_aTextRec.nTextRotation;
+ *m_pStream >> m_aTextRec.nTextExtraSpacing;
- // some draw files in version 1.2 have an extra byte following '\0'.
- // can't rely on that, so read in the whole string into memory.
+ // some draw files in version 1.2 have an extra byte following '\0'.
+ // can't rely on that, so read in the whole string into memory.
- // the 71 is the fixed length before text content in textbox record
- sal_Int16 TextLength = m_aObjHeader.nRecLen - 71;
- m_aTextRec.pTextString = new sal_uInt8 [TextLength];
+ // the 71 is the fixed length before text content in textbox record
+ sal_Int16 TextLength = m_aObjHeader.nRecLen - 71;
+ m_aTextRec.pTextString = new sal_uInt8 [TextLength];
- m_pStream->Read(m_aTextRec.pTextString, TextLength);
+ m_pStream->Read(m_aTextRec.pTextString, TextLength);
}
rtl::OUString LwpDrawTextBox::RegisterStyle()
@@ -1190,37 +1188,37 @@ void LwpDrawTextArt::Read()
{
for (sal_uInt8 nC = 0; nC < 4; nC++)
{
- m_pStream->Read(&m_aVector[nC].x, 2);
- m_pStream->Read(&m_aVector[nC].y, 2);
+ *m_pStream >> m_aVector[nC].x;
+ *m_pStream >> m_aVector[nC].y;
}
this->ReadClosedObjStyle();
m_aTextArtRec.aTextColor = m_aClosedObjStyleRec.aForeColor;
- m_pStream->Read(&m_aTextArtRec.nIndex, 1);
- m_pStream->Read(&m_aTextArtRec.nRotation, 2);
+ *m_pStream >> m_aTextArtRec.nIndex;
+ *m_pStream >> m_aTextArtRec.nRotation;
sal_uInt16 nPointNumber;
sal_Int16 nX, nY;
- m_pStream->Read(&nPointNumber, 2);
+ *m_pStream >> nPointNumber;
m_aTextArtRec.aPath[0].n = nPointNumber;
m_aTextArtRec.aPath[0].pPts = new SdwPoint [nPointNumber*3+1];
sal_uInt16 nPt = 0;
for ( nPt = 0; nPt <= nPointNumber*3; nPt++)
{
- m_pStream->Read(&nX, 2);
- m_pStream->Read(&nY, 2);
+ *m_pStream >> nX;
+ *m_pStream >> nY;
m_aTextArtRec.aPath[0].pPts[nPt].x = nX;
m_aTextArtRec.aPath[0].pPts[nPt].y = nY;
}
- m_pStream->Read(&nPointNumber, 2);
+ *m_pStream >> nPointNumber;
m_aTextArtRec.aPath[1].n = nPointNumber;
m_aTextArtRec.aPath[1].pPts = new SdwPoint [nPointNumber*3+1];
for (nPt = 0; nPt <= nPointNumber*3; nPt++)
{
- m_pStream->Read(&nX, 2);
- m_pStream->Read(&nY, 2);
+ *m_pStream >> nX;
+ *m_pStream >> nY;
m_aTextArtRec.aPath[1].pPts[nPt].x = nX;
m_aTextArtRec.aPath[1].pPts[nPt].y = nY;
}
@@ -1230,15 +1228,15 @@ void LwpDrawTextArt::Read()
m_pStream->Read(m_aTextArtRec.tmpTextFaceName, DRAW_FACESIZE);
m_pStream->SeekRel(1);// PitchAndFamily
- m_pStream->Read(&m_aTextArtRec.nTextSize, sizeof(m_aTextArtRec.nTextSize));
+ *m_pStream >> m_aTextArtRec.nTextSize;
if (m_aTextArtRec.nTextSize < 0)
m_aTextArtRec.nTextSize = -m_aTextArtRec.nTextSize;
- m_pStream->Read(&m_aTextArtRec.nTextAttrs, sizeof(m_aTextArtRec.nTextAttrs));
- m_pStream->Read(&m_aTextArtRec.nTextCharacterSet, sizeof(m_aTextArtRec.nTextCharacterSet));
+ *m_pStream >> m_aTextArtRec.nTextAttrs;
+ *m_pStream >> m_aTextArtRec.nTextCharacterSet;
m_aTextArtRec.nTextRotation = 0;
- m_pStream->Read(&m_aTextArtRec.nTextExtraSpacing, sizeof(m_aTextArtRec.nTextExtraSpacing));
+ *m_pStream >> m_aTextArtRec.nTextExtraSpacing;
const sal_uInt16 nTextArtFixedLength = 105;
m_aTextArtRec.nTextLen = m_aObjHeader.nRecLen - nTextArtFixedLength
@@ -1350,8 +1348,8 @@ LwpDrawBitmap::~LwpDrawBitmap()
*/
void LwpDrawBitmap::Read()
{
- m_pStream->Read(&m_aBmpRec.nTranslation, sizeof(m_aBmpRec.nTranslation));
- m_pStream->Read(&m_aBmpRec.nRotation, sizeof(m_aBmpRec.nRotation));
+ *m_pStream >> m_aBmpRec.nTranslation;
+ *m_pStream >> m_aBmpRec.nRotation;
// 20 == length of draw-specific fields.
// 14 == length of bmp file header.
@@ -1359,17 +1357,17 @@ void LwpDrawBitmap::Read()
m_pImageData = new sal_uInt8 [m_aBmpRec.nFileSize];
BmpInfoHeader2 aInfoHeader2;
- m_pStream->Read(&aInfoHeader2.nHeaderLen, 4);
+ *m_pStream >> aInfoHeader2.nHeaderLen;
sal_uInt32 N;
sal_uInt32 rgbTableSize;
if (aInfoHeader2.nHeaderLen == sizeof(BmpInfoHeader))
{
- m_pStream->Read(&aInfoHeader2.nWidth, 2);
- m_pStream->Read(&aInfoHeader2.nHeight, 2);
- m_pStream->Read(&aInfoHeader2.nPlanes, 2);
- m_pStream->Read(&aInfoHeader2.nBitCount, 2);
+ *m_pStream >> aInfoHeader2.nWidth;
+ *m_pStream >> aInfoHeader2.nHeight;
+ *m_pStream >> aInfoHeader2.nPlanes;
+ *m_pStream >> aInfoHeader2.nBitCount;
N = aInfoHeader2.nPlanes * aInfoHeader2.nBitCount;
if (N == 24)
@@ -1383,10 +1381,10 @@ void LwpDrawBitmap::Read()
}
else
{
- m_pStream->Read(&aInfoHeader2.nWidth, 4);
- m_pStream->Read(&aInfoHeader2.nHeight, 4);
- m_pStream->Read(&aInfoHeader2.nPlanes, 2);
- m_pStream->Read(&aInfoHeader2.nBitCount, 2);
+ *m_pStream >> aInfoHeader2.nWidth;
+ *m_pStream >> aInfoHeader2.nHeight;
+ *m_pStream >> aInfoHeader2.nPlanes;
+ *m_pStream >> aInfoHeader2.nBitCount;
N = aInfoHeader2.nPlanes * aInfoHeader2.nBitCount;
if (N == 24)
{
More information about the Libreoffice-commits
mailing list