Kaydet (Commit) 8ff71b59 authored tarafından Oliver Specht's avatar Oliver Specht

TextField and FieldMaster 'Bibliography' completed

üst cfc62f26
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: authfld.hxx,v $ * $RCSfile: authfld.hxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: hr $ $Date: 2000-09-18 17:14:24 $ * last change: $Author: os $ $Date: 2000-11-16 12:27:25 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -131,6 +131,9 @@ public: ...@@ -131,6 +131,9 @@ public:
virtual SwFieldType* Copy() const; virtual SwFieldType* Copy() const;
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ); virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, const String& rProperty ) const;
virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, const String& rProperty );
inline SwDoc* GetDoc() const { return m_pDoc; } inline SwDoc* GetDoc() const { return m_pDoc; }
inline void SetDoc(SwDoc* pNewDoc) { m_pDoc = pNewDoc; } inline void SetDoc(SwDoc* pNewDoc) { m_pDoc = pNewDoc; }
...@@ -198,6 +201,9 @@ public: ...@@ -198,6 +201,9 @@ public:
virtual void SetPar1(const String& rStr); virtual void SetPar1(const String& rStr);
virtual SwFieldType* ChgTyp( SwFieldType* ); virtual SwFieldType* ChgTyp( SwFieldType* );
virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, const String& rProperty ) const;
virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, const String& rProperty );
long GetHandle() const { return nHandle; } long GetHandle() const { return nHandle; }
//import interface //import interface
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: unocoll.hxx,v $ * $RCSfile: unocoll.hxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: os $ $Date: 2000-11-09 10:42:57 $ * last change: $Author: os $ $Date: 2000-11-16 12:27:25 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -224,7 +224,7 @@ class SwUnoCollection ...@@ -224,7 +224,7 @@ class SwUnoCollection
#define SW_SERVICE_FIELDMASTER_DDE 81 #define SW_SERVICE_FIELDMASTER_DDE 81
#define SW_SERVICE_FIELDMASTER_SET_EXP 82 #define SW_SERVICE_FIELDMASTER_SET_EXP 82
#define SW_SERVICE_FIELDMASTER_DATABASE 83 #define SW_SERVICE_FIELDMASTER_DATABASE 83
#define SW_SERVICE_FIELDMASTER_DUMMY1 84 #define SW_SERVICE_FIELDMASTER_BIBLIOGRAPHY 84
#define SW_SERVICE_FIELDMASTER_DUMMY2 85 #define SW_SERVICE_FIELDMASTER_DUMMY2 85
#define SW_SERVICE_FIELDMASTER_DUMMY3 86 #define SW_SERVICE_FIELDMASTER_DUMMY3 86
#define SW_SERVICE_FIELDMASTER_DUMMY4 87 #define SW_SERVICE_FIELDMASTER_DUMMY4 87
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: unoprnms.hxx,v $ * $RCSfile: unoprnms.hxx,v $
* *
* $Revision: 1.13 $ * $Revision: 1.14 $
* *
* last change: $Author: os $ $Date: 2000-11-09 14:12:01 $ * last change: $Author: os $ $Date: 2000-11-16 12:27:25 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -314,6 +314,7 @@ extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_CONTOURED ...@@ -314,6 +314,7 @@ extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_CONTOURED
extern const SwPropNameLen __FAR_DATA UNO_NAME_CONTOUR_OUTSIDE ; extern const SwPropNameLen __FAR_DATA UNO_NAME_CONTOUR_OUTSIDE ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_CONTENT_PROTECTED ; extern const SwPropNameLen __FAR_DATA UNO_NAME_CONTENT_PROTECTED ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_COUNT_EMPTY_LINES ; extern const SwPropNameLen __FAR_DATA UNO_NAME_COUNT_EMPTY_LINES ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_RESTART_AT_EACH_PAGE;
extern const SwPropNameLen __FAR_DATA UNO_NAME_DATA_BASE_NAME ; extern const SwPropNameLen __FAR_DATA UNO_NAME_DATA_BASE_NAME ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_DATA_TABLE_NAME ; extern const SwPropNameLen __FAR_DATA UNO_NAME_DATA_TABLE_NAME ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_DATA_COLUMN_NAME ; extern const SwPropNameLen __FAR_DATA UNO_NAME_DATA_COLUMN_NAME ;
...@@ -593,6 +594,14 @@ extern const SwPropNameLen __FAR_DATA UNO_NAME_ENDNOTE_NUMBERING_TYPE ...@@ -593,6 +594,14 @@ extern const SwPropNameLen __FAR_DATA UNO_NAME_ENDNOTE_NUMBERING_TYPE
extern const SwPropNameLen __FAR_DATA UNO_NAME_ENDNOTE_NUMBERING_PREFIX ; extern const SwPropNameLen __FAR_DATA UNO_NAME_ENDNOTE_NUMBERING_PREFIX ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_ENDNOTE_NUMBERING_SUFFIX ; extern const SwPropNameLen __FAR_DATA UNO_NAME_ENDNOTE_NUMBERING_SUFFIX ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_BRACKET_BEFORE ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_BRACKET_AFTER ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_IS_NUMBER_ENTRIES ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_IS_SORT_BY_POSITION ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_SORT_KEYS ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_IS_SORT_ASCENDING ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_SORT_KEY ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_FIELDS;
#endif #endif
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: authfld.cxx,v $ * $RCSfile: authfld.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: jp $ $Date: 2000-10-20 11:11:17 $ * last change: $Author: os $ $Date: 2000-11-16 12:30:48 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -116,7 +116,17 @@ ...@@ -116,7 +116,17 @@
#ifndef _SV_SYSTEM_HXX #ifndef _SV_SYSTEM_HXX
#include <vcl/system.hxx> #include <vcl/system.hxx>
#endif #endif
#ifndef _UNOPRNMS_HXX
#include <unoprnms.hxx>
#endif
#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_HPP_
#include <com/sun/star/beans/PropertyValues.hpp>
#endif
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace rtl;
#define C2U(cChar) rtl::OUString::createFromAscii(cChar)
typedef SwAuthEntry* SwAuthEntryPtr; typedef SwAuthEntry* SwAuthEntryPtr;
SV_DECL_PTRARR_DEL( SwAuthDataArr, SwAuthEntryPtr, 5, 5 ) SV_DECL_PTRARR_DEL( SwAuthDataArr, SwAuthEntryPtr, 5, 5 )
SV_IMPL_PTRARR( SwAuthDataArr, SwAuthEntryPtr ) SV_IMPL_PTRARR( SwAuthDataArr, SwAuthEntryPtr )
...@@ -561,7 +571,115 @@ USHORT SwAuthorityFieldType::GetSequencePos(long nHandle) ...@@ -561,7 +571,115 @@ USHORT SwAuthorityFieldType::GetSequencePos(long nHandle)
ASSERT(nRet, "Handle not found") ASSERT(nRet, "Handle not found")
return nRet; return nRet;
} }
/* -----------------------------15.11.00 17:33--------------------------------
---------------------------------------------------------------------------*/
BOOL SwAuthorityFieldType::QueryValue( Any& rVal, const String& rProperty ) const
{
if(rProperty.EqualsAscii(UNO_NAME_BRACKET_BEFORE.pName, 0, UNO_NAME_BRACKET_BEFORE.nNameLen))
{
OUString sVal(m_cPrefix);
rVal <<= sVal;
}
else if(rProperty.EqualsAscii(UNO_NAME_BRACKET_AFTER .pName, 0, UNO_NAME_BRACKET_AFTER .nNameLen))
{
OUString sVal(m_cSuffix);
rVal <<= sVal;
}
else if(rProperty.EqualsAscii(UNO_NAME_IS_NUMBER_ENTRIES .pName, 0, UNO_NAME_IS_NUMBER_ENTRIES .nNameLen))
{
sal_Bool bVal = m_bIsSequence;
rVal.setValue(&bVal, ::getBooleanCppuType());
}
else if(rProperty.EqualsAscii(UNO_NAME_IS_SORT_BY_POSITION .pName, 0, UNO_NAME_IS_SORT_BY_POSITION.nNameLen))
{
sal_Bool bVal = m_bSortByDocument;
rVal.setValue(&bVal, ::getBooleanCppuType());
}
else if(rProperty.EqualsAscii(UNO_NAME_SORT_KEYS .pName, 0, UNO_NAME_SORT_KEYS .nNameLen))
{
Sequence<PropertyValues> aRet(m_pSortKeyArr->Count());
PropertyValues* pValues = aRet.getArray();
for(sal_Int32 i = 0; i < m_pSortKeyArr->Count(); i++)
{
const SwTOXSortKey* pKey = (*m_pSortKeyArr)[i];
pValues[i].realloc(2);
PropertyValue* pValue = pValues[i].getArray();
pValue[0].Name = C2U(UNO_NAME_SORT_KEY.pName);
pValue[0].Value <<= sal_Int16(pKey->eField);
pValue[1].Name = C2U(UNO_NAME_IS_SORT_ASCENDING.pName);
pValue[1].Value.setValue(&pKey->bSortAscending, ::getBooleanCppuType());
}
rVal <<= aRet;
}
else
return FALSE;
return TRUE;
}
/* -----------------------------15.11.00 17:33--------------------------------
---------------------------------------------------------------------------*/
BOOL SwAuthorityFieldType::PutValue( const Any& rVal, const String& rProperty )
{
sal_Bool bRet = TRUE;
if(rProperty.EqualsAscii(UNO_NAME_BRACKET_BEFORE.pName, 0, UNO_NAME_BRACKET_BEFORE.nNameLen))
{
OUString sVal; rVal >>= sVal;
if(sVal.getLength())
m_cPrefix = sVal[0];
}
else if(rProperty.EqualsAscii(UNO_NAME_BRACKET_AFTER .pName, 0, UNO_NAME_BRACKET_AFTER .nNameLen))
{
OUString sVal; rVal >>= sVal;
if(sVal.getLength())
m_cSuffix = sVal[0];
}
else if(rProperty.EqualsAscii(UNO_NAME_IS_NUMBER_ENTRIES .pName, 0, UNO_NAME_IS_NUMBER_ENTRIES .nNameLen))
{
sal_Bool bValue = *(sal_Bool*)rVal.getValue();
m_bIsSequence = bValue;
}
else if(rProperty.EqualsAscii(UNO_NAME_IS_SORT_BY_POSITION .pName, 0, UNO_NAME_IS_SORT_BY_POSITION.nNameLen))
{
sal_Bool bValue = *(sal_Bool*)rVal.getValue();
m_bSortByDocument = bValue;
}
else if(rProperty.EqualsAscii(UNO_NAME_SORT_KEYS .pName, 0, UNO_NAME_SORT_KEYS .nNameLen))
{
Sequence<PropertyValues> aSeq;
bRet = rVal >>= aSeq;
if(bRet)
{
const PropertyValues* pValues = aSeq.getConstArray();
for(sal_Int32 i = 0; i < aSeq.getLength() && i < USHRT_MAX / 4; i++)
{
m_pSortKeyArr->DeleteAndDestroy(0, m_pSortKeyArr->Count());
const PropertyValue* pValue = pValues[i].getConstArray();
SwTOXSortKey* pSortKey = new SwTOXSortKey;
for(sal_Int32 j = 0; j < pValues[i].getLength(); i++)
{
if(pValue[i].Name.equalsAsciiL(UNO_NAME_SORT_KEY.pName, UNO_NAME_SORT_KEY.nNameLen))
{
sal_Int16 nVal = -1; pValue[i].Value >>= nVal;
if(nVal >= 0 && nVal < AUTH_FIELD_END)
pSortKey->eField = (ToxAuthorityField) nVal;
else
bRet = FALSE;
}
else if(pValue[i].Name.equalsAsciiL(UNO_NAME_IS_SORT_ASCENDING.pName, UNO_NAME_IS_SORT_ASCENDING.nNameLen))
{
pSortKey->bSortAscending = *(sal_Bool*)pValue[i].Value.getValue();
}
}
m_pSortKeyArr->Insert(pSortKey, m_pSortKeyArr->Count());
}
}
}
else
bRet = FALSE;
return bRet;
}
/* -----------------19.10.99 13:25------------------- /* -----------------19.10.99 13:25-------------------
--------------------------------------------------*/ --------------------------------------------------*/
...@@ -684,8 +802,106 @@ USHORT SwAuthorityField::GetHandlePosition() const ...@@ -684,8 +802,106 @@ USHORT SwAuthorityField::GetHandlePosition() const
DBG_ASSERT(pAuthType, "no field type") DBG_ASSERT(pAuthType, "no field type")
return pAuthType->GetPosition(nHandle); return pAuthType->GetPosition(nHandle);
} }
/* -----------------------------15.11.00 17:33--------------------------------
---------------------------------------------------------------------------*/
const char* aFieldNames[] =
{
"Identifier",
"BibiliographicType",
"Address",
"Annote",
"Author",
"Booktitle",
"Chapter",
"Edition",
"Editor",
"Howpublished",
"Institution",
"Journal",
"Month",
"Note",
"Number",
"Organizations",
"Pages",
"Publisher",
"School",
"Series",
"Title",
"Report_Type",
"Volume",
"Year",
"URL",
"Custom1",
"Custom2",
"Custom3",
"Custom4",
"Custom5",
"ISBN"
};
/* -----------------------------16.11.00 12:27--------------------------------
---------------------------------------------------------------------------*/
BOOL SwAuthorityField::QueryValue( Any& rVal, const String& rProperty ) const
{
if(!GetTyp())
return FALSE;
const SwAuthEntry* pAuthEntry = ((SwAuthorityFieldType*)GetTyp())->GetEntryByHandle(nHandle);
if(!pAuthEntry)
return FALSE;
Sequence <PropertyValue> aRet(AUTH_FIELD_END);
PropertyValue* pValues = aRet.getArray();
for(sal_Int16 i = 0; i < AUTH_FIELD_END; i++)
{
pValues[i].Name = C2U(aFieldNames[i]);
const String& rField = pAuthEntry->GetAuthorField((ToxAuthorityField) i);
pValues[i].Value <<= OUString(rField);
}
rVal <<= aRet;
return FALSE;
}
/* -----------------------------15.11.00 17:33--------------------------------
---------------------------------------------------------------------------*/
sal_Int16 lcl_Find(const OUString& rFieldName)
{
for(sal_Int16 i = 0; i < AUTH_FIELD_END; i++)
if(!rFieldName.compareToAscii(aFieldNames[i]))
return i;
return -1;
}
//----------------------------------------------------------------------------
BOOL SwAuthorityField::PutValue( const Any& rVal, const String& rProperty )
{
if(!GetTyp() || !((SwAuthorityFieldType*)GetTyp())->GetEntryByHandle(nHandle))
return FALSE;
Sequence <PropertyValue> aParam;
if(!(rVal >>= aParam))
return FALSE;
String sToSet;
sToSet.Fill(AUTH_FIELD_ISBN, TOX_STYLE_DELIMITER);
const PropertyValue* pParam = aParam.getConstArray();
for(sal_Int32 i = 0; i < aParam.getLength(); i++)
{
sal_Int16 nFound = lcl_Find(pParam[i].Name);
if(nFound >= 0)
{
OUString sContent;
pParam[i].Value >>= sContent;
sToSet.SetToken(nFound, TOX_STYLE_DELIMITER, sContent);
}
}
((SwAuthorityFieldType*)GetTyp())->RemoveField(nHandle);
((SwAuthorityFieldType*)GetTyp())->AddField(sToSet);
return FALSE;
}
/* -----------------11.10.99 09:43-------------------
--------------------------------------------------*/
SwFieldType* SwAuthorityField::ChgTyp( SwFieldType* pFldTyp ) SwFieldType* SwAuthorityField::ChgTyp( SwFieldType* pFldTyp )
{ {
SwAuthorityFieldType* pSrcTyp = (SwAuthorityFieldType*)GetTyp(), SwAuthorityFieldType* pSrcTyp = (SwAuthorityFieldType*)GetTyp(),
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: unocoll.cxx,v $ * $RCSfile: unocoll.cxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: os $ $Date: 2000-11-09 10:43:36 $ * last change: $Author: os $ $Date: 2000-11-16 12:29:49 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -158,6 +158,9 @@ ...@@ -158,6 +158,9 @@
#ifndef _SV_SVAPP_HXX //autogen #ifndef _SV_SVAPP_HXX //autogen
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#endif #endif
#ifndef _AUTHFLD_HXX
#include <authfld.hxx>
#endif
using namespace ::rtl; using namespace ::rtl;
using namespace ::com::sun::star; using namespace ::com::sun::star;
...@@ -256,7 +259,7 @@ const char* __FAR_DATA aProvNames[] = ...@@ -256,7 +259,7 @@ const char* __FAR_DATA aProvNames[] =
"com.sun.star.text.FieldMaster.DDE",//SW_SERVICE_FIELDMASTER_DDE "com.sun.star.text.FieldMaster.DDE",//SW_SERVICE_FIELDMASTER_DDE
"com.sun.star.text.FieldMaster.SetExpression",//SW_SERVICE_FIELDMASTER_SET_EXP "com.sun.star.text.FieldMaster.SetExpression",//SW_SERVICE_FIELDMASTER_SET_EXP
"com.sun.star.text.FieldMaster.Database",//SW_SERVICE_FIELDMASTER_DATABASE "com.sun.star.text.FieldMaster.Database",//SW_SERVICE_FIELDMASTER_DATABASE
"",//SW_SERVICE_FIELDMASTER_DUMMY1 "com.sun.star.text.FieldMaster.Bibliography",//SW_SERVICE_FIELDMASTER_BIBLIOGRAPHY
"",//SW_SERVICE_FIELDMASTER_DUMMY2 "",//SW_SERVICE_FIELDMASTER_DUMMY2
"",//SW_SERVICE_FIELDMASTER_DUMMY3 "",//SW_SERVICE_FIELDMASTER_DUMMY3
"",//SW_SERVICE_FIELDMASTER_DUMMY4 "",//SW_SERVICE_FIELDMASTER_DUMMY4
...@@ -523,6 +526,25 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16 ...@@ -523,6 +526,25 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16
xRet = (cppu::OWeakObject*)new SwXFieldMaster(pDoc, nResId); xRet = (cppu::OWeakObject*)new SwXFieldMaster(pDoc, nResId);
} }
break; break;
case SW_SERVICE_FIELDMASTER_BIBLIOGRAPHY:
{
SwFieldType* pType = pDoc->GetFldType(RES_AUTHORITY, aEmptyStr);
if(!pType)
{
SwAuthorityFieldType aType(pDoc);
pType = pDoc->InsertFldType(aType);
}
else
{
SwClientIter aIter( *pType );
SwXFieldMaster* pMaster = (SwXFieldMaster*)aIter.First( TYPE( SwXFieldMaster ));
if(pMaster)
xRet = (cppu::OWeakObject*)pMaster;
}
if(!xRet.is())
xRet = (cppu::OWeakObject*)new SwXFieldMaster(*pType, pDoc);
}
break;
case SW_SERVICE_PARAGRAPH : case SW_SERVICE_PARAGRAPH :
xRet = (cppu::OWeakObject*)new SwXParagraph(); xRet = (cppu::OWeakObject*)new SwXParagraph();
break; break;
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: unofield.cxx,v $ * $RCSfile: unofield.cxx,v $
* *
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* last change: $Author: os $ $Date: 2000-11-10 13:49:21 $ * last change: $Author: os $ $Date: 2000-11-16 12:29:49 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -797,7 +797,6 @@ const SfxItemPropertyMap* SwFieldPropMapProvider::GetPropertyMap(USHORT nService ...@@ -797,7 +797,6 @@ const SfxItemPropertyMap* SwFieldPropMapProvider::GetPropertyMap(USHORT nService
pRet = aDBFieldTypePropMap; pRet = aDBFieldTypePropMap;
} }
break; break;
case SW_SERVICE_FIELDMASTER_DUMMY1 :
case SW_SERVICE_FIELDMASTER_DUMMY2 : case SW_SERVICE_FIELDMASTER_DUMMY2 :
case SW_SERVICE_FIELDMASTER_DUMMY3 : case SW_SERVICE_FIELDMASTER_DUMMY3 :
case SW_SERVICE_FIELDMASTER_DUMMY4 : case SW_SERVICE_FIELDMASTER_DUMMY4 :
...@@ -820,11 +819,34 @@ const SfxItemPropertyMap* SwFieldPropMapProvider::GetPropertyMap(USHORT nService ...@@ -820,11 +819,34 @@ const SfxItemPropertyMap* SwFieldPropMapProvider::GetPropertyMap(USHORT nService
{ {
static SfxItemPropertyMap aBibliographyFieldMap[] = static SfxItemPropertyMap aBibliographyFieldMap[] =
{ {
#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__))
{SW_PROP_NAME(UNO_NAME_FIELDS ) , 0, new uno::Type(::getCppuType((Sequence<PropertyValue>*)0)),PROPERTY_NONE, 0},
#else
{SW_PROP_NAME(UNO_NAME_FIELDS ) , 0, &::getCppuType((Sequence<PropertyValue>*)0),PROPERTY_NONE, 0},
#endif
{0,0,0,0} {0,0,0,0}
}; };
pRet = aBibliographyFieldMap; pRet = aBibliographyFieldMap;
} }
break; break;
case SW_SERVICE_FIELDMASTER_BIBLIOGRAPHY:
{
static SfxItemPropertyMap aBibliographyFieldMasterMap[] =
{
{SW_PROP_NAME(UNO_NAME_BRACKET_BEFORE ) , 0, &::getCppuType((OUString*)0), PROPERTY_NONE, 0},
{SW_PROP_NAME(UNO_NAME_BRACKET_AFTER ) , 0, &::getCppuType((OUString*)0), PROPERTY_NONE, 0},
{SW_PROP_NAME(UNO_NAME_IS_NUMBER_ENTRIES ) , 0, &::getBooleanCppuType(), PROPERTY_NONE, 0},
{SW_PROP_NAME(UNO_NAME_IS_SORT_BY_POSITION) , 0, &::getBooleanCppuType(), PROPERTY_NONE, 0},
#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__))
{SW_PROP_NAME(UNO_NAME_SORT_KEYS ) , 0, new uno::Type(::getCppuType((Sequence<PropertyValues>*)0)),PROPERTY_NONE, 0},
#else
{SW_PROP_NAME(UNO_NAME_SORT_KEYS ) , 0, &::getCppuType((Sequence<PropertyValues>*)0),PROPERTY_NONE, 0},
#endif
{0,0,0,0}
};
pRet = aBibliographyFieldMasterMap;
}
break;
} }
DBG_ASSERT(pRet, "illegal service id") DBG_ASSERT(pRet, "illegal service id")
return pRet; return pRet;
...@@ -998,7 +1020,6 @@ SwXFieldMaster::SwXFieldMaster(SwDoc* pDoc, sal_uInt16 nResId) : ...@@ -998,7 +1020,6 @@ SwXFieldMaster::SwXFieldMaster(SwDoc* pDoc, sal_uInt16 nResId) :
bParam1(FALSE), bParam1(FALSE),
nParam1(-1) nParam1(-1)
{ {
} }
/*-- 14.12.98 11:08:33--------------------------------------------------- /*-- 14.12.98 11:08:33---------------------------------------------------
...@@ -1029,7 +1050,7 @@ uno::Reference< XPropertySetInfo > SwXFieldMaster::getPropertySetInfo(void) ...@@ -1029,7 +1050,7 @@ uno::Reference< XPropertySetInfo > SwXFieldMaster::getPropertySetInfo(void)
throw( uno::RuntimeException ) throw( uno::RuntimeException )
{ {
vos::OGuard aGuard(Application::GetSolarMutex()); vos::OGuard aGuard(Application::GetSolarMutex());
const SfxItemPropertyMap* pCreate = SwFieldPropMapProvider::GetPropertyMap(SW_SERVICE_FIELDMASTER_DUMMY1); const SfxItemPropertyMap* pCreate = SwFieldPropMapProvider::GetPropertyMap(SW_SERVICE_FIELDMASTER_DUMMY2);
if(nResTypeId == RES_USERFLD) if(nResTypeId == RES_USERFLD)
pCreate = SwFieldPropMapProvider::GetPropertyMap(SW_SERVICE_FIELDMASTER_USER); pCreate = SwFieldPropMapProvider::GetPropertyMap(SW_SERVICE_FIELDMASTER_USER);
else if(nResTypeId == RES_DBFLD) else if(nResTypeId == RES_DBFLD)
...@@ -1038,6 +1059,8 @@ uno::Reference< XPropertySetInfo > SwXFieldMaster::getPropertySetInfo(void) ...@@ -1038,6 +1059,8 @@ uno::Reference< XPropertySetInfo > SwXFieldMaster::getPropertySetInfo(void)
pCreate = SwFieldPropMapProvider::GetPropertyMap(SW_SERVICE_FIELDMASTER_SET_EXP); pCreate = SwFieldPropMapProvider::GetPropertyMap(SW_SERVICE_FIELDMASTER_SET_EXP);
else if(nResTypeId == RES_DDEFLD) else if(nResTypeId == RES_DDEFLD)
pCreate = SwFieldPropMapProvider::GetPropertyMap(SW_SERVICE_FIELDMASTER_DDE); pCreate = SwFieldPropMapProvider::GetPropertyMap(SW_SERVICE_FIELDMASTER_DDE);
else if(nResTypeId == RES_AUTHORITY)
pCreate = SwFieldPropMapProvider::GetPropertyMap(SW_SERVICE_FIELDMASTER_BIBLIOGRAPHY);
uno::Reference< XPropertySetInfo > aRef = new SfxItemPropertySetInfo(pCreate); uno::Reference< XPropertySetInfo > aRef = new SfxItemPropertySetInfo(pCreate);
return aRef; return aRef;
} }
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: unoprnms.cxx,v $ * $RCSfile: unoprnms.cxx,v $
* *
* $Revision: 1.15 $ * $Revision: 1.16 $
* *
* last change: $Author: os $ $Date: 2000-11-15 15:00:48 $ * last change: $Author: os $ $Date: 2000-11-16 12:29:49 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -592,4 +592,12 @@ const SwPropNameLen __FAR_DATA UNO_NAME_ENDNOTE_NUMBERING_TYPE (MAP ...@@ -592,4 +592,12 @@ const SwPropNameLen __FAR_DATA UNO_NAME_ENDNOTE_NUMBERING_TYPE (MAP
const SwPropNameLen __FAR_DATA UNO_NAME_ENDNOTE_NUMBERING_PREFIX (MAP_CHAR_LEN("EndnoteNumberingPrefix")); const SwPropNameLen __FAR_DATA UNO_NAME_ENDNOTE_NUMBERING_PREFIX (MAP_CHAR_LEN("EndnoteNumberingPrefix"));
const SwPropNameLen __FAR_DATA UNO_NAME_ENDNOTE_NUMBERING_SUFFIX (MAP_CHAR_LEN("EndnoteNumberingSuffix")); const SwPropNameLen __FAR_DATA UNO_NAME_ENDNOTE_NUMBERING_SUFFIX (MAP_CHAR_LEN("EndnoteNumberingSuffix"));
const SwPropNameLen __FAR_DATA UNO_NAME_BRACKET_BEFORE (MAP_CHAR_LEN("BracketBefore"));
const SwPropNameLen __FAR_DATA UNO_NAME_BRACKET_AFTER (MAP_CHAR_LEN("BracketAfter"));
const SwPropNameLen __FAR_DATA UNO_NAME_IS_NUMBER_ENTRIES (MAP_CHAR_LEN("IsNumberEntries"));
const SwPropNameLen __FAR_DATA UNO_NAME_IS_SORT_BY_POSITION (MAP_CHAR_LEN("IsSortByPosition"));
const SwPropNameLen __FAR_DATA UNO_NAME_SORT_KEYS (MAP_CHAR_LEN("SortKeys"));
const SwPropNameLen __FAR_DATA UNO_NAME_IS_SORT_ASCENDING (MAP_CHAR_LEN("IsSortAscending"));
const SwPropNameLen __FAR_DATA UNO_NAME_SORT_KEY (MAP_CHAR_LEN("SortKey"));
const SwPropNameLen __FAR_DATA UNO_NAME_FIELDS (MAP_CHAR_LEN("Fields"));
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment