Skip to content

C
core
Kaydet (Commit) 146a73e2 authored tarafından Kohei Yoshida's avatar Kohei Yoshida
Dosyalara gözat
Seçenekler

Use UNO's field type values for the SvxFieldData class IDs too. 

Change-Id: I Iae5abcd0936f176b0b8976b6ea50cfe3e18593b4
üst 8f555e3b
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 84 deletions
editeng/inc/editeng/flditem.hxx
Dosyayı görüntüle @ 146a73e2
......@@ -35,6 +35,8 @@
#include <tools/pstm.hxx>
#include "editeng/editengdllapi.h"
#include <com/sun/star/text/textfield/Type.hpp>
class SvNumberFormatter;
class MetaAction;
......@@ -45,7 +47,7 @@ class MetaAction;
class EDITENG_DLLPUBLIC SvxFieldData : public SvPersistBase
{
public:
SV_DECL_PERSIST1( SvxFieldData, SvPersistBase, 1 )
SV_DECL_PERSIST1( SvxFieldData, SvPersistBase, -1 )
SvxFieldData();
virtual ~SvxFieldData();
......@@ -89,21 +91,6 @@ public:
// The following are the derivatives of SvxFieldData ...
// =================================================================
#define SVX_DATEFIELD 2
#define SVX_URLFIELD 3
#define SVX_PAGEFIELD 100 // Ex-Calc Fields
#define SVX_PAGESFIELD 101
#define SVX_TIMEFIELD 102
#define SVX_FILEFIELD 103
#define SVX_TABLEFIELD 104
#define SVX_EXT_TIMEFIELD 105
#define SVX_EXT_FILEFIELD 106
#define SVX_AUTHORFIELD 107
#define SVX_HEADERFIELD 108
#define SVX_FOOTERFIELD 109
#define SVX_DATEFIMEFIELD 110
enum SvxDateType { SVXDATETYPE_FIX, SVXDATETYPE_VAR };
enum SvxDateFormat { SVXDATEFORMAT_APPDEFAULT, // Set as in App
SVXDATEFORMAT_SYSTEM, // Set as in System
......@@ -124,7 +111,7 @@ class EDITENG_DLLPUBLIC SvxDateField : public SvxFieldData
SvxDateFormat eFormat;
public:
SV_DECL_PERSIST1( SvxDateField, SvxFieldData, SVX_DATEFIELD )
SV_DECL_PERSIST1( SvxDateField, SvxFieldData, com::sun::star::text::textfield::Type::DATE )
SvxDateField();
SvxDateField( const Date& rDate,
......@@ -166,7 +153,7 @@ private:
rtl::OUString aTargetFrame; // In what Frame
public:
SV_DECL_PERSIST1( SvxURLField, SvxFieldData, SVX_URLFIELD )
SV_DECL_PERSIST1( SvxURLField, SvxFieldData, com::sun::star::text::textfield::Type::URL )
SvxURLField();
SvxURLField( const rtl::OUString& rURL, const rtl::OUString& rRepres, SvxURLFormat eFmt = SVXURLFORMAT_URL );
......@@ -192,7 +179,7 @@ public:
class EDITENG_DLLPUBLIC SvxPageField : public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxPageField, SvxFieldData, SVX_PAGEFIELD )
SV_DECL_PERSIST1( SvxPageField, SvxFieldData, com::sun::star::text::textfield::Type::PAGE )
SvxPageField();
virtual SvxFieldData* Clone() const;
......@@ -204,7 +191,7 @@ public:
class EDITENG_DLLPUBLIC SvxPagesField : public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxPagesField, SvxFieldData, SVX_PAGESFIELD )
SV_DECL_PERSIST1( SvxPagesField, SvxFieldData, com::sun::star::text::textfield::Type::PAGES )
SvxPagesField();
virtual SvxFieldData* Clone() const;
......@@ -214,7 +201,7 @@ public:
class EDITENG_DLLPUBLIC SvxTimeField : public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxTimeField, SvxFieldData, SVX_TIMEFIELD )
SV_DECL_PERSIST1( SvxTimeField, SvxFieldData, com::sun::star::text::textfield::Type::TIME )
SvxTimeField();
virtual SvxFieldData* Clone() const;
......@@ -226,7 +213,7 @@ public:
class EDITENG_DLLPUBLIC SvxFileField : public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxFileField, SvxFieldData, SVX_FILEFIELD )
SV_DECL_PERSIST1( SvxFileField, SvxFieldData, com::sun::star::text::textfield::Type::FILE )
SvxFileField();
virtual SvxFieldData* Clone() const;
......@@ -237,7 +224,7 @@ class EDITENG_DLLPUBLIC SvxTableField : public SvxFieldData
{
int mnTab;
public:
SV_DECL_PERSIST1( SvxTableField, SvxFieldData, SVX_TABLEFIELD )
SV_DECL_PERSIST1( SvxTableField, SvxFieldData, com::sun::star::text::textfield::Type::TABLE )
SvxTableField();
SvxTableField(int nTab);
......@@ -272,7 +259,7 @@ private:
SvxTimeFormat eFormat;
public:
SV_DECL_PERSIST1( SvxExtTimeField, SvxFieldData, SVX_EXT_TIMEFIELD )
SV_DECL_PERSIST1( SvxExtTimeField, SvxFieldData, com::sun::star::text::textfield::Type::EXTENDED_TIME )
SvxExtTimeField();
SvxExtTimeField( const Time& rTime,
SvxTimeType eType = SVXTIMETYPE_VAR,
......@@ -316,7 +303,7 @@ private:
SvxFileFormat eFormat;
public:
SV_DECL_PERSIST1( SvxExtFileField, SvxFieldData, SVX_EXT_FILEFIELD )
SV_DECL_PERSIST1( SvxExtFileField, SvxFieldData, com::sun::star::text::textfield::Type::EXTENDED_FILE )
SvxExtFileField();
SvxExtFileField( const rtl::OUString& rString,
SvxFileType eType = SVXFILETYPE_VAR,
......@@ -355,7 +342,7 @@ private:
SvxAuthorFormat eFormat;
public:
SV_DECL_PERSIST1( SvxAuthorField, SvxFieldData, SVX_AUTHORFIELD )
SV_DECL_PERSIST1( SvxAuthorField, SvxFieldData, com::sun::star::text::textfield::Type::AUTHOR )
SvxAuthorField();
SvxAuthorField(
const rtl::OUString& rFirstName,
......@@ -390,7 +377,7 @@ public:
class EDITENG_DLLPUBLIC SvxHeaderField : public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxHeaderField, SvxFieldData, SVX_HEADERFIELD )
SV_DECL_PERSIST1( SvxHeaderField, SvxFieldData, com::sun::star::text::textfield::Type::HEADER )
SvxHeaderField();
virtual SvxFieldData* Clone() const;
......@@ -402,7 +389,7 @@ public:
class EDITENG_DLLPUBLIC SvxFooterField : public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxFooterField, SvxFieldData, SVX_FOOTERFIELD )
SV_DECL_PERSIST1( SvxFooterField, SvxFieldData, com::sun::star::text::textfield::Type::FOOTER )
SvxFooterField();
virtual SvxFieldData* Clone() const;
virtual int operator==( const SvxFieldData& ) const;
......@@ -413,7 +400,7 @@ public:
class EDITENG_DLLPUBLIC SvxDateTimeField : public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxDateTimeField, SvxFieldData, SVX_DATEFIMEFIELD )
SV_DECL_PERSIST1( SvxDateTimeField, SvxFieldData, com::sun::star::text::textfield::Type::DATE_TIME )
SvxDateTimeField();
static rtl::OUString GetFormatted( Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage );
......
editeng/inc/editeng/measfld.hxx
Dosyayı görüntüle @ 146a73e2
......@@ -40,7 +40,7 @@
#endif
#include "editeng/editengdllapi.h"
#define SDR_MEASUREFIELD 50
#include <com/sun/star/text/textfield/Type.hpp>
class SdrMeasureObj;
......@@ -49,7 +49,7 @@ enum SdrMeasureFieldKind {SDRMEASUREFIELD_VALUE,SDRMEASUREFIELD_UNIT,SDRMEASUREF
class EDITENG_DLLPUBLIC SdrMeasureField: public SvxFieldData {
SdrMeasureFieldKind eMeasureFieldKind;
public:
SV_DECL_PERSIST1(SdrMeasureField,SvxFieldData,SDR_MEASUREFIELD)
SV_DECL_PERSIST1(SdrMeasureField,SvxFieldData,com::sun::star::text::textfield::Type::MEASURE)
SdrMeasureField(): eMeasureFieldKind(SDRMEASUREFIELD_VALUE) {}
SdrMeasureField(SdrMeasureFieldKind eNewKind): eMeasureFieldKind(eNewKind) {}
virtual ~SdrMeasureField();
......
editeng/source/editeng/fieldupdater.cxx
Dosyayı görüntüle @ 146a73e2
......@@ -30,6 +30,10 @@
#include "editeng/flditem.hxx"
#include "editobj2.hxx"
#include <com/sun/star/text/textfield/Type.hpp>
using namespace com::sun::star;
namespace editeng {
class FieldUpdaterImpl
......@@ -57,7 +61,7 @@ public:
const SvxFieldItem* pFI = static_cast<const SvxFieldItem*>(pItem);
const SvxFieldData* pData = pFI->GetField();
if (pData->GetClassId() != SVX_TABLEFIELD)
if (pData->GetClassId() != text::textfield::Type::TABLE)
// This is not a table field.
continue;
......
filter/source/svg/svgexport.cxx
Dosyayı görüntüle @ 146a73e2
......@@ -34,6 +34,7 @@
#include "impsvgdialog.hxx"
#include <com/sun/star/util/MeasureUnit.hpp>
#include <com/sun/star/text/textfield/Type.hpp>
#include <rtl/bootstrap.hxx>
#include <svtools/miscopt.hxx>
......@@ -1772,15 +1773,15 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
pCharSetMap = &( mTextFieldCharSets[ mCreateOjectsCurrentMasterPage ] );
}
const SvxFieldData* pField = pInfo->GetField().GetField();
if( bHasCharSetMap && ( pField->GetClassId() == SVX_HEADERFIELD ) && ( pCharSetMap->find( aHeaderId ) != pCharSetMap->end() ) )
if( bHasCharSetMap && ( pField->GetClassId() == text::textfield::Type::HEADER ) && ( pCharSetMap->find( aHeaderId ) != pCharSetMap->end() ) )
{
pCharSet = &( (*pCharSetMap)[ aHeaderId ] );
}
else if( bHasCharSetMap && ( pField->GetClassId() == SVX_FOOTERFIELD ) && ( pCharSetMap->find( aFooterId ) != pCharSetMap->end() ) )
else if( bHasCharSetMap && ( pField->GetClassId() == text::textfield::Type::FOOTER ) && ( pCharSetMap->find( aFooterId ) != pCharSetMap->end() ) )
{
pCharSet = &( (*pCharSetMap)[ aFooterId ] );
}
else if( pField->GetClassId() == SVX_DATEFIMEFIELD )
else if( pField->GetClassId() == text::textfield::Type::DATE_TIME )
{
if( bHasCharSetMap && ( pCharSetMap->find( aDateTimeId ) != pCharSetMap->end() ) )
{
......@@ -1872,7 +1873,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
}
}
}
else if( pField->GetClassId() == SVX_PAGEFIELD )
else if( pField->GetClassId() == text::textfield::Type::PAGE )
{
switch( mVisiblePagePropSet.nPageNumberingType )
{
......@@ -1912,20 +1913,20 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
if( mVisiblePagePropSet.bAreBackgroundObjectsVisible )
{
const SvxFieldData* pField = pInfo->GetField().GetField();
if( ( pField->GetClassId() == SVX_HEADERFIELD ) && mVisiblePagePropSet.bIsHeaderFieldVisible )
if( ( pField->GetClassId() == text::textfield::Type::HEADER ) && mVisiblePagePropSet.bIsHeaderFieldVisible )
{
aRepresentation += mVisiblePagePropSet.sHeaderText;
}
else if( ( pField->GetClassId() == SVX_FOOTERFIELD ) && mVisiblePagePropSet.bIsFooterFieldVisible )
else if( ( pField->GetClassId() == text::textfield::Type::FOOTER ) && mVisiblePagePropSet.bIsFooterFieldVisible )
{
aRepresentation += mVisiblePagePropSet.sFooterText;
}
else if( ( pField->GetClassId() == SVX_DATEFIMEFIELD ) && mVisiblePagePropSet.bIsDateTimeFieldVisible )
else if( ( pField->GetClassId() == text::textfield::Type::DATE_TIME ) && mVisiblePagePropSet.bIsDateTimeFieldVisible )
{
// TODO: implement the variable case
aRepresentation += mVisiblePagePropSet.sDateTimeText;
}
else if( ( pField->GetClassId() == SVX_PAGEFIELD ) && mVisiblePagePropSet.bIsPageNumberFieldVisible )
else if( ( pField->GetClassId() == text::textfield::Type::PAGE ) && mVisiblePagePropSet.bIsPageNumberFieldVisible )
{
sal_Int16 nPageNumber = mVisiblePagePropSet.nPageNumber;
switch( mVisiblePagePropSet.nPageNumberingType )
......
sc/source/core/tool/editutil.cxx
Dosyayı görüntüle @ 146a73e2
......@@ -50,6 +50,8 @@
#include <svl/inethist.hxx>
#include <unotools/syslocale.hxx>
#include <com/sun/star/text/textfield/Type.hpp>
#include "editutil.hxx"
#include "global.hxx"
#include "attrib.hxx"
......@@ -60,6 +62,8 @@
#include "inputopt.hxx"
#include "compiler.hxx"
using namespace com::sun::star;
// STATIC DATA -----------------------------------------------------------
// Delimiters zusaetzlich zu EditEngine-Default:
......@@ -722,7 +726,7 @@ String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField,
sal_uInt16 nClsId = pFieldData->GetClassId();
switch (nClsId)
{
case SVX_URLFIELD:
case text::textfield::Type::URL:
{
const SvxURLField* pField = static_cast<const SvxURLField*>(pFieldData);
rtl::OUString aURL = pField->GetURL();
......@@ -745,20 +749,20 @@ String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField,
rTxtColor = new Color( SC_MOD()->GetColorConfig().GetColorValue(eEntry).nColor );
}
break;
case SVX_EXT_TIMEFIELD:
case text::textfield::Type::EXTENDED_TIME:
{
const SvxExtTimeField* pField = static_cast<const SvxExtTimeField*>(pFieldData);
if (mpDoc)
aRet = pField->GetFormatted(*mpDoc->GetFormatTable(), ScGlobal::eLnge);
}
break;
case SVX_DATEFIELD:
case text::textfield::Type::DATE:
{
Date aDate(Date::SYSTEM);
aRet = ScGlobal::pLocaleData->getDate(aDate);
}
break;
case SVX_TABLEFIELD:
case text::textfield::Type::TABLE:
{
const SvxTableField* pField = static_cast<const SvxTableField*>(pFieldData);
SCTAB nTab = pField->GetTab();
......
sc/source/ui/unoobj/fielduno.cxx
Dosyayı görüntüle @ 146a73e2
......@@ -141,39 +141,6 @@ sal_Int16 lcl_SvxToUnoFileFormat( SvxFileFormat nSvxValue )
}
}
sal_Int32 getFieldType(sal_uInt16 nSvxType)
{
switch (nSvxType)
{
case SVX_DATEFIELD:
return text::textfield::Type::DATE;
case SVX_URLFIELD:
return text::textfield::Type::URL;
case SVX_PAGEFIELD:
return text::textfield::Type::PAGE;
case SVX_PAGESFIELD:
return text::textfield::Type::PAGES;
case SVX_TIMEFIELD:
return text::textfield::Type::TIME;
case SVX_EXT_TIMEFIELD:
return text::textfield::Type::EXTENDED_TIME;
case SVX_FILEFIELD:
return text::textfield::Type::FILE;
case SVX_TABLEFIELD:
return text::textfield::Type::TABLE;
case SVX_EXT_FILEFIELD:
return text::textfield::Type::EXTENDED_FILE;
case SVX_AUTHORFIELD:
case SVX_HEADERFIELD:
case SVX_FOOTERFIELD:
case SVX_DATEFIMEFIELD:
// These are not supported yet.
default:
;
}
return text::textfield::Type::URL; // Default to URL for no good reason.
}
}
#define SCTEXTFIELD_SERVICE "com.sun.star.text.TextField"
......@@ -376,7 +343,7 @@ uno::Reference<text::XTextField> ScCellFieldsObj::GetObjectByIndex_Impl(sal_Int3
xub_StrLen nPos = aTempEngine.GetFieldPos();
ESelection aSelection( nPar, nPos, nPar, nPos+1 ); // Feld ist 1 Zeichen
sal_Int32 eType = getFieldType(pData->GetClassId());
sal_Int32 eType = pData->GetClassId();
uno::Reference<text::XTextField> xRet(
new ScEditFieldObj(mxContent, new ScCellEditSource(pDocShell, aCellPos), eType, aSelection));
return xRet;
......@@ -557,7 +524,7 @@ uno::Reference<text::XTextField> ScHeaderFieldsObj::GetObjectByIndex_Impl(sal_In
xub_StrLen nPos = aTempEngine.GetFieldPos();
ESelection aSelection( nPar, nPos, nPar, nPos+1 ); // Field is 1 character
sal_Int32 eRealType = getFieldType(pData->GetClassId());
sal_Int32 eRealType = pData->GetClassId();
uno::Reference<text::XTextField> xRet(
new ScEditFieldObj(xTextRange, new ScHeaderFooterEditSource(mrData), eRealType, aSelection));
return xRet;
......@@ -742,7 +709,7 @@ void ScEditFieldObj::setPropertyValueURL(const rtl::OUString& rName, const com::
if (!pField)
return;
if (pField->GetClassId() != SVX_URLFIELD)
if (pField->GetClassId() != text::textfield::Type::URL)
// Make sure this is indeed a URL field.
return;
......@@ -814,7 +781,7 @@ uno::Any ScEditFieldObj::getPropertyValueURL(const rtl::OUString& rName)
if (!pField)
throw uno::RuntimeException();
if (pField->GetClassId() != SVX_URLFIELD)
if (pField->GetClassId() != text::textfield::Type::URL)
throw uno::RuntimeException();
const SvxURLField* pURL = static_cast<const SvxURLField*>(pField);
......@@ -936,7 +903,7 @@ void ScEditFieldObj::setPropertyValueSheet(const rtl::OUString& rName, const uno
if (!pField)
return;
if (pField->GetClassId() != SVX_TABLEFIELD)
if (pField->GetClassId() != text::textfield::Type::TABLE)
// Make sure this is indeed a URL field.
return;
......@@ -1070,7 +1037,7 @@ rtl::OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand )
{
case text::textfield::Type::URL:
{
if (pField->GetClassId() != SVX_URLFIELD)
if (pField->GetClassId() != text::textfield::Type::URL)
// Not an URL field, but URL is expected.
throw uno::RuntimeException();
......
svx/source/unodraw/unomod.cxx
Dosyayı görüntüle @ 146a73e2
......@@ -61,6 +61,8 @@
#include <svx/svdpage.hxx>
#include <svx/unoshape.hxx>
#include <com/sun/star/text/textfield/Type.hpp>
//-////////////////////////////////////////////////////////////////////
using namespace ::rtl;
......@@ -411,7 +413,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( c
if( 0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextField.DateTime") ) )
{
return (::cppu::OWeakObject * )new SvxUnoTextField( ID_EXT_DATEFIELD );
return (::cppu::OWeakObject * )new SvxUnoTextField(text::textfield::Type::EXTENDED_DATE);
}
uno::Reference< uno::XInterface > xRet;
......
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