include/linguistic/hyphdta.hxx | 43 ++--- include/linguistic/lngprophelp.hxx | 146 ++++++++------------ include/linguistic/misc.hxx | 60 +++----- include/linguistic/spelldta.hxx | 50 +++--- include/oox/core/binarycodec.hxx | 8 - include/oox/core/contexthandler.hxx | 18 +- include/oox/core/contexthandler2.hxx | 28 +-- include/oox/core/fastparser.hxx | 28 +-- include/oox/core/fasttokenhandler.hxx | 14 - include/oox/core/filterbase.hxx | 72 ++++----- include/oox/core/filterdetect.hxx | 50 +++--- include/oox/core/fragmenthandler.hxx | 30 ++-- include/oox/core/fragmenthandler2.hxx | 30 ++-- include/oox/core/recordparser.hxx | 6 include/oox/core/relationshandler.hxx | 6 include/oox/core/xmlfilterbase.hxx | 32 ++-- include/oox/crypto/DocumentDecryption.hxx | 12 - include/oox/crypto/DocumentEncryption.hxx | 4 include/oox/drawingml/chart/chartconverter.hxx | 10 - include/oox/drawingml/chart/datasourcemodel.hxx | 2 include/oox/drawingml/color.hxx | 4 include/oox/drawingml/drawingmltypes.hxx | 16 +- include/oox/drawingml/fillproperties.hxx | 24 +-- include/oox/drawingml/lineproperties.hxx | 4 include/oox/drawingml/shape.hxx | 80 +++++------ include/oox/drawingml/shapepropertymap.hxx | 20 +- include/oox/drawingml/theme.hxx | 8 - include/oox/dump/dumperbase.hxx | 58 ++++---- include/oox/dump/oledumper.hxx | 10 - include/oox/dump/pptxdumper.hxx | 6 include/oox/dump/xlsbdumper.hxx | 6 include/oox/export/drawingml.hxx | 96 ++++++------- include/oox/export/shapes.hxx | 62 ++++---- include/oox/helper/attributelist.hxx | 10 - include/oox/helper/binaryinputstream.hxx | 4 include/oox/helper/binaryoutputstream.hxx | 4 include/oox/helper/binarystreambase.hxx | 6 include/oox/helper/containerhelper.hxx | 26 +-- include/oox/helper/graphichelper.hxx | 44 +++--- include/oox/helper/modelobjecthelper.hxx | 30 ++-- include/oox/helper/progressbar.hxx | 6 include/oox/helper/propertymap.hxx | 22 +-- include/oox/helper/propertyset.hxx | 28 +-- include/oox/helper/storagebase.hxx | 24 +-- include/oox/helper/textinputstream.hxx | 18 +- include/oox/helper/zipstorage.hxx | 18 +- include/oox/mathml/importutils.hxx | 4 include/oox/ole/axcontrol.hxx | 32 ++-- include/oox/ole/olehelper.hxx | 16 +- include/oox/ole/oleobjecthelper.hxx | 10 - include/oox/ole/olestorage.hxx | 26 +-- include/oox/ole/vbacontrol.hxx | 16 +- include/oox/ole/vbamodule.hxx | 26 +-- include/oox/ole/vbaproject.hxx | 36 ++-- include/oox/ppt/animationspersist.hxx | 19 +- include/oox/ppt/comments.hxx | 4 include/oox/ppt/dgmimport.hxx | 2 include/oox/ppt/dgmlayout.hxx | 2 include/oox/ppt/pptimport.hxx | 8 - include/oox/ppt/pptshape.hxx | 4 include/oox/ppt/presentationfragmenthandler.hxx | 4 include/oox/ppt/slidepersist.hxx | 22 +-- include/oox/ppt/slidetransition.hxx | 2 include/oox/ppt/timenode.hxx | 16 +- include/oox/ppt/timenodelistcontext.hxx | 4 include/oox/token/tokenmap.hxx | 6 include/oox/vml/vmldrawing.hxx | 28 +-- include/oox/vml/vmldrawingfragment.hxx | 2 include/oox/vml/vmlformatting.hxx | 6 include/oox/vml/vmlinputstream.hxx | 38 ++--- include/oox/vml/vmlshape.hxx | 78 +++++----- include/oox/vml/vmlshapecontainer.hxx | 6 include/oox/vml/vmltextbox.hxx | 2 include/package/Deflater.hxx | 8 - include/package/Inflater.hxx | 8 - include/sax/fastattribs.hxx | 22 +-- include/sax/fastparser.hxx | 26 +-- include/sax/fshelper.hxx | 10 - include/sax/tools/converter.hxx | 34 ++-- include/sax/tools/documenthandleradapter.hxx | 88 ++++++------ include/sfx2/DocumentMetadataAccess.hxx | 173 ++++++++++-------------- include/sfx2/Metadatable.hxx | 36 ++-- include/sfx2/XmlIdRegistry.hxx | 5 include/sfx2/app.hxx | 4 include/sfx2/bindings.hxx | 14 - include/sfx2/brokenpackageint.hxx | 4 include/sfx2/childwin.hxx | 2 include/sfx2/dinfdlg.hxx | 61 ++++---- include/sfx2/dispatch.hxx | 2 include/sfx2/docfilt.hxx | 8 - include/sfx2/docinf.hxx | 14 - include/sfx2/dockwin.hxx | 4 include/sfx2/docmacromode.hxx | 27 +-- include/sfx2/docstoragemodifylistener.hxx | 6 include/sfx2/event.hxx | 4 include/sfx2/evntconf.hxx | 2 include/sfx2/fcontnr.hxx | 6 include/sfx2/filedlghelper.hxx | 26 +-- include/sfx2/frame.hxx | 36 ++-- include/sfx2/frmhtmlw.hxx | 5 include/sfx2/imagemgr.hxx | 2 include/sfx2/ipclient.hxx | 8 - include/sfx2/linkmgr.hxx | 6 include/sfx2/linksrc.hxx | 10 - include/sfx2/lnkbase.hxx | 8 - include/sfx2/mailmodelapi.hxx | 14 - include/sfx2/module.hxx | 2 include/sfx2/objsh.hxx | 122 ++++++++-------- include/sfx2/querystatus.hxx | 6 include/sfx2/recentdocsview.hxx | 6 include/sfx2/request.hxx | 6 include/sfx2/sfxbasemodel.hxx | 6 include/sfx2/sfxdlg.hxx | 18 +- include/sfx2/sfxmodelfactory.hxx | 6 include/sfx2/sfxstatuslistener.hxx | 20 +- include/sfx2/shell.hxx | 4 include/sfx2/sidebar/ILayoutableWindow.hxx | 2 include/sfx2/stbitem.hxx | 32 ++-- include/sfx2/tabdlg.hxx | 4 include/sfx2/taskpane.hxx | 4 include/sfx2/tbxctrl.hxx | 48 +++--- include/sfx2/templatedlg.hxx | 6 include/sfx2/templateinfodlg.hxx | 4 include/sfx2/templatelocalview.hxx | 4 include/sfx2/templateremoteview.hxx | 2 include/sfx2/thumbnailview.hxx | 6 include/sfx2/thumbnailviewitem.hxx | 4 include/sfx2/tplpitem.hxx | 6 include/sfx2/unoctitm.hxx | 80 +++++------ include/sfx2/userinputinterception.hxx | 8 - include/sfx2/viewfrm.hxx | 18 +- include/sfx2/viewsh.hxx | 28 +-- include/sfx2/zoomitem.hxx | 4 133 files changed, 1384 insertions(+), 1457 deletions(-)
New commits: commit e4acd26406056addac8c10e80d8cfaa48cedc7fc Author: Noel Grandin <[email protected]> Date: Thu Oct 22 16:38:52 2015 +0200 com::sun::star->css in include/linguistic to include/sfx2 Change-Id: Id69e293fda98ee6cf2cc3d3296a0cd2e06bd847e Reviewed-on: https://gerrit.libreoffice.org/19527 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx index 7c5f7fe..32d1875 100644 --- a/include/linguistic/hyphdta.hxx +++ b/include/linguistic/hyphdta.hxx @@ -29,10 +29,7 @@ namespace linguistic { class HyphenatedWord : - public cppu::WeakImplHelper - < - ::com::sun::star::linguistic2::XHyphenatedWord - > + public cppu::WeakImplHelper< css::linguistic2::XHyphenatedWord > { OUString aWord; OUString aHyphenatedWord; @@ -52,24 +49,24 @@ public: // XHyphenatedWord virtual OUString SAL_CALL getWord() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::lang::Locale SAL_CALL + throw(css::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL getLocale() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getHyphenationPos() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getHyphenatedWord() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getHyphenPos() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAlternativeSpelling() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - static com::sun::star::uno::Reference <com::sun::star::linguistic2::XHyphenatedWord> LNG_DLLPUBLIC CreateHyphenatedWord( + static css::uno::Reference <css::linguistic2::XHyphenatedWord> LNG_DLLPUBLIC CreateHyphenatedWord( const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos, const OUString &rHyphenatedWord, sal_Int16 nHyphenPos ); }; @@ -78,12 +75,12 @@ public: class PossibleHyphens : public cppu::WeakImplHelper < - ::com::sun::star::linguistic2::XPossibleHyphens + css::linguistic2::XPossibleHyphens > { OUString aWord; OUString aWordWithHyphens; - ::com::sun::star::uno::Sequence< sal_Int16 > aOrigHyphenPos; + css::uno::Sequence< sal_Int16 > aOrigHyphenPos; sal_Int16 nLanguage; PossibleHyphens(const PossibleHyphens &) = delete; @@ -92,27 +89,27 @@ class PossibleHyphens : public: PossibleHyphens(const OUString &rWord, sal_Int16 nLang, const OUString &rHyphWord, - const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions); + const css::uno::Sequence< sal_Int16 > &rPositions); virtual ~PossibleHyphens(); // XPossibleHyphens virtual OUString SAL_CALL getWord() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::lang::Locale SAL_CALL + throw(css::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL getLocale() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getPossibleHyphens() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getHyphenationPositions() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - static com::sun::star::uno::Reference < com::sun::star::linguistic2::XPossibleHyphens > LNG_DLLPUBLIC CreatePossibleHyphens + static css::uno::Reference < css::linguistic2::XPossibleHyphens > LNG_DLLPUBLIC CreatePossibleHyphens (const OUString &rWord, sal_Int16 nLang, const OUString &rHyphWord, - const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions); + const css::uno::Sequence< sal_Int16 > &rPositions); }; } // namespace linguistic diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx index 2ac4aff..6039555 100644 --- a/include/linguistic/lngprophelp.hxx +++ b/include/linguistic/lngprophelp.hxx @@ -51,19 +51,17 @@ namespace linguistic typedef cppu::WeakImplHelper < - ::com::sun::star::beans::XPropertyChangeListener, - ::com::sun::star::linguistic2::XLinguServiceEventBroadcaster + css::beans::XPropertyChangeListener, + css::linguistic2::XLinguServiceEventBroadcaster > PropertyChgHelperBase; class PropertyChgHelper : public PropertyChgHelperBase { - ::com::sun::star::uno::Sequence< OUString > aPropNames; - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > xMyEvtObj; + css::uno::Sequence< OUString > aPropNames; + css::uno::Reference< css::uno::XInterface > xMyEvtObj; ::cppu::OInterfaceContainerHelper aLngSvcEvtListeners; - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > xPropSet; + css::uno::Reference< css::beans::XPropertySet > xPropSet; int nEvtFlags; // flags for event types allowed to be launched @@ -82,63 +80,55 @@ protected: virtual void SetDefaultValues(); virtual void GetCurrentValues(); - ::com::sun::star::uno::Sequence< OUString > & + css::uno::Sequence< OUString > & GetPropNames() { return aPropNames; } - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & + css::uno::Reference< + css::beans::XPropertySet > & GetPropSet() { return xPropSet; } void AddPropNames( const char *pNewNames[], sal_Int32 nCount ); - virtual bool propertyChange_Impl( - const ::com::sun::star::beans::PropertyChangeEvent& rEvt ); + virtual bool propertyChange_Impl( const css::beans::PropertyChangeEvent& rEvt ); public: PropertyChgHelper( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > &rxSource, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet, + const css::uno::Reference< css::uno::XInterface > &rxSource, + css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet, int nAllowedEvents ); virtual ~PropertyChgHelper(); - virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ); + virtual void SetTmpPropVals( const css::beans::PropertyValues &rPropVals ); // XEventListener virtual void SAL_CALL - disposing( const ::com::sun::star::lang::EventObject& rSource ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + disposing( const css::lang::EventObject& rSource ) + throw(css::uno::RuntimeException, std::exception) override; // XPropertyChangeListener virtual void SAL_CALL - propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + propertyChange( const css::beans::PropertyChangeEvent& rEvt ) + throw(css::uno::RuntimeException, std::exception) override; // XLinguServiceEventBroadcaster virtual sal_Bool SAL_CALL addLinguServiceEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener ) + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL removeLinguServiceEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener ) + throw(css::uno::RuntimeException, std::exception) override; // non-UNO functions void LNG_DLLPUBLIC AddAsPropListener(); void LNG_DLLPUBLIC RemoveAsPropListener(); - void LaunchEvent( - const ::com::sun::star::linguistic2::LinguServiceEvent& rEvt ); + void LaunchEvent( const css::linguistic2::LinguServiceEvent& rEvt ); - const ::com::sun::star::uno::Sequence< OUString > & + const css::uno::Sequence< OUString > & GetPropNames() const { return aPropNames; } - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & + const css::uno::Reference< css::beans::XPropertySet > & GetPropSet() const { return xPropSet; } - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > & + const css::uno::Reference< css::uno::XInterface > & GetEvtObj() const { return xMyEvtObj; } }; @@ -151,22 +141,20 @@ class PropertyHelper_Thes : public: PropertyHelper_Thes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > &rxSource, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet ); + const css::uno::Reference< css::uno::XInterface > &rxSource, + css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet ); virtual ~PropertyHelper_Thes(); // XPropertyChangeListener virtual void SAL_CALL - propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + propertyChange( const css::beans::PropertyChangeEvent& rEvt ) + throw(css::uno::RuntimeException, std::exception) override; }; class LNG_DLLPUBLIC PropertyHelper_Thesaurus { PropertyHelper_Thes* pInst; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener > xPropHelper; + css::uno::Reference< css::beans::XPropertyChangeListener > xPropHelper; // disallow use of copy-constructor and assignment-operator PropertyHelper_Thesaurus( const PropertyHelper_Thes & ); @@ -174,14 +162,12 @@ class LNG_DLLPUBLIC PropertyHelper_Thesaurus public: PropertyHelper_Thesaurus( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > &rxSource, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet ); + const css::uno::Reference< css::uno::XInterface > &rxSource, + css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet ); ~PropertyHelper_Thesaurus(); void AddAsPropListener(); void RemoveAsPropListener(); - void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ); + void SetTmpPropVals( const css::beans::PropertyValues &rPropVals ); }; @@ -207,22 +193,20 @@ protected: virtual void SetDefaultValues() override; virtual void GetCurrentValues() override; virtual bool propertyChange_Impl( - const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) override; + const css::beans::PropertyChangeEvent& rEvt ) override; public: PropertyHelper_Spell( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > &rxSource, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet ); + const css::uno::Reference< css::uno::XInterface > &rxSource, + css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet ); virtual ~PropertyHelper_Spell(); - virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) override; + virtual void SetTmpPropVals( const css::beans::PropertyValues &rPropVals ) override; // XPropertyChangeListener virtual void SAL_CALL - propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + propertyChange( const css::beans::PropertyChangeEvent& rEvt ) + throw(css::uno::RuntimeException, std::exception) override; static sal_Int16 GetDefaultNumberOfSuggestions() { return 16; } @@ -235,7 +219,7 @@ public: class LNG_DLLPUBLIC PropertyHelper_Spelling { PropertyHelper_Spell* pInst; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener > xPropHelper; + css::uno::Reference< css::beans::XPropertyChangeListener > xPropHelper; // disallow use of copy-constructor and assignment-operator PropertyHelper_Spelling( const PropertyHelper_Spell & ); @@ -243,26 +227,22 @@ class LNG_DLLPUBLIC PropertyHelper_Spelling public: PropertyHelper_Spelling( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > &rxSource, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet ); + const css::uno::Reference< css::uno::XInterface > &rxSource, + css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet ); ~PropertyHelper_Spelling(); void AddAsPropListener(); void RemoveAsPropListener(); - void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ); + void SetTmpPropVals( const css::beans::PropertyValues &rPropVals ); bool IsSpellUpperCase() const; bool IsSpellWithDigits() const; bool IsSpellCapitalization() const; bool addLinguServiceEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener ) - throw(::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener ) + throw(css::uno::RuntimeException); bool removeLinguServiceEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener ) - throw(::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener ) + throw(css::uno::RuntimeException); }; @@ -287,22 +267,20 @@ protected: virtual void SetDefaultValues() override; virtual void GetCurrentValues() override; virtual bool propertyChange_Impl( - const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) override; + const css::beans::PropertyChangeEvent& rEvt ) override; public: PropertyHelper_Hyphen( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > &rxSource, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet); + const css::uno::Reference< css::uno::XInterface > &rxSource, + css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet); virtual ~PropertyHelper_Hyphen(); - virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) override; + virtual void SetTmpPropVals( const css::beans::PropertyValues &rPropVals ) override; // XPropertyChangeListener virtual void SAL_CALL - propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + propertyChange( const css::beans::PropertyChangeEvent& rEvt ) + throw(css::uno::RuntimeException, std::exception) override; sal_Int16 GetMinLeading() const { return nResHyphMinLeading; } sal_Int16 GetMinTrailing() const { return nResHyphMinTrailing; } @@ -312,7 +290,7 @@ public: class LNG_DLLPUBLIC PropertyHelper_Hyphenation { PropertyHelper_Hyphen* pInst; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener > xPropHelper; + css::uno::Reference< css::beans::XPropertyChangeListener > xPropHelper; // disallow use of copy-constructor and assignment-operator PropertyHelper_Hyphenation( const PropertyHelper_Hyphen & ); @@ -320,26 +298,22 @@ class LNG_DLLPUBLIC PropertyHelper_Hyphenation public: PropertyHelper_Hyphenation( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > &rxSource, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet); + const css::uno::Reference< css::uno::XInterface > &rxSource, + css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet); ~PropertyHelper_Hyphenation(); void AddAsPropListener(); void RemoveAsPropListener(); - void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ); + void SetTmpPropVals( const css::beans::PropertyValues &rPropVals ); sal_Int16 GetMinLeading() const; sal_Int16 GetMinTrailing() const; sal_Int16 GetMinWordLength() const; bool addLinguServiceEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener ) - throw(::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener ) + throw(css::uno::RuntimeException); bool removeLinguServiceEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener ) - throw(::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener ) + throw(css::uno::RuntimeException); }; } // namespace linguistic diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx index d746e042..1a3f467 100644 --- a/include/linguistic/misc.hxx +++ b/include/linguistic/misc.hxx @@ -88,13 +88,13 @@ sal_Int32 LevDistance( const OUString &rTxt1, const OUString &rTxt2 ); Linguistic specific handling of an empty locale denoting LANGUAGE_NONE. Does not resolve empty locale as system locale. */ -LNG_DLLPUBLIC LanguageType LinguLocaleToLanguage( const ::com::sun::star::lang::Locale& rLocale ); +LNG_DLLPUBLIC LanguageType LinguLocaleToLanguage( const css::lang::Locale& rLocale ); /** Convert LanguageType to Locale for legacy handling. Linguistic specific handling of LANGUAGE_NONE resulting in an empty locale. Avoid use! */ -LNG_DLLPUBLIC ::com::sun::star::lang::Locale LinguLanguageToLocale( LanguageType nLanguage ); +LNG_DLLPUBLIC css::lang::Locale LinguLanguageToLocale( LanguageType nLanguage ); /** Checks if a LanguageType is one of the values that denote absence of language or undetermined language or multiple languages, in short all @@ -106,9 +106,8 @@ LNG_DLLPUBLIC bool LinguIsUnspecified( LanguageType nLanguage ); tag string instead. */ LNG_DLLPUBLIC bool LinguIsUnspecified( const OUString & rBcp47 ); -::com::sun::star::uno::Sequence< sal_Int16 > - LocaleSeqToLangSeq( ::com::sun::star::uno::Sequence< - ::com::sun::star::lang::Locale > &rLocaleSeq ); +css::uno::Sequence< sal_Int16 > + LocaleSeqToLangSeq( css::uno::Sequence< css::lang::Locale > &rLocaleSeq ); // checks if file pointed to by rURL is readonly // and may also check return if such a file exists or not @@ -119,7 +118,7 @@ bool FileExists( const OUString &rURL ); OUString GetDictionaryWriteablePath(); -::com::sun::star::uno::Sequence< OUString > GetDictionaryPaths(); +css::uno::Sequence< OUString > GetDictionaryPaths(); /// @returns an URL for a new and writable dictionary rDicName. /// The URL will point to the path given by 'GetDictionaryWriteablePath' @@ -127,11 +126,10 @@ LNG_DLLPUBLIC OUString GetWritableDictionaryURL( const OUString &rDicName ); LNG_DLLPUBLIC sal_Int32 GetPosInWordToCheck( const OUString &rTxt, sal_Int32 nPos ); -::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenatedWord > - RebuildHyphensAndControlChars( const OUString &rOrigWord, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenatedWord > &rxHyphWord ); +css::uno::Reference< css::linguistic2::XHyphenatedWord > + RebuildHyphensAndControlChars( + const OUString &rOrigWord, + css::uno::Reference< css::linguistic2::XHyphenatedWord > &rxHyphWord ); LNG_DLLPUBLIC bool IsUpper( const OUString &rText, sal_Int32 nPos, sal_Int32 nLen, sal_Int16 nLanguage ); @@ -144,46 +142,40 @@ LNG_DLLPUBLIC bool HasDigits( const OUString &rText ); LNG_DLLPUBLIC bool IsNumeric( const OUString &rText ); -LNG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguProperties > GetLinguProperties(); -::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > GetDictionaryList(); -::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetIgnoreAllList(); +LNG_DLLPUBLIC css::uno::Reference< css::linguistic2::XLinguProperties > GetLinguProperties(); +css::uno::Reference< css::linguistic2::XSearchableDictionaryList > GetDictionaryList(); +css::uno::Reference< css::linguistic2::XDictionary > GetIgnoreAllList(); -bool IsUseDicList( const ::com::sun::star::beans::PropertyValues &rProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > &rxPropSet ); +bool IsUseDicList( const css::beans::PropertyValues &rProperties, + const css::uno::Reference< css::beans::XPropertySet > &rxPropSet ); -bool IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > &rxPropSet ); +bool IsIgnoreControlChars( const css::beans::PropertyValues &rProperties, + const css::uno::Reference< css::beans::XPropertySet > &rxPropSet ); -::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryEntry > +css::uno::Reference< + css::linguistic2::XDictionaryEntry > SearchDicList( - const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList >& rDicList, + const css::uno::Reference< css::linguistic2::XSearchableDictionaryList >& rDicList, const OUString& rWord, sal_Int16 nLanguage, bool bSearchPosDics, bool bSearchSpellEntry ); LNG_DLLPUBLIC DictionaryError AddEntryToDic( - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > &rxDic, + css::uno::Reference< css::linguistic2::XDictionary > &rxDic, const OUString &rWord, bool bIsNeg, const OUString &rRplcTxt, sal_Int16 nRplcLang, bool bStripDot = true ); -LNG_DLLPUBLIC bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > &xDicList ); +LNG_DLLPUBLIC bool SaveDictionaries( const css::uno::Reference< css::linguistic2::XSearchableDictionaryList > &xDicList ); // AppExitLstnr: // virtual base class that calls it AtExit function when the application // (ie the Desktop) is about to terminate class AppExitListener : - public cppu::WeakImplHelper - < - ::com::sun::star::frame::XTerminateListener - > + public cppu::WeakImplHelper< css::frame::XTerminateListener > { - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDesktop2 > xDesktop; + css::uno::Reference< css::frame::XDesktop2 > xDesktop; public: AppExitListener(); @@ -195,11 +187,11 @@ public: void Deactivate(); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; }; } // namespace linguistic diff --git a/include/linguistic/spelldta.hxx b/include/linguistic/spelldta.hxx index fe38138..5e56574 100644 --- a/include/linguistic/spelldta.hxx +++ b/include/linguistic/spelldta.hxx @@ -38,64 +38,62 @@ namespace com { namespace sun { namespace star { namespace linguistic { -::com::sun::star::uno::Sequence< OUString > +css::uno::Sequence< OUString > MergeProposalSeqs( - ::com::sun::star::uno::Sequence< OUString > &rAlt1, - ::com::sun::star::uno::Sequence< OUString > &rAlt2, + css::uno::Sequence< OUString > &rAlt1, + css::uno::Sequence< OUString > &rAlt2, bool bAllowDuplicates ); void SeqRemoveNegEntries( - ::com::sun::star::uno::Sequence< OUString > &rSeq, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSearchableDictionaryList > &rxDicList, + css::uno::Sequence< OUString > &rSeq, + css::uno::Reference< css::linguistic2::XSearchableDictionaryList > &rxDicList, sal_Int16 nLanguage ); bool SeqHasEntry( - const ::com::sun::star::uno::Sequence< OUString > &rSeq, + const css::uno::Sequence< OUString > &rSeq, const OUString &rTxt); void SearchSimilarText( const OUString &rText, sal_Int16 nLanguage, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSearchableDictionaryList > &xDicList, + css::uno::Reference< css::linguistic2::XSearchableDictionaryList > &xDicList, std::vector< OUString > & rDicListProps ); class SpellAlternatives : public cppu::WeakImplHelper < - ::com::sun::star::linguistic2::XSpellAlternatives, - ::com::sun::star::linguistic2::XSetSpellAlternatives + css::linguistic2::XSpellAlternatives, + css::linguistic2::XSetSpellAlternatives > , private ::boost::noncopyable { - ::com::sun::star::uno::Sequence< OUString > aAlt; // list of alternatives, may be empty. - OUString aWord; - sal_Int16 nType; // type of failure - sal_Int16 nLanguage; + css::uno::Sequence< OUString > aAlt; // list of alternatives, may be empty. + OUString aWord; + sal_Int16 nType; // type of failure + sal_Int16 nLanguage; public: LNG_DLLPUBLIC SpellAlternatives(); SpellAlternatives(const OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType, - const ::com::sun::star::uno::Sequence< OUString > &rAlternatives ); + const css::uno::Sequence< OUString > &rAlternatives ); virtual ~SpellAlternatives(); // XSpellAlternatives - virtual OUString SAL_CALL getWord( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getFailureType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getAlternativesCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAlternatives( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getWord( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getFailureType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getAlternativesCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAlternatives( ) throw (css::uno::RuntimeException, std::exception) override; // XSetSpellAlternatives - virtual void SAL_CALL setAlternatives( const ::com::sun::star::uno::Sequence< OUString >& aAlternatives ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAlternatives( const css::uno::Sequence< OUString >& aAlternatives ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (css::uno::RuntimeException, std::exception) override; // non-interface specific functions void LNG_DLLPUBLIC SetWordLanguage(const OUString &rWord, sal_Int16 nLang); void LNG_DLLPUBLIC SetFailureType(sal_Int16 nTypeP); - void LNG_DLLPUBLIC SetAlternatives( const ::com::sun::star::uno::Sequence< OUString > &rAlt ); - static com::sun::star::uno::Reference < com::sun::star::linguistic2::XSpellAlternatives > LNG_DLLPUBLIC CreateSpellAlternatives( - const OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< OUString > &rAlt ); + void LNG_DLLPUBLIC SetAlternatives( const css::uno::Sequence< OUString > &rAlt ); + static css::uno::Reference < css::linguistic2::XSpellAlternatives > LNG_DLLPUBLIC CreateSpellAlternatives( + const OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const css::uno::Sequence< OUString > &rAlt ); }; } // namespace linguistic diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx index ad0153f..1095e45 100644 --- a/include/oox/core/binarycodec.hxx +++ b/include/oox/core/binarycodec.hxx @@ -82,7 +82,7 @@ public: The sequence contains the necessary data to initialize the codec. */ - bool initCodec( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aData ); + bool initCodec( const css::uno::Sequence< css::beans::NamedValue >& aData ); /** Retrieves the encryption data @@ -90,7 +90,7 @@ public: The sequence contains the necessary data to initialize the codec. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > getEncryptionData(); + css::uno::Sequence< css::beans::NamedValue > getEncryptionData(); /** Verifies the validity of the password using the passed key and hash. @@ -192,7 +192,7 @@ public: The sequence contains the necessary data to initialize the codec. */ - bool initCodec( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aData ); + bool initCodec( const css::uno::Sequence< css::beans::NamedValue >& aData ); /** Retrieves the encryption data @@ -200,7 +200,7 @@ public: The sequence contains the necessary data to initialize the codec. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > getEncryptionData(); + css::uno::Sequence< css::beans::NamedValue > getEncryptionData(); /** Initializes the algorithm with the specified password and document ID. diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx index 5578796..50b935d 100644 --- a/include/oox/core/contexthandler.hxx +++ b/include/oox/core/contexthandler.hxx @@ -48,7 +48,7 @@ typedef ::rtl::Reference< ContextHandler > ContextHandlerRef; struct FragmentBaseData; typedef std::shared_ptr< FragmentBaseData > FragmentBaseDataRef; -typedef ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XFastContextHandler > ContextHandler_BASE; +typedef ::cppu::WeakImplHelper< css::xml::sax::XFastContextHandler > ContextHandler_BASE; class OOX_DLLPUBLIC ContextHandler : public ContextHandler_BASE { @@ -73,13 +73,13 @@ public: // com.sun.star.xml.sax.XFastContextHandler interface --------------------- - virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; // record context interface ----------------------------------------------- @@ -91,7 +91,7 @@ protected: /** Helper constructor for the FragmentHandler. */ explicit ContextHandler( const FragmentBaseDataRef& rxBaseData ); - void implSetLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator ); + void implSetLocator( const css::uno::Reference< css::xml::sax::XLocator >& rxLocator ); #ifdef _MSC_VER ContextHandler() {} // workaround diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx index c4ef453..20ab9ff 100644 --- a/include/oox/core/contexthandler2.hxx +++ b/include/oox/core/contexthandler2.hxx @@ -164,15 +164,15 @@ public: protected: /** Must be called from createFastChildContext() in derived classes. */ - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > + css::uno::Reference< css::xml::sax::XFastContextHandler > implCreateChildContext( sal_Int32 nElement, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ); + const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs ); /** Must be called from startFastElement() in derived classes. */ void implStartElement( sal_Int32 nElement, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ); + const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs ); /** Must be called from characters() in derived classes. */ void implCharacters( const OUString& rChars ); @@ -219,26 +219,26 @@ public: // com.sun.star.xml.sax.XFastContextHandler interface --------------------- - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL + virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) final override; + const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs ) + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) final override; virtual void SAL_CALL startFastElement( sal_Int32 nElement, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) final override; + const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs ) + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) final override; virtual void SAL_CALL characters( const OUString& rChars ) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) final override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) final override; virtual void SAL_CALL endFastElement( sal_Int32 nElement ) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) final override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) final override; // oox.core.ContextHandler interface -------------------------------------- diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx index 8d41dee..497bb00 100644 --- a/include/oox/core/fastparser.hxx +++ b/include/oox/core/fastparser.hxx @@ -44,51 +44,51 @@ class FastParser { public: explicit FastParser( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) - throw( ::com::sun::star::uno::RuntimeException ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) + throw( css::uno::RuntimeException ); virtual ~FastParser(); /** Registers an OOXML namespace at the parser. */ void registerNamespace( sal_Int32 nNamespaceId ) - throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ); /** Sets the passed document handler that will receive the SAX parser events. */ void setDocumentHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastDocumentHandler >& rxDocHandler ) - throw( ::com::sun::star::uno::RuntimeException ); + const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& rxDocHandler ) + throw( css::uno::RuntimeException ); /** Parses the passed SAX input source. @param bCloseStream True = closes the stream in the input source after parsing. */ - void parseStream( const ::com::sun::star::xml::sax::InputSource& rInputSource, bool bCloseStream = false ) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ); + void parseStream( const css::xml::sax::InputSource& rInputSource, bool bCloseStream = false ) + throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException ); /** Parses the passed input stream. @param bCloseStream True = closes the passed stream after parsing. */ void parseStream( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream, + const css::uno::Reference< css::io::XInputStream >& rxInStream, const OUString& rStreamName, bool bCloseStream = false ) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ); + throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException ); /** Parses a stream from the passed storage with the specified name. @param bCloseStream True = closes the stream after parsing. */ void parseStream( StorageBase& rStorage, const OUString& rStreamName, bool bCloseStream = false ) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ); + throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException ); OUString getNamespaceURL( const OUString& rPrefix ) - throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ); bool hasNamespaceURL( const OUString& rPrefix ) const; sal_Int32 getNamespaceId( const OUString& aUrl ); - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler > + css::uno::Reference< css::xml::sax::XFastTokenHandler > getTokenHandler() const { return mxTokenHandler; } private: - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastParser > + css::uno::Reference< css::xml::sax::XFastParser > mxParser; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler > + css::uno::Reference< css::xml::sax::XFastTokenHandler > mxTokenHandler; const NamespaceMap& mrNamespaceMap; diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx index 3ac4e5f..744d922 100644 --- a/include/oox/core/fasttokenhandler.hxx +++ b/include/oox/core/fasttokenhandler.hxx @@ -37,8 +37,8 @@ namespace core { that provides access to the tokens generated from the internal token name list. */ class OOX_DLLPUBLIC FastTokenHandler : - public ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::xml::sax::XFastTokenHandler >, + public ::cppu::WeakImplHelper< css::lang::XServiceInfo, + css::xml::sax::XFastTokenHandler >, public sax_fastparser::FastTokenHandlerBase { public: @@ -46,13 +46,13 @@ public: virtual ~FastTokenHandler(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; // XFastTokenHandler - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getTokenFromUTF8( const ::com::sun::star::uno::Sequence< sal_Int8 >& Identifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) throw (css::uno::RuntimeException, std::exception) override; // Much faster direct C++ shortcut to the method that matters virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const override; diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx index f37489d..519e63f 100644 --- a/include/oox/core/filterbase.hxx +++ b/include/oox/core/filterbase.hxx @@ -81,19 +81,19 @@ enum OoxmlVersion struct FilterBaseImpl; typedef ::cppu::WeakImplHelper< - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::document::XImporter, - ::com::sun::star::document::XExporter, - ::com::sun::star::document::XFilter > + css::lang::XServiceInfo, + css::lang::XInitialization, + css::document::XImporter, + css::document::XExporter, + css::document::XFilter > FilterBase_BASE; class OOX_DLLPUBLIC FilterBase : public FilterBase_BASE, public ::cppu::BaseMutex { public: explicit FilterBase( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) - throw( ::com::sun::star::uno::RuntimeException ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) + throw( css::uno::RuntimeException ); virtual ~FilterBase(); @@ -113,27 +113,27 @@ public: /** Returns the component context passed in the filter constructor (always existing). */ - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& + const css::uno::Reference< css::uno::XComponentContext >& getComponentContext() const; /** Returns the document model (always existing). */ - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& + const css::uno::Reference< css::frame::XModel >& getModel() const; /** Returns the service factory provided by the document model (always existing). */ - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& + const css::uno::Reference< css::lang::XMultiServiceFactory >& getModelFactory() const; /** Returns the frame that will contain the document model (may be null). */ - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& + const css::uno::Reference< css::frame::XFrame >& getTargetFrame() const; /// Returns the parent shape to load into (if any) - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& + const css::uno::Reference< css::drawing::XShape >& getParentShape() const; /** Returns the status indicator (may be null). */ - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >& + const css::uno::Reference< css::task::XStatusIndicator >& getStatusIndicator() const; /** Returns the FilterData */ @@ -159,7 +159,7 @@ public: access has been enabled in the storage, the base stream can be accessed by passing an empty string as stream name. */ - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > openInputStream( const OUString& rStreamName ) const; /** Opens and returns the specified output stream from the base storage. @@ -170,7 +170,7 @@ public: access has been enabled in the storage, the base stream can be accessed by passing an empty string as stream name. */ - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > + css::uno::Reference< css::io::XOutputStream > openOutputStream( const OUString& rStreamName ) const; /** Commits changes to base storage (and substorages) */ @@ -199,11 +199,11 @@ public: virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // com.sun.star.lang.XInitialization interface ---------------------------- @@ -218,49 +218,49 @@ public: filter implementations may support different arguments. */ virtual void SAL_CALL initialize( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs ) - throw( ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< css::uno::Any >& rArgs ) + throw( css::uno::Exception, + css::uno::RuntimeException, std::exception ) override; // com.sun.star.document.XImporter interface ------------------------------ virtual void SAL_CALL setTargetDocument( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxDocument ) - throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::lang::XComponent >& rxDocument ) + throw( css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ) override; // com.sun.star.document.XExporter interface ------------------------------ virtual void SAL_CALL setSourceDocument( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxDocument ) - throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::lang::XComponent >& rxDocument ) + throw( css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ) override; // com.sun.star.document.XFilter interface -------------------------------- virtual sal_Bool SAL_CALL filter( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL cancel() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; bool exportVBA() const; protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > + virtual css::uno::Reference< css::io::XStream > implGetOutputStream( utl::MediaDescriptor& rMediaDesc ) const; virtual bool implFinalizeExport( utl::MediaDescriptor& rMediaDescriptor ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > + css::uno::Reference< css::io::XStream > getMainDocumentStream( ) const; private: void setMediaDescriptor( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq ); + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq ); /** Derived classes may create a specialized graphic helper, e.g. for resolving palette colors. */ @@ -270,9 +270,9 @@ private: virtual ::oox::ole::VbaProject* implCreateVbaProject() const = 0; virtual StorageRef implCreateStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const = 0; + const css::uno::Reference< css::io::XInputStream >& rxInStream ) const = 0; virtual StorageRef implCreateStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const = 0; + const css::uno::Reference< css::io::XStream >& rxOutStream ) const = 0; private: std::unique_ptr< FilterBaseImpl > mxImpl; diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index e5db562..9ac48df 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -46,25 +46,25 @@ namespace core { It takes a reference to the filter string object via its constructor, and puts the name of the detected filter to it, if it successfully finds one. */ -class FilterDetectDocHandler : public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XFastDocumentHandler > +class FilterDetectDocHandler : public ::cppu::WeakImplHelper< css::xml::sax::XFastDocumentHandler > { public: - explicit FilterDetectDocHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, OUString& rFilter ); + explicit FilterDetectDocHandler( const css::uno::Reference< css::uno::XComponentContext >& rxContext, OUString& rFilter ); virtual ~FilterDetectDocHandler(); // XFastDocumentHandler - virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; // XFastContextHandler - virtual void SAL_CALL startFastElement( sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endFastElement( sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startFastElement( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endFastElement( sal_Int32 Element ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; private: void parseRelationship( const AttributeList& rAttribs ); @@ -76,19 +76,19 @@ private: private: typedef ::std::vector< sal_Int32 > ContextVector; - OUString& mrFilterName; + OUString& mrFilterName; ContextVector maContextStack; - OUString maTargetPath; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; + OUString maTargetPath; + css::uno::Reference< css::uno::XComponentContext > mxContext; }; -class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo > +class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper< css::document::XExtendedFilterDetection, css::lang::XServiceInfo > { public: - explicit FilterDetect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) - throw( ::com::sun::star::uno::RuntimeException ); + explicit FilterDetect( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) + throw( css::uno::RuntimeException ); virtual ~FilterDetect(); /** Tries to extract an unencrypted ZIP package from the passed media @@ -114,14 +114,14 @@ public: is stored in the property 'ComponentData' of the media descriptor and its input stream is returned. */ - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > extractUnencryptedPackage( utl::MediaDescriptor& rMediaDesc ) const; // com.sun.star.lang.XServiceInfo interface ------------------------------- - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // com.sun.star.document.XExtendedFilterDetection interface --------------- @@ -142,11 +142,11 @@ public: property of the passed media descriptor. */ virtual OUString SAL_CALL - detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + detect( css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq ) + throw( css::uno::RuntimeException, std::exception ) override; private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; + css::uno::Reference< css::uno::XComponentContext > mxContext; }; diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx index 81bce58..f1110db 100644 --- a/include/oox/core/fragmenthandler.hxx +++ b/include/oox/core/fragmenthandler.hxx @@ -43,8 +43,8 @@ namespace core { struct FragmentBaseData { XmlFilterBase& mrFilter; - const OUString maFragmentPath; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > + const OUString maFragmentPath; + css::uno::Reference< css::xml::sax::XLocator > mxLocator; RelationsRef mxRelations; @@ -74,7 +74,7 @@ struct RecordInfo -typedef ::cppu::ImplInheritanceHelper< ContextHandler, ::com::sun::star::xml::sax::XFastDocumentHandler > FragmentHandler_BASE; +typedef ::cppu::ImplInheritanceHelper< ContextHandler, css::xml::sax::XFastDocumentHandler > FragmentHandler_BASE; class OOX_DLLPUBLIC FragmentHandler : public FragmentHandler_BASE { @@ -83,30 +83,30 @@ public: virtual ~FragmentHandler(); /** Returns the com.sun.star.xml.sax.XFastContextHandler interface of this context. */ - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > + css::uno::Reference< css::xml::sax::XFastContextHandler > getFastContextHandler() { return static_cast< ContextHandler* >( this ); } // com.sun.star.xml.sax.XFastDocumentHandler interface -------------------- - virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& rxLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; // com.sun.star.xml.sax.XFastContextHandler interface --------------------- - virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; // XML stream handling ---------------------------------------------------- /** Opens the fragment stream referred by the own fragment path. Derived classes may provide specilized stream implementations. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > openFragmentStream() const; // binary records --------------------------------------------------------- diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx index ac23014..200be17 100644 --- a/include/oox/core/fragmenthandler2.hxx +++ b/include/oox/core/fragmenthandler2.hxx @@ -57,36 +57,36 @@ public: // com.sun.star.xml.sax.XFastContextHandler interface --------------------- - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL + virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) final override; + const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs ) + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) final override; virtual void SAL_CALL startFastElement( sal_Int32 nElement, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) final override; + const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs ) + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) final override; virtual void SAL_CALL characters( const OUString& rChars ) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) final override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) final override; virtual void SAL_CALL endFastElement( sal_Int32 nElement ) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) final override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) final override; // com.sun.star.xml.sax.XFastDocumentHandler interface -------------------- virtual void SAL_CALL startDocument() - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; // oox.core.ContextHandler interface -------------------------------------- diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx index 8d97af4..03c6904 100644 --- a/include/oox/core/recordparser.hxx +++ b/include/oox/core/recordparser.hxx @@ -53,9 +53,9 @@ public: void setFragmentHandler( const ::rtl::Reference< FragmentHandler >& rxHandler ); void parseStream( const RecordInputSource& rInputSource ) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + throw( css::xml::sax::SAXException, + css::io::IOException, + css::uno::RuntimeException ); const RecordInputSource& getInputSource() const { return maSource; } diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx index 9dac43f..d7ceb73 100644 --- a/include/oox/core/relationshandler.hxx +++ b/include/oox/core/relationshandler.hxx @@ -34,11 +34,11 @@ public: XmlFilterBase& rFilter, RelationsRef xRelations ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL + virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs ) + throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; private: RelationsRef mxRelations; diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index 0a775b7..f845aea 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -62,9 +62,9 @@ class FragmentHandler; class FastParser; struct TextField { - com::sun::star::uno::Reference< com::sun::star::text::XText > xText; - com::sun::star::uno::Reference< com::sun::star::text::XTextCursor > xTextCursor; - com::sun::star::uno::Reference< com::sun::star::text::XTextField > xTextField; + css::uno::Reference< css::text::XText > xText; + css::uno::Reference< css::text::XTextCursor > xTextCursor; + css::uno::Reference< css::text::XTextField > xTextField; }; typedef std::vector< TextField > TextFieldStack; @@ -74,8 +74,8 @@ class OOX_DLLPUBLIC XmlFilterBase : public FilterBase { public: explicit XmlFilterBase( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) - throw( ::com::sun::star::uno::RuntimeException ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) + throw( css::uno::RuntimeException ); virtual ~XmlFilterBase(); @@ -115,8 +115,7 @@ public: @return a non-empty reference to the XDocument, if the fragment could be imported. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::dom::XDocument> importFragment( const OUString& rFragmentPath ); + css::uno::Reference< css::xml::dom::XDocument> importFragment( const OUString& rFragmentPath ); /** Imports a fragment from an xml::dom::XDocument using the passed fragment handler @@ -130,8 +129,7 @@ public: @return true, if the fragment could be imported. */ bool importFragment( const ::rtl::Reference< FragmentHandler >& rxHandler, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XFastSAXSerializable >& rxSerializer ); + const css::uno::Reference< css::xml::sax::XFastSAXSerializable >& rxSerializer ); /** Imports the relations fragment associated with the specified fragment. @@ -164,7 +162,7 @@ public: @return Added relation Id. */ - OUString addRelation( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream, const OUString& rType, const OUString& rTarget, bool bExternal = false ); + OUString addRelation( const css::uno::Reference< css::io::XOutputStream >& rOutputStream, const OUString& rType, const OUString& rTarget, bool bExternal = false ); /** Returns a stack of used textfields, used by the pptx importer to replace links to slidepages with the real page name */ TextFieldStack& getTextFieldStack() const; @@ -183,7 +181,7 @@ public: @return The opened output stream. */ - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > + css::uno::Reference< css::io::XOutputStream > openFragmentStream( const OUString& rStreamName, const OUString& rMediaType ); @@ -220,7 +218,7 @@ public: @return *this */ - XmlFilterBase& exportDocumentProperties( ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > xProperties ); + XmlFilterBase& exportDocumentProperties( css::uno::Reference< css::document::XDocumentProperties > xProperties ); OUString getNamespaceURL( const OUString& rPrefix ); @@ -235,22 +233,22 @@ public: bool isMSO2007Document() const; void checkDocumentProperties( - com::sun::star::uno::Reference<com::sun::star::document::XDocumentProperties> xDocProps); + css::uno::Reference<css::document::XDocumentProperties> xDocProps); protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > + virtual css::uno::Reference< css::io::XStream > implGetOutputStream( utl::MediaDescriptor& rMediaDesc ) const override; virtual bool implFinalizeExport( utl::MediaDescriptor& rMediaDescriptor ) override; private: virtual StorageRef implCreateStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const override; + const css::uno::Reference< css::io::XInputStream >& rxInStream ) const override; virtual StorageRef implCreateStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const override; + const css::uno::Reference< css::io::XStream >& rxOutStream ) const override; private: ::std::unique_ptr< XmlFilterBaseImpl > mxImpl; diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx index ca80a95..b494ea2 100644 --- a/include/oox/crypto/DocumentDecryption.hxx +++ b/include/oox/crypto/DocumentDecryption.hxx @@ -34,7 +34,7 @@ namespace core { class OOX_DLLPUBLIC DocumentDecryption { private: - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; + css::uno::Reference< css::uno::XComponentContext > mxContext; enum CryptoType { @@ -44,22 +44,22 @@ private: }; oox::ole::OleStorage& mrOleStorage; - std::unique_ptr<CryptoEngine> mEngine; + std::unique_ptr<CryptoEngine> mEngine; CryptoType mCryptoType; - bool readAgileEncryptionInfo( com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& rStream ); + bool readAgileEncryptionInfo( css::uno::Reference< css::io::XInputStream >& rStream ); bool readStandard2007EncryptionInfo( BinaryInputStream& rStream ); public: DocumentDecryption( oox::ole::OleStorage& rOleStorage, - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext); + css::uno::Reference< css::uno::XComponentContext > xContext); - bool decrypt(com::sun::star::uno::Reference< com::sun::star::io::XStream > xDocumentStream); + bool decrypt(css::uno::Reference< css::io::XStream > xDocumentStream); bool readEncryptionInfo(); bool generateEncryptionKey(const OUString& rPassword); - com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > createEncryptionData(const OUString& rPassword); + css::uno::Sequence< css::beans::NamedValue > createEncryptionData(const OUString& rPassword); }; diff --git a/include/oox/crypto/DocumentEncryption.hxx b/include/oox/crypto/DocumentEncryption.hxx index 55e3d12..d0ceee4 100644 --- a/include/oox/crypto/DocumentEncryption.hxx +++ b/include/oox/crypto/DocumentEncryption.hxx @@ -31,7 +31,7 @@ namespace core { class OOX_DLLPUBLIC DocumentEncryption { private: - com::sun::star::uno::Reference< com::sun::star::io::XStream > mxDocumentStream; + css::uno::Reference< css::io::XStream > mxDocumentStream; oox::ole::OleStorage& mrOleStorage; OUString maPassword; @@ -39,7 +39,7 @@ private: public: DocumentEncryption( - com::sun::star::uno::Reference< com::sun::star::io::XStream > xDocumentStream, + css::uno::Reference< css::io::XStream > xDocumentStream, oox::ole::OleStorage& rOleStorage, const OUString& aPassword); diff --git a/include/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx index d459f54..ebce01a 100644 --- a/include/oox/drawingml/chart/chartconverter.hxx +++ b/include/oox/drawingml/chart/chartconverter.hxx @@ -71,15 +71,15 @@ public: void convertFromModel( ::oox::core::XmlFilterBase& rFilter, ChartSpaceModel& rChartModel, - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxExternalPage, - const ::com::sun::star::awt::Point& rChartPos, - const ::com::sun::star::awt::Size& rChartSize ); + const css::uno::Reference< css::chart2::XChartDocument >& rxChartDoc, + const css::uno::Reference< css::drawing::XShapes >& rxExternalPage, + const css::awt::Point& rChartPos, + const css::awt::Size& rChartSize ); /** Creates an internal data provider. Derived classes may override this function to create an external data provider. */ virtual void createDataProvider( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc ); + const css::uno::Reference< css::chart2::XChartDocument >& rxChartDoc ); /** Creates a data sequence from a formula. Dummy implementation. Derived classes have to override this function to actually parse the formula. */ diff --git a/include/oox/drawingml/chart/datasourcemodel.hxx b/include/oox/drawingml/chart/datasourcemodel.hxx index 75a5d01..e6539ca 100644 --- a/include/oox/drawingml/chart/datasourcemodel.hxx +++ b/include/oox/drawingml/chart/datasourcemodel.hxx @@ -31,7 +31,7 @@ namespace chart { struct DataSequenceModel { - typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > AnyMap; + typedef ::std::map< sal_Int32, css::uno::Any > AnyMap; AnyMap maData; /// Map of values, indexed by point identifier. OUString maFormula; /// Formula reference, e.g. into a spreadsheet. diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index e846289..110b0d6 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -97,7 +97,7 @@ public: /** Returns the scheme name from the a:schemeClr element for interoperability purposes */ OUString getSchemeName() const { return msSchemeName; } /** Returns the unaltered list of transformations for interoperability purposes */ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getTransformations() const { return maInteropTransformations;} + css::uno::Sequence< css::beans::PropertyValue > getTransformations() const { return maInteropTransformations;} /** Translates between color transformation tokens and their names */ static OUString getColorTransformationName( sal_Int32 nElement ); @@ -146,7 +146,7 @@ private: sal_Int32 mnAlpha; /// Alpha value (color opacity). OUString msSchemeName; /// Scheme name from the a:schemeClr element for interoperability purposes - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > + css::uno::Sequence< css::beans::PropertyValue > maInteropTransformations; /// Unaltered list of transformations for interoperability purposes }; diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx index 621695b..6fa8261 100644 --- a/include/oox/drawingml/drawingmltypes.hxx +++ b/include/oox/drawingml/drawingmltypes.hxx @@ -89,14 +89,14 @@ typedef std::shared_ptr< TableProperties > TablePropertiesPtr; /** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */ -com::sun::star::awt::Point GetPointPercent( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs ); +css::awt::Point GetPointPercent( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs ); /** converts the attributes from an CT_Size2D into an awt Size with 1/100th mm */ -com::sun::star::awt::Size GetSize2D( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes ); +css::awt::Size GetSize2D( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes ); /** converts the attributes from a CT_RelativeRect to an IntegerRectangle2D */ -com::sun::star::geometry::IntegerRectangle2D GetRelativeRect( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes ); +css::geometry::IntegerRectangle2D GetRelativeRect( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes ); /** converts EMUs into 1/100th mmm */ sal_Int32 GetCoordinate( sal_Int32 nValue ); @@ -118,7 +118,7 @@ sal_Int32 GetTextSpacingPoint( const OUString& sValue ); sal_Int32 GetTextSpacingPoint( const sal_Int32 nValue ); /** */ -::com::sun::star::style::TabAlign GetTabAlign( ::sal_Int32 aToken ); +css::style::TabAlign GetTabAlign( ::sal_Int32 aToken ); float GetFontHeight( sal_Int32 nHeight ); @@ -132,13 +132,13 @@ sal_Int16 GetCaseMap( sal_Int32 nToken ); sal_Int16 GetParaAdjust( sal_Int32 nAlign ); // Converts vertical adjust tokens to a TextVerticalAdjust item -::com::sun::star::drawing::TextVerticalAdjust GetTextVerticalAdjust( sal_Int32 nToken ); +css::drawing::TextVerticalAdjust GetTextVerticalAdjust( sal_Int32 nToken ); // Converts a TextVerticalAdjust item to string value appearing in ooxml -OOX_DLLPUBLIC const char* GetTextVerticalAdjust( ::com::sun::star::drawing::TextVerticalAdjust eAdjust ); +OOX_DLLPUBLIC const char* GetTextVerticalAdjust( css::drawing::TextVerticalAdjust eAdjust ); // Converts a Hatch object to an ooxml pattern. -const char* GetHatchPattern( const ::com::sun::star::drawing::Hatch& rHatch ); +const char* GetHatchPattern( const css::drawing::Hatch& rHatch ); @@ -149,7 +149,7 @@ struct IndexRange { }; /** retrieve the content of CT_IndexRange */ -IndexRange GetIndexRange( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes ); +IndexRange GetIndexRange( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes ); diff --git a/include/oox/drawingml/fillproperties.hxx b/include/oox/drawingml/fillproperties.hxx index 815881a..0fa28ad 100644 --- a/include/oox/drawingml/fillproperties.hxx +++ b/include/oox/drawingml/fillproperties.hxx @@ -41,8 +41,8 @@ struct GradientFillProperties typedef ::std::map< double, Color > GradientStopMap; GradientStopMap maGradientStops; /// Gradient stops (colors/transparence). - OptValue< ::com::sun::star::geometry::IntegerRectangle2D > moFillToRect; - OptValue< ::com::sun::star::geometry::IntegerRectangle2D > moTileRect; + OptValue< css::geometry::IntegerRectangle2D > moFillToRect; + OptValue< css::geometry::IntegerRectangle2D > moTileRect; OptValue< sal_Int32 > moGradientPath; /// If set, gradient follows rectangle, circle, or shape. OptValue< sal_Int32 > moShadeAngle; /// Rotation angle of linear gradients. OptValue< sal_Int32 > moShadeFlip; /// Flip mode of gradient, if not stretched to shape. @@ -88,27 +88,27 @@ struct ArtisticEffectProperties struct BlipFillProperties { - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > - mxGraphic; /// The fill graphic. + css::uno::Reference< css::graphic::XGraphic > + mxGraphic; /// The fill graphic. OptValue< sal_Int32 > moBitmapMode; /// Bitmap tile or stretch. - OptValue< ::com::sun::star::geometry::IntegerRectangle2D > - moFillRect; /// Stretch fill offsets. - OptValue< ::com::sun::star::geometry::IntegerRectangle2D > - moClipRect; + OptValue< css::geometry::IntegerRectangle2D > + moFillRect; /// Stretch fill offsets. + OptValue< css::geometry::IntegerRectangle2D > + moClipRect; OptValue< sal_Int32 > moTileOffsetX; /// Width of bitmap tiles (EMUs). OptValue< sal_Int32 > moTileOffsetY; /// Height of bitmap tiles (EMUs). OptValue< sal_Int32 > moTileScaleX; /// Horizontal scaling of bitmap tiles (1/1000 percent). OptValue< sal_Int32 > moTileScaleY; /// Vertical scaling of bitmap tiles (1/1000 percent). OptValue< sal_Int32 > moTileAlign; /// Anchor point inside bitmap. OptValue< sal_Int32 > moTileFlip; /// Flip mode of bitmap tiles. - OptValue< bool > moRotateWithShape; /// True = rotate bitmap with shape. + OptValue< bool > moRotateWithShape; /// True = rotate bitmap with shape. // effects OptValue< sal_Int32 > moColorEffect; /// XML token for a color effect. OptValue< sal_Int32 > moBrightness; /// Brightness in the range [-100000,100000]. OptValue< sal_Int32 > moContrast; /// Contrast in the range [-100000,100000]. - Color maColorChangeFrom; /// Start color of color transformation. - Color maColorChangeTo; /// Destination color of color transformation. - Color maDuotoneColors[2]; /// Duotone Colors + Color maColorChangeFrom; /// Start color of color transformation. + Color maColorChangeTo; /// Destination color of color transformation. + Color maDuotoneColors[2]; /// Duotone Colors ArtisticEffectProperties maEffect; /// Artistic effect, not supported by core. diff --git a/include/oox/drawingml/lineproperties.hxx b/include/oox/drawingml/lineproperties.hxx index c38c7e1..bc1793d 100644 --- a/include/oox/drawingml/lineproperties.hxx +++ b/include/oox/drawingml/lineproperties.hxx @@ -62,9 +62,9 @@ struct OOX_DLLPUBLIC LineProperties sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const; /** Calculates the line style attribute from the internal state of the object */ - ::com::sun::star::drawing::LineStyle getLineStyle() const; + css::drawing::LineStyle getLineStyle() const; /** Calculates the line joint attribute from the internal state of the object */ - ::com::sun::star::drawing::LineJoint getLineJoint() const; + css::drawing::LineJoint getLineJoint() const; /** Calculates the line width attribute from the internal state of the object */ sal_Int32 getLineWidth() const; }; diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index ba5e89b..486cd6c 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -103,14 +103,14 @@ public: ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
