diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-30 14:59:47 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-31 12:56:21 +0000 |
commit | 4530451d40470bf5359645de0c142ddf9dc329b6 (patch) | |
tree | 8b57614e9316685a8178d9d61795932c3e705d45 /svx/source/form | |
parent | bd332c2a335b34e209fe2b7fdfb669c855325636 (diff) |
com::sun::star->css in svx
Change-Id: If2c11fa548c5ebef2297d2491edd837b54e3707c
Reviewed-on: https://gerrit.libreoffice.org/19690
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx/source/form')
-rw-r--r-- | svx/source/form/ParseContext.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmPropBrw.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/fmcontrolbordermanager.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmdpage.cxx | 28 | ||||
-rw-r--r-- | svx/source/form/fmexch.cxx | 8 | ||||
-rw-r--r-- | svx/source/form/fmexpl.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmobj.cxx | 10 | ||||
-rw-r--r-- | svx/source/form/fmobjfac.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/fmpage.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/fmpgeimp.cxx | 28 | ||||
-rw-r--r-- | svx/source/form/fmshell.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/fmshimp.cxx | 54 | ||||
-rw-r--r-- | svx/source/form/fmsrcimp.cxx | 66 | ||||
-rw-r--r-- | svx/source/form/fmtextcontrolshell.cxx | 12 | ||||
-rw-r--r-- | svx/source/form/fmtools.cxx | 54 | ||||
-rw-r--r-- | svx/source/form/fmundo.cxx | 12 | ||||
-rw-r--r-- | svx/source/form/fmview.cxx | 6 | ||||
-rw-r--r-- | svx/source/form/formcontroller.cxx | 10 | ||||
-rw-r--r-- | svx/source/form/legacyformcontroller.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/navigatortreemodel.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/sdbdatacolumn.cxx | 6 | ||||
-rw-r--r-- | svx/source/form/sqlparserclient.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/tabwin.cxx | 8 |
23 files changed, 167 insertions, 167 deletions
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index 99995c5a76a6..310ed7d18053 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -46,7 +46,7 @@ OSystemParseContext::~OSystemParseContext() } -::com::sun::star::lang::Locale OSystemParseContext::getPreferredLocale( ) const +css::lang::Locale OSystemParseContext::getPreferredLocale( ) const { return SvtSysLocale().GetLanguageTag().getLocale(); } diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index fda30fdbdb41..d7bcdbd754f9 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -444,11 +444,11 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection ) SetText( sTitle ); - Reference< ::com::sun::star::awt::XLayoutConstrains > xLayoutConstrains( m_xBrowserController, UNO_QUERY ); + Reference< css::awt::XLayoutConstrains > xLayoutConstrains( m_xBrowserController, UNO_QUERY ); if( xLayoutConstrains.is() ) { ::Size aConstrainedSize; - ::com::sun::star::awt::Size aMinSize = xLayoutConstrains->getMinimumSize(); + css::awt::Size aMinSize = xLayoutConstrains->getMinimumSize(); sal_Int32 nLeft(0), nTop(0), nRight(0), nBottom(0); GetBorder( nLeft, nTop, nRight, nBottom ); diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx index 8cbe36f4872e..649d320badd3 100644 --- a/svx/source/form/fmcontrolbordermanager.cxx +++ b/svx/source/form/fmcontrolbordermanager.cxx @@ -404,7 +404,7 @@ namespace svxform else { // and also the new font - setUnderline( xPeer, UnderlineDescriptor( com::sun::star::awt::FontUnderline::WAVE, m_nInvalidColor ) ); + setUnderline( xPeer, UnderlineDescriptor( css::awt::FontUnderline::WAVE, m_nInvalidColor ) ); } } diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index 56668dada57a..dd5a845a5362 100644 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx @@ -38,12 +38,12 @@ SvxFmDrawPage::~SvxFmDrawPage() throw () { } -::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SvxFmDrawPage::getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< sal_Int8 > SAL_CALL SvxFmDrawPage::getImplementationId() throw(css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } -Any SAL_CALL SvxFmDrawPage::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL SvxFmDrawPage::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception) { Any aRet = ::cppu::queryInterface ( _rType , static_cast< XFormsSupplier2* >( this ) @@ -55,17 +55,17 @@ Any SAL_CALL SvxFmDrawPage::queryAggregation( const ::com::sun::star::uno::Type& return aRet; } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL SvxFmDrawPage::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL SvxFmDrawPage::getTypes( ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > aTypes(SvxDrawPage::getTypes()); + css::uno::Sequence< css::uno::Type > aTypes(SvxDrawPage::getTypes()); aTypes.realloc(aTypes.getLength() + 1); - ::com::sun::star::uno::Type* pTypes = aTypes.getArray(); + css::uno::Type* pTypes = aTypes.getArray(); - pTypes[aTypes.getLength()-1] = cppu::UnoType<com::sun::star::form::XFormsSupplier>::get(); + pTypes[aTypes.getLength()-1] = cppu::UnoType<css::form::XFormsSupplier>::get(); return aTypes; } -SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xDescr ) +SdrObject *SvxFmDrawPage::_CreateSdrObject( const css::uno::Reference< css::drawing::XShape > & xDescr ) throw (css::uno::RuntimeException, std::exception) { OUString aShapeType( xDescr->getShapeType() ); @@ -79,12 +79,12 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen } -::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SvxFmDrawPage::_CreateShape( SdrObject *pObj ) const +css::uno::Reference< css::drawing::XShape > SvxFmDrawPage::_CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) { if( FmFormInventor == pObj->GetObjInventor() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape = static_cast<SvxShape*>(new SvxShapeControl( pObj )); + css::uno::Reference< css::drawing::XShape > xShape = static_cast<SvxShape*>(new SvxShapeControl( pObj )); return xShape; } else @@ -92,9 +92,9 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen } // XFormsSupplier -::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +css::uno::Reference< css::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms() throw( css::uno::RuntimeException, std::exception ) { - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xForms; + css::uno::Reference< css::container::XNameContainer > xForms; FmFormPage *pFmPage = dynamic_cast<FmFormPage*>( GetSdrPage() ); if( pFmPage ) @@ -104,7 +104,7 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen } // XFormsSupplier2 -sal_Bool SAL_CALL SvxFmDrawPage::hasForms() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxFmDrawPage::hasForms() throw( css::uno::RuntimeException, std::exception ) { bool bHas = false; FmFormPage* pFormPage = dynamic_cast<FmFormPage*>( GetSdrPage() ); @@ -113,8 +113,8 @@ sal_Bool SAL_CALL SvxFmDrawPage::hasForms() throw( ::com::sun::star::uno::Runtim return bHas; } -// ::com::sun::star::lang::XServiceInfo -::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmDrawPage::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +// css::lang::XServiceInfo +css::uno::Sequence< OUString > SAL_CALL SvxFmDrawPage::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { return SvxDrawPage::getSupportedServiceNames(); } diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index d9b0911b2a0f..af817752bd7c 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -205,7 +205,7 @@ namespace svxform } - void OControlTransferData::addHiddenControlsFormat(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& seqInterfaces) + void OControlTransferData::addHiddenControlsFormat(const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& seqInterfaces) { m_aHiddenControlModels = seqInterfaces; } @@ -220,7 +220,7 @@ namespace svxform return; m_aControlPaths.realloc(nEntryCount); - ::com::sun::star::uno::Sequence<sal_uInt32>* pAllPaths = m_aControlPaths.getArray(); + css::uno::Sequence<sal_uInt32>* pAllPaths = m_aControlPaths.getArray(); for ( ListBoxEntrySet::const_iterator loop = m_aSelectedEntries.begin(); loop != m_aSelectedEntries.end(); ++loop, ++pAllPaths @@ -239,7 +239,7 @@ namespace svxform // pLoop == NULL heisst, dass ich am oberen Ende angelangt bin, dann sollte das Ganze abbrechen, was nur bei pRoot == NULL der Fall sein wird } - // dann koennen wir ihn in die ::com::sun::star::uno::Sequence uebertragen + // dann koennen wir ihn in die css::uno::Sequence uebertragen Sequence<sal_uInt32>& rCurrentPath = *pAllPaths; sal_Int32 nDepth = aCurrentPath.size(); @@ -258,7 +258,7 @@ namespace svxform m_aSelectedEntries.swap( aEmpty ); sal_Int32 nControls = m_aControlPaths.getLength(); - const ::com::sun::star::uno::Sequence<sal_uInt32>* pPaths = m_aControlPaths.getConstArray(); + const css::uno::Sequence<sal_uInt32>* pPaths = m_aControlPaths.getConstArray(); for (sal_Int32 i=0; i<nControls; ++i) { sal_Int32 nThisPatLength = pPaths[i].getLength(); diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index d84890f404d5..6f1d36761b02 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -191,7 +191,7 @@ FmEntryData::~FmEntryData() } -void FmEntryData::newObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIFace ) +void FmEntryData::newObject( const css::uno::Reference< css::uno::XInterface >& _rxIFace ) { // do not just copy, normalize it m_xNormalizedIFace = Reference< XInterface >( _rxIFace, UNO_QUERY ); diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 603a98820837..2cc0e156ec30 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -407,10 +407,10 @@ namespace { OUString lcl_getFormComponentAccessPath(const Reference< XInterface >& _xElement, Reference< XInterface >& _rTopLevelElement) { - Reference< ::com::sun::star::form::XFormComponent> xChild(_xElement, UNO_QUERY); - Reference< ::com::sun::star::container::XIndexAccess> xParent; + Reference< css::form::XFormComponent> xChild(_xElement, UNO_QUERY); + Reference< css::container::XIndexAccess> xParent; if (xChild.is()) - xParent = Reference< ::com::sun::star::container::XIndexAccess>(xChild->getParent(), UNO_QUERY); + xParent = Reference< css::container::XIndexAccess>(xChild->getParent(), UNO_QUERY); // while the current content is a form OUString sReturn; @@ -433,7 +433,7 @@ namespace // travel up xChild.set(xParent, css::uno::UNO_QUERY); if (xChild.is()) - xParent = Reference< ::com::sun::star::container::XIndexAccess>(xChild->getParent(), UNO_QUERY); + xParent = Reference< css::container::XIndexAccess>(xChild->getParent(), UNO_QUERY); } _rTopLevelElement = xParent; @@ -619,7 +619,7 @@ const FmFormObj* FmFormObj::GetFormObject( const SdrObject* _pSdrObject ) } -void FmFormObj::SetUnoControlModel( const Reference< com::sun::star::awt::XControlModel >& _rxModel ) +void FmFormObj::SetUnoControlModel( const Reference< css::awt::XControlModel >& _rxModel ) { SdrUnoObj::SetUnoControlModel( _rxModel ); diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index f83c8ec74e1d..4f8e5e363dd3 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -60,7 +60,7 @@ FmFormObjFactory::FmFormObjFactory() SdrObjFactory::InsertMakeObjectHdl(LINK(this, FmFormObjFactory, MakeObject)); - // Konfigurations-::com::sun::star::frame::Controller und NavigationBar registrieren + // Konfigurations-css::frame::Controller und NavigationBar registrieren SvxFmTbxCtlAbsRec::RegisterControl( SID_FM_RECORD_ABSOLUTE ); SvxFmTbxCtlRecText::RegisterControl( SID_FM_RECORD_TEXT ); SvxFmTbxCtlRecFromText::RegisterControl( SID_FM_RECORD_FROM_TEXT ); @@ -90,7 +90,7 @@ FmFormObjFactory::~FmFormObjFactory() { } -// ::com::sun::star::form::Form-Objekte erzeugen +// css::form::Form-Objekte erzeugen namespace { void lcl_initProperty( FmFormObj* _pObject, const OUString& _rPropName, const Any& _rValue ) diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index cc32c6dad91a..f0721b4e2687 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -109,7 +109,7 @@ void FmFormPage::SetModel(SdrModel* pNewModel) xForms->setParent( pObjShell->GetModel() ); } } - catch( ::com::sun::star::uno::Exception const& ) + catch( css::uno::Exception const& ) { OSL_FAIL( "UNO Exception caught resetting model for m_pImpl (FmFormPageImpl) in FmFormPage::SetModel" ); } @@ -177,7 +177,7 @@ bool FmFormPage::RequestHelp( vcl::Window* pWindow, SdrView* pView, return false; OUString aHelpText; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xSet( pFormObject->GetUnoControlModel(), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::beans::XPropertySet > xSet( pFormObject->GetUnoControlModel(), css::uno::UNO_QUERY ); if (xSet.is()) { if (::comphelper::hasProperty(FM_PROP_HELPTEXT, xSet)) diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 2a2aa6b98a37..7ab848e63058 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -356,7 +356,7 @@ bool FmFormPageImpl::validateCurForm() } -void FmFormPageImpl::setCurForm(Reference< ::com::sun::star::form::XForm > xForm) +void FmFormPageImpl::setCurForm(Reference< css::form::XForm > xForm) { xCurrentForm = xForm; } @@ -446,7 +446,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() } -Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormComponentHierarchy( +Reference< css::form::XForm > FmFormPageImpl::findPlaceInFormComponentHierarchy( const Reference< XFormComponent > & rContent, const Reference< XDataSource > & rDatabase, const OUString& rDBTitle, const OUString& rCursorSource, sal_Int32 nCommandType ) { @@ -466,17 +466,17 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo // erst in der aktuellen form suchen xForm = findFormForDataSource( xCurrentForm, rDatabase, rCursorSource, nCommandType ); - Reference< ::com::sun::star::container::XIndexAccess > xFormsByIndex( getForms(), UNO_QUERY ); + Reference< css::container::XIndexAccess > xFormsByIndex( getForms(), UNO_QUERY ); DBG_ASSERT(xFormsByIndex.is(), "FmFormPageImpl::findPlaceInFormComponentHierarchy : no index access for my forms collection !"); sal_Int32 nCount = xFormsByIndex->getCount(); for (sal_Int32 i = 0; !xForm.is() && i < nCount; i++) { - Reference< ::com::sun::star::form::XForm > xToSearch; + Reference< css::form::XForm > xToSearch; xFormsByIndex->getByIndex(i) >>= xToSearch; xForm = findFormForDataSource( xToSearch, rDatabase, rCursorSource, nCommandType ); } - // wenn keine ::com::sun::star::form gefunden, dann eine neue erzeugen + // wenn keine css::form gefunden, dann eine neue erzeugen if (!xForm.is()) { SdrModel* pModel = m_rPage.GetModel(); @@ -491,9 +491,9 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo pModel->BegUndo(aUndoStr); } - xForm = Reference< ::com::sun::star::form::XForm >(::comphelper::getProcessServiceFactory()->createInstance(FM_SUN_COMPONENT_FORM), UNO_QUERY); + xForm = Reference< css::form::XForm >(::comphelper::getProcessServiceFactory()->createInstance(FM_SUN_COMPONENT_FORM), UNO_QUERY); // a form should always have the command type table as default - Reference< ::com::sun::star::beans::XPropertySet > xFormProps(xForm, UNO_QUERY); + Reference< css::beans::XPropertySet > xFormProps(xForm, UNO_QUERY); try { xFormProps->setPropertyValue(FM_PROP_COMMANDTYPE, makeAny(sal_Int32(CommandType::TABLE))); } catch(Exception&) { } @@ -501,7 +501,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo xFormProps->setPropertyValue(FM_PROP_DATASOURCE,makeAny(rDBTitle)); else { - Reference< ::com::sun::star::beans::XPropertySet > xDatabaseProps(rDatabase, UNO_QUERY); + Reference< css::beans::XPropertySet > xDatabaseProps(rDatabase, UNO_QUERY); Any aDatabaseUrl = xDatabaseProps->getPropertyValue(FM_PROP_URL); xFormProps->setPropertyValue(FM_PROP_URL, aDatabaseUrl); } @@ -509,7 +509,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo xFormProps->setPropertyValue(FM_PROP_COMMAND,makeAny(rCursorSource)); xFormProps->setPropertyValue(FM_PROP_COMMANDTYPE, makeAny(nCommandType)); - Reference< ::com::sun::star::container::XNameAccess > xNamedSet( getForms(), UNO_QUERY ); + Reference< css::container::XNameAccess > xNamedSet( getForms(), UNO_QUERY ); const bool bTableOrQuery = ( CommandType::TABLE == nCommandType ) || ( CommandType::QUERY == nCommandType ); OUString sName = FormControlFactory::getUniqueName( xNamedSet, @@ -519,7 +519,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo if( bUndo ) { - Reference< ::com::sun::star::container::XIndexContainer > xContainer( getForms(), UNO_QUERY ); + Reference< css::container::XIndexContainer > xContainer( getForms(), UNO_QUERY ); pModel->AddUndo(new FmUndoContainerAction(*static_cast<FmFormModel*>(pModel), FmUndoContainerAction::Inserted, xContainer, @@ -612,7 +612,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( sal_Int32 nCount = xComponents->getCount(); for (sal_Int32 i = 0; !xResultForm.is() && i < nCount; ++i) { - Reference< ::com::sun::star::form::XForm > xSearchForm; + Reference< css::form::XForm > xSearchForm; xComponents->getByIndex(i) >>= xSearchForm; // continue searching in the sub form if (xSearchForm.is()) @@ -635,11 +635,11 @@ OUString FmFormPageImpl::setUniqueName(const Reference< XFormComponent > & xForm } #endif OUString sName; - Reference< ::com::sun::star::beans::XPropertySet > xSet(xFormComponent, UNO_QUERY); + Reference< css::beans::XPropertySet > xSet(xFormComponent, UNO_QUERY); if (xSet.is()) { sName = ::comphelper::getString( xSet->getPropertyValue( FM_PROP_NAME ) ); - Reference< ::com::sun::star::container::XNameAccess > xNameAcc(xControls, UNO_QUERY); + Reference< css::container::XNameAccess > xNameAcc(xControls, UNO_QUERY); if (sName.isEmpty() || xNameAcc->hasByName(sName)) { @@ -651,7 +651,7 @@ OUString FmFormPageImpl::setUniqueName(const Reference< XFormComponent > & xForm Reference< XNameAccess >( xControls, UNO_QUERY ), xSet ); // bei Radiobuttons, die einen Namen haben, diesen nicht ueberschreiben! - if (sName.isEmpty() || nClassId != ::com::sun::star::form::FormComponentType::RADIOBUTTON) + if (sName.isEmpty() || nClassId != css::form::FormComponentType::RADIOBUTTON) { xSet->setPropertyValue(FM_PROP_NAME, makeAny(sDefaultName)); } diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 99bcb04f61ba..629a94667b50 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -902,7 +902,7 @@ void FmFormShell::GetState(SfxItemSet &rSet) bool bLayerLocked = false; if (m_pFormView) { - // Ist der ::com::sun::star::drawing::Layer gelocked, so m???ssen die Slots disabled werden. #36897 + // Ist der css::drawing::Layer gelocked, so m???ssen die Slots disabled werden. #36897 SdrPageView* pPV = m_pFormView->GetSdrPageView(); if (pPV != NULL) bLayerLocked = pPV->IsLayerLocked(m_pFormView->GetActiveLayer()); @@ -1111,7 +1111,7 @@ void FmFormShell::GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich) case SID_FM_SEARCH: { - Reference< ::com::sun::star::beans::XPropertySet > xNavSet(GetImpl()->getActiveForm(), UNO_QUERY); + Reference< css::beans::XPropertySet > xNavSet(GetImpl()->getActiveForm(), UNO_QUERY); sal_Int32 nCount = ::comphelper::getINT32(xNavSet->getPropertyValue(FM_PROP_ROWCOUNT)); bEnable = nCount != 0; } break; diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index cf5d5a3231ea..cf32940c3d9e 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -478,7 +478,7 @@ namespace // check if the control has one of the interfaces we can use for searching // *_pCurrentText will be filled with the current text of the control (as used when searching this control) -bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxControl, +bool IsSearchableControl( const css::uno::Reference< css::uno::XInterface>& _rxControl, OUString* _pCurrentText ) { if ( !_rxControl.is() ) @@ -770,7 +770,7 @@ void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e) throw( Runtime if (xFormController.is()) xFormController->removeActivateListener(static_cast<XFormControllerListener*>(this)); - Reference< ::com::sun::star::lang::XComponent> xComp(m_xExternalViewController, UNO_QUERY); + Reference< css::lang::XComponent> xComp(m_xExternalViewController, UNO_QUERY); if (xComp.is()) xComp->removeEventListener(static_cast<XEventListener*>(static_cast<XPropertyChangeListener*>(this))); @@ -783,7 +783,7 @@ void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e) throw( Runtime } -void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) { if ( impl_checkDisposed() ) return; @@ -1139,14 +1139,14 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent lang::Locale aNewLanguage = Application::GetSettings().GetUILanguageTag().getLocale(); TransferFormComponentProperties(xOldSet, xNewSet, aNewLanguage); - Sequence< ::com::sun::star::script::ScriptEventDescriptor> aOldScripts; + Sequence< css::script::ScriptEventDescriptor> aOldScripts; Reference< XChild> xChild(xOldModel, UNO_QUERY); if (xChild.is()) { Reference< XIndexAccess> xParent(xChild->getParent(), UNO_QUERY); // remember old script events - Reference< ::com::sun::star::script::XEventAttacherManager> xEvManager(xChild->getParent(), UNO_QUERY); + Reference< css::script::XEventAttacherManager> xEvManager(xChild->getParent(), UNO_QUERY); if (xParent.is() && xEvManager.is()) { sal_Int32 nIndex = getElementPos(xParent, xOldModel); @@ -1171,7 +1171,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent else { OSL_FAIL("FmXFormShell::executeControlConversionSlot: could not replace the model !"); - Reference< ::com::sun::star::lang::XComponent> xNewComponent(xNewModel, UNO_QUERY); + Reference< css::lang::XComponent> xNewComponent(xNewModel, UNO_QUERY); if (xNewComponent.is()) xNewComponent->dispose(); return false; @@ -1180,7 +1180,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent catch(Exception&) { OSL_FAIL("FmXFormShell::executeControlConversionSlot: could not replace the model !"); - Reference< ::com::sun::star::lang::XComponent> xNewComponent(xNewModel, UNO_QUERY); + Reference< css::lang::XComponent> xNewComponent(xNewModel, UNO_QUERY); if (xNewComponent.is()) xNewComponent->dispose(); return false; @@ -1710,8 +1710,8 @@ void FmXFormShell::CloseExternalFormViewer() if (!m_xExternalViewController.is()) return; - Reference< ::com::sun::star::frame::XFrame> xExternalViewFrame( m_xExternalViewController->getFrame()); - Reference< ::com::sun::star::frame::XDispatchProvider> xCommLink(xExternalViewFrame, UNO_QUERY); + Reference< css::frame::XFrame> xExternalViewFrame( m_xExternalViewController->getFrame()); + Reference< css::frame::XDispatchProvider> xCommLink(xExternalViewFrame, UNO_QUERY); if (!xCommLink.is()) return; @@ -2514,7 +2514,7 @@ IMPL_LINK_TYPED(FmXFormShell, OnSearchContextRequest, FmSearchContext&, rfmscCon // XContainerListener -void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) { if ( impl_checkDisposed() ) return; @@ -2529,7 +2529,7 @@ void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun:: } -void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) { if ( impl_checkDisposed() ) return; @@ -2542,7 +2542,7 @@ void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(::com::sun:: } -void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) { if ( impl_checkDisposed() ) return; @@ -2608,7 +2608,7 @@ void FmXFormShell::impl_AddElement_nothrow(const Reference< XInterface>& Element xCont->addContainerListener(this); } - const Reference< ::com::sun::star::view::XSelectionSupplier> xSelSupplier(Element, UNO_QUERY); + const Reference< css::view::XSelectionSupplier> xSelSupplier(Element, UNO_QUERY); if (xSelSupplier.is()) xSelSupplier->addSelectionChangeListener(this); } @@ -2623,7 +2623,7 @@ void FmXFormShell::RemoveElement(const Reference< XInterface>& Element) void FmXFormShell::impl_RemoveElement_nothrow(const Reference< XInterface>& Element) { - const Reference< ::com::sun::star::view::XSelectionSupplier> xSelSupplier(Element, UNO_QUERY); + const Reference< css::view::XSelectionSupplier> xSelSupplier(Element, UNO_QUERY); if (xSelSupplier.is()) xSelSupplier->removeSelectionChangeListener(this); @@ -2650,7 +2650,7 @@ void FmXFormShell::impl_RemoveElement_nothrow(const Reference< XInterface>& Elem } -void FmXFormShell::selectionChanged(const lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) +void FmXFormShell::selectionChanged(const lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) { if ( impl_checkDisposed() ) return; @@ -3128,9 +3128,9 @@ void FmXFormShell::CreateExternalView() // the frame the external view is displayed in bool bAlreadyExistent = m_xExternalViewController.is(); - Reference< ::com::sun::star::frame::XFrame> xExternalViewFrame; + Reference< css::frame::XFrame> xExternalViewFrame; OUString sFrameName("_beamer"); - sal_Int32 nSearchFlags = ::com::sun::star::frame::FrameSearchFlag::CHILDREN | ::com::sun::star::frame::FrameSearchFlag::CREATE; + sal_Int32 nSearchFlags = css::frame::FrameSearchFlag::CHILDREN | css::frame::FrameSearchFlag::CREATE; Reference< runtime::XFormController > xCurrentNavController( getNavController()); // the creation of the "partwindow" may cause a deactivate of the document which will result in our nav controller to be set to NULL @@ -3169,8 +3169,8 @@ void FmXFormShell::CreateExternalView() URL aWantToDispatch; aWantToDispatch.Complete = FMURL_COMPONENT_FORMGRIDVIEW; - Reference< ::com::sun::star::frame::XDispatchProvider> xProv(m_xAttachedFrame, UNO_QUERY); - Reference< ::com::sun::star::frame::XDispatch> xDisp; + Reference< css::frame::XDispatchProvider> xProv(m_xAttachedFrame, UNO_QUERY); + Reference< css::frame::XDispatch> xDisp; if (xProv.is()) xDisp = xProv->queryDispatch(aWantToDispatch, sFrameName, nSearchFlags); if (xDisp.is()) @@ -3179,11 +3179,11 @@ void FmXFormShell::CreateExternalView() } // with this the component should be loaded, now search the frame where it resides in - xExternalViewFrame = m_xAttachedFrame->findFrame(sFrameName, ::com::sun::star::frame::FrameSearchFlag::CHILDREN); + xExternalViewFrame = m_xAttachedFrame->findFrame(sFrameName, css::frame::FrameSearchFlag::CHILDREN); if (xExternalViewFrame.is()) { m_xExternalViewController = xExternalViewFrame->getController(); - Reference< ::com::sun::star::lang::XComponent> xComp(m_xExternalViewController, UNO_QUERY); + Reference< css::lang::XComponent> xComp(m_xExternalViewController, UNO_QUERY); if (xComp.is()) xComp->addEventListener(static_cast<XEventListener*>(static_cast<XPropertyChangeListener*>(this))); } @@ -3191,7 +3191,7 @@ void FmXFormShell::CreateExternalView() else { xExternalViewFrame = m_xExternalViewController->getFrame(); - Reference< ::com::sun::star::frame::XDispatchProvider> xCommLink(xExternalViewFrame, UNO_QUERY); + Reference< css::frame::XDispatchProvider> xCommLink(xExternalViewFrame, UNO_QUERY); // if we display the active form we interpret the slot as "remove it" Reference< XForm> xCurrentModel(xCurrentNavController->getModel(), UNO_QUERY); @@ -3213,7 +3213,7 @@ void FmXFormShell::CreateExternalView() URL aClearURL; aClearURL.Complete = FMURL_GRIDVIEW_CLEARVIEW; - Reference< ::com::sun::star::frame::XDispatch> xClear( xCommLink->queryDispatch(aClearURL, OUString(), 0)); + Reference< css::frame::XDispatch> xClear( xCommLink->queryDispatch(aClearURL, OUString(), 0)); if (xClear.is()) xClear->dispatch(aClearURL, Sequence< PropertyValue>()); } @@ -3222,7 +3222,7 @@ void FmXFormShell::CreateExternalView() // instance for which this "external view" was triggered // get the dispatch interface of the frame so we can communicate (interceptable) with the controller - Reference< ::com::sun::star::frame::XDispatchProvider> xCommLink(xExternalViewFrame, UNO_QUERY); + Reference< css::frame::XDispatchProvider> xCommLink(xExternalViewFrame, UNO_QUERY); if (m_xExternalViewController.is()) { @@ -3230,10 +3230,10 @@ void FmXFormShell::CreateExternalView() // collect the dispatchers we will need URL aAddColumnURL; aAddColumnURL.Complete = FMURL_GRIDVIEW_ADDCOLUMN; - Reference< ::com::sun::star::frame::XDispatch> xAddColumnDispatch( xCommLink->queryDispatch(aAddColumnURL, OUString(), 0)); + Reference< css::frame::XDispatch> xAddColumnDispatch( xCommLink->queryDispatch(aAddColumnURL, OUString(), 0)); URL aAttachURL; aAttachURL.Complete = FMURL_GRIDVIEW_ATTACHTOFORM; - Reference< ::com::sun::star::frame::XDispatch> xAttachDispatch( xCommLink->queryDispatch(aAttachURL, OUString(), 0)); + Reference< css::frame::XDispatch> xAttachDispatch( xCommLink->queryDispatch(aAttachURL, OUString(), 0)); if (xAddColumnDispatch.is() && xAttachDispatch.is()) { @@ -3539,7 +3539,7 @@ void FmXFormShell::implAdjustConfigCache() } -void FmXFormShell::Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) +void FmXFormShell::Notify( const css::uno::Sequence< OUString >& _rPropertyNames) { if ( impl_checkDisposed() ) return; diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 5361cf735a32..aae9551b4262 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -88,10 +88,10 @@ void FmSearchThread::onTerminated() // SMART_UNO_IMPLEMENTATION(FmRecordCountListener, UsrObject); -FmRecordCountListener::FmRecordCountListener(const Reference< ::com::sun::star::sdbc::XResultSet > & dbcCursor) +FmRecordCountListener::FmRecordCountListener(const Reference< css::sdbc::XResultSet > & dbcCursor) { - m_xListening = Reference< ::com::sun::star::beans::XPropertySet > (dbcCursor, UNO_QUERY); + m_xListening = Reference< css::beans::XPropertySet > (dbcCursor, UNO_QUERY); if (!m_xListening.is()) return; @@ -102,7 +102,7 @@ FmRecordCountListener::FmRecordCountListener(const Reference< ::com::sun::star:: return; } - m_xListening->addPropertyChangeListener(FM_PROP_ROWCOUNT, static_cast<com::sun::star::beans::XPropertyChangeListener*>(this)); + m_xListening->addPropertyChangeListener(FM_PROP_ROWCOUNT, static_cast<css::beans::XPropertyChangeListener*>(this)); } @@ -127,12 +127,12 @@ FmRecordCountListener::~FmRecordCountListener() void FmRecordCountListener::DisConnect() { if(m_xListening.is()) - m_xListening->removePropertyChangeListener(FM_PROP_ROWCOUNT, static_cast<com::sun::star::beans::XPropertyChangeListener*>(this)); + m_xListening->removePropertyChangeListener(FM_PROP_ROWCOUNT, static_cast<css::beans::XPropertyChangeListener*>(this)); m_xListening = NULL; } -void SAL_CALL FmRecordCountListener::disposing(const ::com::sun::star::lang::EventObject& /*Source*/) throw( RuntimeException, std::exception ) +void SAL_CALL FmRecordCountListener::disposing(const css::lang::EventObject& /*Source*/) throw( RuntimeException, std::exception ) { DBG_ASSERT(m_xListening.is(), "FmRecordCountListener::disposing should never have been called without a propset !"); DisConnect(); @@ -150,7 +150,7 @@ void FmRecordCountListener::NotifyCurrentCount() } -void FmRecordCountListener::propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& /*evt*/) throw(::com::sun::star::uno::RuntimeException, std::exception) +void FmRecordCountListener::propertyChange(const css::beans::PropertyChangeEvent& /*evt*/) throw(css::uno::RuntimeException, std::exception) { NotifyCurrentCount(); } @@ -158,7 +158,7 @@ void FmRecordCountListener::propertyChange(const ::com::sun::star::beans::Prope // FmSearchEngine - local classes -SimpleTextWrapper::SimpleTextWrapper(const Reference< ::com::sun::star::awt::XTextComponent > & _xText) +SimpleTextWrapper::SimpleTextWrapper(const Reference< css::awt::XTextComponent > & _xText) :ControlTextWrapper(_xText.get()) ,m_xText(_xText) { @@ -172,7 +172,7 @@ OUString SimpleTextWrapper::getCurrentText() const } -ListBoxWrapper::ListBoxWrapper(const Reference< ::com::sun::star::awt::XListBox > & _xBox) +ListBoxWrapper::ListBoxWrapper(const Reference< css::awt::XListBox > & _xBox) :ControlTextWrapper(_xBox.get()) ,m_xBox(_xBox) { @@ -186,7 +186,7 @@ OUString ListBoxWrapper::getCurrentText() const } -CheckBoxWrapper::CheckBoxWrapper(const Reference< ::com::sun::star::awt::XCheckBox > & _xBox) +CheckBoxWrapper::CheckBoxWrapper(const Reference< css::awt::XCheckBox > & _xBox) :ControlTextWrapper(_xBox.get()) ,m_xBox(_xBox) { @@ -233,7 +233,7 @@ bool FmSearchEngine::MoveCursor() else m_xSearchCursor.previous(); } - catch(::com::sun::star::sdbc::SQLException const& e) + catch(css::sdbc::SQLException const& e) { #if OSL_DEBUG_LEVEL > 0 OStringBuffer sDebugMessage("FmSearchEngine::MoveCursor : catched a DatabaseException ("); @@ -295,7 +295,7 @@ bool FmSearchEngine::MoveField(sal_Int32& nPos, FieldCollection::iterator& iter, } -void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star::container::XIndexAccess > & xAllFields, sal_Int32 nField) +void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< css::container::XIndexAccess > & xAllFields, sal_Int32 nField) { DBG_ASSERT( xAllFields.is() && ( nField >= 0 ) && ( nField < xAllFields->getCount() ), "FmSearchEngine::BuildAndInsertFieldInfo: invalid field descriptor!" ); @@ -306,19 +306,19 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star:: // von dem weiss ich jetzt, dass es den DatabaseRecord-Service unterstuetzt (hoffe ich) // fuer den FormatKey und den Typ brauche ich das PropertySet - Reference< ::com::sun::star::beans::XPropertySet > xProperties(xCurrentField, UNO_QUERY); + Reference< css::beans::XPropertySet > xProperties(xCurrentField, UNO_QUERY); // die FieldInfo dazu aufbauen FieldInfo fiCurrent; - fiCurrent.xContents = Reference< ::com::sun::star::sdb::XColumn > (xCurrentField, UNO_QUERY); + fiCurrent.xContents = Reference< css::sdb::XColumn > (xCurrentField, UNO_QUERY); fiCurrent.nFormatKey = ::comphelper::getINT32(xProperties->getPropertyValue(FM_PROP_FORMATKEY)); fiCurrent.bDoubleHandling = false; if (m_xFormatSupplier.is()) { - Reference< ::com::sun::star::util::XNumberFormats > xNumberFormats(m_xFormatSupplier->getNumberFormats()); + Reference< css::util::XNumberFormats > xNumberFormats(m_xFormatSupplier->getNumberFormats()); - sal_Int16 nFormatType = ::comphelper::getNumberFormatType(xNumberFormats, fiCurrent.nFormatKey) & ~((sal_Int16)::com::sun::star::util::NumberFormat::DEFINED); - fiCurrent.bDoubleHandling = (nFormatType != ::com::sun::star::util::NumberFormat::TEXT); + sal_Int16 nFormatType = ::comphelper::getNumberFormatType(xNumberFormats, fiCurrent.nFormatKey) & ~((sal_Int16)css::util::NumberFormat::DEFINED); + fiCurrent.bDoubleHandling = (nFormatType != css::util::NumberFormat::TEXT); } // und merken @@ -383,7 +383,7 @@ OUString FmSearchEngine::FormatField(sal_Int32 nWhich) if (m_nCurrentFieldIndex != -1) { DBG_ASSERT((nWhich == 0) || (nWhich == m_nCurrentFieldIndex), "FmSearchEngine::FormatField : Parameter nWhich ist ungueltig"); - // ich bin im single-field-modus, da ist auch die richtige Feld-Nummer erlaubt, obwohl dann der richtige ::com::sun::star::sdbcx::Index + // ich bin im single-field-modus, da ist auch die richtige Feld-Nummer erlaubt, obwohl dann der richtige css::sdbcx::Index // fuer meinen Array-Zugriff natuerlich 0 ist nWhich = 0; } @@ -693,8 +693,8 @@ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext, ,m_nTransliterationFlags(0) { - m_xFormatter = Reference< ::com::sun::star::util::XNumberFormatter >( - ::com::sun::star::util::NumberFormatter::create( ::comphelper::getProcessComponentContext() ), + m_xFormatter = Reference< css::util::XNumberFormatter >( + css::util::NumberFormatter::create( ::comphelper::getProcessComponentContext() ), UNO_QUERY_THROW); m_xFormatter->attachNumberFormatsSupplier(m_xFormatSupplier); @@ -795,21 +795,21 @@ void FmSearchEngine::fillControlTexts(const InterfaceArray& arrFields) xCurrent = arrFields.at(i); DBG_ASSERT(xCurrent.is(), "FmSearchEngine::fillControlTexts : invalid field interface !"); // check which type of control this is - Reference< ::com::sun::star::awt::XTextComponent > xAsText(xCurrent, UNO_QUERY); + Reference< css::awt::XTextComponent > xAsText(xCurrent, UNO_QUERY); if (xAsText.is()) { m_aControlTexts.insert(m_aControlTexts.end(), new SimpleTextWrapper(xAsText)); continue; } - Reference< ::com::sun::star::awt::XListBox > xAsListBox(xCurrent, UNO_QUERY); + Reference< css::awt::XListBox > xAsListBox(xCurrent, UNO_QUERY); if (xAsListBox.is()) { m_aControlTexts.insert(m_aControlTexts.end(), new ListBoxWrapper(xAsListBox)); continue; } - Reference< ::com::sun::star::awt::XCheckBox > xAsCheckBox(xCurrent, UNO_QUERY); + Reference< css::awt::XCheckBox > xAsCheckBox(xCurrent, UNO_QUERY); DBG_ASSERT(xAsCheckBox.is(), "FmSearchEngine::fillControlTexts : invalid field interface (no supported type) !"); // we don't have any more options ... m_aControlTexts.insert(m_aControlTexts.end(), new CheckBoxWrapper(xAsCheckBox)); @@ -854,14 +854,14 @@ void FmSearchEngine::Init(const OUString& sVisibleFields) // now that we have this information, we need a collator which is able to case (in)sentively compare strings m_aStringCompare.loadDefaultCollator( SvtSysLocale().GetLanguageTag().getLocale(), - bCaseSensitiveIdentifiers ? 0 : ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE ); + bCaseSensitiveIdentifiers ? 0 : css::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE ); try { // der Cursor kann mir einen Record (als PropertySet) liefern, dieser unterstuetzt den DatabaseRecord-Service - Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); + Reference< css::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); DBG_ASSERT(xSupplyCols.is(), "FmSearchEngine::Init : invalid cursor (no columns supplier) !"); - Reference< ::com::sun::star::container::XNameAccess > xAllFieldNames = xSupplyCols->getColumns(); + Reference< css::container::XNameAccess > xAllFieldNames = xSupplyCols->getColumns(); Sequence< OUString > seqFieldNames = xAllFieldNames->getElementNames(); OUString* pFieldNames = seqFieldNames.getArray(); @@ -1132,7 +1132,7 @@ void FmSearchEngine::CancelSearch() } -bool FmSearchEngine::SwitchToContext(const Reference< ::com::sun::star::sdbc::XResultSet > & xCursor, const OUString& sVisibleFields, const InterfaceArray& arrFields, +bool FmSearchEngine::SwitchToContext(const Reference< css::sdbc::XResultSet > & xCursor, const OUString& sVisibleFields, const InterfaceArray& arrFields, sal_Int32 nFieldIndex) { DBG_ASSERT(!m_bSearchingCurrently, "FmSearchEngine::SwitchToContext : please do not call while I'm searching !"); @@ -1242,7 +1242,7 @@ void FmSearchEngine::RebuildUsedFields(sal_Int32 nFieldIndex, bool bForce) { if (!bForce && (nFieldIndex == m_nCurrentFieldIndex)) return; - // (da ich keinen Wechsel des Iterators von aussen zulasse, heisst selber ::com::sun::star::sdbcx::Index auch immer selbe Spalte, also habe ich nix zu tun) + // (da ich keinen Wechsel des Iterators von aussen zulasse, heisst selber css::sdbcx::Index auch immer selbe Spalte, also habe ich nix zu tun) DBG_ASSERT((nFieldIndex == -1) || ((nFieldIndex >= 0) && @@ -1252,21 +1252,21 @@ void FmSearchEngine::RebuildUsedFields(sal_Int32 nFieldIndex, bool bForce) m_arrUsedFields.clear(); if (nFieldIndex == -1) { - Reference< ::com::sun::star::container::XIndexAccess > xFields; + Reference< css::container::XIndexAccess > xFields; for (size_t i=0; i<m_arrFieldMapping.size(); ++i) { - Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); + Reference< css::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); DBG_ASSERT(xSupplyCols.is(), "FmSearchEngine::RebuildUsedFields : invalid cursor (no columns supplier) !"); - xFields = Reference< ::com::sun::star::container::XIndexAccess > (xSupplyCols->getColumns(), UNO_QUERY); + xFields = Reference< css::container::XIndexAccess > (xSupplyCols->getColumns(), UNO_QUERY); BuildAndInsertFieldInfo(xFields, m_arrFieldMapping[i]); } } else { - Reference< ::com::sun::star::container::XIndexAccess > xFields; - Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); + Reference< css::container::XIndexAccess > xFields; + Reference< css::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); DBG_ASSERT(xSupplyCols.is(), "FmSearchEngine::RebuildUsedFields : invalid cursor (no columns supplier) !"); - xFields = Reference< ::com::sun::star::container::XIndexAccess > (xSupplyCols->getColumns(), UNO_QUERY); + xFields = Reference< css::container::XIndexAccess > (xSupplyCols->getColumns(), UNO_QUERY); BuildAndInsertFieldInfo(xFields, m_arrFieldMapping[static_cast< size_t >(nFieldIndex)]); } diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index e8530ebf01cb..280d0ac3ba83 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -311,7 +311,7 @@ namespace svx } - void SAL_CALL FmMouseListenerAdapter::mousePressed( const awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL FmMouseListenerAdapter::mousePressed( const awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // is this a request for a context menu? @@ -323,19 +323,19 @@ namespace svx } - void SAL_CALL FmMouseListenerAdapter::mouseReleased( const awt::MouseEvent& /*e*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL FmMouseListenerAdapter::mouseReleased( const awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception) { // not interested in } - void SAL_CALL FmMouseListenerAdapter::mouseEntered( const awt::MouseEvent& /*e*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL FmMouseListenerAdapter::mouseEntered( const awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception) { // not interested in } - void SAL_CALL FmMouseListenerAdapter::mouseExited( const awt::MouseEvent& /*e*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL FmMouseListenerAdapter::mouseExited( const awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception) { // not interested in } @@ -1323,7 +1323,7 @@ namespace svx } - void FmTextControlShell::focusGained( const ::com::sun::star::awt::FocusEvent& _rEvent ) + void FmTextControlShell::focusGained( const css::awt::FocusEvent& _rEvent ) { Reference< XControl > xControl( _rEvent.Source, UNO_QUERY ); @@ -1339,7 +1339,7 @@ namespace svx } - void FmTextControlShell::focusLost( const ::com::sun::star::awt::FocusEvent& _rEvent ) + void FmTextControlShell::focusLost( const css::awt::FocusEvent& _rEvent ) { Reference< XControl > xControl( _rEvent.Source, UNO_QUERY ); diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 5cef4a75c094..646e39e045a4 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -142,25 +142,25 @@ void displayException(const Any& _rExcept, vcl::Window* _pParent) } -void displayException(const ::com::sun::star::sdbc::SQLException& _rExcept, vcl::Window* _pParent) +void displayException(const css::sdbc::SQLException& _rExcept, vcl::Window* _pParent) { displayException(makeAny(_rExcept), _pParent); } -void displayException(const ::com::sun::star::sdb::SQLContext& _rExcept, vcl::Window* _pParent) +void displayException(const css::sdb::SQLContext& _rExcept, vcl::Window* _pParent) { displayException(makeAny(_rExcept), _pParent); } -void displayException(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent, vcl::Window* _pParent) +void displayException(const css::sdb::SQLErrorEvent& _rEvent, vcl::Window* _pParent) { displayException(_rEvent.Reason, _pParent); } -sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAccess>& xCont, const Reference< XInterface >& xElement) +sal_Int32 getElementPos(const Reference< css::container::XIndexAccess>& xCont, const Reference< XInterface >& xElement) { sal_Int32 nIndex = -1; if (!xCont.is()) @@ -194,14 +194,14 @@ sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAcce } -OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& xControlModel) +OUString getLabelName(const Reference< css::beans::XPropertySet>& xControlModel) { if (!xControlModel.is()) return OUString(); if (::comphelper::hasProperty(FM_PROP_CONTROLLABEL, xControlModel)) { - Reference< ::com::sun::star::beans::XPropertySet> xLabelSet; + Reference< css::beans::XPropertySet> xLabelSet; xControlModel->getPropertyValue(FM_PROP_CONTROLLABEL) >>= xLabelSet; if (xLabelSet.is() && ::comphelper::hasProperty(FM_PROP_LABEL, xLabelSet)) { @@ -217,26 +217,26 @@ OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& x // = CursorWrapper -CursorWrapper::CursorWrapper(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxCursor, bool bUseCloned) +CursorWrapper::CursorWrapper(const Reference< css::sdbc::XRowSet>& _rxCursor, bool bUseCloned) { - ImplConstruct(Reference< ::com::sun::star::sdbc::XResultSet>(_rxCursor, UNO_QUERY), bUseCloned); + ImplConstruct(Reference< css::sdbc::XResultSet>(_rxCursor, UNO_QUERY), bUseCloned); } -CursorWrapper::CursorWrapper(const Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, bool bUseCloned) +CursorWrapper::CursorWrapper(const Reference< css::sdbc::XResultSet>& _rxCursor, bool bUseCloned) { ImplConstruct(_rxCursor, bUseCloned); } -void CursorWrapper::ImplConstruct(const Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, bool bUseCloned) +void CursorWrapper::ImplConstruct(const Reference< css::sdbc::XResultSet>& _rxCursor, bool bUseCloned) { if (bUseCloned) { - Reference< ::com::sun::star::sdb::XResultSetAccess> xAccess(_rxCursor, UNO_QUERY); + Reference< css::sdb::XResultSetAccess> xAccess(_rxCursor, UNO_QUERY); try { - m_xMoveOperations = xAccess.is() ? xAccess->createResultSet() : Reference< ::com::sun::star::sdbc::XResultSet>(); + m_xMoveOperations = xAccess.is() ? xAccess->createResultSet() : Reference< css::sdbc::XResultSet>(); } catch(Exception&) { @@ -260,11 +260,11 @@ void CursorWrapper::ImplConstruct(const Reference< ::com::sun::star::sdbc::XResu } -const CursorWrapper& CursorWrapper::operator=(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxCursor) +const CursorWrapper& CursorWrapper::operator=(const Reference< css::sdbc::XRowSet>& _rxCursor) { - m_xMoveOperations = Reference< ::com::sun::star::sdbc::XResultSet>(_rxCursor, UNO_QUERY); - m_xBookmarkOperations = Reference< ::com::sun::star::sdbcx::XRowLocate>(_rxCursor, UNO_QUERY); - m_xColumnsSupplier = Reference< ::com::sun::star::sdbcx::XColumnsSupplier>(_rxCursor, UNO_QUERY); + m_xMoveOperations = Reference< css::sdbc::XResultSet>(_rxCursor, UNO_QUERY); + m_xBookmarkOperations = Reference< css::sdbcx::XRowLocate>(_rxCursor, UNO_QUERY); + m_xColumnsSupplier = Reference< css::sdbcx::XColumnsSupplier>(_rxCursor, UNO_QUERY); if (!m_xMoveOperations.is() || !m_xBookmarkOperations.is() || !m_xColumnsSupplier.is()) { // all or nothing !! m_xMoveOperations = NULL; @@ -300,7 +300,7 @@ void FmXDisposeListener::setAdapter(FmXDisposeMultiplexer* pAdapter) -FmXDisposeMultiplexer::FmXDisposeMultiplexer(FmXDisposeListener* _pListener, const Reference< ::com::sun::star::lang::XComponent>& _rxObject, sal_Int16 _nId) +FmXDisposeMultiplexer::FmXDisposeMultiplexer(FmXDisposeListener* _pListener, const Reference< css::lang::XComponent>& _rxObject, sal_Int16 _nId) :m_xObject(_rxObject) ,m_pListener(_pListener) ,m_nId(_nId) @@ -316,11 +316,11 @@ FmXDisposeMultiplexer::~FmXDisposeMultiplexer() { } -// ::com::sun::star::lang::XEventListener +// css::lang::XEventListener -void FmXDisposeMultiplexer::disposing(const ::com::sun::star::lang::EventObject& _Source) throw( RuntimeException, std::exception ) +void FmXDisposeMultiplexer::disposing(const css::lang::EventObject& _Source) throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::lang::XEventListener> xPreventDelete(this); + Reference< css::lang::XEventListener> xPreventDelete(this); if (m_pListener) { @@ -336,7 +336,7 @@ void FmXDisposeMultiplexer::dispose() { if (m_xObject.is()) { - Reference< ::com::sun::star::lang::XEventListener> xPreventDelete(this); + Reference< css::lang::XEventListener> xPreventDelete(this); m_xObject->removeEventListener(this); m_xObject = NULL; @@ -348,11 +348,11 @@ void FmXDisposeMultiplexer::dispose() -sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServiceInfo>& _rxObject) +sal_Int16 getControlTypeByObject(const Reference< css::lang::XServiceInfo>& _rxObject) { // ask for the persistent service name - Reference< ::com::sun::star::io::XPersistObject> xPersistence(_rxObject, UNO_QUERY); - DBG_ASSERT(xPersistence.is(), "::getControlTypeByObject : argument shold be an ::com::sun::star::io::XPersistObject !"); + Reference< css::io::XPersistObject> xPersistence(_rxObject, UNO_QUERY); + DBG_ASSERT(xPersistence.is(), "::getControlTypeByObject : argument shold be an css::io::XPersistObject !"); if (!xPersistence.is()) return OBJ_FM_CONTROL; @@ -425,10 +425,10 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi bool isRowSetAlive(const Reference< XInterface >& _rxRowSet) { bool bIsAlive = false; - Reference< ::com::sun::star::sdbcx::XColumnsSupplier> xSupplyCols(_rxRowSet, UNO_QUERY); - Reference< ::com::sun::star::container::XIndexAccess> xCols; + Reference< css::sdbcx::XColumnsSupplier> xSupplyCols(_rxRowSet, UNO_QUERY); + Reference< css::container::XIndexAccess> xCols; if (xSupplyCols.is()) - xCols = Reference< ::com::sun::star::container::XIndexAccess>(xSupplyCols->getColumns(), UNO_QUERY); + xCols = Reference< css::container::XIndexAccess>(xSupplyCols->getColumns(), UNO_QUERY); if (xCols.is() && (xCols->getCount() > 0)) bIsAlive = true; diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 88ebcc3fa4b4..b4bc5688af17 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -97,7 +97,7 @@ public: } } - virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) throw( com::sun::star::reflection::InvocationTargetException, RuntimeException, std::exception) override + virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) throw( css::reflection::InvocationTargetException, RuntimeException, std::exception) override { attemptListenerCreation(); if ( m_vbaListener.is() ) @@ -530,7 +530,7 @@ void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( Runtime // XPropertyChangeListener -void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -725,7 +725,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) // XContainerListener -void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -749,7 +749,7 @@ void FmXUndoEnvironment::implSetModified() } -void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -766,7 +766,7 @@ void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) thr } -void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -1217,7 +1217,7 @@ FmUndoModelReplaceAction::~FmUndoModelReplaceAction() -void FmUndoModelReplaceAction::DisposeElement( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xReplaced ) +void FmUndoModelReplaceAction::DisposeElement( const css::uno::Reference< css::awt::XControlModel>& xReplaced ) { Reference< XComponent > xComp(xReplaced, UNO_QUERY); if (xComp.is()) diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 62a6d77c7a61..0422871d55d1 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -434,7 +434,7 @@ SdrObject* FmFormView::CreateFieldControl(const OUString& rFieldDesc) const } -void FmFormView::InsertControlContainer(const Reference< ::com::sun::star::awt::XControlContainer > & xCC) +void FmFormView::InsertControlContainer(const Reference< css::awt::XControlContainer > & xCC) { if( !IsDesignMode() ) { @@ -456,7 +456,7 @@ void FmFormView::InsertControlContainer(const Reference< ::com::sun::star::awt:: } -void FmFormView::RemoveControlContainer(const Reference< ::com::sun::star::awt::XControlContainer > & xCC) +void FmFormView::RemoveControlContainer(const Reference< css::awt::XControlContainer > & xCC) { if( !IsDesignMode() ) { @@ -532,7 +532,7 @@ bool FmFormView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource) { - Reference< ::com::sun::star::awt::XControl> xControl(pImpl->m_xWindow,UNO_QUERY); + Reference< css::awt::XControl> xControl(pImpl->m_xWindow,UNO_QUERY); bool bRet = !xControl.is() || !_xSource.is() || _xSource != xControl->getModel(); if ( bRet ) UnmarkAll(); diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 28c8e47e61ff..4226e170b130 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -97,8 +97,8 @@ using namespace ::connectivity; using namespace ::dbtools; -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - FormController_NewInstance_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB ) +css::uno::Reference< css::uno::XInterface > SAL_CALL + FormController_NewInstance_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxORB ) throw (css::uno::Exception) { return *( new ::svxform::FormController( comphelper::getComponentContext(_rxORB) ) ); @@ -903,7 +903,7 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X } -::sal_Int32 SAL_CALL FormController::getFilterComponents() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +::sal_Int32 SAL_CALL FormController::getFilterComponents() throw( css::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -912,7 +912,7 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X } -::sal_Int32 SAL_CALL FormController::getDisjunctiveTerms() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +::sal_Int32 SAL_CALL FormController::getDisjunctiveTerms() throw( css::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2770,7 +2770,7 @@ void FormController::stopFormListening( const Reference< XPropertySet >& _rxForm } } -// com::sun::star::sdbc::XRowSetListener +// css::sdbc::XRowSetListener void FormController::cursorMoved(const EventObject& /*event*/) throw( RuntimeException, std::exception ) { diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index 3960dab6505e..e90784df970d 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -199,8 +199,8 @@ namespace svxform } -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - LegacyFormController_NewInstance_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB ) +css::uno::Reference< css::uno::XInterface > SAL_CALL + LegacyFormController_NewInstance_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxORB ) throw (css::uno::Exception) { return ::svxform::LegacyFormController::Create( _rxORB ); diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index e6e8b3f72bed..139cfb2f4491 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -162,7 +162,7 @@ namespace svxform } - void OFormComponentObserver::Remove( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) + void OFormComponentObserver::Remove( const css::uno::Reference< css::uno::XInterface >& _rxElement ) { if (IsLocked() || !m_pNavModel) return; diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx index db8bfcbcce0b..0b028a42f456 100644 --- a/svx/source/form/sdbdatacolumn.cxx +++ b/svx/source/form/sdbdatacolumn.cxx @@ -35,11 +35,11 @@ namespace svxform //= DataColumn - a class wrapping an object implementing a sdb::DataColumn service - DataColumn::DataColumn(const Reference< ::com::sun::star::beans::XPropertySet>& _rxIFace) + DataColumn::DataColumn(const Reference< css::beans::XPropertySet>& _rxIFace) { m_xPropertySet = _rxIFace; - m_xColumn = Reference< ::com::sun::star::sdb::XColumn>(_rxIFace, UNO_QUERY); - m_xColumnUpdate = Reference< ::com::sun::star::sdb::XColumnUpdate>(_rxIFace, UNO_QUERY); + m_xColumn = Reference< css::sdb::XColumn>(_rxIFace, UNO_QUERY); + m_xColumnUpdate = Reference< css::sdb::XColumnUpdate>(_rxIFace, UNO_QUERY); if (!m_xPropertySet.is() || !m_xColumn.is()) { diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx index 6f2ced18f938..3d6e58b62235 100644 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -40,8 +40,8 @@ namespace svxform std::shared_ptr< ::connectivity::OSQLParseNode > OSQLParserClient::predicateTree( OUString& _rErrorMessage, const OUString& _rStatement, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField + const css::uno::Reference< css::util::XNumberFormatter >& _rxFormatter, + const css::uno::Reference< css::beans::XPropertySet >& _rxField ) const { return std::shared_ptr< OSQLParseNode >(m_pParser->predicateTree(_rErrorMessage, _rStatement, _rxFormatter, _rxField)); diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index cc3f76b7ed0c..700e0a617536 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -278,9 +278,9 @@ bool FmFieldWin::Close() } -void FmFieldWin::_propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void FmFieldWin::_propertyChanged(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) { - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > xForm(evt.Source, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::form::XForm > xForm(evt.Source, css::uno::UNO_QUERY); UpdateContent(xForm); } @@ -315,7 +315,7 @@ void FmFieldWin::UpdateContent(FmFormShell* pShell) } -void FmFieldWin::UpdateContent(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > & xForm) +void FmFieldWin::UpdateContent(const css::uno::Reference< css::form::XForm > & xForm) { try { @@ -401,7 +401,7 @@ void FmFieldWin::Resize() - // adapt size of ::com::sun::star::form::ListBox + // adapt size of css::form::ListBox Point aLBPos( LISTBOX_BORDER, LISTBOX_BORDER ); Size aLBSize( aOutputSize ); aLBSize.Width() -= (2*LISTBOX_BORDER); |