diff options
| -rw-r--r-- | writerperfect/inc/ImportFilter.hxx | 4 | ||||
| -rw-r--r-- | writerperfect/qa/unit/WpftLoader.cxx | 19 | ||||
| -rw-r--r-- | writerperfect/source/impress/KeynoteImportFilter.cxx | 17 | ||||
| -rw-r--r-- | writerperfect/source/writer/WordPerfectImportFilter.cxx | 4 |
4 files changed, 23 insertions, 21 deletions
diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx index 69b0e77631e0..4f69d160419f 100644 --- a/writerperfect/inc/ImportFilter.hxx +++ b/writerperfect/inc/ImportFilter.hxx @@ -139,10 +139,10 @@ public: if (location == nLength) { Descriptor.realloc(nLength + 1); - Descriptor[location].Name = "TypeName"; + Descriptor.getArray()[location].Name = "TypeName"; } - Descriptor[location].Value <<= sTypeName; + Descriptor.getArray()[location].Value <<= sTypeName; } return sTypeName; diff --git a/writerperfect/qa/unit/WpftLoader.cxx b/writerperfect/qa/unit/WpftLoader.cxx index c5e7b7b60700..d0809b909918 100644 --- a/writerperfect/qa/unit/WpftLoader.cxx +++ b/writerperfect/qa/unit/WpftLoader.cxx @@ -123,21 +123,22 @@ bool WpftLoader::impl_load() xImporter->setTargetDocument(m_xDoc); uno::Sequence<beans::PropertyValue> aDescriptor(3); - aDescriptor[0].Name = "URL"; - aDescriptor[0].Value <<= m_aURL; + auto pDescriptor = aDescriptor.getArray(); + pDescriptor[0].Name = "URL"; + pDescriptor[0].Value <<= m_aURL; if (m_xInputStream.is()) { - aDescriptor[1].Name = "InputStream"; - aDescriptor[1].Value <<= m_xInputStream; + pDescriptor[1].Name = "InputStream"; + pDescriptor[1].Value <<= m_xInputStream; } else { ucbhelper::Content aContent(m_aURL, uno::Reference<ucb::XCommandEnvironment>(), m_xContext); - aDescriptor[1].Name = "InputStream"; - aDescriptor[1].Value <<= aContent.openStream(); - aDescriptor[2].Name = "UCBContent"; - aDescriptor[2].Value <<= aContent.get(); + pDescriptor[1].Name = "InputStream"; + pDescriptor[1].Value <<= aContent.openStream(); + pDescriptor[2].Name = "UCBContent"; + pDescriptor[2].Value <<= aContent.get(); } const uno::Reference<document::XExtendedFilterDetection> xDetector(m_xFilter, @@ -194,7 +195,7 @@ void WpftLoader::impl_detectFilterName(uno::Sequence<beans::PropertyValue>& rDes { const sal_Int32 nDescriptorLen = rDescriptor.getLength(); rDescriptor.realloc(nDescriptorLen + 1); - auto& el = rDescriptor[nDescriptorLen]; + auto& el = rDescriptor.getArray()[nDescriptorLen]; el.Name = "FilterName"; el.Value <<= aFilterName; return; diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx index 900555be6e0b..ccd93e3d2aaa 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.cxx +++ b/writerperfect/source/impress/KeynoteImportFilter.cxx @@ -170,19 +170,20 @@ KeynoteImportFilter::detect(css::uno::Sequence<css::beans::PropertyValue>& Descr if (nNewLength > nLength) Descriptor.realloc(nNewLength); + auto pDescriptor = Descriptor.getArray(); if (nTypeNameLocation == -1) { assert(nLength < nNewLength); nTypeNameLocation = nLength++; - Descriptor[nTypeNameLocation].Name = "TypeName"; + pDescriptor[nTypeNameLocation].Name = "TypeName"; } if (bIsPackage && (nComponentDataLocation == -1)) { assert(nLength < nNewLength); nComponentDataLocation = nLength++; - Descriptor[nComponentDataLocation].Name = "ComponentData"; + pDescriptor[nComponentDataLocation].Name = "ComponentData"; } if (bIsPackage) @@ -194,8 +195,8 @@ KeynoteImportFilter::detect(css::uno::Sequence<css::beans::PropertyValue>& Descr beans::NamedValue aValue; aValue.Name = "IsPackage"; aValue.Value <<= true; - lComponentDataNV[nCDSize] = aValue; - Descriptor[nComponentDataLocation].Value <<= lComponentDataNV; + lComponentDataNV.getArray()[nCDSize] = aValue; + pDescriptor[nComponentDataLocation].Value <<= lComponentDataNV; } else { @@ -206,16 +207,16 @@ KeynoteImportFilter::detect(css::uno::Sequence<css::beans::PropertyValue>& Descr aProp.Value <<= true; aProp.Handle = -1; aProp.State = beans::PropertyState_DIRECT_VALUE; - lComponentDataPV[nCDSize] = aProp; - Descriptor[nComponentDataLocation].Value <<= lComponentDataPV; + lComponentDataPV.getArray()[nCDSize] = aProp; + pDescriptor[nComponentDataLocation].Value <<= lComponentDataPV; } } if (bUCBContentChanged) - Descriptor[nUCBContentLocation].Value <<= xContent; + pDescriptor[nUCBContentLocation].Value <<= xContent; const OUString sTypeName("impress_AppleKeynote"); - Descriptor[nTypeNameLocation].Value <<= sTypeName; + pDescriptor[nTypeNameLocation].Value <<= sTypeName; return sTypeName; } diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx index 8779fb618d19..46e3241ee5eb 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.cxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx @@ -197,10 +197,10 @@ WordPerfectImportFilter::detect(css::uno::Sequence<css::beans::PropertyValue>& D if (location == nLength) { Descriptor.realloc(nLength + 1); - Descriptor[location].Name = "TypeName"; + Descriptor.getArray()[location].Name = "TypeName"; } - Descriptor[location].Value <<= sTypeName; + Descriptor.getArray()[location].Value <<= sTypeName; } return sTypeName; |