summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sc/inc/fielduno.hxx6
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx2
-rw-r--r--sc/source/ui/unoobj/fielduno.cxx175
-rw-r--r--sc/source/ui/unoobj/servuno.cxx30
-rw-r--r--sc/source/ui/unoobj/textuno.cxx2
5 files changed, 135 insertions, 80 deletions
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index 7c1929d6a4a3..bbd7405a43e6 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -55,7 +55,6 @@ class SvxEditSource;
class SvxFieldItem;
class SvxFieldData;
class ScEditFieldObj;
-class ScHeaderFieldObj;
class ScHeaderFooterContentObj;
class ScDocShell;
class EditTextObject;
@@ -148,7 +147,7 @@ private:
/// mutex to lock the InterfaceContainerHelper
osl::Mutex aMutex;
- ScHeaderFieldObj* GetObjectByIndex_Impl(sal_Int32 Index) const;
+ ScEditFieldObj* GetObjectByIndex_Impl(sal_Int32 Index) const;
public:
ScHeaderFieldsObj(ScHeaderFooterTextData& rData);
@@ -355,6 +354,7 @@ private:
SvxFieldData* getData();
void setPropertyValueURL(const rtl::OUString& rName, const com::sun::star::uno::Any& rVal);
+ com::sun::star::uno::Any getPropertyValueURL(const rtl::OUString& rName);
public:
static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
@@ -370,7 +370,7 @@ public:
SvxFieldItem CreateFieldItem();
void InitDoc(
const com::sun::star::uno::Reference<com::sun::star::text::XTextRange>& rContent,
- SvxEditSource* pEditSrc, FieldType eType, const ESelection& rSel);
+ SvxEditSource* pEditSrc, const ESelection& rSel);
// XTextField
virtual ::rtl::OUString SAL_CALL getPresentation( sal_Bool bShowCommand )
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 38726788ba80..dde5a44d5238 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -6450,7 +6450,7 @@ void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRang
aSelection.nEndPos = aSelection.nStartPos + 1;
uno::Reference<text::XTextRange> xParent(this);
pCellField->InitDoc(
- xParent, new ScCellEditSource(pDocSh, aCellPos), ScEditFieldObj::URL, aSelection);
+ xParent, new ScCellEditSource(pDocSh, aCellPos), aSelection);
// for bAbsorb=FALSE, the new selection must be behind the inserted content
// (the xml filter relies on this)
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 4ae7236467f8..66ed53fcbdf1 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -454,7 +454,35 @@ ScHeaderFieldsObj::~ScHeaderFieldsObj()
// XIndexAccess (via XTextFields)
-ScHeaderFieldObj* ScHeaderFieldsObj::GetObjectByIndex_Impl(sal_Int32 Index) const
+namespace {
+
+ScEditFieldObj::FieldType getFieldType(sal_uInt16 nOldType)
+{
+ switch (nOldType)
+ {
+ case SC_SERVICE_PAGEFIELD:
+ return ScEditFieldObj::Page;
+ case SC_SERVICE_PAGESFIELD:
+ return ScEditFieldObj::Pages;
+ case SC_SERVICE_DATEFIELD:
+ return ScEditFieldObj::Date;
+ case SC_SERVICE_TIMEFIELD:
+ return ScEditFieldObj::Time;
+ case SC_SERVICE_TITLEFIELD:
+ return ScEditFieldObj::Title;
+ case SC_SERVICE_FILEFIELD:
+ return ScEditFieldObj::File;
+ case SC_SERVICE_SHEETFIELD:
+ return ScEditFieldObj::Sheet;
+ default:
+ ;
+ }
+ return ScEditFieldObj::URL;
+}
+
+}
+
+ScEditFieldObj* ScHeaderFieldsObj::GetObjectByIndex_Impl(sal_Int32 Index) const
{
//! Feld-Funktionen muessen an den Forwarder !!!
ScEditEngineDefaulter* pEditEngine = ((ScHeaderFooterEditSource*)pEditSource)->GetEditEngine();
@@ -504,7 +532,8 @@ ScHeaderFieldObj* ScHeaderFieldsObj::GetObjectByIndex_Impl(sal_Int32 Index) cons
uno::Reference<text::XTextRange> xTemp(xText, uno::UNO_QUERY);
xTextRange = xTemp;
- return new ScHeaderFieldObj(xTextRange, new ScHeaderFooterEditSource(mrData), nFieldType, aSelection);
+ ScEditFieldObj::FieldType eRealType = getFieldType(nFieldType);
+ return new ScEditFieldObj(xTextRange, new ScHeaderFooterEditSource(mrData), eRealType, aSelection);
}
return NULL;
}
@@ -1152,6 +1181,67 @@ void ScEditFieldObj::setPropertyValueURL(const rtl::OUString& rName, const com::
throw beans::UnknownPropertyException();
}
+uno::Any ScEditFieldObj::getPropertyValueURL(const rtl::OUString& rName)
+{
+ uno::Any aRet;
+
+ // anchor type is always "as character", text wrap always "none"
+
+ if (rName == SC_UNONAME_ANCTYPE)
+ aRet <<= text::TextContentAnchorType_AS_CHARACTER;
+ else if (rName == SC_UNONAME_ANCTYPES)
+ {
+ uno::Sequence<text::TextContentAnchorType> aSeq(1);
+ aSeq[0] = text::TextContentAnchorType_AS_CHARACTER;
+ aRet <<= aSeq;
+ }
+ else if (rName == SC_UNONAME_TEXTWRAP)
+ aRet <<= text::WrapTextMode_NONE;
+ else if (pEditSource)
+ {
+ //! Feld-Funktionen muessen an den Forwarder !!!
+ ScEditEngineDefaulter* pEditEngine = ((ScCellEditSource*)pEditSource)->GetEditEngine();
+ ScUnoEditEngine aTempEngine(pEditEngine);
+
+ // Typ egal (in Zellen gibts nur URLs)
+ const SvxFieldData* pField = aTempEngine.FindByPos( aSelection.nStartPara, aSelection.nStartPos, 0 );
+ OSL_ENSURE(pField,"getPropertyValue: Feld nicht gefunden");
+ if (!pField)
+ throw uno::RuntimeException();
+
+ if (pField->GetClassId() != SVX_URLFIELD)
+ throw uno::RuntimeException();
+
+ const SvxURLField* pURL = static_cast<const SvxURLField*>(pField);
+
+ if (rName == SC_UNONAME_URL)
+ aRet <<= pURL->GetURL();
+ else if (rName == SC_UNONAME_REPR)
+ aRet <<= pURL->GetRepresentation();
+ else if (rName == SC_UNONAME_TARGET)
+ aRet <<= pURL->GetTargetFrame();
+ else
+ throw beans::UnknownPropertyException();
+ }
+ else // noch nicht eingefuegt
+ {
+ const SvxFieldData* pField = getData();
+ if (!pField)
+ return aRet;
+
+ const SvxURLField* pURL = static_cast<const SvxURLField*>(pField);
+ if (rName == SC_UNONAME_URL)
+ aRet <<= pURL->GetURL();
+ else if (rName == SC_UNONAME_REPR)
+ aRet <<= pURL->GetRepresentation();
+ else if (rName == SC_UNONAME_TARGET)
+ aRet <<= pURL->GetTargetFrame();
+ else
+ throw beans::UnknownPropertyException();
+ }
+ return aRet;
+}
+
ScEditFieldObj::ScEditFieldObj(
const uno::Reference<text::XTextRange>& rContent,
SvxEditSource* pEditSrc, FieldType eType, const ESelection& rSel) :
@@ -1165,13 +1255,11 @@ ScEditFieldObj::ScEditFieldObj(
}
void ScEditFieldObj::InitDoc(
- const uno::Reference<text::XTextRange>& rContent,
- SvxEditSource* pEditSrc, FieldType eType, const ESelection& rSel)
+ const uno::Reference<text::XTextRange>& rContent, SvxEditSource* pEditSrc, const ESelection& rSel)
{
if (!pEditSource)
{
mpContent = rContent;
- meType = eType;
mpData.reset();
aSelection = rSel;
@@ -1187,7 +1275,7 @@ ScEditFieldObj::~ScEditFieldObj()
SvxFieldItem ScEditFieldObj::CreateFieldItem()
{
OSL_ENSURE( !pEditSource, "CreateFieldItem mit eingefuegtem Feld" );
- return SvxFieldItem(*mpData, EE_FEATURE_FIELD);
+ return SvxFieldItem(*getData(), EE_FEATURE_FIELD);
}
void ScEditFieldObj::DeleteField()
@@ -1245,7 +1333,7 @@ rtl::OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand )
default:
;
}
- return rtl::OUString();
+ return rtl::OUString("fail");
}
// XTextContent
@@ -1323,75 +1411,14 @@ uno::Any SAL_CALL ScEditFieldObj::getPropertyValue( const rtl::OUString& aProper
uno::RuntimeException)
{
SolarMutexGuard aGuard;
- uno::Any aRet;
-
- // anchor type is always "as character", text wrap always "none"
-
- if (aPropertyName == SC_UNONAME_ANCTYPE)
- aRet <<= text::TextContentAnchorType_AS_CHARACTER;
- else if (aPropertyName == SC_UNONAME_ANCTYPES)
- {
- uno::Sequence<text::TextContentAnchorType> aSeq(1);
- aSeq[0] = text::TextContentAnchorType_AS_CHARACTER;
- aRet <<= aSeq;
- }
- else if (aPropertyName == SC_UNONAME_TEXTWRAP)
- aRet <<= text::WrapTextMode_NONE;
- else if (pEditSource)
- {
- //! Feld-Funktionen muessen an den Forwarder !!!
- ScEditEngineDefaulter* pEditEngine = ((ScCellEditSource*)pEditSource)->GetEditEngine();
- ScUnoEditEngine aTempEngine(pEditEngine);
-
- // Typ egal (in Zellen gibts nur URLs)
- const SvxFieldData* pField = aTempEngine.FindByPos( aSelection.nStartPara, aSelection.nStartPos, 0 );
- OSL_ENSURE(pField,"getPropertyValue: Feld nicht gefunden");
- if (!pField)
- throw uno::RuntimeException();
-
- switch (meType)
- {
- case URL:
- {
- if (pField->GetClassId() != SVX_URLFIELD)
- throw uno::RuntimeException();
-
- const SvxURLField* pURL = static_cast<const SvxURLField*>(pField);
-
- if (aPropertyName == SC_UNONAME_URL)
- aRet <<= pURL->GetURL();
- else if (aPropertyName == SC_UNONAME_REPR)
- aRet <<= pURL->GetRepresentation();
- else if (aPropertyName == SC_UNONAME_TARGET)
- aRet <<= pURL->GetTargetFrame();
- }
- break;
- }
- }
- else // noch nicht eingefuegt
+ switch (meType)
{
- const SvxFieldData* pField = getData();
- if (!pField)
- return aRet;
-
- switch (meType)
- {
- case URL:
- {
- const SvxURLField* pURL = static_cast<const SvxURLField*>(pField);
- if (aPropertyName == SC_UNONAME_URL)
- aRet <<= pURL->GetURL();
- else if (aPropertyName == SC_UNONAME_REPR)
- aRet <<= pURL->GetRepresentation();
- else if (aPropertyName == SC_UNONAME_TARGET)
- aRet <<= pURL->GetTargetFrame();
- }
- break;
- default:
- ;
- }
+ case URL:
+ return getPropertyValueURL(aPropertyName);
+ break;
+ default:
+ throw beans::UnknownPropertyException();
}
- return aRet;
}
SC_IMPL_DUMMY_PROPERTY_LISTENER( ScEditFieldObj )
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index d7c2d9ba09c1..e726f7b7ec72 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -418,6 +418,34 @@ sal_uInt16 ScServiceProvider::GetProviderType(const String& rServiceName)
return SC_SERVICE_INVALID;
}
+namespace {
+
+ScEditFieldObj::FieldType getFieldType(sal_uInt16 nOldType)
+{
+ switch (nOldType)
+ {
+ case SC_SERVICE_PAGEFIELD:
+ return ScEditFieldObj::Page;
+ case SC_SERVICE_PAGESFIELD:
+ return ScEditFieldObj::Pages;
+ case SC_SERVICE_DATEFIELD:
+ return ScEditFieldObj::Date;
+ case SC_SERVICE_TIMEFIELD:
+ return ScEditFieldObj::Time;
+ case SC_SERVICE_TITLEFIELD:
+ return ScEditFieldObj::Title;
+ case SC_SERVICE_FILEFIELD:
+ return ScEditFieldObj::File;
+ case SC_SERVICE_SHEETFIELD:
+ return ScEditFieldObj::Sheet;
+ default:
+ ;
+ }
+ return ScEditFieldObj::URL;
+}
+
+}
+
uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
sal_uInt16 nType, ScDocShell* pDocShell )
{
@@ -445,7 +473,7 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
{
uno::Reference<text::XTextRange> xNullContent;
xRet.set(static_cast<text::XTextField*>(
- new ScHeaderFieldObj(xNullContent, NULL, nType, ESelection())));
+ new ScEditFieldObj(xNullContent, NULL, getFieldType(nType), ESelection())));
}
break;
case SC_SERVICE_CELLSTYLE:
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index eacdf6effbeb..0b67312d120b 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -423,7 +423,7 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent(
SolarMutexGuard aGuard;
if ( xContent.is() && xRange.is() )
{
- ScHeaderFieldObj* pHeaderField = ScHeaderFieldObj::getImplementation( xContent );
+ ScEditFieldObj* pHeaderField = ScEditFieldObj::getImplementation( xContent );
SvxUnoTextRangeBase* pTextRange =
ScHeaderFooterTextCursor::getImplementation( xRange );
generated by cgit (git 2.34.1) at 2024-08-17 17:27:37 +0000