diff options
29 files changed, 67 insertions, 101 deletions
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx index e9dd6774ef41..5c195440ffd2 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx @@ -62,8 +62,6 @@ namespace accessibility namespace AccessibleEventId = ::com::sun::star::accessibility::AccessibleEventId; namespace AccessibleStateType = ::com::sun::star::accessibility::AccessibleStateType; - typedef css::awt::Point UnoPoint; - // AccessibleToolPanelDeck_Impl - declaration class AccessibleToolPanelDeck_Impl :public ::boost::noncopyable ,public ::svt::IToolPanelDeckListener @@ -285,7 +283,7 @@ namespace accessibility return AccessibleRole::PANEL; } - Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleAtPoint( const UnoPoint& i_rPoint ) throw (RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleAtPoint( const css::awt::Point& i_rPoint ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *m_xImpl ); diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx index a41add67d371..14509f619cb9 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx @@ -63,8 +63,6 @@ namespace accessibility namespace AccessibleEventId = ::com::sun::star::accessibility::AccessibleEventId; namespace AccessibleStateType = ::com::sun::star::accessibility::AccessibleStateType; - typedef css::awt::Point UnoPoint; - // AccessibleWrapper typedef ::cppu::WeakImplHelper< XAccessible > AccessibleWrapper_Base; class AccessibleWrapper : public AccessibleWrapper_Base @@ -340,12 +338,12 @@ namespace accessibility } } - Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleAtPoint( const UnoPoint& i_rPoint ) throw (RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleAtPoint( const css::awt::Point& i_rPoint ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *m_xImpl ); // check the tab items - const UnoPoint aOwnScreenPos( getLocationOnScreen() ); + const css::awt::Point aOwnScreenPos( getLocationOnScreen() ); const ::Point aRequestedScreenPoint( i_rPoint.X + aOwnScreenPos.X, i_rPoint.Y + aOwnScreenPos.Y ); for ( size_t i=0; i<m_xImpl->getPanelDeck()->GetPanelCount(); ++i ) diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 63eb72697909..3a2da2aa5c77 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -634,7 +634,7 @@ void SAL_CALL ODatabaseModelImpl::disposing( const css::lang::EventObject& Sourc { if ( xCon == i->get() ) { - *i = OWeakConnection(); + *i = css::uno::WeakReference< css::sdbc::XConnection >(); bStore = true; break; } diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index e347aa8c5d6c..79de473dfaa3 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -79,8 +79,7 @@ namespace comphelper namespace dbaccess { -typedef css::uno::WeakReference< css::sdbc::XConnection > OWeakConnection; -typedef std::vector< OWeakConnection > OWeakConnectionArray; +typedef std::vector< css::uno::WeakReference< css::sdbc::XConnection > > OWeakConnectionArray; struct AsciiPropertyValue { diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index eb418f7a58f1..73bf3c8d3810 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -1188,7 +1188,7 @@ Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, co Reference< XComponent> xComp(xConn,UNO_QUERY); if ( xComp.is() ) xComp->addEventListener( static_cast< XContainerListener* >( this ) ); - m_pImpl->m_aConnections.push_back(OWeakConnection(xConn)); + m_pImpl->m_aConnections.push_back(css::uno::WeakReference< css::sdbc::XConnection >(xConn)); } return xConn; diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx index da4c34ba137f..1b333a7b5ffa 100644 --- a/editeng/source/outliner/overflowingtxt.cxx +++ b/editeng/source/outliner/overflowingtxt.cxx @@ -33,7 +33,7 @@ OutlinerParaObject *TextChainingUtils::JuxtaposeParaObject( - TranferableText xOverflowingContent, + css::uno::Reference< css::datatransfer::XTransferable > xOverflowingContent, Outliner *pOutl, OutlinerParaObject *pNextPObj) { @@ -69,7 +69,7 @@ OutlinerParaObject *TextChainingUtils::JuxtaposeParaObject( } OutlinerParaObject *TextChainingUtils::DeeplyMergeParaObject( - TranferableText xOverflowingContent, + css::uno::Reference< css::datatransfer::XTransferable > xOverflowingContent, Outliner *pOutl, OutlinerParaObject *pNextPObj) { @@ -94,7 +94,7 @@ OutlinerParaObject *TextChainingUtils::DeeplyMergeParaObject( return pOutl->CreateParaObject(); } -TranferableText TextChainingUtils::CreateTransferableFromText(Outliner *pOutl) +css::uno::Reference< css::datatransfer::XTransferable > TextChainingUtils::CreateTransferableFromText(Outliner *pOutl) { const EditEngine &rEditEngine = pOutl->GetEditEngine(); sal_Int32 nLastPara = pOutl->GetParagraphCount()-1; @@ -120,7 +120,7 @@ ESelection getLastPositionSel(const EditTextObject *pTObj) // class OverflowingText -OverflowingText::OverflowingText(TranferableText xOverflowingContent) : +OverflowingText::OverflowingText(css::uno::Reference< css::datatransfer::XTransferable > xOverflowingContent) : mxOverflowingContent(xOverflowingContent) { diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 0a47d3bd7e16..23bda2b9b629 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -277,7 +277,7 @@ void BibToolBar::InitListener() xTrans->parseStrict( aURL ); - BibToolBarListenerRef xListener; + css::uno::Reference< css::frame::XStatusListener> xListener; if(nId==TBC_LB_SOURCE) { xListener=new BibTBListBoxListener(this,aURL.Complete,nId); @@ -517,8 +517,8 @@ void BibToolBar::statusChanged(const frame::FeatureStateEvent& rEvent) { for(size_t i = 0; i < aListenerArr.size(); i++) { - BibToolBarListenerRef* pListener = &aListenerArr[i]; - (*pListener)->statusChanged(rEvent); + css::uno::Reference< css::frame::XStatusListener>& rListener = aListenerArr[i]; + rListener->statusChanged(rEvent); } } diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index f195608ec797..164eee6f4d10 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -101,8 +101,7 @@ public: }; -typedef css::uno::Reference< css::frame::XStatusListener> BibToolBarListenerRef; -typedef std::vector<BibToolBarListenerRef> BibToolBarListenerArr; +typedef std::vector< css::uno::Reference< css::frame::XStatusListener> > BibToolBarListenerArr; class BibToolBar: public ToolBox { diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index 3ade3666656f..8c05b4cecdf3 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -93,9 +93,6 @@ namespace pcr namespace MeasureUnit = css::util::MeasureUnit; - typedef css::awt::Point AwtPoint; - typedef css::awt::Size AwtSize; - #define ANCHOR_TO_SHEET 0 #define ANCHOR_TO_CELL 1 @@ -393,7 +390,7 @@ namespace pcr sal_Int32 nPosition(0); OSL_VERIFY( _rValue >>= nPosition ); - AwtPoint aPos( m_xAssociatedShape->getPosition() ); + css::awt::Point aPos( m_xAssociatedShape->getPosition() ); if ( nPropId == PROPERTY_ID_POSITIONX ) aPos.X = nPosition; else @@ -408,7 +405,7 @@ namespace pcr sal_Int32 nSize(0); OSL_VERIFY( _rValue >>= nSize ); - AwtSize aSize( m_xAssociatedShape->getSize() ); + css::awt::Size aSize( m_xAssociatedShape->getSize() ); if ( nPropId == PROPERTY_ID_WIDTH ) aSize.Width = nSize; else @@ -617,7 +614,7 @@ namespace pcr namespace { static sal_Int32 lcl_getLowerBoundRowOrColumn( const Reference< XIndexAccess >& _rxRowsOrColumns, const bool _bRows, - const AwtPoint& _rRelativePosition ) + const css::awt::Point& _rRelativePosition ) { sal_Int32 nAccumulated = 0; @@ -665,7 +662,7 @@ namespace pcr "FormGeometryHandler::impl_setSheetAnchorType_nothrow: sheet not found!" ); if ( xSheet.is() ) { - AwtPoint aPreservePosition( m_xAssociatedShape->getPosition() ); + css::awt::Point aPreservePosition( m_xAssociatedShape->getPosition() ); m_xShapeProperties->setPropertyValue( PROPERTY_ANCHOR, makeAny( xSheet ) ); m_xAssociatedShape->setPosition( aPreservePosition ); } @@ -681,7 +678,7 @@ namespace pcr OSL_ENSURE( xCurrentAnchor.is(), "FormGeometryHandler::impl_setSheetAnchorType_nothrow: only to be called when currently anchored to a sheet!" ); // get the current position - AwtPoint aRelativePosition( m_xAssociatedShape->getPosition() ); + css::awt::Point aRelativePosition( m_xAssociatedShape->getPosition() ); Reference< XTableColumns > xCols( xColsRows->getColumns(), UNO_SET_THROW ); sal_Int32 nNewAnchorCol = lcl_getLowerBoundRowOrColumn( xCols.get(), false, aRelativePosition ); @@ -733,13 +730,13 @@ namespace pcr if ( _event.PropertyName == "Position" ) { - AwtPoint aPos = m_xShape->getPosition(); + css::awt::Point aPos = m_xShape->getPosition(); aEventTranslations.push_back( EventTranslation( PROPERTY_POSITIONX, makeAny( aPos.X ) ) ); aEventTranslations.push_back( EventTranslation( PROPERTY_POSITIONY, makeAny( aPos.Y ) ) ); } else if ( _event.PropertyName == "Size" ) { - AwtSize aSize = m_xShape->getSize(); + css::awt::Size aSize = m_xShape->getSize(); aEventTranslations.push_back( EventTranslation( PROPERTY_WIDTH, makeAny( aSize.Width ) ) ); aEventTranslations.push_back( EventTranslation( PROPERTY_HEIGHT, makeAny( aSize.Height ) ) ); } diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx index b8150cb0926f..cf3a05ad49e9 100644 --- a/forms/source/helper/commandimageprovider.cxx +++ b/forms/source/helper/commandimageprovider.cxx @@ -69,7 +69,7 @@ namespace frm } // ICommandImageProvider - virtual CommandImages getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge ) const override; + virtual CommandImages getCommandImages( const css::uno::Sequence< OUString >& _rCommandURLs, const bool _bLarge ) const override; private: void impl_init_nothrow( const Reference<XComponentContext>& _rContext, const Reference< XModel >& _rxDocument ); @@ -117,7 +117,7 @@ namespace frm } - CommandImages DocumentCommandImageProvider::getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge ) const + CommandImages DocumentCommandImageProvider::getCommandImages( const css::uno::Sequence< OUString >& _rCommandURLs, const bool _bLarge ) const { const size_t nCommandCount = _rCommandURLs.getLength(); CommandImages aImages( nCommandCount ); diff --git a/forms/source/inc/commandimageprovider.hxx b/forms/source/inc/commandimageprovider.hxx index af0aefcc9f0e..7b6f01bf8d80 100644 --- a/forms/source/inc/commandimageprovider.hxx +++ b/forms/source/inc/commandimageprovider.hxx @@ -35,15 +35,13 @@ namespace frm //= ICommandImageProvider - typedef OUString CommandURL; - typedef css::uno::Sequence< CommandURL > CommandURLs; - typedef ::std::vector< Image > CommandImages; + typedef ::std::vector< Image > CommandImages; class SAL_NO_VTABLE ICommandImageProvider { public: virtual CommandImages getCommandImages( - const CommandURLs& _rCommandURLs, + const css::uno::Sequence< OUString >& _rCommandURLs, const bool _bLarge ) const = 0; diff --git a/forms/source/inc/componenttools.hxx b/forms/source/inc/componenttools.hxx index 4a41e88d9938..f3e445effd1e 100644 --- a/forms/source/inc/componenttools.hxx +++ b/forms/source/inc/componenttools.hxx @@ -34,11 +34,7 @@ namespace frm struct TypeCompareLess : public ::std::binary_function< css::uno::Type, css::uno::Type, bool > { - private: - typedef css::uno::Type Type; - - public: - bool operator()( const Type& _rLHS, const Type& _rRHS ) const + bool operator()( const css::uno::Type& _rLHS, const css::uno::Type& _rRHS ) const { return _rLHS.getTypeName() < _rRHS.getTypeName(); } @@ -50,9 +46,8 @@ namespace frm class TypeBag { public: - typedef css::uno::Type Type; - typedef css::uno::Sequence< Type > TypeSequence; - typedef ::std::set< Type, TypeCompareLess > TypeSet; + typedef css::uno::Sequence< css::uno::Type > TypeSequence; + typedef ::std::set< css::uno::Type, TypeCompareLess > TypeSet; private: TypeSet m_aTypes; @@ -72,9 +67,9 @@ namespace frm const TypeSequence& _rTypes3 ); - void addType( const Type& i_rType ); + void addType( const css::uno::Type& i_rType ); void addTypes( const TypeSequence& _rTypes ); - void removeType( const Type& i_rType ); + void removeType( const css::uno::Type& i_rType ); /** returns the types represented by this bag */ diff --git a/forms/source/inc/listenercontainers.hxx b/forms/source/inc/listenercontainers.hxx index 59cdccc35a02..e46443dbc0d1 100644 --- a/forms/source/inc/listenercontainers.hxx +++ b/forms/source/inc/listenercontainers.hxx @@ -32,9 +32,7 @@ namespace frm class EventListeners : public ::comphelper::OListenerContainerBase< LISTENER, css::lang::EventObject > { public: - typedef LISTENER ListenerClass; - typedef css::lang::EventObject EventClass; - typedef ::comphelper::OListenerContainerBase< ListenerClass, EventClass > + typedef ::comphelper::OListenerContainerBase< LISTENER, css::lang::EventObject > EventListeners_Base; private: diff --git a/forms/source/misc/componenttools.cxx b/forms/source/misc/componenttools.cxx index 62e7609f62ea..add35d583630 100644 --- a/forms/source/misc/componenttools.cxx +++ b/forms/source/misc/componenttools.cxx @@ -66,13 +66,13 @@ namespace frm } - void TypeBag::addType( const Type& i_rType ) + void TypeBag::addType( const css::uno::Type& i_rType ) { m_aTypes.insert( i_rType ); } - void TypeBag::removeType( const TypeBag::Type& i_rType ) + void TypeBag::removeType( const css::uno::Type& i_rType ) { m_aTypes.erase( i_rType ); } diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index bda953d7ab26..90723a27b9c0 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -364,7 +364,7 @@ namespace frm } // translate them into command URLs - CommandURLs aCommandURLs( aFormFeatures.size() ); + css::uno::Sequence< OUString > aCommandURLs( aFormFeatures.size() ); for ( FormFeatures::const_iterator formFeature = aFormFeatures.begin(); formFeature != aFormFeatures.end(); ++formFeature diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index 4a7359064f89..ebb8eb45b35e 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -727,9 +727,8 @@ void Binding::valueModified() void Binding::distributeMIP( const css::uno::Reference<css::xml::dom::XNode> & rxNode ) { - typedef css::xforms::XFormsEventConcrete XFormsEvent_t; OUString sEventName("xforms-generic"); - XFormsEvent_t *pEvent = new XFormsEvent_t; + css::xforms::XFormsEventConcrete *pEvent = new css::xforms::XFormsEventConcrete; pEvent->initXFormsEvent(sEventName, sal_True, sal_False); Reference<XEvent> xEvent(pEvent); diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx index 36d76cba6b59..ddf1c7c8dc0e 100644 --- a/forms/source/xforms/convert.cxx +++ b/forms/source/xforms/convert.cxx @@ -294,30 +294,30 @@ Convert& Convert::get() return *pConvert; } -bool Convert::hasType( const Type_t& rType ) +bool Convert::hasType( const css::uno::Type& rType ) { return maMap.find( rType ) != maMap.end(); } -Convert::Types_t Convert::getTypes() +css::uno::Sequence<css::uno::Type> Convert::getTypes() { - Types_t aTypes( maMap.size() ); + css::uno::Sequence<css::uno::Type> aTypes( maMap.size() ); transform( maMap.begin(), maMap.end(), aTypes.getArray(), o3tl::select1st<Map_t::value_type>() ); return aTypes; } -OUString Convert::toXSD( const Any_t& rAny ) +OUString Convert::toXSD( const css::uno::Any& rAny ) { Map_t::iterator aIter = maMap.find( rAny.getValueType() ); return aIter != maMap.end() ? aIter->second.first( rAny ) : OUString(); } -Convert::Any_t Convert::toAny( const OUString& rValue, - const Type_t& rType ) +css::uno::Any Convert::toAny( const OUString& rValue, + const css::uno::Type& rType ) { Map_t::iterator aIter = maMap.find( rType ); - return aIter != maMap.end() ? aIter->second.second( rValue ) : Any_t(); + return aIter != maMap.end() ? aIter->second.second( rValue ) : css::uno::Any(); } diff --git a/forms/source/xforms/convert.hxx b/forms/source/xforms/convert.hxx index c710d9e3f171..c80bb9f62a9b 100644 --- a/forms/source/xforms/convert.hxx +++ b/forms/source/xforms/convert.hxx @@ -41,15 +41,11 @@ struct TypeLess class Convert { - typedef css::uno::Type Type_t; - typedef css::uno::Sequence<css::uno::Type> Types_t; - typedef css::uno::Any Any_t; - // hold conversion objects - typedef OUString (*fn_toXSD)( const Any_t& ); - typedef Any_t (*fn_toAny)( const OUString& ); + typedef OUString (*fn_toXSD)( const css::uno::Any& ); + typedef css::uno::Any (*fn_toAny)( const OUString& ); typedef std::pair<fn_toXSD,fn_toAny> Convert_t; - typedef std::map<Type_t,Convert_t,TypeLess> Map_t; + typedef std::map<css::uno::Type, Convert_t, TypeLess> Map_t; Map_t maMap; Convert(); @@ -61,16 +57,16 @@ public: static Convert& get(); /// can we convert this type? - bool hasType( const Type_t& ); + bool hasType( const css::uno::Type& ); /// get list of convertible types - Types_t getTypes(); + css::uno::Sequence<css::uno::Type> getTypes(); /// convert any to XML representation - OUString toXSD( const Any_t& rAny ); + OUString toXSD( const css::uno::Any& rAny ); /// convert XML representation to Any of given type - Any_t toAny( const OUString&, const Type_t& ); + css::uno::Any toAny( const OUString&, const css::uno::Type& ); /** replace all sequences of 0x08, 0x0A, 0x0D, 0x20 with a single 0x20. also strip leading/trailing whitespace. diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx index d500ff161c68..ec10c91950f3 100644 --- a/forms/source/xforms/namedcollection.hxx +++ b/forms/source/xforms/namedcollection.hxx @@ -50,8 +50,7 @@ public: return findItem( rName ) != maItems.end(); } - typedef css::uno::Sequence<OUString> Names_t; - Names_t getNames() const + css::uno::Sequence<OUString> getNames() const { // iterate over members, and collect all those that have names std::vector<OUString> aNames; @@ -66,7 +65,7 @@ public: } // copy names to Sequence and return - Names_t aResult( aNames.size() ); + css::uno::Sequence<OUString> aResult( aNames.size() ); OUString* pStrings = aResult.getArray(); std::copy( aNames.begin(), aNames.end(), pStrings ); @@ -117,7 +116,7 @@ public: } - virtual Names_t SAL_CALL getElementNames() + virtual css::uno::Sequence<OUString> SAL_CALL getElementNames() throw( css::uno::RuntimeException ) override { return getNames(); diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx index a11a28155e61..0d465b60266e 100644 --- a/fpicker/source/aqua/FilterHelper.hxx +++ b/fpicker/source/aqua/FilterHelper.hxx @@ -42,7 +42,7 @@ typedef ::std::list<OUString> OUStringList; struct FilterEntry { protected: - OUString m_sTitle; + OUString m_sTitle; OUStringList m_sFilterSuffixList; UnoFilterList m_aSubFilters; diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index dbf66e20c233..25fad322970d 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -46,7 +46,6 @@ typedef ::std::list < ElementEntry_Impl > ElementList; typedef css::beans::StringPair UnoFilterEntry; typedef css::uno::Sequence< UnoFilterEntry > UnoFilterList; // can be transported more effectively -typedef css::uno::Sequence< OUString > OUStringList; // can be transported more effectively // class SvtFilePicker --------------------------------------------------- @@ -74,7 +73,8 @@ protected: OUString m_aOldHideDirectory; OUString m_aStandardDir; - OUStringList m_aBlackList; + css::uno::Sequence< OUString > + m_aBlackList; css::uno::Reference< css::ui::dialogs::XFilePickerListener > m_xListener; diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index f9af46a88da4..991da0ae2685 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -64,7 +64,6 @@ enum SvtRemoteDlgType }; typedef std::shared_ptr< Place > ServicePtr; -typedef css::uno::Sequence< OUString > OUStringList; class FileViewContainer; diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx index 1a693f76697b..e1dade722bb2 100644 --- a/fpicker/source/office/asyncfilepicker.cxx +++ b/fpicker/source/office/asyncfilepicker.cxx @@ -60,7 +60,7 @@ namespace svt const OUString& _rFilter, sal_Int32 _nMinTimeout, sal_Int32 _nMaxTimeout, - const OUStringList& rBlackList ) + const css::uno::Sequence< OUString >& rBlackList ) { DBG_TESTSOLARMUTEX(); // if this asserts, we'd need to have an own mutex per instance diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx index ef4f84121480..981cc5263b75 100644 --- a/fpicker/source/office/asyncfilepicker.hxx +++ b/fpicker/source/office/asyncfilepicker.hxx @@ -30,9 +30,6 @@ class SvtFileView; class SvtFileDialog_Base; -typedef css::uno::Sequence< OUString > OUStringList; - - namespace svt { @@ -79,7 +76,7 @@ namespace svt const OUString& _rFilter, sal_Int32 _nMinTimeout, sal_Int32 _nMaxTimeout, - const OUStringList& rBlackList = OUStringList() ); + const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >() ); /// cancels the running action void cancel(); diff --git a/include/editeng/overflowingtxt.hxx b/include/editeng/overflowingtxt.hxx index de20a4029429..342006459145 100644 --- a/include/editeng/overflowingtxt.hxx +++ b/include/editeng/overflowingtxt.hxx @@ -30,9 +30,6 @@ namespace com { namespace sun { namespace star { namespace datatransfer { class XTransferable; } } } } - -typedef css::uno::Reference< css::datatransfer::XTransferable> TranferableText; - namespace rtl { class OUString; }; @@ -51,14 +48,14 @@ class Outliner; class TextChainingUtils { public: - static TranferableText CreateTransferableFromText(Outliner *); + static css::uno::Reference< css::datatransfer::XTransferable> CreateTransferableFromText(Outliner *); static OutlinerParaObject *JuxtaposeParaObject( - TranferableText xOverflowingContent, + css::uno::Reference< css::datatransfer::XTransferable > xOverflowingContent, Outliner *, OutlinerParaObject *); static OutlinerParaObject *DeeplyMergeParaObject( - TranferableText xOverflowingContent, + css::uno::Reference< css::datatransfer::XTransferable > xOverflowingContent, Outliner *, OutlinerParaObject *); }; @@ -78,9 +75,9 @@ public: private: friend class Outliner; - OverflowingText(TranferableText xOverflowingContent); + OverflowingText(css::uno::Reference< css::datatransfer::XTransferable > xOverflowingContent); - TranferableText mxOverflowingContent; + css::uno::Reference< css::datatransfer::XTransferable > mxOverflowingContent; }; class NonOverflowingText @@ -134,7 +131,7 @@ public: OutlinerParaObject *CreateMergedUnderflowParaObject(Outliner *, OutlinerParaObject *); private: - TranferableText mxUnderflowingTxt; + css::uno::Reference< css::datatransfer::XTransferable > mxUnderflowingTxt; bool mbIsDeepMerge; }; diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx index 9811c7f01bf1..f889abd190e7 100644 --- a/oox/source/drawingml/diagram/diagram.hxx +++ b/oox/source/drawingml/diagram/diagram.hxx @@ -151,7 +151,6 @@ class LayoutNode; typedef std::shared_ptr< LayoutNode > LayoutNodePtr; typedef std::map< OUString, css::uno::Reference<css::xml::dom::XDocument> > DiagramDomMap; -typedef css::uno::Sequence< css::uno::Sequence< css::uno::Any > > DiagramRelsMap; class DiagramData { @@ -274,7 +273,7 @@ public: DiagramColorMap& getColors() { return maColors; } const DiagramColorMap& getColors() const { return maColors; } DiagramDomMap & getDomMap() { return maMainDomMap; } - DiagramRelsMap & getDataRelsMap() { return maDataRelsMap; } + css::uno::Sequence< css::uno::Sequence< css::uno::Any > > & getDataRelsMap() { return maDataRelsMap; } void addTo( const ShapePtr & pShape ); css::uno::Sequence<css::beans::PropertyValue> getDomsAsPropertyValues() const; @@ -286,7 +285,7 @@ private: DiagramColorMap maColors; std::map< OUString, ShapePtr > maShapeMap; DiagramDomMap maMainDomMap; - DiagramRelsMap maDataRelsMap; + css::uno::Sequence< css::uno::Sequence< css::uno::Any > > maDataRelsMap; }; typedef std::shared_ptr< Diagram > DiagramPtr; diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx index 71b86581fe64..cdc55feafc38 100644 --- a/writerfilter/source/dmapper/GraphicImport.hxx +++ b/writerfilter/source/dmapper/GraphicImport.hxx @@ -44,7 +44,6 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; - typedef css::uno::Sequence< css::beans::PropertyValue > PropertyValues; } }}} diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx index 405141a2c76f..2ec048c42f50 100644 --- a/writerfilter/source/dmapper/PropertyMapHelper.cxx +++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx @@ -85,7 +85,7 @@ void lcl_DumpPropertyValues(beans::PropertyValues & rValues) TagLogger::getInstance().endElement(); } -void lcl_DumpPropertyValueSeq(PropertyValueSeq_t & rPropValSeq) +void lcl_DumpPropertyValueSeq(css::uno::Sequence<css::beans::PropertyValues> & rPropValSeq) { TagLogger::getInstance().startElement("PropertyValueSeq"); diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx index 4472fea609da..4bc6ad8f65f1 100644 --- a/writerfilter/source/dmapper/PropertyMapHelper.hxx +++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx @@ -32,8 +32,7 @@ void lcl_DumpTableColumnSeparators(const css::uno::Any & rTableColumnSeparators) #ifdef DEBUG_WRITERFILTER void lcl_DumpPropertyValues(css::beans::PropertyValues & rValues); -typedef css::uno::Sequence<css::beans::PropertyValues> PropertyValueSeq_t; -void lcl_DumpPropertyValueSeq(PropertyValueSeq_t & rPropValSeq); +void lcl_DumpPropertyValueSeq(css::uno::Sequence<css::beans::PropertyValues> & rPropValSeq); #endif // DEBUG_WRITERFILTER } } |