summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/inc/reffld.hxx6
-rw-r--r--sw/source/core/fields/reffld.cxx73
-rw-r--r--sw/source/core/unocore/unofield.cxx32
3 files changed, 45 insertions, 66 deletions
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index d7ecb32dae15..e970c729be24 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: reffld.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: jp $ $Date: 2001-10-24 18:43:03 $
+ * last change: $Author: os $ $Date: 2002-01-11 13:59:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -155,6 +155,8 @@ public:
virtual String GetPar2() const;
virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMId ) const;
virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMId );
+
+ void ConvertProgrammaticToUIName();
};
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 5f367defea34..ad7d89ee4447 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: reffld.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: os $ $Date: 2002-01-11 11:43:58 $
+ * last change: $Author: os $ $Date: 2002-01-11 13:58:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -552,7 +552,6 @@ BOOL SwGetRefField::QueryValue( uno::Any& rAny, BYTE nMId ) const
if(REF_SEQUENCEFLD == nSubType)
{
sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromUIName( sTmp, GET_POOLID_TXTCOLL );
- USHORT nResId = USHRT_MAX;
switch( nPoolId )
{
case RES_POOLCOLL_LABEL_ABB:
@@ -613,36 +612,10 @@ BOOL SwGetRefField::PutValue( const uno::Any& rAny, BYTE nMId )
case ReferenceFieldSource::REFERENCE_MARK : nSubType = REF_SETREFATTR ; break;
case ReferenceFieldSource::SEQUENCE_FIELD :
{
- //convert the possibly programmatic name to a UIName
- if(REF_SEQUENCEFLD == nSubType && GetTyp())
- {
- SwDoc* pDoc = ((SwGetRefFieldType*)GetTyp())->GetDoc();
- //don't convert when the name points to an existing field type
- const String& rPar1 = GetPar1();
- if(!pDoc->GetFldType(RES_SETEXPFLD, rPar1))
- {
- sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromProgName( rPar1, GET_POOLID_TXTCOLL );
- USHORT nResId = USHRT_MAX;
- switch( nPoolId )
- {
- case RES_POOLCOLL_LABEL_ABB:
- nResId = STR_POOLCOLL_LABEL_ABB;
- break;
- case RES_POOLCOLL_LABEL_TABLE:
- nResId = STR_POOLCOLL_LABEL_TABLE;
- break;
- case RES_POOLCOLL_LABEL_FRAME:
- nResId = STR_POOLCOLL_LABEL_FRAME;
- break;
- case RES_POOLCOLL_LABEL_DRAWING:
- nResId = STR_POOLCOLL_LABEL_DRAWING;
- break;
- }
- if( nResId != USHRT_MAX )
- SetPar1(SW_RESSTR( nResId ));
- }
- }
+ if(REF_SEQUENCEFLD == nSubType)
+ break;
nSubType = REF_SEQUENCEFLD;
+ ConvertProgrammaticToUIName();
}
break;
case ReferenceFieldSource::BOOKMARK : nSubType = REF_BOOKMARK ; break;
@@ -655,8 +628,7 @@ BOOL SwGetRefField::PutValue( const uno::Any& rAny, BYTE nMId )
{
OUString sTmp;
rAny >>= sTmp;
- if(REF_SEQUENCEFLD == nSubType)
- sTmp = SwStyleNameMapper::GetUIName(sTmp, GET_POOLID_TXTCOLL );
+ ConvertProgrammaticToUIName();
SetPar1(sTmp);
}
break;
@@ -676,7 +648,40 @@ BOOL SwGetRefField::PutValue( const uno::Any& rAny, BYTE nMId )
}
return TRUE;
}
+/* -----------------------------11.01.2002 12:50------------------------------
+ ---------------------------------------------------------------------------*/
+void SwGetRefField::ConvertProgrammaticToUIName()
+{
+ if(GetTyp() && REF_SEQUENCEFLD == nSubType)
+ {
+ SwDoc* pDoc = ((SwGetRefFieldType*)GetTyp())->GetDoc();
+ const String& rPar1 = GetPar1();
+ //don't convert when the name points to an existing field type
+ if(!pDoc->GetFldType(RES_SETEXPFLD, rPar1))
+ {
+ sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromProgName( rPar1, GET_POOLID_TXTCOLL );
+ USHORT nResId = USHRT_MAX;
+ switch( nPoolId )
+ {
+ case RES_POOLCOLL_LABEL_ABB:
+ nResId = STR_POOLCOLL_LABEL_ABB;
+ break;
+ case RES_POOLCOLL_LABEL_TABLE:
+ nResId = STR_POOLCOLL_LABEL_TABLE;
+ break;
+ case RES_POOLCOLL_LABEL_FRAME:
+ nResId = STR_POOLCOLL_LABEL_FRAME;
+ break;
+ case RES_POOLCOLL_LABEL_DRAWING:
+ nResId = STR_POOLCOLL_LABEL_DRAWING;
+ break;
+ }
+ if( nResId != USHRT_MAX )
+ SetPar1(SW_RESSTR( nResId ));
+ }
+ }
+}
/*-----------------JP: 18.06.93 -------------------
Get-Referenz-Type
--------------------------------------------------*/
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index d5bb611e5607..d8d5b8cd1964 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unofield.cxx,v $
*
- * $Revision: 1.56 $
+ * $Revision: 1.57 $
*
- * last change: $Author: os $ $Date: 2002-01-11 11:43:33 $
+ * last change: $Author: os $ $Date: 2002-01-11 13:58:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1482,34 +1482,6 @@ void SwXTextField::attachToRange(
pFld->PutValue(aVal, FIELD_PROP_USHORT2 );
aVal <<=(sal_Int16)m_pProps->nSHORT1;
pFld->PutValue(aVal, FIELD_PROP_SHORT1 );
- //convert the possibly programmatic name to a UIName
- if(REF_SEQUENCEFLD == ((SwGetRefField*)pFld)->GetSubType())
- {
- //don't convert when the name points to an existing field type
- const String& rPar1 = pFld->GetPar1();
- if(!pDoc->GetFldType(RES_SETEXPFLD, rPar1))
- {
- sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromProgName( rPar1, GET_POOLID_TXTCOLL );
- USHORT nResId = USHRT_MAX;
- switch( nPoolId )
- {
- case RES_POOLCOLL_LABEL_ABB:
- nResId = STR_POOLCOLL_LABEL_ABB;
- break;
- case RES_POOLCOLL_LABEL_TABLE:
- nResId = STR_POOLCOLL_LABEL_TABLE;
- break;
- case RES_POOLCOLL_LABEL_FRAME:
- nResId = STR_POOLCOLL_LABEL_FRAME;
- break;
- case RES_POOLCOLL_LABEL_DRAWING:
- nResId = STR_POOLCOLL_LABEL_DRAWING;
- break;
- }
- if( nResId != USHRT_MAX )
- pFld->SetPar1(SW_RESSTR( nResId ));
- }
- }
}
break;
case SW_SERVICE_FIELDTYPE_JUMP_EDIT:
generated by cgit (git 2.34.1) at 2025-01-31 03:10:14 +0000