accessibility/source/extended/textwindowaccessibility.cxx | 116 +++++++------- basctl/source/basicide/baside2.hxx | 6 chart2/source/model/main/FormattedString.hxx | 48 ++--- chart2/source/model/template/ChartTypeTemplate.cxx | 2 chart2/source/model/template/ChartTypeTemplate.hxx | 2 chart2/source/model/template/GL3DBarChartTypeTemplate.cxx | 4 chart2/source/model/template/GL3DBarChartTypeTemplate.hxx | 4 cui/source/options/optaboutconfig.cxx | 2 cui/source/options/optaboutconfig.hxx | 2 cui/uiconfig/ui/aboutconfigdialog.ui | 1 framework/source/services/frame.cxx | 2 framework/source/services/pathsettings.cxx | 6 include/sax/fastattribs.hxx | 4 include/sfx2/sfxbasecontroller.hxx | 2 include/svtools/colorcfg.hxx | 2 include/svx/fmgridif.hxx | 12 - include/svx/fmsrccfg.hxx | 2 sax/source/tools/fastattribs.cxx | 2 sc/inc/document.hxx | 2 sc/source/filter/inc/formulabuffer.hxx | 8 sc/source/ui/app/scdll.cxx | 8 sfx2/source/view/sfxbasecontroller.cxx | 2 sw/inc/dbmgr.hxx | 10 - sw/inc/splargs.hxx | 6 tools/source/fsys/urlobj.cxx | 4 ucb/source/ucp/webdav/webdavdatasupplier.cxx | 2 ucb/source/ucp/webdav/webdavresultset.cxx | 2 uui/source/requeststringresolver.cxx | 36 ++-- uui/source/sslwarndlg.cxx | 4 uui/source/unknownauthdlg.cxx | 6 vcl/source/window/accessibility.cxx | 1 vcl/source/window/stacking.cxx | 1 winaccessibility/source/service/msaaservice_impl.cxx | 4 writerfilter/source/dmapper/GraphicImport.cxx | 2 xmlhelp/source/cxxhelp/provider/contentcaps.cxx | 23 +- 35 files changed, 163 insertions(+), 177 deletions(-)
New commits: commit 65a54a19adcaa2271c5a502a752eb7e6191d08da Author: Thomas Arnhold <[email protected]> Date: Tue May 27 13:42:17 2014 +0200 Export Config: Use ModelessDialog The huge size of this dialog calls for a maximize button... Change-Id: I68706669ac4e10ea9d5cba5526e9f1b0eb3628b6 diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index ff39661..5392ff6 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -130,7 +130,7 @@ Size CuiAboutConfigTabPage::GetOptimalSize() const } CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent/*, const SfxItemSet& rItemSet*/ ) : - ModalDialog( pParent, "AboutConfig", "cui/ui/aboutconfigdialog.ui"), + ModelessDialog( pParent, "AboutConfig", "cui/ui/aboutconfigdialog.ui"), m_pPrefCtrl( get<SvSimpleTableContainer>("preferences") ), m_pResetBtn( get<PushButton>("reset") ), m_pEditBtn( get<PushButton>("edit") ), diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index 6761e3c..ee42492 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -40,7 +40,7 @@ public: //void setBehaviour( bool bNumeric, int nLengthLimit); }; -class CuiAboutConfigTabPage : public ModalDialog +class CuiAboutConfigTabPage : public ModelessDialog { private: SvSimpleTableContainer* m_pPrefCtrl; diff --git a/cui/uiconfig/ui/aboutconfigdialog.ui b/cui/uiconfig/ui/aboutconfigdialog.ui index 495b0eab..9bd4bbd 100644 --- a/cui/uiconfig/ui/aboutconfigdialog.ui +++ b/cui/uiconfig/ui/aboutconfigdialog.ui @@ -5,6 +5,7 @@ <object class="GtkDialog" id="AboutConfig"> <property name="can_focus">False</property> <property name="border_width">5</property> + <property name="title" translatable="yes">Expert Configuration</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> commit bab0c4fc0c8b1213869f42a5ed3029f901323828 Author: Thomas Arnhold <[email protected]> Date: Tue May 27 11:47:06 2014 +0200 bin obsolete CLOOK comments Change-Id: I34f37587284893927463e214f0d7d1c3e914c7b2 diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index e1aabf4..259d119 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -2094,7 +2094,7 @@ public: void SetCalcConfig( const ScCalcConfig& rConfig ); const ScCalcConfig& GetCalcConfig() const; -private: // CLOOK-Impl-methods +private: /** * Use this class as a locale variable to merge number formatter from diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 9f9f839..7436253 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -46,14 +46,6 @@ #include "sc.hrc" #include "cfgids.hxx" -//! Here used to be an old German comment: "die Registrierung wird -//! wegen CLOOKs in ein eigenes File wandern muessen..." which refers -//! to the infamous CLOOK (Compiler Limit: Out of Keys) problem -//! (http://msdn.microsoft.com/en-us/library/3d859kh1(v=vs.71).aspx , -//! which has not been relevant for many years. Presumably that is -//! supposed to explain some odd arrangement of source code, or -//! something. Or maybe that comment is completely irrelevant. - #include "docsh.hxx" #include "tabvwsh.hxx" #include "prevwsh.hxx" commit dd4035568a4dd5d68318579fb46aae8b8182a0b8 Author: Thomas Arnhold <[email protected]> Date: Tue May 27 11:03:10 2014 +0200 remove external header guards Change-Id: I847e5e3652517d0c11eb2cf3e9625ed649595bc5 diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx index d501931..1114f4d 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx @@ -24,9 +24,7 @@ #include "webdavdatasupplier.hxx" #include "webdavcontent.hxx" #include "ContentProperties.hxx" -#ifndef _WEBDAV_SESSION_HXX #include "DAVSession.hxx" -#endif #include "SerfUri.hxx" using namespace com::sun::star; diff --git a/ucb/source/ucp/webdav/webdavresultset.cxx b/ucb/source/ucp/webdav/webdavresultset.cxx index fc14180..42b5874 100644 --- a/ucb/source/ucp/webdav/webdavresultset.cxx +++ b/ucb/source/ucp/webdav/webdavresultset.cxx @@ -26,9 +26,7 @@ *************************************************************************/ #include "webdavresultset.hxx" -#ifndef _WEBDAV_SESSION_HXX #include "DAVSession.hxx" -#endif #include "comphelper/processfactory.hxx" commit 92b447876d1d9c10fba17e5f527332fe6ec07fb9 Author: Thomas Arnhold <[email protected]> Date: Tue May 27 08:11:10 2014 +0200 css already means ::com::sun::star Change-Id: I48d7b746d7cc49246743c62480b0d225d2519342 diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 58ed5fc..7d80013 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -982,8 +982,8 @@ Document::retrieveCharacterBounds(Paragraph const * pParagraph, struct IndexCompare { - const ::css::beans::PropertyValue* pValues; - IndexCompare( const ::css::beans::PropertyValue* pVals ) : pValues(pVals) {} + const css::beans::PropertyValue* pValues; + IndexCompare( const css::beans::PropertyValue* pVals ) : pValues(pVals) {} bool operator() ( const sal_Int32& a, const sal_Int32& b ) const { return pValues[a].Name < pValues[b].Name; @@ -1000,13 +1000,13 @@ Document::retrieveCharacterAttributes( Font aFont = m_rEngine.GetFont(); const sal_Int32 AttributeCount = 9; sal_Int32 i = 0; - ::css::uno::Sequence< ::css::beans::PropertyValue > aAttribs( AttributeCount ); + css::uno::Sequence< css::beans::PropertyValue > aAttribs( AttributeCount ); //character background color aAttribs[i].Name = "CharBackColor"; aAttribs[i].Handle = -1; aAttribs[i].Value = mapFontColor( aFont.GetFillColor() ); - aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE; + aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE; i++; //character color @@ -1014,65 +1014,65 @@ Document::retrieveCharacterAttributes( aAttribs[i].Handle = -1; //aAttribs[i].Value = mapFontColor( aFont.GetColor() ); aAttribs[i].Value = mapFontColor( m_rEngine.GetTextColor() ); - aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE; + aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE; i++; //character font name aAttribs[i].Name = "CharFontName"; aAttribs[i].Handle = -1; - aAttribs[i].Value = ::css::uno::makeAny( (::rtl::OUString)aFont.GetName() ); - aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE; + aAttribs[i].Value = css::uno::makeAny( (::rtl::OUString)aFont.GetName() ); + aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE; i++; //character height aAttribs[i].Name = "CharHeight"; aAttribs[i].Handle = -1; - aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)aFont.GetHeight() ); - aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE; + aAttribs[i].Value = css::uno::makeAny( (sal_Int16)aFont.GetHeight() ); + aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE; i++; //character posture aAttribs[i].Name = "CharPosture"; aAttribs[i].Handle = -1; - aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)aFont.GetItalic() ); - aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE; + aAttribs[i].Value = css::uno::makeAny( (sal_Int16)aFont.GetItalic() ); + aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE; i++; //character relief /* aAttribs[i].Name = "CharRelief"; aAttribs[i].Handle = -1; - aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)aFont.GetRelief() ); - aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE; + aAttribs[i].Value = css::uno::makeAny( (sal_Int16)aFont.GetRelief() ); + aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE; i++; */ //character strikeout aAttribs[i].Name = "CharStrikeout"; aAttribs[i].Handle = -1; - aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)aFont.GetStrikeout() ); - aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE; + aAttribs[i].Value = css::uno::makeAny( (sal_Int16)aFont.GetStrikeout() ); + aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE; i++; //character underline aAttribs[i].Name = "CharUnderline"; aAttribs[i].Handle = -1; - aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)aFont.GetUnderline() ); - aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE; + aAttribs[i].Value = css::uno::makeAny( (sal_Int16)aFont.GetUnderline() ); + aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE; i++; //character weight aAttribs[i].Name = "CharWeight"; aAttribs[i].Handle = -1; - aAttribs[i].Value = ::css::uno::makeAny( (float)aFont.GetWeight() ); - aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE; + aAttribs[i].Value = css::uno::makeAny( (float)aFont.GetWeight() ); + aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE; i++; //character alignment aAttribs[i].Name = "ParaAdjust"; aAttribs[i].Handle = -1; - aAttribs[i].Value = ::css::uno::makeAny( (sal_Int16)m_rEngine.GetTextAlign() ); - aAttribs[i].State = ::css::beans::PropertyState_DIRECT_VALUE; + aAttribs[i].Value = css::uno::makeAny( (sal_Int16)m_rEngine.GetTextAlign() ); + aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE; i++; ::osl::MutexGuard aInternalGuard(GetMutex()); @@ -1101,24 +1101,24 @@ Document::retrieveCharacterAttributes( aCharAttrSeq[ aRunIter->first ] = aRunIter->second; } - ::css::beans::PropertyValue* pValues = aAttribs.getArray(); + css::beans::PropertyValue* pValues = aAttribs.getArray(); for (i = 0; i < AttributeCount; i++,pValues++) { aCharAttrSeq[ pValues->Name ] = *pValues; } - ::css::uno::Sequence< ::css::beans::PropertyValue > aRes = convertHashMapToSequence( aCharAttrSeq ); + css::uno::Sequence< css::beans::PropertyValue > aRes = convertHashMapToSequence( aCharAttrSeq ); // sort the attributes sal_Int32 nLength = aRes.getLength(); - const ::css::beans::PropertyValue* pPairs = aRes.getConstArray(); + const css::beans::PropertyValue* pPairs = aRes.getConstArray(); sal_Int32* pIndices = new sal_Int32[nLength]; for( i = 0; i < nLength; i++ ) pIndices[i] = i; std::sort( &pIndices[0], &pIndices[nLength], IndexCompare(pPairs) ); // create sorted sequences according to index array - ::css::uno::Sequence< ::css::beans::PropertyValue > aNewValues( nLength ); - ::css::beans::PropertyValue* pNewValues = aNewValues.getArray(); + css::uno::Sequence< css::beans::PropertyValue > aNewValues( nLength ); + css::beans::PropertyValue* pNewValues = aNewValues.getArray(); for( i = 0; i < nLength; i++ ) { pNewValues[i] = pPairs[pIndices[i]]; @@ -1531,16 +1531,16 @@ void Document::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet { VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet ); if (!m_rView.IsReadOnly()) - rStateSet.AddState( ::css::accessibility::AccessibleStateType::EDITABLE ); + rStateSet.AddState( css::accessibility::AccessibleStateType::EDITABLE ); } void Document::FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) { - if( getAccessibleParent()->getAccessibleContext()->getAccessibleRole() == ::css::accessibility::AccessibleRole::SCROLL_PANE ) + if( getAccessibleParent()->getAccessibleContext()->getAccessibleRole() == css::accessibility::AccessibleRole::SCROLL_PANE ) { - ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > aSequence(1); + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > aSequence(1); aSequence[0] = getAccessibleParent(); - rRelationSet.AddRelation( ::css::accessibility::AccessibleRelation( ::css::accessibility::AccessibleRelationType::MEMBER_OF, aSequence ) ); + rRelationSet.AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType::MEMBER_OF, aSequence ) ); } else { @@ -1700,11 +1700,11 @@ IMPL_LINK(Document, WindowEventHandler, ::VclSimpleEvent *, pEvent) if (xParagraph.is()) { xParagraph->notifyEvent( - ::css::accessibility::AccessibleEventId:: + css::accessibility::AccessibleEventId:: STATE_CHANGED, - ::css::uno::Any(), - ::css::uno::makeAny( - ::css::accessibility::AccessibleStateType:: + css::uno::Any(), + css::uno::makeAny( + css::accessibility::AccessibleStateType:: FOCUSED)); } } @@ -1736,12 +1736,12 @@ IMPL_LINK(Document, WindowEventHandler, ::VclSimpleEvent *, pEvent) ::rtl::Reference< Paragraph > xParagraph(getParagraph(m_aTemp)); if (xParagraph.is()) xParagraph->notifyEvent( - ::css::accessibility::AccessibleEventId:: + css::accessibility::AccessibleEventId:: STATE_CHANGED, - ::css::uno::makeAny( - ::css::accessibility::AccessibleStateType:: + css::uno::makeAny( + css::accessibility::AccessibleStateType:: FOCUSED), - ::css::uno::Any()); + css::uno::Any()); } /* @@ -2235,7 +2235,7 @@ void Document::sendEvent(::sal_Int32 start, ::sal_Int32 end, ::sal_Int16 nEventI if (xParagraph.is()) xParagraph->notifyEvent( nEventId, - ::css::uno::Any(), ::css::uno::Any()); + css::uno::Any(), css::uno::Any()); ++aIt; } } @@ -2325,8 +2325,8 @@ void Document::handleSelectionChangeNotification() //old has no selection but new has selection nMin = ::std::min(nNewFirstPara, nNewLastPara); nMax = ::std::max(nNewFirstPara, nNewLastPara); - sendEvent(nMin, nMax, ::css::accessibility::AccessibleEventId::SELECTION_CHANGED); - sendEvent(nMin, nMax, ::css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); + sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::SELECTION_CHANGED); + sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); } break; case 3: @@ -2334,64 +2334,64 @@ void Document::handleSelectionChangeNotification() //old has selection but new has no selection. nMin = ::std::min(m_nSelectionFirstPara, m_nSelectionLastPara); nMax = ::std::max(m_nSelectionFirstPara, m_nSelectionLastPara); - sendEvent(nMin, nMax, ::css::accessibility::AccessibleEventId::SELECTION_CHANGED); - sendEvent(nMin, nMax, ::css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); + sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::SELECTION_CHANGED); + sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); } break; case 4: { //Send text_selection_change event on Nep - sendEvent(nNewLastPara, nNewLastPara, ::css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); + sendEvent(nNewLastPara, nNewLastPara, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); } break; case 5: { // 4, 1 -> 4, 7 - sendEvent(m_nSelectionLastPara, m_nSelectionFirstPara-1, ::css::accessibility::AccessibleEventId::SELECTION_CHANGED); - sendEvent(nNewFirstPara+1, nNewLastPara, ::css::accessibility::AccessibleEventId::SELECTION_CHANGED); + sendEvent(m_nSelectionLastPara, m_nSelectionFirstPara-1, css::accessibility::AccessibleEventId::SELECTION_CHANGED); + sendEvent(nNewFirstPara+1, nNewLastPara, css::accessibility::AccessibleEventId::SELECTION_CHANGED); - sendEvent(m_nSelectionLastPara, nNewLastPara, ::css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); + sendEvent(m_nSelectionLastPara, nNewLastPara, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); } break; case 6: { // 1, 2 -> 1, 4; 4,4->4,5; - sendEvent(m_nSelectionLastPara+1, nNewLastPara, ::css::accessibility::AccessibleEventId::SELECTION_CHANGED); + sendEvent(m_nSelectionLastPara+1, nNewLastPara, css::accessibility::AccessibleEventId::SELECTION_CHANGED); - sendEvent(m_nSelectionLastPara, nNewLastPara, ::css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); + sendEvent(m_nSelectionLastPara, nNewLastPara, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); } break; case 7: { // 4,1 -> 4,3, - sendEvent(m_nSelectionLastPara +1, nNewLastPara , ::css::accessibility::AccessibleEventId::SELECTION_CHANGED); + sendEvent(m_nSelectionLastPara +1, nNewLastPara , css::accessibility::AccessibleEventId::SELECTION_CHANGED); - sendEvent(m_nSelectionLastPara, nNewLastPara, ::css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); + sendEvent(m_nSelectionLastPara, nNewLastPara, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); } break; case 8: { // 4,7 ->4,5; - sendEvent(nNewLastPara + 1, m_nSelectionLastPara, ::css::accessibility::AccessibleEventId::SELECTION_CHANGED); + sendEvent(nNewLastPara + 1, m_nSelectionLastPara, css::accessibility::AccessibleEventId::SELECTION_CHANGED); - sendEvent(nNewLastPara, m_nSelectionLastPara, ::css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); + sendEvent(nNewLastPara, m_nSelectionLastPara, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); } break; case 9: { // 3,2 -> 3,1; 4,4->4,3 - sendEvent(nNewLastPara, m_nSelectionLastPara - 1, ::css::accessibility::AccessibleEventId::SELECTION_CHANGED); + sendEvent(nNewLastPara, m_nSelectionLastPara - 1, css::accessibility::AccessibleEventId::SELECTION_CHANGED); - sendEvent(nNewLastPara, m_nSelectionLastPara, ::css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); + sendEvent(nNewLastPara, m_nSelectionLastPara, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); } break; case 10: { // 4,7 -> 4,1 - sendEvent(m_nSelectionFirstPara + 1, m_nSelectionLastPara, ::css::accessibility::AccessibleEventId::SELECTION_CHANGED); - sendEvent(nNewLastPara, nNewFirstPara - 1, ::css::accessibility::AccessibleEventId::SELECTION_CHANGED); + sendEvent(m_nSelectionFirstPara + 1, m_nSelectionLastPara, css::accessibility::AccessibleEventId::SELECTION_CHANGED); + sendEvent(nNewLastPara, nNewFirstPara - 1, css::accessibility::AccessibleEventId::SELECTION_CHANGED); - sendEvent(nNewLastPara, m_nSelectionLastPara, ::css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); + sendEvent(nNewLastPara, m_nSelectionLastPara, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); } break; default: diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 41f1af8..aae2ae6 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -539,9 +539,9 @@ public: class UnoTypeCodeCompletetor { private: - ::css::uno::Reference< ::css::lang::XMultiServiceFactory > xFactory; - ::css::uno::Reference< ::css::reflection::XIdlReflection > xRefl; - ::css::uno::Reference< ::css::reflection::XIdlClass > xClass; + css::uno::Reference< css::lang::XMultiServiceFactory > xFactory; + css::uno::Reference< css::reflection::XIdlReflection > xRefl; + css::uno::Reference< css::reflection::XIdlClass > xClass; bool bCanComplete; bool CheckField( const OUString& sFieldName ); diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index ade1c38..20adb06 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -36,11 +36,11 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper5< - ::css::chart2::XFormattedString2, - ::css::lang::XServiceInfo, - ::css::util::XCloneable, - ::css::util::XModifyBroadcaster, - ::css::util::XModifyListener > + css::chart2::XFormattedString2, + css::lang::XServiceInfo, + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::util::XModifyListener > FormattedString_Base; } @@ -50,8 +50,8 @@ class FormattedString : public ::property::OPropertySet { public: - FormattedString( ::css::uno::Reference< - ::css::uno::XComponentContext > const & xContext ); + FormattedString( css::uno::Reference< + css::uno::XComponentContext > const & xContext ); virtual ~FormattedString(); /// declare XServiceInfo methods @@ -82,43 +82,43 @@ protected: // ____ XFormattedString ____ virtual OUString SAL_CALL getString() - throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setString( const OUString& String ) - throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual ::css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::css::beans::UnknownPropertyException) SAL_OVERRIDE; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const + throw(css::beans::UnknownPropertyException) SAL_OVERRIDE; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ - virtual ::css::uno::Reference< ::css::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ - virtual ::css::uno::Reference< ::css::util::XCloneable > SAL_CALL createClone() - throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const ::css::uno::Reference< ::css::util::XModifyListener >& aListener ) - throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( - const ::css::uno::Reference< ::css::util::XModifyListener >& aListener ) - throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const ::css::lang::EventObject& aEvent ) - throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::lang::EventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const ::css::lang::EventObject& Source ) - throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() SAL_OVERRIDE; @@ -129,7 +129,7 @@ protected: private: OUString m_aString; - ::css::uno::Reference< ::css::util::XModifyListener > m_xModifyEventForwarder; + css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; } // namespace chart diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index e1296cf..1940305 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -179,7 +179,7 @@ uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource } sal_Bool SAL_CALL ChartTypeTemplate::supportsCategories() - throw (::css::uno::RuntimeException, ::std::exception) + throw (css::uno::RuntimeException, ::std::exception) { return sal_True; } diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index b373ac2..39f3e0c 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -92,7 +92,7 @@ protected: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// denotes if the chart needs categories at the first scale virtual sal_Bool SAL_CALL supportsCategories() - throw (::css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE; virtual void SAL_CALL changeDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx index 2239997..4440db5 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx @@ -148,7 +148,7 @@ sal_Bool SAL_CALL GL3DBarChartTypeTemplate::matchesTemplate( uno::Reference<chart2::XChartType> GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence<uno::Reference<chart2::XChartType> >& /*xOldChartTypes*/ ) - throw (::css::uno::RuntimeException, ::std::exception) + throw (css::uno::RuntimeException, ::std::exception) { uno::Reference<chart2::XChartType> xResult; @@ -180,7 +180,7 @@ GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence<uno::Ref } sal_Bool GL3DBarChartTypeTemplate::supportsCategories() - throw (::css::uno::RuntimeException, ::std::exception) + throw (css::uno::RuntimeException, ::std::exception) { return false; } diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx index f295753..ce81771 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx @@ -45,10 +45,10 @@ public: virtual css::uno::Reference<css::chart2::XChartType> SAL_CALL getChartTypeForNewSeries( const css::uno::Sequence<css::uno::Reference<css::chart2::XChartType> >& xOldChartTypes ) - throw (::css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsCategories() - throw (::css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE; // OPropertySet virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index a091e6d..4210bd0 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -404,7 +404,7 @@ private: bool m_bSelfClose; /// in case of CloseVetoException on method close() wqs thrown by ourself - we must close ourself later if no internal processes are running bool m_bIsHidden; /// indicates, if this frame is used in hidden mode or not static css::uno::WeakReference< css::frame::XFrame2 > m_xCloserFrame; /// holds the only frame, which must show the special closer menu item (can be NULL!) - css::uno::Reference< ::css::frame::XLayoutManager2 > m_xLayoutManager; /// is used to layout the child windows of the frame. + css::uno::Reference< css::frame::XLayoutManager2 > m_xLayoutManager; /// is used to layout the child windows of the frame. css::uno::Reference< css::frame::XDispatchInformationProvider > m_xDispatchInfoHelper; css::uno::Reference< css::frame::XTitle > m_xTitleHelper; diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 7639388..9b9f935 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -206,14 +206,14 @@ public: } // XInterface - virtual ::css::uno::Any SAL_CALL queryInterface( const ::css::uno::Type& type) throw ( ::css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakObject::release(); } // XTypeProvider - virtual ::css::uno::Sequence< ::css::uno::Type > SAL_CALL getTypes( ) throw(::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::util::XChangesListener virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -447,7 +447,7 @@ private: // warning: by âvirtual void {anonymous}::PathSettings::getFastPropertyValue(com::sun::star::uno::Any&, sal_Int32) constâ [-Woverloaded-virtual] using cppu::OPropertySetHelper::getFastPropertyValue; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** factory methods to guarantee right (but on demand) initialized members ... */ css::uno::Reference< css::util::XStringSubstitution > fa_getSubstitution(); diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx index 7108591..4724b7e 100644 --- a/include/sax/fastattribs.hxx +++ b/include/sax/fastattribs.hxx @@ -61,11 +61,11 @@ class SAX_DLLPUBLIC FastTokenHandlerBase class SAX_DLLPUBLIC FastTokenLookup { static const int mnUtf8BufferSize = 128; - ::css::uno::Sequence< sal_Int8 > maUtf8Buffer; + css::uno::Sequence< sal_Int8 > maUtf8Buffer; public: FastTokenLookup(); sal_Int32 getTokenFromChars( - const ::css::uno::Reference< ::css::xml::sax::XFastTokenHandler > &mxTokenHandler, + const css::uno::Reference< css::xml::sax::XFastTokenHandler > &mxTokenHandler, FastTokenHandlerBase *pTokenHandler, const char *pStr, size_t nLength = 0 ); }; diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx index a81568f..0f77a44 100644 --- a/include/sfx2/sfxbasecontroller.hxx +++ b/include/sfx2/sfxbasecontroller.hxx @@ -169,7 +169,7 @@ public: virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::lang::XInitialization - virtual void SAL_CALL initialize( const ::css::uno::Sequence< ::css::uno::Any >& aArguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now; // either the _Impl name should vanish or there should be an "official" API diff --git a/include/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx index 00f8293..d373d6a 100644 --- a/include/svtools/colorcfg.hxx +++ b/include/svtools/colorcfg.hxx @@ -114,7 +114,7 @@ public: EditableColorConfig(); ~EditableColorConfig(); - ::css::uno::Sequence< OUString > GetSchemeNames() const; + css::uno::Sequence< OUString > GetSchemeNames() const; void DeleteScheme(const OUString& rScheme ); void AddScheme(const OUString& rScheme ); bool LoadScheme(const OUString& rScheme ); diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 1f2b2c5..4d5fd54 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -341,8 +341,8 @@ class FmGridControl; class SVX_DLLPUBLIC FmXGridPeer :public VCLXWindow ,public FmXGridPeer_BASE { - ::css::uno::Reference< ::css::container::XIndexContainer > m_xColumns; - ::css::uno::Reference< ::css::sdbc::XRowSet > m_xCursor; + css::uno::Reference< css::container::XIndexContainer > m_xColumns; + css::uno::Reference< css::sdbc::XRowSet > m_xCursor; ::cppu::OInterfaceContainerHelper m_aModifyListeners, m_aUpdateListeners, m_aContainerListeners, @@ -352,13 +352,13 @@ class SVX_DLLPUBLIC FmXGridPeer :public VCLXWindow OUString m_aMode; sal_Int32 m_nCursorListening; - ::css::uno::Reference< ::css::frame::XDispatchProviderInterceptor > m_xFirstDispatchInterceptor; + css::uno::Reference< css::frame::XDispatchProviderInterceptor > m_xFirstDispatchInterceptor; bool m_bInterceptingDispatch; bool* m_pStateCache; // one bool for each supported url - ::css::uno::Reference< ::css::frame::XDispatch > * m_pDispatchers; + css::uno::Reference< css::frame::XDispatch > * m_pDispatchers; // one dispatcher for each supported url // (I would like to have a vector here but including the stl in an exported file seems // very risky to me ....) @@ -368,11 +368,11 @@ class SVX_DLLPUBLIC FmXGridPeer :public VCLXWindow GridListenerDelegator* m_pGridListener; protected: - ::css::uno::Reference< ::css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; ::osl::Mutex m_aMutex; public: - FmXGridPeer(const ::css::uno::Reference< ::css::uno::XComponentContext >&); + FmXGridPeer(const css::uno::Reference< css::uno::XComponentContext >&); virtual ~FmXGridPeer(); // spaeter Constructor, immer nach dem realen Constructor zu rufen ! diff --git a/include/svx/fmsrccfg.hxx b/include/svx/fmsrccfg.hxx index ce869e1..1e11506 100644 --- a/include/svx/fmsrccfg.hxx +++ b/include/svx/fmsrccfg.hxx @@ -54,7 +54,7 @@ namespace svxform public: // no bit fields at all (want to pass the addresses to the OConfigurationValueContainer) - ::css::uno::Sequence< OUString > + css::uno::Sequence< OUString > aHistory; OUString sSingleSearchField; diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx index e3df6b1..9d03772 100644 --- a/sax/source/tools/fastattribs.cxx +++ b/sax/source/tools/fastattribs.cxx @@ -239,7 +239,7 @@ FastTokenLookup::FastTokenLookup() * pet sequence around and do some heavy petting on it. */ sal_Int32 FastTokenLookup::getTokenFromChars( - const ::css::uno::Reference< ::css::xml::sax::XFastTokenHandler > &xTokenHandler, + const css::uno::Reference< css::xml::sax::XFastTokenHandler > &xTokenHandler, FastTokenHandlerBase *pTokenHandler, const char *pToken, size_t nLen /* = 0 */ ) { diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx index 7b45e89..44ff299 100644 --- a/sc/source/filter/inc/formulabuffer.hxx +++ b/sc/source/filter/inc/formulabuffer.hxx @@ -127,11 +127,11 @@ public: void setCellFormulaValue( const css::table::CellAddress& rAddress, const OUString& rValueStr, sal_Int32 nCellType ); - void setCellArrayFormula( const ::css::table::CellRangeAddress& rRangeAddress, - const ::css::table::CellAddress& rTokenAddress, + void setCellArrayFormula( const css::table::CellRangeAddress& rRangeAddress, + const css::table::CellAddress& rTokenAddress, const OUString& ); - void createSharedFormulaMapEntry( const ::css::table::CellAddress& rAddress, - const ::css::table::CellRangeAddress& rRange, + void createSharedFormulaMapEntry( const css::table::CellAddress& rAddress, + const css::table::CellRangeAddress& rRange, sal_Int32 nSharedId, const OUString& rTokens ); /// ensure sizes of vectors matches the number of sheets diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 9c07350..51c73c1 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -1524,7 +1524,7 @@ void SAL_CALL SfxBaseController::removeTitleChangeListener(const Reference< fram xBroadcaster->removeTitleChangeListener (xListener); } -void SfxBaseController::initialize( const ::css::uno::Sequence< ::css::uno::Any >& /*aArguments*/ ) throw (css::uno::RuntimeException, std::exception) +void SfxBaseController::initialize( const css::uno::Sequence< css::uno::Any >& /*aArguments*/ ) throw (css::uno::RuntimeException, std::exception) { if (m_pData->m_pViewShell) m_pData->m_pViewShell->Initialize(); diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index c4c6ad1..4eb8721 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -137,16 +137,16 @@ struct SwMergeDescriptor const ::svx::ODataAccessDescriptor& rDescriptor; OUString sSaveToFilter; ///< export filter to save resulting files OUString sSaveToFilterOptions; - ::css::uno::Sequence< ::css::beans::PropertyValue > aSaveToFilterData; + css::uno::Sequence< css::beans::PropertyValue > aSaveToFilterData; OUString sSubject; OUString sAddressFromColumn; OUString sMailBody; OUString sAttachmentName; - ::css::uno::Sequence< OUString > aCopiesTo; - ::css::uno::Sequence< OUString > aBlindCopiesTo; + css::uno::Sequence< OUString > aCopiesTo; + css::uno::Sequence< OUString > aBlindCopiesTo; - ::css::uno::Reference< ::css::mail::XSmtpService > xSmtpServer; + css::uno::Reference< css::mail::XSmtpService > xSmtpServer; bool bSendAsHTML; bool bSendAsAttachment; @@ -247,7 +247,7 @@ public: void GetColumnNames(ListBox* pListBox, const OUString& rDBName, const OUString& rTableName, bool bAppend = false); void GetColumnNames(ListBox* pListBox, - ::css::uno::Reference< ::css::sdbc::XConnection> xConnection, + css::uno::Reference< css::sdbc::XConnection> xConnection, const OUString& rTableName, bool bAppend = false); sal_uLong GetColumnFmt( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource, diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx index 438a2f5..2771e90 100644 --- a/sw/inc/splargs.hxx +++ b/sw/inc/splargs.hxx @@ -109,7 +109,7 @@ struct SwSpellArgs : SwArgsBase class SwInterHyphInfo { - ::css::uno::Reference< ::css::linguistic2::XHyphenatedWord > xHyphWord; + css::uno::Reference< css::linguistic2::XHyphenatedWord > xHyphWord; const Point aCrsrPos; bool bNoLang : 1; bool bCheck : 1; @@ -143,11 +143,11 @@ public: bool IsCheck() const { return bCheck; } void SetCheck( const bool bNew ) { bCheck = bNew; } void SetNoLang( const bool bNew ) { bNoLang = bNew; } - void SetHyphWord(const ::css::uno::Reference< ::css::linguistic2::XHyphenatedWord > &rxHW) + void SetHyphWord(const css::uno::Reference< css::linguistic2::XHyphenatedWord > &rxHW) { xHyphWord = rxHW; } - ::css::uno::Reference< ::css::linguistic2::XHyphenatedWord > GetHyphWord() + css::uno::Reference< css::linguistic2::XHyphenatedWord > GetHyphWord() { return xHyphWord; } diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx index 991520f..11e183f 100644 --- a/uui/source/sslwarndlg.cxx +++ b/uui/source/sslwarndlg.cxx @@ -29,9 +29,9 @@ using namespace css; void SSLWarnDialog::ViewCert() { - uno::Reference< ::css::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures; + uno::Reference< css::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures; - xDocumentDigitalSignatures = ::css::security::DocumentDigitalSignatures::createDefault( m_xContext ); + xDocumentDigitalSignatures = css::security::DocumentDigitalSignatures::createDefault( m_xContext ); xDocumentDigitalSignatures.get()->showCertificate(getCert()); } diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index 3e315f2..44e4bdd 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -46,10 +46,10 @@ IMPL_LINK_NOARG(UnknownAuthDialog, OKHdl_Impl) IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl) { - uno::Reference< ::css::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures; + uno::Reference< css::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures; - xDocumentDigitalSignatures = uno::Reference< ::css::security::XDocumentDigitalSignatures >( - ::css::security::DocumentDigitalSignatures::createDefault(m_xContext) ); + xDocumentDigitalSignatures = uno::Reference< css::security::XDocumentDigitalSignatures >( + css::security::DocumentDigitalSignatures::createDefault(m_xContext) ); xDocumentDigitalSignatures.get()->showCertificate(getCert()); diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx index 88b78e0..6e69cd7 100644 --- a/winaccessibility/source/service/msaaservice_impl.cxx +++ b/winaccessibility/source/service/msaaservice_impl.cxx @@ -69,8 +69,8 @@ public: // XComponent - as used by VCL to lifecycle manage this bridge. virtual void SAL_CALL dispose(); - virtual void SAL_CALL addEventListener( const ::css::uno::Reference< ::css::lang::XEventListener >& ) { /* dummy */ } - virtual void SAL_CALL removeEventListener( const ::css::uno::Reference< ::css::lang::XEventListener >& ) { /* dummy */ } + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) { /* dummy */ } + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) { /* dummy */ } // XMSAAService virtual sal_Int64 SAL_CALL getAccObjectPtr( diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 11f5a73..8ede560 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -643,7 +643,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) sal_Int32 nRotation = 0; xShapeProps->getPropertyValue("RotateAngle") >>= nRotation; - ::css::beans::PropertyValues aGrabBag; + css::beans::PropertyValues aGrabBag; bool bContainsEffects = false; xShapeProps->getPropertyValue("InteropGrabBag") >>= aGrabBag; for( sal_Int32 i = 0; i < aGrabBag.getLength(); ++i ) commit e6ff6f9a71ec88747e3cf8165fb72a96b57f2e99 Author: Thomas Arnhold <[email protected]> Date: Tue May 27 07:39:55 2014 +0200 use namespace css instead of com::sun Change-Id: I47582b072bb939cf270a76e430a9f7908b5c1d93 diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 9947a86..69b84a9 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -40,7 +40,7 @@ namespace unnamed_tools_urlobj {} using namespace unnamed_tools_urlobj; // unnamed namespaces don't work well yet... -using namespace com::sun; +using namespace css; // INetURLObject @@ -3702,7 +3702,7 @@ OUString INetURLObject::GetURLNoMark(DecodeMechanism eMechanism, OUString INetURLObject::getAbbreviated( - star::uno::Reference< star::util::XStringWidth > const & rStringWidth, + uno::Reference< util::XStringWidth > const & rStringWidth, sal_Int32 nWidth, DecodeMechanism eMechanism, rtl_TextEncoding eCharset) diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx index 00706bf..c14a2f4 100644 --- a/uui/source/requeststringresolver.cxx +++ b/uui/source/requeststringresolver.cxx @@ -22,10 +22,10 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> -using namespace com::sun; +using namespace css; UUIInteractionRequestStringResolver::UUIInteractionRequestStringResolver( - star::uno::Reference< star::uno::XComponentContext > const & + uno::Reference< uno::XComponentContext > const & rxContext) SAL_THROW(()) : m_pImpl(new UUIInteractionHelper(rxContext)) @@ -39,7 +39,7 @@ UUIInteractionRequestStringResolver::~UUIInteractionRequestStringResolver() OUString SAL_CALL UUIInteractionRequestStringResolver::getImplementationName() - throw (star::uno::RuntimeException, std::exception) + throw (uno::RuntimeException, std::exception) { return OUString::createFromAscii(m_aImplementationName); } @@ -47,50 +47,50 @@ UUIInteractionRequestStringResolver::getImplementationName() sal_Bool SAL_CALL UUIInteractionRequestStringResolver::supportsService( OUString const & rServiceName) - throw (star::uno::RuntimeException, std::exception) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } -star::uno::Sequence< OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL UUIInteractionRequestStringResolver::getSupportedServiceNames() - throw (star::uno::RuntimeException, std::exception) + throw (uno::RuntimeException, std::exception) { return getSupportedServiceNames_static(); } -star::beans::Optional< OUString > SAL_CALL +beans::Optional< OUString > SAL_CALL UUIInteractionRequestStringResolver::getStringFromInformationalRequest( - const star::uno::Reference< - star::task::XInteractionRequest >& Request ) - throw (star::uno::RuntimeException, std::exception) + const uno::Reference< + task::XInteractionRequest >& Request ) + throw (uno::RuntimeException, std::exception) { try { return m_pImpl->getStringFromRequest(Request); } - catch (star::uno::RuntimeException const & ex) + catch (uno::RuntimeException const & ex) { - throw star::uno::RuntimeException(ex.Message, *this); + throw uno::RuntimeException(ex.Message, *this); } } char const UUIInteractionRequestStringResolver::m_aImplementationName[] = "com.sun.star.comp.uui.UUIInteractionRequestStringResolver"; -star::uno::Sequence< OUString > +uno::Sequence< OUString > UUIInteractionRequestStringResolver::getSupportedServiceNames_static() { - star::uno::Sequence< OUString > aNames(1); + uno::Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.task.InteractionRequestStringResolver"; return aNames; } -star::uno::Reference< star::uno::XInterface > SAL_CALL +uno::Reference< uno::XInterface > SAL_CALL UUIInteractionRequestStringResolver::createInstance( - star::uno::Reference< star::lang::XMultiServiceFactory > const & + uno::Reference< lang::XMultiServiceFactory > const & rServiceFactory) - SAL_THROW((star::uno::Exception)) + SAL_THROW((uno::Exception)) { try { @@ -98,7 +98,7 @@ UUIInteractionRequestStringResolver::createInstance( } catch (std::bad_alloc const &) { - throw star::uno::RuntimeException("out of memory", 0); + throw uno::RuntimeException("out of memory", 0); } } diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index 2b4749e..f6262b0 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -104,7 +104,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::datatransfer::clipboard; using namespace ::com::sun::star::datatransfer::dnd; using namespace ::com::sun::star; -using namespace com::sun; using ::com::sun::star::awt::XTopWindow; diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index 6a9be38..3e0a059 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::datatransfer::clipboard; using namespace ::com::sun::star::datatransfer::dnd; using namespace ::com::sun::star; -using namespace com::sun; using ::com::sun::star::awt::XTopWindow; diff --git a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx index 82a8f15..4ae7455 100644 --- a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx +++ b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx @@ -26,14 +26,13 @@ #include "content.hxx" -using namespace com::sun; using namespace com::sun::star; using namespace chelp; // virtual uno::Sequence< beans::Property > Content::getProperties( - const uno::Reference< star::ucb::XCommandEnvironment > & /*xEnv*/ ) + const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ ) { bool withMediaType = m_aURLParameter.isFile() || m_aURLParameter.isRoot(); bool isModule = m_aURLParameter.isModule(); @@ -155,44 +154,44 @@ uno::Sequence< beans::Property > Content::getProperties( } // virtual -uno::Sequence< star::ucb::CommandInfo > Content::getCommands( - const uno::Reference< star::ucb::XCommandEnvironment > & /*xEnv*/ ) +uno::Sequence< ucb::CommandInfo > Content::getCommands( + const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ ) { // Supported commands #define COMMAND_COUNT 5 - static const star::ucb::CommandInfo aCommandInfoTable[] = + static const ucb::CommandInfo aCommandInfoTable[] = { // Required commands - star::ucb::CommandInfo( + ucb::CommandInfo( "getCommandInfo", -1, getCppuVoidType() ), - star::ucb::CommandInfo( + ucb::CommandInfo( "getPropertySetInfo", -1, getCppuVoidType() ), - star::ucb::CommandInfo( + ucb::CommandInfo( "getPropertyValues", -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), - star::ucb::CommandInfo( + ucb::CommandInfo( "setPropertyValues", -1, getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) ) ), - star::ucb::CommandInfo( + ucb::CommandInfo( "open", -1, - cppu::UnoType<star::ucb::OpenCommandArgument2>::get() + cppu::UnoType<ucb::OpenCommandArgument2>::get() ) }; - return uno::Sequence< star::ucb::CommandInfo >( + return uno::Sequence< ucb::CommandInfo >( aCommandInfoTable, COMMAND_COUNT ); }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
