summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-08-19 13:34:43 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-08-19 13:34:43 +0200
commitd21260cdb6e6fa898ed90bafb41ba4fe5dd3140c (patch)
tree079d8d3608341ae764e4d879cb692b018ff2135e /svx
parent9528fb4a6adb2116a287653cfadc208e6c970fbc (diff)
Remove two silly typedefs
Change-Id: Ia7de1cebf6009e770ca1b96bab6d5e121573ccc1
Diffstat (limited to 'svx')
-rw-r--r--svx/source/fmcomp/fmgridif.cxx14
-rw-r--r--svx/source/fmcomp/gridcell.cxx20
-rw-r--r--svx/source/fmcomp/gridcols.cxx6
-rw-r--r--svx/source/form/xfm_addcondition.cxx2
4 files changed, 21 insertions, 21 deletions
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index dbd9c3850177..e966cecb9c45 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -386,7 +386,7 @@ OUString SAL_CALL FmXGridControl::getImplementationName() throw(std::exception)
return OUString("com.sun.star.form.FmXGridControl");
}
-::comphelper::StringSequence SAL_CALL FmXGridControl::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedServiceNames() throw(std::exception)
{
Sequence< OUString > aServiceNames(2);
aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL;
@@ -961,10 +961,10 @@ OUString SAL_CALL FmXGridControl::getMode() throw( RuntimeException, std::except
}
-::comphelper::StringSequence SAL_CALL FmXGridControl::getSupportedModes() throw( RuntimeException, std::exception )
+css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedModes() throw( RuntimeException, std::exception )
{
Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY);
- return xPeer.is() ? xPeer->getSupportedModes() : ::comphelper::StringSequence();
+ return xPeer.is() ? xPeer->getSupportedModes() : css::uno::Sequence<OUString>();
}
@@ -1386,7 +1386,7 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeE
else if (pGrid && m_xColumns.is() && m_xColumns->hasElements())
{
// next find which column has changed
- ::comphelper::InterfaceRef xCurrent;
+ css::uno::Reference<css::uno::XInterface> xCurrent;
sal_Int32 i;
for ( i = 0; i < m_xColumns->getCount(); i++)
@@ -2377,9 +2377,9 @@ OUString FmXGridPeer::getMode() throw( RuntimeException, std::exception )
}
-::comphelper::StringSequence FmXGridPeer::getSupportedModes() throw( RuntimeException, std::exception )
+css::uno::Sequence<OUString> FmXGridPeer::getSupportedModes() throw( RuntimeException, std::exception )
{
- static ::comphelper::StringSequence aModes;
+ static css::uno::Sequence<OUString> aModes;
if (!aModes.getLength())
{
aModes.realloc(2);
@@ -2393,7 +2393,7 @@ OUString FmXGridPeer::getMode() throw( RuntimeException, std::exception )
sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) throw( RuntimeException, std::exception )
{
- ::comphelper::StringSequence aModes(getSupportedModes());
+ css::uno::Sequence<OUString> aModes(getSupportedModes());
const OUString* pModes = aModes.getConstArray();
for (sal_Int32 i = aModes.getLength(); i > 0; )
{
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 6863c9574601..73cbd3bf269b 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2432,7 +2432,7 @@ void DbComboBox::SetList(const Any& rItems)
ComboBoxControl* pField = static_cast<ComboBoxControl*>(m_pWindow.get());
pField->Clear();
- ::comphelper::StringSequence aTest;
+ css::uno::Sequence<OUString> aTest;
if (rItems >>= aTest)
{
const OUString* pStrings = aTest.getConstArray();
@@ -2553,7 +2553,7 @@ void DbListBox::SetList(const Any& rItems)
pField->Clear();
m_bBound = false;
- ::comphelper::StringSequence aTest;
+ css::uno::Sequence<OUString> aTest;
if (rItems >>= aTest)
{
const OUString* pStrings = aTest.getConstArray();
@@ -2716,7 +2716,7 @@ void DbFilterField::PaintCell(OutputDevice& rDev, const Rectangle& rRect)
void DbFilterField::SetList(const Any& rItems, bool bComboBox)
{
- ::comphelper::StringSequence aTest;
+ css::uno::Sequence<OUString> aTest;
rItems >>= aTest;
const OUString* pStrings = aTest.getConstArray();
sal_Int32 nItems = aTest.getLength();
@@ -4095,7 +4095,7 @@ void SAL_CALL FmXListBoxCell::addItem(const OUString& aItem, sal_Int16 nPos) thr
}
-void SAL_CALL FmXListBoxCell::addItems(const ::comphelper::StringSequence& aItems, sal_Int16 nPos) throw( RuntimeException, std::exception )
+void SAL_CALL FmXListBoxCell::addItems(const css::uno::Sequence<OUString>& aItems, sal_Int16 nPos) throw( RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
if (m_pBox)
@@ -4135,15 +4135,15 @@ OUString SAL_CALL FmXListBoxCell::getItem(sal_Int16 nPos) throw( RuntimeExceptio
return m_pBox ? OUString(m_pBox->GetEntry(nPos)) : OUString();
}
-::comphelper::StringSequence SAL_CALL FmXListBoxCell::getItems() throw( RuntimeException, std::exception )
+css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getItems() throw( RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
- ::comphelper::StringSequence aSeq;
+ css::uno::Sequence<OUString> aSeq;
if (m_pBox)
{
sal_uInt16 nEntries = m_pBox ->GetEntryCount();
- aSeq = ::comphelper::StringSequence( nEntries );
+ aSeq = css::uno::Sequence<OUString>( nEntries );
for ( sal_uInt16 n = nEntries; n; )
{
--n;
@@ -4201,17 +4201,17 @@ OUString SAL_CALL FmXListBoxCell::getSelectedItem() throw( RuntimeException, std
}
-::comphelper::StringSequence SAL_CALL FmXListBoxCell::getSelectedItems() throw( RuntimeException, std::exception )
+css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getSelectedItems() throw( RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
- ::comphelper::StringSequence aSeq;
+ css::uno::Sequence<OUString> aSeq;
if (m_pBox)
{
UpdateFromColumn();
sal_uInt16 nSelEntries = m_pBox->GetSelectEntryCount();
- aSeq = ::comphelper::StringSequence( nSelEntries );
+ aSeq = css::uno::Sequence<OUString>( nSelEntries );
for ( sal_uInt16 n = 0; n < nSelEntries; n++ )
aSeq.getArray()[n] = m_pBox->GetSelectEntry( n );
}
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index 23f3de93b60c..d002874235f3 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -25,9 +25,9 @@
using namespace ::com::sun::star::uno;
-const ::comphelper::StringSequence& getColumnTypes()
+const css::uno::Sequence<OUString>& getColumnTypes()
{
- static ::comphelper::StringSequence aColumnTypes(10);
+ static css::uno::Sequence<OUString> aColumnTypes(10);
if (aColumnTypes.getConstArray()[0].isEmpty())
{
OUString* pNames = aColumnTypes.getArray();
@@ -89,7 +89,7 @@ sal_Int32 getColumnTypeByModelName(const OUString& aModelName)
? aModelName.copy(aModelPrefix.getLength())
: aModelName.copy(aCompatibleModelPrefix.getLength());
- const ::comphelper::StringSequence& rColumnTypes = getColumnTypes();
+ const css::uno::Sequence<OUString>& rColumnTypes = getColumnTypes();
nTypeId = lcl_findPos(aColumnType, rColumnTypes);
}
return nTypeId;
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index eaf48e26b6a2..c905e9a3b8d3 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -53,7 +53,7 @@ namespace svxform
Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames()
{
- ::comphelper::StringSequence aSupported( 1 );
+ css::uno::Sequence<OUString> aSupported( 1 );
aSupported.getArray()[0] = "com.sun.star.xforms.ui.dialogs.AddCondition";
return aSupported;
}
generated by cgit (git 2.34.1) at 2025-03-13 16:44:22 +0000