[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Mar 14 09:50:58 PDT 2011
binfilter/bf_sw/source/core/unocore/makefile.mk | 2
binfilter/bf_sw/source/core/unocore/sw_SwXTextDefaults.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unobkm.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx | 43 +--
binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx | 10
binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx | 26 -
binfilter/bf_sw/source/core/unocore/sw_unoevtlstnr.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unofield.cxx | 66 ++--
binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx | 74 ++---
binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx | 26 -
binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx | 70 +++--
binfilter/bf_sw/source/core/unocore/sw_unomap.cxx | 173 ++++++-------
binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx | 65 ++--
binfilter/bf_sw/source/core/unocore/sw_unoparagraph.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unoport.cxx | 35 +-
binfilter/bf_sw/source/core/unocore/sw_unoportenum.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unoredline.cxx | 6
binfilter/bf_sw/source/core/unocore/sw_unoredlines.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unorefmk.cxx | 8
binfilter/bf_sw/source/core/unocore/sw_unosect.cxx | 20 -
binfilter/bf_sw/source/core/unocore/sw_unosett.cxx | 109 ++++----
binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx | 6
binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx | 102 ++++---
binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx | 94 +++----
binfilter/inc/bf_sw/tabcol.hxx | 6
binfilter/inc/bf_sw/unosett.hxx | 2
27 files changed, 492 insertions(+), 477 deletions(-)
New commits:
commit 646368f2a8e5d5d7cfb2e3a5ffe374b99924ea71
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 14 12:57:51 2011 +0000
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/unocore/makefile.mk b/binfilter/bf_sw/source/core/unocore/makefile.mk
index 5db2327..1a57d51 100644
--- a/binfilter/bf_sw/source/core/unocore/makefile.mk
+++ b/binfilter/bf_sw/source/core/unocore/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/core/unocore/sw_SwXTextDefaults.cxx b/binfilter/bf_sw/source/core/unocore/sw_SwXTextDefaults.cxx
index c1acdb5..48ae3b6 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_SwXTextDefaults.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_SwXTextDefaults.cxx
@@ -65,8 +65,8 @@ void lcl_setPageDesc(SwDoc*, const uno::Any&, SfxItemSet& ); // from unoobj.cxx
SwXTextDefaults::SwXTextDefaults ( SwDoc * pNewDoc )
-: pDoc (pNewDoc)
-, aPropSet (aSwMapProvider.GetPropertyMap ( PROPERTY_MAP_TEXT_DEFAULT ) )
+ : aPropSet (aSwMapProvider.GetPropertyMap ( PROPERTY_MAP_TEXT_DEFAULT ) )
+ , pDoc(pNewDoc)
{
}
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unobkm.cxx b/binfilter/bf_sw/source/core/unocore/sw_unobkm.cxx
index fd8b96b..c36695d 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unobkm.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unobkm.cxx
@@ -78,9 +78,9 @@ sal_Int64 SAL_CALL SwXBookmark::getSomething( const uno::Sequence< sal_Int8 >& r
}
SwXBookmark::SwXBookmark(SwBookmark* pBkm, SwDoc* pDc) :
+ aLstnrCntnr( (text::XTextContent*)this),
pDoc(pDc),
- bIsDescriptor(0 == pBkm),
- aLstnrCntnr( (text::XTextContent*)this)
+ bIsDescriptor(0 == pBkm)
{
if(pBkm)
pBkm->Add(this);
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx b/binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx
index b405d7b..a648b16 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx
@@ -679,8 +679,8 @@ Sequence< OUString > SwXFrames::getSupportedServiceNames(void) throw( RuntimeExc
return aRet;
}
-SwXFrames::SwXFrames(SwDoc* pDoc, FlyCntType eSet) :
- SwUnoCollection(pDoc),
+SwXFrames::SwXFrames(SwDoc* pInDoc, FlyCntType eSet) :
+ SwUnoCollection(pInDoc),
eType(eSet)
{
}
@@ -732,6 +732,8 @@ uno::Any SwXFrames::getByIndex(sal_Int32 nIndex)
aRet.setValue(&xRef, ::getCppuType((Reference<XEmbeddedObjectSupplier>*)0));
}
break;
+ default:
+ break;
}
}
else
@@ -786,6 +788,8 @@ uno::Any SwXFrames::getByName(const OUString& rName)
aRet.setValue(&xRef, ::getCppuType((Reference<XEmbeddedObjectSupplier>*)0));
}
break;
+ default:
+ break;
}
return aRet;
}
@@ -820,6 +824,7 @@ sal_Bool SwXFrames::hasByName(const OUString& rName) throw( uno::RuntimeExceptio
{
case FLYCNTTYPE_GRF: nNodeType = ND_GRFNODE; break;
case FLYCNTTYPE_OLE: nNodeType = ND_OLENODE; break;
+ default: break;
}
return 0 != GetDoc()->FindFlyByName( rName, nNodeType );
@@ -842,6 +847,8 @@ uno::Type SAL_CALL SwXFrames::getElementType() throw(uno::RuntimeException)
case FLYCNTTYPE_OLE:
aRet = ::getCppuType((uno::Reference<XEmbeddedObjectSupplier>*)0);
break;
+ default:
+ break;
}
return aRet;
}
@@ -874,6 +881,8 @@ SwXFrame* SwXFrames::GetObject( SwFrmFmt& rFmt, FlyCntType eType )
case FLYCNTTYPE_OLE:
pFrm = new SwXTextEmbeddedObject(rFmt);
break;
+ default:
+ break;
}
}
return pFrm;
@@ -900,8 +909,8 @@ Sequence< OUString > SwXTextFrames::getSupportedServiceNames(void) throw( Runtim
return aRet;
}
-SwXTextFrames::SwXTextFrames(SwDoc* pDoc) :
- SwXFrames(pDoc, FLYCNTTYPE_FRM)
+SwXTextFrames::SwXTextFrames(SwDoc* pInDoc) :
+ SwXFrames(pInDoc, FLYCNTTYPE_FRM)
{
}
@@ -930,8 +939,8 @@ Sequence< OUString > SwXTextGraphicObjects::getSupportedServiceNames(void) throw
return aRet;
}
-SwXTextGraphicObjects::SwXTextGraphicObjects(SwDoc* pDoc) :
- SwXFrames(pDoc, FLYCNTTYPE_GRF)
+SwXTextGraphicObjects::SwXTextGraphicObjects(SwDoc* pInDoc) :
+ SwXFrames(pInDoc, FLYCNTTYPE_GRF)
{
}
@@ -960,8 +969,8 @@ Sequence< OUString > SwXTextEmbeddedObjects::getSupportedServiceNames(void) thro
return aRet;
}
-SwXTextEmbeddedObjects::SwXTextEmbeddedObjects(SwDoc* pDoc) :
- SwXFrames(pDoc, FLYCNTTYPE_OLE)
+SwXTextEmbeddedObjects::SwXTextEmbeddedObjects(SwDoc* pInDoc) :
+ SwXFrames(pInDoc, FLYCNTTYPE_OLE)
{
}
@@ -992,8 +1001,8 @@ Sequence< OUString > SwXTextSections::getSupportedServiceNames(void) throw( Runt
return aRet;
}
-SwXTextSections::SwXTextSections(SwDoc* pDoc) :
- SwUnoCollection(pDoc)
+SwXTextSections::SwXTextSections(SwDoc* pInDoc) :
+ SwUnoCollection(pInDoc)
{
}
@@ -1188,8 +1197,8 @@ Sequence< OUString > SwXBookmarks::getSupportedServiceNames(void) throw( Runtime
return aRet;
}
-SwXBookmarks::SwXBookmarks(SwDoc* pDoc) :
- SwUnoCollection(pDoc)
+SwXBookmarks::SwXBookmarks(SwDoc* pInDoc) :
+ SwUnoCollection(pInDoc)
{
}
@@ -1339,8 +1348,8 @@ Sequence< OUString > SwXFootnotes::getSupportedServiceNames(void) throw( Runtime
return aRet;
}
-SwXFootnotes::SwXFootnotes(sal_Bool bEnd, SwDoc* pDoc) :
- SwUnoCollection(pDoc),
+SwXFootnotes::SwXFootnotes(sal_Bool bEnd, SwDoc* pInDoc) :
+ SwUnoCollection(pInDoc),
bEndnote(bEnd)
{
}
@@ -1373,7 +1382,7 @@ uno::Any SwXFootnotes::getByIndex(sal_Int32 nIndex)
{
SolarMutexGuard aGuard;
uno::Any aRet;
- sal_uInt32 nCount = 0;
+ sal_Int32 nCount = 0;
if(IsValid())
{
sal_uInt16 n, nFtnCnt = GetDoc()->GetFtnIdxs().Count();
@@ -1446,8 +1455,8 @@ Sequence< OUString > SwXReferenceMarks::getSupportedServiceNames(void) throw( Ru
return aRet;
}
-SwXReferenceMarks::SwXReferenceMarks(SwDoc* pDoc) :
- SwUnoCollection(pDoc)
+SwXReferenceMarks::SwXReferenceMarks(SwDoc* pInDoc) :
+ SwUnoCollection(pInDoc)
{
}
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx b/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx
index a23049e..d04e33b 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx
@@ -509,10 +509,10 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
// CharStyle besorgen und an der chaos::Rule setzen
sal_uInt16 nChCount = pDoc->GetCharFmts()->Count();
SwCharFmt* pCharFmt = 0;
- for(sal_uInt16 i = 0; i< nChCount; i++)
+ for(sal_uInt16 nCharFmt = 0; nCharFmt < nChCount; nCharFmt++)
{
- SwCharFmt& rChFmt = *((*(pDoc->GetCharFmts()))[i]);;
- if(rChFmt.GetName() == pNewCharStyles[i])
+ SwCharFmt& rChFmt = *((*(pDoc->GetCharFmts()))[nCharFmt]);;
+ if(rChFmt.GetName() == pNewCharStyles[nCharFmt])
{
pCharFmt = &rChFmt;
break;
@@ -536,8 +536,8 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
//jetzt nochmal fuer Fonts
if(pBulletFontNames[i] != SwXNumberingRules::GetInvalidStyle() &&
((pBulletFontNames[i].Len() && !aFmt.GetBulletFont()) ||
- pBulletFontNames[i].Len() &&
- aFmt.GetBulletFont()->GetName() != pBulletFontNames[i] ))
+ (pBulletFontNames[i].Len() &&
+ aFmt.GetBulletFont()->GetName() != pBulletFontNames[i]) ))
{
const SvxFontListItem* pFontListItem =
(const SvxFontListItem* )pDoc->GetDocShell()
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx b/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
index 384dafd..8f8c119 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
@@ -181,8 +181,8 @@ public:
/****************************************************************************
class SwFmDrawPage
****************************************************************************/
-SwFmDrawPage::SwFmDrawPage( SdrPage* pPage ) :
- SvxFmDrawPage( pPage ), pPageView(0)
+SwFmDrawPage::SwFmDrawPage( SdrPage* pInPage ) :
+ SvxFmDrawPage( pInPage ), pPageView(0)
{
}
@@ -250,7 +250,7 @@ uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj )
SwFlyDrawContact* pFlyContact = (SwFlyDrawContact*)pObj->GetUserCall();
if(pFlyContact)
{
- FlyCntType eType;
+ FlyCntType eType(FLYCNTTYPE_ALL);
SwFrmFmt* pFlyFmt = pFlyContact->GetFmt();
SwDoc* pDoc = pFlyFmt->GetDoc();
const SwNodeIndex* pIdx;
@@ -685,8 +685,8 @@ sal_Int64 SAL_CALL SwXShape::getSomething( const uno::Sequence< sal_Int8 >& rId
SwXShape::SwXShape(uno::Reference< uno::XInterface > & xShape) :
aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_SHAPE)),
_pMap(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_SHAPE)),
- pImpl(new SwShapeDescriptor_Impl),
pImplementationId(0),
+ pImpl(new SwShapeDescriptor_Impl),
m_bDescriptor(sal_True)
{
if(xShape.is()) // default Ctor
@@ -857,15 +857,15 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
pFrame->GetFrmFmt()->GetDoc() == pDoc)
{
UnoActionContext aCtx(pDoc);
- SfxItemSet aSet( pDoc->GetAttrPool(),
+ SfxItemSet aLclSet( pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END - 1 );
- aSet.SetParent(&pFmt->GetAttrSet());
- SwFmtAnchor aAnchor = (const SwFmtAnchor&)aSet.Get(pMap->nWID);
+ aLclSet.SetParent(&pFmt->GetAttrSet());
+ SwFmtAnchor aAnchor = (const SwFmtAnchor&)aLclSet.Get(pMap->nWID);
SwPosition aPos(*pFrame->GetFrmFmt()->GetCntnt().GetCntntIdx());
aAnchor.SetAnchor(&aPos);
aAnchor.SetType(FLY_AT_FLY);
- aSet.Put(aAnchor);
- pFmt->SetAttr(aSet);
+ aLclSet.Put(aAnchor);
+ pFmt->SetAttr(aLclSet);
bDone = sal_True;
}
}
@@ -904,7 +904,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
SdrMarkList aList;
SdrMark aMark(pObj);
aList.InsertEntry(aMark);
- sal_Int32 nAnchor;
+ sal_Int32 nAnchor(0);
cppu::enum2int( nAnchor, aValue );
pDoc->ChgAnchor( aList, nAnchor,
sal_False, sal_True );
@@ -1581,9 +1581,9 @@ void SwXGroupShape::add( const Reference< XShape >& xShape ) throw (RuntimeExcep
}
pSwShape->m_bDescriptor = sal_False;
//add the group member to the format of the group
- SwFrmFmt* pFmt = ::binfilter::FindFrmFmt( pSvxShape->GetSdrObject() );
- if(pFmt)
- pFmt->Add(pSwShape);
+ SwFrmFmt* pLclFmt = ::binfilter::FindFrmFmt( pSvxShape->GetSdrObject() );
+ if(pLclFmt)
+ pLclFmt->Add(pSwShape);
}
}
else
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoevtlstnr.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoevtlstnr.cxx
index 99c6eb5..e42c157 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoevtlstnr.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoevtlstnr.cxx
@@ -51,9 +51,9 @@ SV_IMPL_PTRARR(SwEvtLstnrArray, XEventListenerPtr);
/*-- 22.04.99 11:24:59---------------------------------------------------
-----------------------------------------------------------------------*/
-SwEventListenerContainer::SwEventListenerContainer( uno::XInterface* pxParent) :
+SwEventListenerContainer::SwEventListenerContainer( uno::XInterface* pxInParent) :
pListenerArr(0),
- pxParent(pxParent)
+ pxParent(pxInParent)
{
}
/*-- 22.04.99 11:24:59---------------------------------------------------
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx b/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx
index f8285c8..691cdb9 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx
@@ -511,13 +511,13 @@ Sequence< OUString > SwXFieldMaster::getSupportedServiceNames(void) throw( Runti
-----------------------------------------------------------------------*/
SwXFieldMaster::SwXFieldMaster(SwDoc* pDoc, sal_uInt16 nResId) :
- m_pDoc(pDoc),
aLstnrCntnr( (XPropertySet*)this),
nResTypeId(nResId),
+ m_pDoc(pDoc),
m_bIsDescriptor(sal_True),
fParam1(0.),
- bParam1(FALSE),
nParam1(-1),
+ bParam1(FALSE),
nParam2(0)
{
pDoc->GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this);
@@ -528,8 +528,8 @@ SwXFieldMaster::SwXFieldMaster(SwDoc* pDoc, sal_uInt16 nResId) :
SwXFieldMaster::SwXFieldMaster(SwFieldType& rType, SwDoc* pDoc) :
SwClient(&rType),
aLstnrCntnr( (XPropertySet*)this),
- m_pDoc(pDoc),
nResTypeId(rType.Which()),
+ m_pDoc(pDoc),
m_bIsDescriptor(sal_False),
fParam1(0.),
nParam1(-1),
@@ -605,14 +605,14 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName,
OUString uTmp;
rValue >>= uTmp;
String sTypeName(uTmp);
- SwFieldType* pType = m_pDoc->GetFldType(nResTypeId, sTypeName);
+ SwFieldType* pLclType = m_pDoc->GetFldType(nResTypeId, sTypeName);
String sTable(SW_RES(STR_POOLCOLL_LABEL_TABLE));
String sDrawing(SW_RES(STR_POOLCOLL_LABEL_DRAWING));
String sFrame(SW_RES(STR_POOLCOLL_LABEL_FRAME));
String sIllustration(SW_RES(STR_POOLCOLL_LABEL_ABB));
- if(pType ||
+ if(pLclType ||
(RES_SETEXPFLD == nResTypeId &&
( sTypeName == sTable || sTypeName == sDrawing ||
sTypeName == sFrame || sTypeName == sIllustration )))
@@ -626,17 +626,17 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName,
case RES_USERFLD :
{
SwUserFieldType aType(m_pDoc, sTypeName);
- pType = m_pDoc->InsertFldType(aType);
- ((SwUserFieldType*)pType)->SetContent(sParam1);
- ((SwUserFieldType*)pType)->SetValue(fParam1);
- ((SwUserFieldType*)pType)->SetType(bParam1 ? GSE_EXPR : GSE_STRING);
+ pLclType = m_pDoc->InsertFldType(aType);
+ ((SwUserFieldType*)pLclType)->SetContent(sParam1);
+ ((SwUserFieldType*)pLclType)->SetValue(fParam1);
+ ((SwUserFieldType*)pLclType)->SetType(bParam1 ? GSE_EXPR : GSE_STRING);
}
break;
case RES_DDEFLD :
{
SwDDEFieldType aType(sTypeName, sParam1,
bParam1 ? ::binfilter::LINKUPDATE_ALWAYS : ::binfilter::LINKUPDATE_ONCALL);
- pType = m_pDoc->InsertFldType(aType);
+ pLclType = m_pDoc->InsertFldType(aType);
}
break;
case RES_SETEXPFLD :
@@ -646,20 +646,20 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName,
aType.SetDelimiter( sParam1.GetChar(0));
if(nParam1 > -1 && nParam1 < MAXLEVEL)
aType.SetOutlineLvl(nParam1);
- pType = m_pDoc->InsertFldType(aType);
+ pLclType = m_pDoc->InsertFldType(aType);
}
break;
}
- if(pType)
+ if(pLclType)
{
- pType->Add(this);
+ pLclType->Add(this);
m_bIsDescriptor = sal_False;
}
else
throw uno::RuntimeException();
}
- DBG_ASSERT(pType, "kein FieldType gefunden!" );
+ DBG_ASSERT(pLclType, "kein FieldType gefunden!" );
}
else
{
@@ -1081,19 +1081,19 @@ struct SwFieldProperties_Impl
sal_Bool bBool4;
SwFieldProperties_Impl():
+ fDouble(0.),
+ pDateTime(0),
nSubType(0),
nFormat(0),
nUSHORT1(0),
nUSHORT2(0),
nSHORT1(0),
nByte1(0),
- fDouble(0.),
+ bFormatIsDefault(sal_True),
bBool1(sal_False),
bBool2(sal_False),
bBool3(sal_False),
- bBool4(sal_True), //Automatic language
- bFormatIsDefault(sal_True),
- pDateTime(0)
+ bBool4(sal_True) //Automatic language
{}
~SwFieldProperties_Impl()
{delete pDateTime;}
@@ -1128,13 +1128,13 @@ sal_Int64 SAL_CALL SwXTextField::getSomething( const uno::Sequence< sal_Int8 >&
-----------------------------------------------------------------------*/
SwXTextField::SwXTextField(sal_uInt16 nServiceId) :
- pFmtFld(0),
aLstnrCntnr( (XTextContent*)this),
+ pFmtFld(0),
m_pDoc(0),
- m_nServiceId(nServiceId),
m_bIsDescriptor(nServiceId != USHRT_MAX),
- m_pProps(new SwFieldProperties_Impl),
- m_bCallUpdate(sal_False)
+ m_bCallUpdate(sal_False),
+ m_nServiceId(nServiceId),
+ m_pProps(new SwFieldProperties_Impl)
{
//Set visible as default!
if(SW_SERVICE_FIELDTYPE_SET_EXP == nServiceId ||
@@ -1150,13 +1150,13 @@ SwXTextField::SwXTextField(sal_uInt16 nServiceId) :
-----------------------------------------------------------------------*/
SwXTextField::SwXTextField(const SwFmtFld& rFmt, SwDoc* pDc) :
- pFmtFld(&rFmt),
aLstnrCntnr( (XTextContent*)this),
+ pFmtFld(&rFmt),
m_pDoc(pDc),
- m_nServiceId( lcl_GetServiceForField( *pFmtFld->GetFld() ) ),
m_bIsDescriptor(sal_False),
- m_pProps(0),
- m_bCallUpdate(sal_False)
+ m_bCallUpdate(sal_False),
+ m_nServiceId( lcl_GetServiceForField( *pFmtFld->GetFld() ) ),
+ m_pProps(0)
{
pDc->GetUnoCallBack()->Add(this);
}
@@ -1916,7 +1916,7 @@ void SwXTextField::setPropertyValue(const OUString& rPropertyName, const uno::An
case FIELD_PROP_USHORT1:
case FIELD_PROP_USHORT2:
{
- sal_Int16 nVal;
+ sal_Int16 nVal(0);
rValue >>= nVal;
if( FIELD_PROP_USHORT1 == pMap->nWID)
m_pProps->nUSHORT1 = nVal;
@@ -2262,8 +2262,8 @@ Sequence< OUString > SwXTextFieldMasters::getSupportedServiceNames(void) throw(
/*-- 21.12.98 10:37:14---------------------------------------------------
-----------------------------------------------------------------------*/
-SwXTextFieldMasters::SwXTextFieldMasters(SwDoc* pDoc) :
- SwUnoCollection(pDoc)
+SwXTextFieldMasters::SwXTextFieldMasters(SwDoc* pInDoc) :
+ SwUnoCollection(pInDoc)
{
}
/*-- 21.12.98 10:37:32---------------------------------------------------
@@ -2508,8 +2508,8 @@ Sequence< OUString > SwXTextFieldTypes::getSupportedServiceNames(void) throw( Ru
/*-- 21.12.98 10:35:15---------------------------------------------------
-----------------------------------------------------------------------*/
-SwXTextFieldTypes::SwXTextFieldTypes(SwDoc* pDoc) :
- SwUnoCollection (pDoc),
+SwXTextFieldTypes::SwXTextFieldTypes(SwDoc* pInDoc) :
+ SwUnoCollection (pInDoc),
aRefreshCont ( static_cast< XEnumerationAccess * >(this) )
{
}
@@ -2626,8 +2626,8 @@ Sequence< OUString > SwXFieldEnumeration::getSupportedServiceNames(void) throw(
*
* --------------------------------------------------*/
SwXFieldEnumeration::SwXFieldEnumeration(SwDoc* pDc) :
- pDoc(pDc),
- nNextIndex(0)
+ nNextIndex(0),
+ pDoc(pDc)
{
pDoc->GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this);
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
index c11767f..ffd1983 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
@@ -756,11 +756,11 @@ Sequence< OUString > SwXFrame::getSupportedServiceNames(void) throw( RuntimeExce
-----------------------------------------------------------------------*/
SwXFrame::SwXFrame(FlyCntType eSet, const SfxItemPropertyMap* pMap, SwDoc *pDoc ) :
aLstnrCntnr( (container::XNamed*)this),
- eType(eSet),
aPropSet(pMap),
_pMap(pMap),
- bIsDescriptor(sal_True),
- mpDoc ( pDoc )
+ mpDoc ( pDoc ),
+ eType(eSet),
+ bIsDescriptor(sal_True)
{
// Register ourselves as a listener to the document (via the page descriptor)
pDoc->GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this);
@@ -780,37 +780,39 @@ SwXFrame::SwXFrame(FlyCntType eSet, const SfxItemPropertyMap* pMap, SwDoc *pDoc
{
case FLYCNTTYPE_FRM:
{
- Any aAny = mxStyleFamily->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Frame" ) ) );
- aAny >>= mxStyleData;
+ Any aLclAny = mxStyleFamily->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Frame" ) ) );
+ aLclAny >>= mxStyleData;
pProps = new SwFrameProperties_Impl( );
}
break;
case FLYCNTTYPE_GRF:
{
- Any aAny = mxStyleFamily->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Graphics" ) ) );
- aAny >>= mxStyleData;
+ Any aLclAny = mxStyleFamily->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Graphics" ) ) );
+ aLclAny >>= mxStyleData;
pProps = new SwGraphicProperties_Impl( );
}
break;
case FLYCNTTYPE_OLE:
{
- Any aAny = mxStyleFamily->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "OLE" ) ) );
- aAny >>= mxStyleData;
+ Any aLclAny = mxStyleFamily->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "OLE" ) ) );
+ aLclAny >>= mxStyleData;
pProps = 0;
pProps = new SwOLEProperties_Impl( );
}
break;
+ default:
+ break;
}
}
SwXFrame::SwXFrame(SwFrmFmt& rFrmFmt, FlyCntType eSet, const SfxItemPropertyMap* pMap) :
- eType(eSet),
SwClient( &rFrmFmt ),
aLstnrCntnr( (container::XNamed*)this),
aPropSet(pMap),
_pMap(pMap),
- bIsDescriptor(sal_False),
- pProps(0)
+ eType(eSet),
+ pProps(0),
+ bIsDescriptor(sal_False)
{
}
@@ -875,6 +877,8 @@ uno::Reference< XPropertySetInfo > SwXFrame::getPropertySetInfo(void) throw( Ru
xOLERef = aPropSet.getPropertySetInfo();
xRef = xOLERef;
break;
+ default:
+ break;
}
return xRef;
}
@@ -939,9 +943,9 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
SwDoc* pDoc = pFmt->GetDoc();
- if( eType == FLYCNTTYPE_GRF &&
+ if( (eType == FLYCNTTYPE_GRF &&
(pCur->nWID >= RES_GRFATR_BEGIN &&
- pCur->nWID < RES_GRFATR_END)||
+ pCur->nWID < RES_GRFATR_END)) ||
pCur->nWID == FN_PARAM_COUNTOUR_PP ||
pCur->nWID == FN_UNO_IS_AUTOMATIC_CONTOUR ||
pCur->nWID == FN_UNO_IS_PIXEL_CONTOUR ||
@@ -1119,10 +1123,10 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
SwFrmFmt* pChain = 0;
for( sal_uInt16 i = 0; i < nCount; i++)
{
- SwFrmFmt* pFmt = pDoc->GetFlyNum(i, FLYCNTTYPE_FRM);
- if(sChainName == pFmt->GetName() )
+ SwFrmFmt* pLclFmt = pDoc->GetFlyNum(i, FLYCNTTYPE_FRM);
+ if(sChainName == pLclFmt->GetName() )
{
- pChain = pFmt;
+ pChain = pLclFmt;
break;
}
}
@@ -1188,8 +1192,8 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
if(aAnchor.GetAnchorId() == FLY_AT_FLY)
{
const SwPosition* pPosition = aAnchor.GetCntntAnchor();
- SwFrmFmt* pFmt = pPosition ? pPosition->nNode.GetNode().GetFlyFmt() : 0;
- if(!pFmt || pFmt->Which() == RES_DRAWFRMFMT)
+ SwFrmFmt* pLclFmt = pPosition ? pPosition->nNode.GetNode().GetFlyFmt() : 0;
+ if(!pLclFmt || pLclFmt->Which() == RES_DRAWFRMFMT)
{
lang::IllegalArgumentException aExcept;
aExcept.Message = C2U("Anchor to frame: no frame found");
@@ -1198,7 +1202,7 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
else
{
SwPosition aPos = *pPosition;
- aPos.nNode = *pFmt->GetCntnt().GetCntntIdx();
+ aPos.nNode = *pLclFmt->GetCntnt().GetCntntIdx();
aAnchor.SetAnchor(&aPos);
aSet.Put(aAnchor);
}
@@ -1958,14 +1962,14 @@ void SwXFrame::attachToRange(const uno::Reference< XTextRange > & xTextRange)
aFrmSz.SetSize(aSz);
aFrmSet.Put(aFrmSz);
}
- SwFlyFrmFmt* pFmt = 0;
+ SwFlyFrmFmt* pLclFmt = 0;
- pFmt = pDoc->Insert(aPam, &xIPObj, &aFrmSet );
- OSL_ENSURE( pFmt, "Doc->Insert(notxt) failed." );
+ pLclFmt = pDoc->Insert(aPam, &xIPObj, &aFrmSet );
+ OSL_ENSURE( pLclFmt, "Doc->Insert(notxt) failed." );
- pFmt->Add(this);
+ pLclFmt->Add(this);
if(sName.Len())
- pDoc->SetFlyName((SwFlyFrmFmt&)*pFmt, sName);
+ pDoc->SetFlyName((SwFlyFrmFmt&)*pLclFmt, sName);
}
}
@@ -1989,16 +1993,6 @@ void SwXFrame::attach(const uno::Reference< XTextRange > & xTextRange)
attachToRange(xTextRange);
else if(0 != (pFmt = GetFrmFmt()))
{
- Reference<XUnoTunnel> xRangeTunnel( xTextRange, UNO_QUERY);
- SwXTextRange* pRange = 0;
- OTextCursorHelper* pCursor = 0;
- if(xRangeTunnel.is())
- {
- pRange = (SwXTextRange*)xRangeTunnel->getSomething(
- SwXTextRange::getUnoTunnelId());
- pCursor = (OTextCursorHelper*)xRangeTunnel->getSomething(
- OTextCursorHelper::getUnoTunnelId());
- }
SwDoc* pDoc = pFmt->GetDoc();
SwUnoInternalPaM aIntPam(*pDoc);
if(SwXTextRange::XTextRangeToSwPaM(aIntPam, xTextRange))
@@ -2055,15 +2049,15 @@ OUString SwXFrame::getShapeType(void) throw( RuntimeException )
/******************************************************************
* SwXTextFrame
******************************************************************/
-SwXTextFrame::SwXTextFrame( SwDoc *pDoc ) :
- SwXFrame(FLYCNTTYPE_FRM, aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_FRAME), pDoc ),
- SwXText(0, CURSOR_FRAME)
+SwXTextFrame::SwXTextFrame( SwDoc *pInDoc ) :
+ SwXText(0, CURSOR_FRAME),
+ SwXFrame(FLYCNTTYPE_FRM, aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_FRAME), pInDoc )
{
}
SwXTextFrame::SwXTextFrame(SwFrmFmt& rFmt) :
- SwXFrame(rFmt, FLYCNTTYPE_FRM, aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_FRAME)),
- SwXText(rFmt.GetDoc(), CURSOR_FRAME)
+ SwXText(rFmt.GetDoc(), CURSOR_FRAME),
+ SwXFrame(rFmt, FLYCNTTYPE_FRM, aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_FRAME))
{
}
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx
index 6c50c4e..34c510e 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx
@@ -124,8 +124,8 @@ Sequence< OUString > SwXFootnote::getSupportedServiceNames(void) throw( RuntimeE
TYPEINIT1(SwXFootnote, SwClient);
SwXFootnote::SwXFootnote(sal_Bool bEndnote) :
- aLstnrCntnr( (text::XTextContent*)this),
SwXText(0, CURSOR_FOOTNOTE),
+ aLstnrCntnr( (text::XTextContent*)this),
pFmtFtn(0),
m_bIsDescriptor(sal_True),
m_bIsEndnote(bEndnote)
@@ -135,8 +135,8 @@ SwXFootnote::SwXFootnote(sal_Bool bEndnote) :
/*-- 10.12.98 15:31:45---------------------------------------------------
-----------------------------------------------------------------------*/
-SwXFootnote::SwXFootnote(SwDoc* pDoc, const SwFmtFtn& rFmt) :
- SwXText(pDoc, CURSOR_FOOTNOTE),
+SwXFootnote::SwXFootnote(SwDoc* pInDoc, const SwFmtFtn& rFmt) :
+ SwXText(pInDoc, CURSOR_FOOTNOTE),
aLstnrCntnr( (text::XTextContent*)this),
pFmtFtn(&rFmt),
m_bIsDescriptor(sal_False),
@@ -252,21 +252,21 @@ void SwXFootnote::attachToRange(const uno::Reference< text::XTextRange > & xText
pCursor = (OTextCursorHelper*)xRangeTunnel->getSomething(
OTextCursorHelper::getUnoTunnelId());
}
- SwDoc* pDoc = pRange ? (SwDoc*)pRange->GetDoc() : pCursor ? (SwDoc*)pCursor->GetDoc() : 0;
- if(pDoc)
+ SwDoc* pLclDoc = pRange ? (SwDoc*)pRange->GetDoc() : pCursor ? (SwDoc*)pCursor->GetDoc() : 0;
+ if(pLclDoc)
{
- SwUnoInternalPaM aPam(*pDoc);
+ SwUnoInternalPaM aPam(*pLclDoc);
//das muss jetzt sal_True liefern
SwXTextRange::XTextRangeToSwPaM(aPam, xTextRange);
- UnoActionContext aCont(pDoc);
+ UnoActionContext aCont(pLclDoc);
SwTxtAttr* pTxtAttr = 0;
- pDoc->DeleteAndJoin(aPam);
+ pLclDoc->DeleteAndJoin(aPam);
aPam.DeleteMark();
SwFmtFtn aFootNote(m_bIsEndnote);
if(m_sLabel.Len())
aFootNote.SetNumStr(m_sLabel);
- SfxItemSet aSet(pDoc->GetAttrPool(), RES_TXTATR_FTN, RES_TXTATR_FTN, 0L);
+ SfxItemSet aSet(pLclDoc->GetAttrPool(), RES_TXTATR_FTN, RES_TXTATR_FTN, 0L);
aSet.Put(aFootNote);
SwXTextCursor::SetCrsrAttr(aPam, aSet, 0);
@@ -277,15 +277,15 @@ void SwXFootnote::attachToRange(const uno::Reference< text::XTextRange > & xText
{
const SwFmtFtn& rFtn = pTxtAttr->GetFtn();
pFmtFtn = &rFtn;
- pDoc->GetUnoCallBack()->Add(this);
+ pLclDoc->GetUnoCallBack()->Add(this);
//force creation of sequence id - is used for references
- if(pDoc->IsInReading())
- ((SwTxtFtn*)pTxtAttr)->SetSeqNo(pDoc->GetFtnIdxs().Count());
+ if(pLclDoc->IsInReading())
+ ((SwTxtFtn*)pTxtAttr)->SetSeqNo(pLclDoc->GetFtnIdxs().Count());
else
((SwTxtFtn*)pTxtAttr)->SetSeqRefNo();
}
m_bIsDescriptor = sal_False;
- SetDoc(pDoc);
+ SetDoc(pLclDoc);
}
else
throw lang::IllegalArgumentException();
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx
index b1e63ee..1a751f8 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx
@@ -279,15 +279,15 @@ Sequence< OUString > SwXDocumentIndex::getSupportedServiceNames(void) throw( Run
-----------------------------------------------------------------------*/
TYPEINIT1(SwXDocumentIndex, SwClient)
SwXDocumentIndex::SwXDocumentIndex(const SwTOXBaseSection* pB, SwDoc* pDc) :
- m_pDoc(pDc),
aLstnrCntnr( (text::XTextContent*)this),
+ _pMap(0),
+ m_pDoc(pDc),
pBase(pB),
+ eTOXType(TOX_USER),
+ bIsDescriptor(sal_False),
pProps(0),
- _pMap(0),
pStyleAccess(0),
- pTokenAccess(0),
- bIsDescriptor(sal_False),
- eTOXType(TOX_USER)
+ pTokenAccess(0)
{
if(pBase && m_pDoc)
{
@@ -313,14 +313,14 @@ SwXDocumentIndex::SwXDocumentIndex(const SwTOXBaseSection* pB, SwDoc* pDc) :
*
* --------------------------------------------------*/
SwXDocumentIndex::SwXDocumentIndex(TOXTypes eType, SwDoc& rDoc) :
- m_pDoc(0),
aLstnrCntnr( (text::XTextContent*)this),
+ m_pDoc(0),
pBase(0),
+ eTOXType(eType),
+ bIsDescriptor(sal_True),
pProps(new SwDocIdxProperties_Impl(rDoc.GetTOXType(eType, 0))),
pStyleAccess(0),
- pTokenAccess(0),
- bIsDescriptor(sal_True),
- eTOXType(eType)
+ pTokenAccess(0)
{
sal_uInt16 PropertyId;
switch(eType)
@@ -353,13 +353,13 @@ OUString SwXDocumentIndex::getServiceName(void) throw( RuntimeException )
USHORT nObjectType = SW_SERVICE_TYPE_INDEX;
switch(eTOXType)
{
-// case TOX_INDEX: break;
case TOX_USER: nObjectType = SW_SERVICE_USER_INDEX;break;
case TOX_CONTENT: nObjectType = SW_SERVICE_CONTENT_INDEX;break;
case TOX_ILLUSTRATIONS: nObjectType = SW_SERVICE_INDEX_ILLUSTRATIONS;break;
case TOX_OBJECTS: nObjectType = SW_SERVICE_INDEX_OBJECTS;break;
case TOX_TABLES: nObjectType = SW_SERVICE_INDEX_TABLES;break;
case TOX_AUTHORITIES: nObjectType = SW_SERVICE_INDEX_BIBLIOGRAPHY;break;
+ default: break;
}
return SwXServiceProvider::GetProviderName(nObjectType);
}
@@ -400,7 +400,7 @@ void SwXDocumentIndex::setPropertyValue(const OUString& rPropertyName,
if ( pMap->nFlags & PropertyAttribute::READONLY)
throw PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
- SwTOXBase* pTOXBase;
+ SwTOXBase* pTOXBase(0);
if(GetFmt())
pTOXBase = (SwTOXBaseSection*)GetFmt()->GetSection();
else if(bIsDescriptor)
@@ -687,7 +687,7 @@ uno::Any SwXDocumentIndex::getPropertyValue(const OUString& rPropertyName)
_pMap, rPropertyName);
if (!pMap)
throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
- SwTOXBase* pTOXBase;
+ SwTOXBase* pTOXBase(0);
if(GetFmt())
pTOXBase = (SwTOXBaseSection*)GetFmt()->GetSection();
else if(bIsDescriptor)
@@ -963,8 +963,8 @@ uno::Any SwXDocumentIndex::getPropertyValue(const OUString& rPropertyName)
Reference<XDocumentIndexMark>* pxMarks = aXMarks.getArray();
for(USHORT i = 0; i < aMarks.Count(); i++)
{
- SwTOXMark* pMark = aMarks.GetObject(i);
- pxMarks[i] = SwXDocumentIndexMark::GetObject((SwTOXType*)pType, pMark, m_pDoc);
+ SwTOXMark* pLclMark = aMarks.GetObject(i);
+ pxMarks[i] = SwXDocumentIndexMark::GetObject((SwTOXType*)pType, pLclMark, m_pDoc);
}
aRet.setValue(&aXMarks, ::getCppuType((Sequence< Reference< XDocumentIndexMark > >*)0));
bBOOL = sal_False;
@@ -1302,6 +1302,8 @@ Sequence< OUString > SwXDocumentIndexMark::getSupportedServiceNames(void) throw(
pArray[2] = C2U(cIdxMark);
pArray[3] = C2U(cIdxMarkAsian);
break;
+ default:
+ break;
}
return aRet;
}
@@ -1309,14 +1311,14 @@ Sequence< OUString > SwXDocumentIndexMark::getSupportedServiceNames(void) throw(
-----------------------------------------------------------------------*/
SwXDocumentIndexMark::SwXDocumentIndexMark(TOXTypes eToxType) :
+ aLstnrCntnr( (text::XTextContent*)this),
aTypeDepend(this, 0),
m_pDoc(0),
- aLstnrCntnr( (text::XTextContent*)this),
m_pTOXMark(0),
- nLevel(0),
- eType(eToxType),
+ bIsDescriptor(sal_True),
bMainEntry(sal_False),
- bIsDescriptor(sal_True)
+ eType(eToxType),
+ nLevel(0)
{
InitMap(eToxType);
}
@@ -1326,14 +1328,14 @@ SwXDocumentIndexMark::SwXDocumentIndexMark(TOXTypes eToxType) :
SwXDocumentIndexMark::SwXDocumentIndexMark(const SwTOXType* pType,
const SwTOXMark* pMark,
SwDoc* pDc) :
- aTypeDepend(this, (SwTOXType*)pType),
aLstnrCntnr( (text::XTextContent*)this),
+ aTypeDepend(this, (SwTOXType*)pType),
m_pDoc(pDc),
m_pTOXMark(pMark),
- nLevel(0),
- eType(pType->GetType()),
bIsDescriptor(sal_False),
- bMainEntry(sal_False)
+ bMainEntry(sal_False),
+ eType(pType->GetType()),
+ nLevel(0)
{
m_pDoc->GetUnoCallBack()->Add(this);
InitMap(eType);
@@ -1359,7 +1361,8 @@ void SwXDocumentIndexMark::InitMap(TOXTypes eToxType)
case TOX_CONTENT:
nMapId = PROPERTY_MAP_CNTIDX_MARK;
break;
- //case TOX_USER:
+ default:
+ break;
}
_pMap = aSwMapProvider.GetPropertyMap(nMapId);
}
@@ -1493,6 +1496,8 @@ void SwXDocumentIndexMark::attachToRange(const Reference< text::XTextRange > & x
}
}
break;
+ default:
+ break;
}
if(!pTOXType)
throw IllegalArgumentException();
@@ -1525,6 +1530,8 @@ void SwXDocumentIndexMark::attachToRange(const Reference< text::XTextRange > & x
if(USHRT_MAX != nLevel)
aMark.SetLevel(nLevel);
break;
+ default:
+ break;
}
UnoActionContext aAction(pDoc);
sal_Bool bMark = *aPam.GetPoint() != *aPam.GetMark();
@@ -1641,6 +1648,7 @@ Reference< XPropertySetInfo > SwXDocumentIndexMark::getPropertySetInfo(void)
case TOX_INDEX: nPos = 0; break;
case TOX_CONTENT: nPos = 1; break;
case TOX_USER: nPos = 2; break;
+ default: break;
}
if(!xInfos[nPos].is())
{
@@ -1757,7 +1765,7 @@ void SwXDocumentIndexMark::setPropertyValue(const OUString& rPropertyName,
break;
case WID_LEVEL:
{
- sal_uInt16 nVal = lcl_AnyToInt16(aValue);
+ const sal_Int16 nVal = lcl_AnyToInt16(aValue);
if(nVal >= 0 && nVal < MAXLEVEL)
nLevel = nVal;
else
@@ -2013,8 +2021,8 @@ Sequence< OUString > SwXDocumentIndexes::getSupportedServiceNames(void) throw( R
/*-- 05.05.99 13:14:59---------------------------------------------------
-----------------------------------------------------------------------*/
-SwXDocumentIndexes::SwXDocumentIndexes(SwDoc* pDoc) :
- SwUnoCollection(pDoc)
+SwXDocumentIndexes::SwXDocumentIndexes(SwDoc* pInDoc) :
+ SwUnoCollection(pInDoc)
{
}
/*-- 05.05.99 13:15:00---------------------------------------------------
@@ -2054,7 +2062,7 @@ uno::Any SwXDocumentIndexes::getByIndex(sal_Int32 nIndex)
throw RuntimeException();
uno::Any aRet;
- sal_uInt32 nIdx = 0;
+ sal_Int32 nIdx = 0;
const SwSectionFmts& rFmts = GetDoc()->GetSections();
for( sal_uInt16 n = 0; n < rFmts.Count(); ++n )
@@ -2449,7 +2457,7 @@ void SwXIndexTokenAccess_Impl::replaceByIndex(sal_Int32 nIndex, const uno::Any&
}
else if( pProperties[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TabStopPosition" )))
{
- sal_Int32 nPosition;
+ sal_Int32 nPosition(0);
if(pProperties[j].Value.getValueType() != ::getCppuType((sal_Int32*)0))
throw IllegalArgumentException();
pProperties[j].Value >>= nPosition;
@@ -2495,7 +2503,7 @@ void SwXIndexTokenAccess_Impl::replaceByIndex(sal_Int32 nIndex, const uno::Any&
}
else if( pProperties[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("BibliographyDataField")))
{
- sal_Int16 nType; pProperties[j].Value >>= nType;
+ sal_Int16 nType(0); pProperties[j].Value >>= nType;
if(nType < 0 || nType > BibliographyDataField::ISBN)
{
IllegalArgumentException aExcept;
@@ -2701,6 +2709,7 @@ uno::Any SwXIndexTokenAccess_Impl::getByIndex(sal_Int32 nIndex)
}
break;
case TOKEN_AUTHORITY :
+ {
rCurTokenSeq.realloc( 3 );
PropertyValue* pArr = rCurTokenSeq.getArray();
@@ -2712,6 +2721,9 @@ uno::Any SwXIndexTokenAccess_Impl::getByIndex(sal_Int32 nIndex)
pArr[2].Name = C2U("BibliographyDataField");
pArr[2].Value <<= sal_Int16(aToken.nAuthorityField);
+ }
+ break;
+ default:
break;
}
}
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unomap.cxx b/binfilter/bf_sw/source/core/unocore/sw_unomap.cxx
index c3542d8..1c47190 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unomap.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unomap.cxx
@@ -450,7 +450,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
static SfxItemPropertyMap aCharAndParaMap_Impl[] =
{
COMPLETE_TEXT_CURSOR_MAP
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aCharAndParaMap_Impl;
}
@@ -462,7 +462,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
COMMON_CRSR_PARA_PROPERTIES_2
TABSTOPS_MAP_ENTRY
COMMON_TEXT_CONTENT_PROPERTIES
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aParagraphMap_Impl;
}
@@ -504,7 +504,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE), RES_CHRATR_ROTATE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_FITTOLINE },
{ SW_PROP_NMID(UNO_NAME_CHAR_SCALE_WIDTH), RES_CHRATR_SCALEW, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
{ SW_PROP_NMID(UNO_NAME_CHAR_RELIEF), RES_CHRATR_RELIEF, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_RELIEF },
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aCharStyleMap;
}
@@ -605,7 +605,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_CATEGORY), FN_UNO_CATEGORY, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , 0 },
{ SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
{ SW_PROP_NMID(UNO_NAME_PARA_IS_CONNECT_BORDER), RES_PARATR_CONNECT_BORDER, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aParaStyleMap;
}
@@ -678,7 +678,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
{ SW_PROP_NMID(UNO_NAME_IS_AUTO_UPDATE), FN_UNO_IS_AUTO_UPDATE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aFrameStyleMap;
}
@@ -797,7 +797,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_GRID_PRINT), RES_TEXTGRID, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_GRID_PRINT},
{ SW_PROP_NMID(UNO_NAME_GRID_DISPLAY), RES_TEXTGRID, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_GRID_DISPLAY},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aPageStyleMap;
}
@@ -809,7 +809,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_NUMBERING_RULES), FN_UNO_NUM_RULES, CPPU_E2T(CPPUTYPE_REFIDXREPL), PROPERTY_NONE, CONVERT_TWIPS},
{ SW_PROP_NMID(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
{ SW_PROP_NMID(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aNumStyleMap;
}
@@ -849,7 +849,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION, CPPU_E2T(CPPUTYPE_REFTEXTSECTION), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
{ SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
_REDLINE_NODE_PROPERTIES
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aTablePropertyMap_Impl;
@@ -880,7 +880,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_CELL_NAME), FN_UNO_CELL_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY,0},
{ SW_PROP_NMID(UNO_NAME_VERT_ORIENT), RES_VERT_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_VERTORIENT_ORIENT },
_REDLINE_NODE_PROPERTIES
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aCellMap_Impl;
}
@@ -982,7 +982,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, 0 },
{ SW_PROP_NMID(UNO_NAME_NUMBERING_RULES), FN_UNO_NUM_RULES, CPPU_E2T(CPPUTYPE_REFIDXREPL), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, \
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aRangePropertyMap_Impl;
}
@@ -1034,7 +1034,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_SECT_LEFT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, MID_L_MARGIN|CONVERT_TWIPS}, \
{ SW_PROP_NMID(UNO_NAME_SECT_RIGHT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS}, \
/* <- #1097001# */
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aSectionPropertyMap_Impl;
}
@@ -1055,7 +1055,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY_REMOVE), WID_SIMILARITY_REMOVE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_SEARCH_STYLES), WID_STYLES, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_SEARCH_WORDS), WID_WORDS, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aSearchPropertyMap_Impl;
}
@@ -1080,7 +1080,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_FRAME_WIDTH_PERCENT), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, MID_FRMSIZE_REL_WIDTH },
{ SW_PROP_NMID(UNO_NAME_SIZE_TYPE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, MID_FRMSIZE_SIZE_TYPE },
{ SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aFramePropertyMap_Impl;
}
@@ -1113,7 +1113,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_GRAPHIC_IS_INVERTED), RES_GRFATR_INVERT, CPPU_E2T(CPPUTYPE_BOOLEAN), 0, 0},
{ SW_PROP_NMID(UNO_NAME_TRANSPARENCY), RES_GRFATR_TRANSPARENCY, CPPU_E2T(CPPUTYPE_INT16), 0, 0},
{ SW_PROP_NMID(UNO_NAME_GRAPHIC_COLOR_MODE), RES_GRFATR_DRAWMODE, CPPU_E2T(CPPUTYPE_COLORMODE), 0, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aGraphicPropertyMap_Impl;
}
@@ -1131,7 +1131,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_CLSID), FN_UNO_CLSID, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0 },
{ SW_PROP_NMID(UNO_NAME_MODEL), FN_UNO_MODEL, CPPU_E2T(CPPUTYPE_REFMODEL), PropertyAttribute::READONLY|PropertyAttribute::MAYBEVOID, 0},
{ SW_PROP_NMID(UNO_NAME_COMPONENT),FN_UNO_COMPONENT, CPPU_E2T(CPPUTYPE_REFCOMPONENT), PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aEmbeddedPropertyMap_Impl;
}
@@ -1161,7 +1161,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_TEXT_RANGE), FN_TEXT_RANGE, CPPU_E2T(CPPUTYPE_REFTXTRANGE), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_OPAQUE), RES_OPAQUE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_ANCHOR_POSITION), FN_ANCHOR_POSITION, CPPU_E2T(CPPUTYPE_AWTPOINT), PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aShapeMap_Impl;
}
@@ -1178,7 +1178,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_SECONDARY_KEY_READING), WID_SECONDARY_KEY_READING, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_IS_MAIN_ENTRY), WID_MAIN_ENTRY, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
COMMON_TEXT_CONTENT_PROPERTIES
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aIdxMarkMap_Impl;
}
@@ -1190,7 +1190,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_ALTERNATIVE_TEXT), WID_ALT_TEXT, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_LEVEL), WID_LEVEL , CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
COMMON_TEXT_CONTENT_PROPERTIES
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aCntntMarkMap_Impl;
}
@@ -1203,7 +1203,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_LEVEL ), WID_LEVEL , CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_USER_INDEX_NAME), WID_USER_IDX_NAME, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
COMMON_TEXT_CONTENT_PROPERTIES
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aUserMarkMap_Impl;
}
@@ -1241,7 +1241,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_LOCALE), WID_IDX_LOCALE, CPPU_E2T(CPPUTYPE_LOCALE), PROPERTY_NONE, 0},\
{ SW_PROP_NMID(UNO_NAME_SORT_ALGORITHM), WID_IDX_SORT_ALGORITHM, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},\
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aTOXIndexMap_Impl;
}
@@ -1281,7 +1281,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL10), WID_PARA_LEV10, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
{ SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, CPPU_E2T(CPPUTYPE_DOCIDXMRK), PropertyAttribute::READONLY ,0 },
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aTOXContentMap_Impl;
}
@@ -1323,7 +1323,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, CPPU_E2T(CPPUTYPE_DOCIDXMRK), PropertyAttribute::READONLY ,0 },
{ SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_USER_INDEX_NAME), WID_USER_IDX_NAME, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aTOXUserMap_Impl;
}
@@ -1348,7 +1348,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
{ SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
{ SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aTOXTablesMap_Impl;
}
@@ -1376,7 +1376,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
{ SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
{ SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aTOXObjectsMap_Impl;
}
@@ -1402,7 +1402,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
{ SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
{ SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aTOXIllustrationsMap_Impl;
}
@@ -1422,7 +1422,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_SIZE_TYPE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, MID_FRMSIZE_SIZE_TYPE },
// { SW_PROP_NMID(UNO_NAME_HEIGHT), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT32) , PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS },
// { SW_PROP_NMID(UNO_NAME_SHADOW_FORMAT), RES_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, CONVERT_TWIPS},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = (SfxItemPropertyMap*)aTableRowPropertyMap_Impl;
@@ -1494,7 +1494,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_SUFFIX), RES_CHRATR_TWO_LINES, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_END_BRACKET},
{ SW_PROP_NMID(UNO_NAME_CHAR_EMPHASIS), RES_CHRATR_EMPHASIS_MARK, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_EMPHASIS},
{ SW_PROP_NMID(UNO_NAME_CHAR_RELIEF), RES_CHRATR_RELIEF, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_RELIEF },
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aTableCursorPropertyMap_Impl;
}
@@ -1505,7 +1505,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{
{ SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), FN_PARAM_LINK_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff},
COMMON_TEXT_CONTENT_PROPERTIES
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aBookmarkPropertyMap_Impl;
}
@@ -1515,7 +1515,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
static SfxItemPropertyMap aParagraphExtensionsMap_Impl[] =
{
COMMON_TEXT_CONTENT_PROPERTIES
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aParagraphExtensionsMap_Impl;
@@ -1538,7 +1538,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_LEVEL_FORMAT), WID_LEVEL_FORMAT , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PROPERTY_NONE,0},
{ SW_PROP_NMID(UNO_NAME_LOCALE), WID_IDX_LOCALE, CPPU_E2T(CPPUTYPE_LOCALE), PROPERTY_NONE, 0},\
{ SW_PROP_NMID(UNO_NAME_SORT_ALGORITHM), WID_IDX_SORT_ALGORITHM, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},\
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aBibliographyMap_Impl;
}
@@ -1577,7 +1577,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_TWO_DIGIT_YEAR), WID_DOC_TWO_DIGIT_YEAR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_AUTOMATIC_CONTROL_FOCUS), WID_DOC_AUTOMATIC_CONTROL_FOCUS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_APPLY_FORM_DESIGN_MODE), WID_DOC_APPLY_FORM_DESIGN_MODE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDocMap_Impl;
}
@@ -1588,7 +1588,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{
{ SW_PROP_NMID(UNO_LINK_DISPLAY_BITMAP), 0, CPPU_E2T(CPPUTYPE_REFBITMAP), PropertyAttribute::READONLY, 0xff},
{ SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), 0, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aLinkTargetMap_Impl;
}
@@ -1599,7 +1599,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{
{ SW_PROP_NMID(UNO_NAME_FILE_PATH), WID_GROUP_PATH, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, PropertyAttribute::READONLY},
{ SW_PROP_NMID(UNO_NAME_TITLE), WID_GROUP_TITLE, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aAutoTextGroupMap_Impl;
}
@@ -1615,7 +1615,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_IS_START), FN_UNO_IS_START, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
//_REDLINE_PROPERTIES
{SW_PROP_NMID(UNO_NAME_TEXT_PORTION_TYPE), FN_UNO_TEXT_PORTION_TYPE, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aTextPortionExtensionMap_Impl;
}
@@ -1627,7 +1627,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_REFERENCE_ID), 0, CPPU_E2T(CPPUTYPE_INT16),PropertyAttribute::READONLY|PropertyAttribute::MAYBEVOID, 0},
COMMON_TEXT_CONTENT_PROPERTIES
_REDLINE_NODE_PROPERTIES
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aFootnoteMap_Impl;
}
@@ -1643,7 +1643,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_RELATIVE_HEIGHT), WID_TXTCOL_LINE_REL_HGT, CPPU_E2T(CPPUTYPE_INT32),PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_VERTIVAL_ALIGNMENT), WID_TXTCOL_LINE_ALIGN, CPPU_E2T(CPPUTYPE_VERTALIGN),PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_IS_ON), WID_TXTCOL_LINE_IS_ON, CPPU_E2T(CPPUTYPE_BOOLEAN),PROPERTY_NONE, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aTextColumns_Impl;
}
@@ -1656,7 +1656,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
_REDLINE_NODE_PROPERTIES
{SW_PROP_NMID(UNO_NAME_REDLINE_START), 0, CPPU_E2T(CPPUTYPE_REFINTERFACE), PropertyAttribute::READONLY, 0},
{SW_PROP_NMID(UNO_NAME_REDLINE_END), 0, CPPU_E2T(CPPUTYPE_REFINTERFACE), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aRedlineMap_Impl;
}
@@ -1669,7 +1669,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN
COMMON_HYPERLINK_PROPERTIES
{ SW_PROP_NMID(UNO_NAME_CHAR_STYLE_NAME), RES_TXTATR_CHARFMT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0}, \
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aTextDefaultMap_Impl;
for( SfxItemPropertyMap * pMap = aTextDefaultMap_Impl;
@@ -1692,7 +1692,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_IS_START), FN_UNO_IS_START, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
_REDLINE_PROPERTIES
{SW_PROP_NMID(UNO_NAME_TEXT_PORTION_TYPE), FN_UNO_TEXT_PORTION_TYPE, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aRedlinePortionMap_Impl;
}
@@ -1707,7 +1707,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_IS_DATE), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
{SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDateTimeFieldPropMap;
}
@@ -1720,7 +1720,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_IS_VISIBLE), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aUserFieldPropMap;
@@ -1744,7 +1744,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_VALUE), FIELD_PROP_DOUBLE, CPPU_E2T(CPPUTYPE_DOUBLE), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_VARIABLE_NAME), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aSetExpFieldPropMap;
}
@@ -1761,7 +1761,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_VALUE), FIELD_PROP_DOUBLE, CPPU_E2T(CPPUTYPE_DOUBLE), PropertyAttribute::READONLY, 0},
{SW_PROP_NMID(UNO_NAME_VARIABLE_SUBTYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aGetExpFieldPropMap;
}
@@ -1773,7 +1773,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_FILE_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aFileNameFieldPropMap;
}
@@ -1786,7 +1786,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_OFFSET), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_SUB_TYPE), FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_PAGENUMTYPE), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_USERTEXT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aPageNumFieldPropMap;
}
@@ -1799,7 +1799,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_FULL_NAME),FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aAuthorFieldPropMap;
}
@@ -1810,7 +1810,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{
{SW_PROP_NMID(UNO_NAME_CHAPTER_FORMAT),FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_LEVEL ),FIELD_PROP_BYTE1, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aChapterFieldPropMap;
}
@@ -1824,7 +1824,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_REFERENCE_FIELD_SOURCE),FIELD_PROP_USHORT2, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_SEQUENCE_NUMBER), FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_SOURCE_NAME), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aGetRefFieldPropMap;
}
@@ -1837,7 +1837,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_FALSE_CONTENT), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_CONDITION_TRUE) , FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_TRUE_CONTENT) , FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aConditionedTxtFieldPropMap;
}
@@ -1849,7 +1849,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_CONDITION), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_CONTENT) , FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_HIDDEN) , FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aHiddenTxtFieldPropMap;
}
@@ -1861,7 +1861,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_AUTHOR), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_DATE), FIELD_PROP_DATE, CPPU_E2T(CPPUTYPE_DATE), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aAnnotationFieldPropMap;
}
@@ -1872,7 +1872,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{
{SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_HINT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aInputFieldPropMap;
}
@@ -1884,7 +1884,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_HINT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_MACRO_NAME),FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_MACRO_LIBRARY),FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aMacroFieldPropMap;
}
@@ -1893,7 +1893,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{
static SfxItemPropertyMap aDDEFieldPropMap [] =
{
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDDEFieldPropMap;
}
@@ -1905,7 +1905,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_ITEMS), FIELD_PROP_STRINGS, CPPU_E2T(CPPUTYPE_OUSTRINGS), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_SELITEM), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_NAME), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDropDownMap;
}
@@ -1916,7 +1916,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{
{SW_PROP_NMID(UNO_NAME_CONDITION),FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_HIDDEN) , FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aHiddenParaFieldPropMap;
}
@@ -1928,7 +1928,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_INFO_FORMAT), FIELD_PROP_USHORT2, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_INFO_TYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDocInfoFieldPropMap;
}
@@ -1938,7 +1938,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
static SfxItemPropertyMap aTmplNameFieldPropMap [] =
{
{SW_PROP_NMID(UNO_NAME_FILE_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aTmplNameFieldPropMap;
}
@@ -1951,7 +1951,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_USER_DATA_TYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId]= aUsrExtFieldPropMap;
}
@@ -1962,7 +1962,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{
{SW_PROP_NMID(UNO_NAME_OFFSET), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_ON), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aRefPgSetFieldPropMap;
}
@@ -1973,7 +1973,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aRefPgGetFieldPropMap;
}
@@ -1985,7 +1985,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_HINT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_PLACEHOLDER), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_PLACEHOLDER_TYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aJumpEdtFieldPropMap;
}
@@ -1997,7 +1997,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_SCRIPT_TYPE), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_URL_CONTENT), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aScriptFieldPropMap;
}
@@ -2010,7 +2010,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_DATA_BASE_NAME ) , FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_DATA_COMMAND_TYPE), FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_DATA_TABLE_NAME) , FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDBNextSetFieldPropMap;
}
@@ -2024,7 +2024,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_DATA_COMMAND_TYPE), FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_DATA_TABLE_NAME ), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_SET_NUMBER ), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDBNumSetFieldPropMap;
}
@@ -2039,7 +2039,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_SET_NUMBER ), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_VISIBLE), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDBSetNumFieldPropMap;
}
@@ -2053,7 +2053,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_IS_DATA_BASE_FORMAT),FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
{SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_VISIBLE), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDBFieldPropMap;
}
@@ -2066,7 +2066,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_DATA_COMMAND_TYPE), FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_DATA_TABLE_NAME) , FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_VISIBLE), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDBNameFieldPropMap;
}
@@ -2076,8 +2076,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
static SfxItemPropertyMap aDocstatFieldPropMap [] =
{
{SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE), FIELD_PROP_USHORT2, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- // {UNO_NAME_STATISTIC_TYPE_ID,FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDocstatFieldPropMap;
}
@@ -2089,7 +2088,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_AUTHOR), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDocInfoAuthorPropMap;
}
@@ -2104,7 +2103,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT),FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDocInfoDateTimePropMap;
}
@@ -2118,7 +2117,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT),FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDocInfoEditTimePropMap;
}
@@ -2130,7 +2129,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDocInfoStringContentPropMap;
}
@@ -2142,7 +2141,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_REVISION), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDocInfoRevisionPropMap;
}
@@ -2152,7 +2151,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
static SfxItemPropertyMap aCombinedCharactersPropMap[] =
{
{SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aCombinedCharactersPropMap;
}
@@ -2165,7 +2164,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_SHOW_FORMULA), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aTableFormulaPropMap;
}
@@ -2174,7 +2173,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{
static SfxItemPropertyMap aEmptyPropMap [] =
{
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aEmptyPropMap;
}
@@ -2189,7 +2188,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_VALUE), FIELD_PROP_DOUBLE, CPPU_E2T(CPPUTYPE_DOUBLE), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aUserFieldTypePropMap;
}
@@ -2205,7 +2204,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_IS_AUTOMATIC_UPDATE), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_NAME), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDDEFieldTypePropMap;
}
@@ -2220,7 +2219,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_NUMBERING_SEPARATOR), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_SUB_TYPE), FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aSetExpFieldTypePropMap;
}
@@ -2235,7 +2234,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_DATA_COLUMN_NAME ), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS), FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
{SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aDBFieldTypePropMap;
}
@@ -2247,7 +2246,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS), 0, CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
{SW_PROP_NMID(UNO_NAME_NAME), 0, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), 0, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aStandardFieldMasterMap;
}
@@ -2257,7 +2256,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
static SfxItemPropertyMap aBibliographyFieldMap[] =
{
{SW_PROP_NMID(UNO_NAME_FIELDS ) , FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_PROPERTYVALUE),PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aBibliographyFieldMap;
}
@@ -2274,7 +2273,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{SW_PROP_NMID(UNO_NAME_SORT_ALGORITHM), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_SORT_KEYS ) , FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_PROPERTYVALUES), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aBibliographyFieldMasterMap;
}
@@ -2284,7 +2283,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
static SfxItemPropertyMap aTextMap[] =
{
_REDLINE_NODE_PROPERTIES
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aTextMap;
}
@@ -2308,7 +2307,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
{ SW_PROP_NMID(UNO_NAME_SINGLE_PRINT_JOBS), WID_SINGLE_PRINT_JOBS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_FILE_NAME_FROM_COLUMN), WID_FILE_NAME_FROM_COLUMN, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_FILE_NAME_PREFIX), WID_FILE_NAME_PREFIX, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
aMapArr[nPropertyId] = aMailMergeMap;
}
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
index d4fad74..d2783b3 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
@@ -274,7 +274,7 @@ void SwXTextCursor::SelectPam(SwPaM& rCrsr, sal_Bool bExpand)
}
-void SwXTextCursor::getTextFromPam(SwPaM& aCrsr, OUString& rBuffer)
+void SwXTextCursor::getTextFromPam(SwPaM& aCrsr, OUString&)
{
if(!aCrsr.HasMark())
return;
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
index 5e422ae..1836849 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
@@ -269,9 +269,9 @@ void SwXTextCursor::insertDocumentFromURL(const OUString& rURL,
{
if ( rProp.Value.getValueType() == ::getCppuType((const OUString*)0))
{
- OUString uFilterName;
- rProp.Value >>= uFilterName;
- sFilterName = String(uFilterName);
+ OUString uLclFilterName;
+ rProp.Value >>= uLclFilterName;
+ sFilterName = String(uLclFilterName);
}
else if ( rProp.Value.getValueType() != ::getVoidCppuType() )
bIllegalArgument = sal_True;
@@ -280,9 +280,9 @@ void SwXTextCursor::insertDocumentFromURL(const OUString& rURL,
{
if ( rProp.Value.getValueType() == ::getCppuType((const OUString*)0))
{
- OUString uFilterOption;
- rProp.Value >>= uFilterOption;
- sFilterOption = String(uFilterOption) ;
+ OUString uLclFilterOption;
+ rProp.Value >>= uLclFilterOption;
+ sFilterOption = String(uLclFilterOption) ;
}
else if ( rProp.Value.getValueType() != ::getVoidCppuType() )
@@ -292,9 +292,9 @@ void SwXTextCursor::insertDocumentFromURL(const OUString& rURL,
{
if ( rProp.Value.getValueType() == ::getCppuType((const OUString*)0))
{
- OUString uPassword;
- rProp.Value >>= uPassword;
- sPassword = String(uPassword );
+ OUString uLclPassword;
+ rProp.Value >>= uLclPassword;
+ sPassword = String(uLclPassword );
}
else if ( rProp.Value.getValueType() != ::getVoidCppuType() )
bIllegalArgument = sal_True;
@@ -1137,13 +1137,13 @@ Sequence< OUString > SwXTextRange::getSupportedServiceNames(void) throw( Runtime
-----------------------------------------------------------------------*/
SwXTextRange::SwXTextRange(SwPaM& rPam, const uno::Reference< XText > & rxParent) :
- aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_CURSOR)),
- xParentText(rxParent),
- aObjectDepend(this, 0),
+ eRangePosition(RANGE_IN_TEXT),
pDoc(rPam.GetDoc()),
pBox(0),
pBoxStartNode(0),
- eRangePosition(RANGE_IN_TEXT)
+ aObjectDepend(this, 0),
+ aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_CURSOR)),
+ xParentText(rxParent)
{
//Bookmark an der anlegen
_CreateNewBookmark(rPam);
@@ -1152,12 +1152,12 @@ SwXTextRange::SwXTextRange(SwPaM& rPam, const uno::Reference< XText > & rxParent
-----------------------------------------------------------------------*/
SwXTextRange::SwXTextRange(SwFrmFmt& rFmt, SwPaM& rPam) :
- aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_CURSOR)),
- aObjectDepend(this, &rFmt),
+ eRangePosition(RANGE_IN_FRAME),
pDoc(rPam.GetDoc()),
pBox(0),
pBoxStartNode(0),
- eRangePosition(RANGE_IN_FRAME)
+ aObjectDepend(this, &rFmt),
+ aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_CURSOR))
{
//Bookmark an der anlegen
_CreateNewBookmark(rPam);
@@ -1166,12 +1166,12 @@ SwXTextRange::SwXTextRange(SwFrmFmt& rFmt, SwPaM& rPam) :
-----------------------------------------------------------------------*/
SwXTextRange::SwXTextRange(SwFrmFmt& rTblFmt, SwTableBox& rTblBox, SwPaM& rPam) :
- aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_CURSOR)),
+ eRangePosition(RANGE_IN_CELL),
pDoc(rPam.GetDoc()),
- aObjectDepend(this, &rTblFmt),
pBox(&rTblBox),
pBoxStartNode(0),
- eRangePosition(RANGE_IN_CELL)
+ aObjectDepend(this, &rTblFmt),
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list