diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-27 14:20:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-28 09:22:34 +0200 |
| commit | 16246ed7b280f51a39a01ded24c0d7bd59d59365 (patch) | |
| tree | e506c24eeae16b384555f08818e0b62ba41e0285 /sc/source/filter/inc | |
| parent | sw: remove SwDBTreeList_Impl::m_aConnections (diff) | |
| download | core-16246ed7b280f51a39a01ded24c0d7bd59d59365.tar.gz core-16246ed7b280f51a39a01ded24c0d7bd59d59365.zip | |
com::sun::star->css in sc
Change-Id: I7774890f46f9343e944e34db27af8bce3b1d0915
Diffstat (limited to 'sc/source/filter/inc')
48 files changed, 366 insertions, 374 deletions
diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index 25da7e98d24d..d05c33db5159 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -41,46 +41,46 @@ public: bool empty() const { return mvAddresses.empty(); } - const ::com::sun::star::table::CellRangeAddress& front() const + const css::table::CellRangeAddress& front() const { return mvAddresses.front(); } - ::com::sun::star::table::CellRangeAddress& operator[]( size_t i ) + css::table::CellRangeAddress& operator[]( size_t i ) { return mvAddresses[ i ]; } - ::std::vector< ::com::sun::star::table::CellRangeAddress >::const_iterator begin() const + ::std::vector< css::table::CellRangeAddress >::const_iterator begin() const { return mvAddresses.begin(); } - ::std::vector< ::com::sun::star::table::CellRangeAddress >::iterator begin() + ::std::vector< css::table::CellRangeAddress >::iterator begin() { return mvAddresses.begin(); } - ::std::vector< ::com::sun::star::table::CellRangeAddress >::const_iterator end() const + ::std::vector< css::table::CellRangeAddress >::const_iterator end() const { return mvAddresses.end(); } - ::std::vector< ::com::sun::star::table::CellRangeAddress >::reverse_iterator rbegin() + ::std::vector< css::table::CellRangeAddress >::reverse_iterator rbegin() { return mvAddresses.rbegin(); } - ::std::vector< ::com::sun::star::table::CellRangeAddress >::reverse_iterator rend() + ::std::vector< css::table::CellRangeAddress >::reverse_iterator rend() { return mvAddresses.rend(); } void clear() { mvAddresses.clear(); } - void erase( ::std::vector< ::com::sun::star::table::CellRangeAddress >::iterator it ) + void erase( ::std::vector< css::table::CellRangeAddress >::iterator it ) { mvAddresses.erase( it ); } void pop_back() { mvAddresses.pop_back(); } - void push_back( const ::com::sun::star::table::CellRangeAddress& rAddress ) + void push_back( const css::table::CellRangeAddress& rAddress ) { mvAddresses.push_back( rAddress ); } /** Returns the base address of this range list (top-left cell of first range). */ - ::com::sun::star::table::CellAddress + css::table::CellAddress getBaseAddress() const; /** Converts to a sequence. */ - com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > + css::uno::Sequence< css::table::CellRangeAddress > toSequence() const; private: - ::std::vector< ::com::sun::star::table::CellRangeAddress > mvAddresses; + ::std::vector< css::table::CellRangeAddress > mvAddresses; }; /** A 2D cell address struct for binary filters. */ @@ -91,7 +91,7 @@ struct BinAddress inline explicit BinAddress() : mnCol( 0 ), mnRow( 0 ) {} inline explicit BinAddress( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {} - inline explicit BinAddress( const ::com::sun::star::table::CellAddress& rAddr ) : mnCol( rAddr.Column ), mnRow( rAddr.Row ) {} + inline explicit BinAddress( const css::table::CellAddress& rAddr ) : mnCol( rAddr.Column ), mnRow( rAddr.Row ) {} void read( SequenceInputStream& rStrm ); void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ); @@ -130,9 +130,9 @@ struct BinRange inline explicit BinRange( const BinAddress& rFirst, const BinAddress& rLast ) : maFirst( rFirst ), maLast( rLast ) {} inline explicit BinRange( sal_Int32 nCol1, sal_Int32 nRow1, sal_Int32 nCol2, sal_Int32 nRow2 ) : maFirst( nCol1, nRow1 ), maLast( nCol2, nRow2 ) {} - inline explicit BinRange( const ::com::sun::star::table::CellAddress& rAddr ) : maFirst( rAddr ), maLast( rAddr ) {} - inline explicit BinRange( const ::com::sun::star::table::CellAddress& rFirst, const ::com::sun::star::table::CellAddress& rLast ) : maFirst( rFirst ), maLast( rLast ) {} - inline explicit BinRange( const ::com::sun::star::table::CellRangeAddress& rRange ) : maFirst( rRange.StartColumn, rRange.StartRow ), maLast( rRange.EndColumn, rRange.EndRow ) {} + inline explicit BinRange( const css::table::CellAddress& rAddr ) : maFirst( rAddr ), maLast( rAddr ) {} + inline explicit BinRange( const css::table::CellAddress& rFirst, const css::table::CellAddress& rLast ) : maFirst( rFirst ), maLast( rLast ) {} + inline explicit BinRange( const css::table::CellRangeAddress& rRange ) : maFirst( rRange.StartColumn, rRange.StartRow ), maLast( rRange.EndColumn, rRange.EndRow ) {} void read( SequenceInputStream& rStrm ); void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ); @@ -252,17 +252,17 @@ public: sal_Int32 nLength = SAL_MAX_INT32 ); /** Returns the biggest valid cell address in the own Calc document. */ - inline const ::com::sun::star::table::CellAddress& + inline const css::table::CellAddress& getMaxApiAddress() const { return maMaxApiPos; } /** Returns the biggest valid cell address in the imported/exported Excel document. */ - inline const ::com::sun::star::table::CellAddress& + inline const css::table::CellAddress& getMaxXlsAddress() const { return maMaxXlsPos; } /** Returns the biggest valid cell address in both Calc and the imported/exported Excel document. */ - inline const ::com::sun::star::table::CellAddress& + inline const css::table::CellAddress& getMaxAddress() const { return maMaxPos; } /** Checks if the passed column index is valid. @@ -300,7 +300,7 @@ public: @return true = Passed address is valid (no index overflow). */ bool checkCellAddress( - const ::com::sun::star::table::CellAddress& rAddress, + const css::table::CellAddress& rAddress, bool bTrackOverflow ); /** Converts the passed string to a single cell address, without checking @@ -312,12 +312,12 @@ public: @return true = Cell address could be parsed from the passed string. */ static bool convertToCellAddressUnchecked( - ::com::sun::star::table::CellAddress& orAddress, + css::table::CellAddress& orAddress, const OUString& rString, sal_Int16 nSheet ); static bool convertToCellAddressUnchecked( - com::sun::star::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ); + css::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ); /** Tries to convert the passed string to a single cell address. @@ -329,13 +329,13 @@ public: @return true = Converted address is valid (no index overflow). */ bool convertToCellAddress( - ::com::sun::star::table::CellAddress& orAddress, + css::table::CellAddress& orAddress, const OUString& rString, sal_Int16 nSheet, bool bTrackOverflow ); bool convertToCellAddress( - com::sun::star::table::CellAddress& rAddress, + css::table::CellAddress& rAddress, const char* pStr, sal_Int16 nSheet, bool bTrackOverflow ); /** Returns a valid cell address by moving it into allowed dimensions. @@ -345,7 +345,7 @@ public: @param bTrackOverflow true = Update the internal overflow flags, if the address is outside of the supported sheet limits. @return A valid API cell address struct. */ - ::com::sun::star::table::CellAddress + css::table::CellAddress createValidCellAddress( const OUString& rString, sal_Int16 nSheet, @@ -359,7 +359,7 @@ public: @param nSheet Sheet index to be inserted into orAddress. */ static void convertToCellAddressUnchecked( - ::com::sun::star::table::CellAddress& orAddress, + css::table::CellAddress& orAddress, const BinAddress& rBinAddress, sal_Int16 nSheet ); @@ -373,7 +373,7 @@ public: @return true = Converted address is valid (no index overflow). */ bool convertToCellAddress( - ::com::sun::star::table::CellAddress& orAddress, + css::table::CellAddress& orAddress, const BinAddress& rBinAddress, sal_Int16 nSheet, bool bTrackOverflow ); @@ -385,7 +385,7 @@ public: @param bTrackOverflow true = Update the internal overflow flags, if the address is outside of the supported sheet limits. @return A valid API cell address struct. */ - ::com::sun::star::table::CellAddress + css::table::CellAddress createValidCellAddress( const BinAddress& rBinAddress, sal_Int16 nSheet, @@ -407,7 +407,7 @@ public: overflow is not allowed via parameter bAllowOverflow. */ bool checkCellRange( - const ::com::sun::star::table::CellRangeAddress& rRange, + const css::table::CellRangeAddress& rRange, bool bAllowOverflow, bool bTrackOverflow ); /** Checks the passed cell range, may try to fit it to current sheet limits. @@ -437,7 +437,7 @@ public: allowed via parameter bAllowOverflow. */ bool validateCellRange( - ::com::sun::star::table::CellRangeAddress& orRange, + css::table::CellRangeAddress& orRange, bool bAllowOverflow, bool bTrackOverflow ); /** Converts the passed string to a cell range address, without checking @@ -449,7 +449,7 @@ public: @return true = Range address could be parsed from the passed string. */ static bool convertToCellRangeUnchecked( - ::com::sun::star::table::CellRangeAddress& orRange, + css::table::CellRangeAddress& orRange, const OUString& rString, sal_Int16 nSheet ); @@ -478,7 +478,7 @@ public: allowed via parameter bAllowOverflow. */ bool convertToCellRange( - ::com::sun::star::table::CellRangeAddress& orRange, + css::table::CellRangeAddress& orRange, const OUString& rString, sal_Int16 nSheet, bool bAllowOverflow, bool bTrackOverflow ); @@ -491,7 +491,7 @@ public: @param nSheet Sheet index to be inserted into orRange. */ static void convertToCellRangeUnchecked( - ::com::sun::star::table::CellRangeAddress& orRange, + css::table::CellRangeAddress& orRange, const BinRange& rBinRange, sal_Int16 nSheet ); @@ -518,7 +518,7 @@ public: allowed via parameter bAllowOverflow. */ bool convertToCellRange( - ::com::sun::star::table::CellRangeAddress& orRange, + css::table::CellRangeAddress& orRange, const BinRange& rBinRange, sal_Int16 nSheet, bool bAllowOverflow, bool bTrackOverflow ); @@ -595,14 +595,14 @@ private: sal_Unicode cSameSheet ); }; - ::com::sun::star::table::CellAddress maMaxApiPos; /// Maximum valid cell address in Calc. - ::com::sun::star::table::CellAddress maMaxXlsPos; /// Maximum valid cell address in Excel. - ::com::sun::star::table::CellAddress maMaxPos; /// Maximum valid cell address in Calc/Excel. - ControlCharacters maLinkChars; /// Control characters for external link import (BIFF). - ControlCharacters maDConChars; /// Control characters for DCON* record import (BIFF). - bool mbColOverflow; /// Flag for "columns overflow". - bool mbRowOverflow; /// Flag for "rows overflow". - bool mbTabOverflow; /// Flag for "tables overflow". + css::table::CellAddress maMaxApiPos; /// Maximum valid cell address in Calc. + css::table::CellAddress maMaxXlsPos; /// Maximum valid cell address in Excel. + css::table::CellAddress maMaxPos; /// Maximum valid cell address in Calc/Excel. + ControlCharacters maLinkChars; /// Control characters for external link import (BIFF). + ControlCharacters maDConChars; /// Control characters for DCON* record import (BIFF). + bool mbColOverflow; /// Flag for "columns overflow". + bool mbRowOverflow; /// Flag for "rows overflow". + bool mbTabOverflow; /// Flag for "tables overflow". }; } // namespace xls diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx index 83a45ace1916..3eb2b2befcf6 100644 --- a/sc/source/filter/inc/autofilterbuffer.hxx +++ b/sc/source/filter/inc/autofilterbuffer.hxx @@ -36,7 +36,7 @@ namespace xls { /** Contains UNO API filter settings for a column in a filtered range. */ struct ApiFilterSettings { - typedef ::std::vector<com::sun::star::sheet::TableFilterField3> FilterFieldVector; + typedef ::std::vector<css::sheet::TableFilterField3> FilterFieldVector; FilterFieldVector maFilterFields; /// List of UNO API filter settings. OptValue< bool > mobNeedsRegExp; /// If set, requires regular expressions to be enabled/disabled. @@ -112,7 +112,7 @@ private: /** A filter criterion for a custom filter. */ struct FilterCriterionModel { - ::com::sun::star::uno::Any maValue; /// Comparison operand. + css::uno::Any maValue; /// Comparison operand. sal_Int32 mnOperator; /// Comparison operator. sal_uInt8 mnDataType; /// Operand data type (BIFF only). sal_uInt8 mnStrLen; /// Length of string operand (BIFF5-BIFF8 only). @@ -197,15 +197,13 @@ public: FilterColumn& createFilterColumn(); /** Applies the filter to the passed filter descriptor. */ - void finalizeImport( - const ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XSheetFilterDescriptor3>& rxFilterDesc ); + void finalizeImport( const css::uno::Reference< css::sheet::XSheetFilterDescriptor3>& rxFilterDesc ); private: typedef RefVector< FilterColumn > FilterColumnVector; FilterColumnVector maFilterColumns; - ::com::sun::star::table::CellRangeAddress maRange; + css::table::CellRangeAddress maRange; }; class AutoFilterBuffer : public WorkbookHelper @@ -222,7 +220,7 @@ public: /** Applies the filters to the passed database range object. @return True = this buffer contains valid auto filter settings. */ - bool finalizeImport( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDatabaseRange >& rxDatabaseRange ); + bool finalizeImport( const css::uno::Reference< css::sheet::XDatabaseRange >& rxDatabaseRange ); private: /** Returns the auto filter object used to perform auto filtering. */ diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index 3aafeae8aa1c..34e08f7b2e52 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -41,8 +41,8 @@ public: inline BiffDecoderBase* clone() { return implClone(); } /** Implementation of the ::comphelper::IDocPasswordVerifier interface. */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) override; - virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) override; + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) override; + virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) override; /** Returns true, if the decoder has been initialized correctly. */ inline bool isValid() const { return mbValid; } @@ -60,8 +60,8 @@ private: /** Derived classes implement password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) = 0; - virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) = 0; + virtual css::uno::Sequence< css::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) = 0; + virtual bool implVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) = 0; /** Implementation of decryption of a memory block. */ virtual void implDecode( @@ -87,8 +87,8 @@ private: virtual BiffDecoder_XOR* implClone() override; /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) override; - virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; + virtual css::uno::Sequence< css::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) override; + virtual bool implVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) override; /** Implementation of decryption of a memory block. */ virtual void implDecode( @@ -99,7 +99,7 @@ private: private: ::oox::core::BinaryCodec_XOR maCodec; /// Cipher algorithm implementation. - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > maEncryptionData; + css::uno::Sequence< css::beans::NamedValue > maEncryptionData; sal_uInt16 mnKey; sal_uInt16 mnHash; }; @@ -115,8 +115,8 @@ private: virtual BiffDecoder_RCF* implClone() override; /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) override; - virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; + virtual css::uno::Sequence< css::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) override; + virtual bool implVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) override; /** Implementation of decryption of a memory block. */ virtual void implDecode( @@ -127,7 +127,7 @@ private: private: ::oox::core::BinaryCodec_RCF maCodec; /// Cipher algorithm implementation. - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > maEncryptionData; + css::uno::Sequence< css::beans::NamedValue > maEncryptionData; ::std::vector< sal_uInt8 > maSalt; ::std::vector< sal_uInt8 > maVerifier; ::std::vector< sal_uInt8 > maVerifierHash; diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx index 6c99f47a2543..af5759b3c4e6 100644 --- a/sc/source/filter/inc/commentsbuffer.hxx +++ b/sc/source/filter/inc/commentsbuffer.hxx @@ -29,10 +29,10 @@ namespace xls { struct CommentModel { - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress maRange; /// Position of the comment in the worksheet. RichStringRef mxText; /// Formatted text of the comment (not used in BIFF8). - OUString maAuthor; /// Comment author (BIFF8 only). + OUString maAuthor; /// Comment author (BIFF8 only). sal_Int32 mnAuthorId; /// Identifier of the comment's author (OOXML and BIFF12 only). sal_uInt16 mnObjId; /// Drawing object identifier (BIFF8 only). bool mbAutoFill; /// Auto Selection of comment object's fill style @@ -42,8 +42,7 @@ struct CommentModel bool mbRowHidden; /// Comment cell's Row is Hidden sal_Int32 mnTHA; /// Horizontal Alignment sal_Int32 mnTVA; /// Vertical Alignment - ::com::sun::star::awt::Rectangle - maAnchor; /// Anchor parameters + css::awt::Rectangle maAnchor; /// Anchor parameters bool mbVisible; /// True = comment is always shown (BIFF2-BIFF8 only). explicit CommentModel(); diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx index 31d67fb01a21..fefdef0313b6 100644 --- a/sc/source/filter/inc/connectionsbuffer.hxx +++ b/sc/source/filter/inc/connectionsbuffer.hxx @@ -39,7 +39,7 @@ const sal_Int32 BIFF12_CONNECTION_DSP = 8; /** Special properties for data connections representing web queries. */ struct WebPrModel { - typedef ::std::vector< ::com::sun::star::uno::Any > TablesVector; + typedef ::std::vector< css::uno::Any > TablesVector; TablesVector maTables; /// Names or indexes of the web query tables. OUString maUrl; /// Source URL to refresh the data. diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx index 0eee4f55e910..5b0c36ebeeb1 100644 --- a/sc/source/filter/inc/defnamesbuffer.hxx +++ b/sc/source/filter/inc/defnamesbuffer.hxx @@ -81,13 +81,13 @@ public: /** Returns the original name as imported from or exported to the file. */ const OUString& getUpcaseModelName() const; /** Returns an Any with a SingleReference or ComplexReference, or an empty Any. */ - ::com::sun::star::uno::Any getReference( const ::com::sun::star::table::CellAddress& rBaseAddr ) const; + css::uno::Any getReference( const css::table::CellAddress& rBaseAddr ) const; protected: - DefinedNameModel maModel; /// Model data for this defined name. - mutable OUString maUpModelName; /// Model name converted to uppercase ASCII. - OUString maCalcName; /// Final name used in the Calc document. - ::com::sun::star::uno::Any maRefAny; /// Single cell/range reference. + DefinedNameModel maModel; /// Model data for this defined name. + mutable OUString maUpModelName; /// Model name converted to uppercase ASCII. + OUString maCalcName; /// Final name used in the Calc document. + css::uno::Any maRefAny; /// Single cell/range reference. }; class DefinedName : public DefinedNameBase @@ -123,7 +123,7 @@ public: /** Returns the token index used in API token arrays (com.sun.star.sheet.FormulaToken). */ inline sal_Int32 getTokenIndex() const { return mnTokenIndex; } /** Tries to resolve the defined name to an absolute cell range. */ - bool getAbsoluteRange( ::com::sun::star::table::CellRangeAddress& orRange ) const; + bool getAbsoluteRange( css::table::CellRangeAddress& orRange ) const; private: typedef ::std::unique_ptr< StreamDataSequence > StreamDataSeqPtr; diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx index a0dc33740584..16e258f7a911 100644 --- a/sc/source/filter/inc/drawingbase.hxx +++ b/sc/source/filter/inc/drawingbase.hxx @@ -101,11 +101,9 @@ public: bool isAnchorValid() const; /** Calculates the resulting shape anchor in EMUs. */ - ::oox::drawingml::EmuRectangle calcAnchorRectEmu( - const ::com::sun::star::awt::Size& rPageSizeHmm ) const; + ::oox::drawingml::EmuRectangle calcAnchorRectEmu( const css::awt::Size& rPageSizeHmm ) const; /** Calculates the resulting shape anchor in 1/100 mm. */ - ::com::sun::star::awt::Rectangle calcAnchorRectHmm( - const ::com::sun::star::awt::Size& rPageSizeHmm ) const; + css::awt::Rectangle calcAnchorRectHmm( const css::awt::Size& rPageSizeHmm ) const; AnchorType getEditAs() const { return meEditAs; } private: /** Converts the passed anchor to an absolute position in EMUs. */ diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 401ee46d46bb..3bb393cff0ef 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -46,13 +46,13 @@ class ShapeMacroAttacher : public ::oox::ole::VbaMacroAttacherBase { public: explicit ShapeMacroAttacher( const OUString& rMacroName, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape ); + const css::uno::Reference< css::drawing::XShape >& rxShape ); private: virtual void attachMacro( const OUString& rMacroUrl ) override; private: - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; + css::uno::Reference< css::drawing::XShape > mxShape; }; class Shape : public ::oox::drawingml::Shape, public WorksheetHelper @@ -66,7 +66,7 @@ public: protected: virtual void finalizeXShape( ::oox::core::XmlFilterBase& rFilter, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ) override; + const css::uno::Reference< css::drawing::XShapes >& rxShapes ) override; private: OUString maMacroName; @@ -114,7 +114,7 @@ protected: private: typedef ::std::unique_ptr< ShapeAnchor > ShapeAnchorRef; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + css::uno::Reference< css::drawing::XShapes > mxDrawPage; /// Drawing page of this sheet. ::oox::drawingml::ShapePtr mxShape; /// Current top-level shape. ShapeAnchorRef mxAnchor; /// Current anchor of top-level shape. @@ -126,14 +126,14 @@ class VmlControlMacroAttacher : public ::oox::ole::VbaMacroAttacherBase { public: explicit VmlControlMacroAttacher( const OUString& rMacroName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rxCtrlFormIC, + const css::uno::Reference< css::container::XIndexContainer >& rxCtrlFormIC, sal_Int32 nCtrlIndex, sal_Int32 nCtrlType, sal_Int32 nDropStyle ); private: virtual void attachMacro( const OUString& rMacroUrl ) override; private: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > mxCtrlFormIC; + css::uno::Reference< css::container::XIndexContainer > mxCtrlFormIC; sal_Int32 mnCtrlIndex; sal_Int32 mnCtrlType; sal_Int32 mnDropStyle; @@ -145,7 +145,7 @@ public: explicit VmlDrawing( const WorksheetHelper& rHelper ); /** Returns the drawing shape for a cell note at the specified position. */ - const ::oox::vml::ShapeBase* getNoteShape( const ::com::sun::star::table::CellAddress& rPos ) const; + const ::oox::vml::ShapeBase* getNoteShape( const css::table::CellAddress& rPos ) const; /** Filters cell note shapes. */ virtual bool isShapeSupported( const ::oox::vml::ShapeBase& rShape ) const override; @@ -155,20 +155,20 @@ public: /** Calculates the shape rectangle from a cell anchor string. */ virtual bool convertClientAnchor( - ::com::sun::star::awt::Rectangle& orShapeRect, + css::awt::Rectangle& orShapeRect, const OUString& rShapeAnchor ) const override; /** Creates a UNO control shape for legacy drawing controls. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + virtual css::uno::Reference< css::drawing::XShape > createAndInsertClientXShape( const ::oox::vml::ShapeBase& rShape, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const override; + const css::uno::Reference< css::drawing::XShapes >& rxShapes, + const css::awt::Rectangle& rShapeRect ) const override; /** Updates the bounding box covering all shapes of this drawing. */ virtual void notifyXShapeInserted( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, - const ::com::sun::star::awt::Rectangle& rShapeRect, + const css::uno::Reference< css::drawing::XShape >& rxShape, + const css::awt::Rectangle& rShapeRect, const ::oox::vml::ShapeBase& rShape, bool bGroupChild ) override; private: diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index 129a1f98d0ca..2e8a8731d957 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -58,13 +58,13 @@ class BiffDrawingBase : public WorksheetHelper { public: explicit BiffDrawingBase( const WorksheetHelper& rHelper, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxDrawPage ); + const css::uno::Reference< css::drawing::XDrawPage >& rxDrawPage ); /** Final processing after import of the all drawing objects. */ void finalizeImport(); private: - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > + css::uno::Reference< css::drawing::XDrawPage > mxDrawPage; /// UNO draw page used to insert the shapes. }; diff --git a/sc/source/filter/inc/excelchartconverter.hxx b/sc/source/filter/inc/excelchartconverter.hxx index 7e594b2c9cda..59982c09bc90 100644 --- a/sc/source/filter/inc/excelchartconverter.hxx +++ b/sc/source/filter/inc/excelchartconverter.hxx @@ -34,7 +34,7 @@ public: /** Creates an external data provider that is able to use spreadsheet data. */ virtual void createDataProvider( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc ) override; + const css::uno::Reference< css::chart2::XChartDocument >& rxChartDoc ) override; /** Creates a data sequence from the passed formula. */ virtual css::uno::Reference<css::chart2::data::XDataSequence> diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx index 637e7fe29a9b..dfbb92a99ae2 100644 --- a/sc/source/filter/inc/excelfilter.hxx +++ b/sc/source/filter/inc/excelfilter.hxx @@ -31,8 +31,8 @@ class ExcelFilter : public ::oox::core::XmlFilterBase { public: explicit ExcelFilter( - 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 ~ExcelFilter(); void registerWorkbookGlobals( WorkbookGlobals& rBookGlob ); @@ -48,7 +48,7 @@ public: virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override; virtual void useInternalChartDataTable( bool bInternal ) override; - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) throw( css::uno::RuntimeException, std::exception ) override; private: virtual GraphicHelper* implCreateGraphicHelper() const override; diff --git a/sc/source/filter/inc/excelvbaproject.hxx b/sc/source/filter/inc/excelvbaproject.hxx index 47d37fec2edc..fc2135c20778 100644 --- a/sc/source/filter/inc/excelvbaproject.hxx +++ b/sc/source/filter/inc/excelvbaproject.hxx @@ -34,15 +34,15 @@ class ExcelVbaProject : public ::oox::ole::VbaProject { public: explicit ExcelVbaProject( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >& rxDocument ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::sheet::XSpreadsheetDocument >& rxDocument ); protected: /** Adds dummy modules for sheets without imported code name. */ virtual void prepareImport() override; private: - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > + css::uno::Reference< css::sheet::XSpreadsheetDocument > mxDocument; }; diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index e78373754fce..47d4a4c56cd8 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -196,7 +196,7 @@ class XclExpSheetProtection : public XclExpProtection class XclExpPassHash : public XclExpRecord { public: - XclExpPassHash(const ::com::sun::star::uno::Sequence<sal_Int8>& aHash); + XclExpPassHash(const css::uno::Sequence<sal_Int8>& aHash); virtual ~XclExpPassHash(); private: diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx index 2ddc5d2e5d4e..526af61f312c 100644 --- a/sc/source/filter/inc/externallinkbuffer.hxx +++ b/sc/source/filter/inc/externallinkbuffer.hxx @@ -93,7 +93,7 @@ public: /** Returns the DDE item info needed by the XML formula parser. */ bool getDdeItemInfo( - ::com::sun::star::sheet::DDEItemInfo& orItemInfo ) const; + css::sheet::DDEItemInfo& orItemInfo ) const; /** Returns the complete DDE link data of this DDE item. */ bool getDdeLinkData( @@ -106,13 +106,13 @@ private: void setResultSize( sal_Int32 nColumns, sal_Int32 nRows ); private: - typedef Matrix< ::com::sun::star::uno::Any > ResultMatrix; + typedef Matrix< css::uno::Any > ResultMatrix; const ExternalLink& mrParentLink; /// External link this name belongs to. ExternalNameModel maExtNameModel; /// Additional name data. ResultMatrix maResults; /// DDE/OLE link results. ResultMatrix::iterator maCurrIt; /// Current position in result matrix. - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDDELink > + css::uno::Reference< css::sheet::XDDELink > mxDdeLink; /// Interface of a DDE link. bool mbDdeLinkCreated; /// True = already tried to create the DDE link. }; @@ -229,7 +229,7 @@ public: /** Returns the target URL of this external link. */ inline const OUString& getTargetUrl() const { return maTargetUrl; } /** Returns the link info needed by the XML formula parser. */ - ::com::sun::star::sheet::ExternalLinkInfo getLinkInfo() const; + css::sheet::ExternalLinkInfo getLinkInfo() const; /** Returns the type of the external library if this is a library link. */ FunctionLibraryType getFuncLibraryType() const; @@ -239,7 +239,7 @@ public: /** Returns the external sheet cache index or for the passed sheet. */ sal_Int32 getSheetCacheIndex( sal_Int32 nTabId = 0 ) const; /** Returns the sheet cache of the external sheet with the passed index. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalSheetCache > + css::uno::Reference< css::sheet::XExternalSheetCache > getSheetCache( sal_Int32 nTabId ) const; /** Returns the internal sheet range or range of external sheet caches for the passed sheet range (BIFF only). */ @@ -265,10 +265,10 @@ private: ExternalLinkType meLinkType; /// Type of this link object. FunctionLibraryType meFuncLibType; /// Type of the function library, if link type is LINKTYPE_LIBRARY. - OUString maRelId; /// Relation identifier for the external link fragment. - OUString maClassName; /// DDE service, OLE class name. - OUString maTargetUrl; /// Target link, DDE topic, OLE target. - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalDocLink > + OUString maRelId; /// Relation identifier for the external link fragment. + OUString maClassName; /// DDE service, OLE class name. + OUString maTargetUrl; /// Target link, DDE topic, OLE target. + css::uno::Reference< css::sheet::XExternalDocLink > mxDocLink; /// Interface for an external document. Int16Vector maCalcSheets; /// Internal sheet indexes. Int32Vector maSheetCaches; /// External sheet cache indexes. @@ -315,7 +315,7 @@ public: void importExternalSheets( SequenceInputStream& rStrm ); /** Returns the sequence of link infos needed by the XML formula parser. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::ExternalLinkInfo > + css::uno::Sequence< css::sheet::ExternalLinkInfo > getLinkInfos() const; /** Returns the external link for the passed reference identifier. */ diff --git a/sc/source/filter/inc/externallinkfragment.hxx b/sc/source/filter/inc/externallinkfragment.hxx index af728e5b802d..6a320ff23c7d 100644 --- a/sc/source/filter/inc/externallinkfragment.hxx +++ b/sc/source/filter/inc/externallinkfragment.hxx @@ -38,7 +38,7 @@ class ExternalSheetDataContext : public WorkbookContextBase public: explicit ExternalSheetDataContext( WorkbookFragmentBase& rFragment, - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalSheetCache >& rxSheetCache ); + const css::uno::Reference< css::sheet::XExternalSheetCache >& rxSheetCache ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; @@ -62,12 +62,12 @@ private: void importExtCellString( SequenceInputStream& rStrm ); /** Sets the passed cell value to the current position in the sheet cache. */ - void setCellValue( const ::com::sun::star::uno::Any& rValue ); + void setCellValue( const css::uno::Any& rValue ); private: - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalSheetCache > + css::uno::Reference< css::sheet::XExternalSheetCache > mxSheetCache; /// The sheet cache used to store external cell values. - ::com::sun::star::table::CellAddress maCurrPos; /// Position of current cell. + css::table::CellAddress maCurrPos; /// Position of current cell. sal_Int32 mnCurrType; /// Data type of current cell. }; diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index 18b2988dd6fb..fa3b152c0564 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -56,7 +56,7 @@ public: /** Converts a non-empty vector into a UNO sequence containing elements of the same type. */ template< typename Type > - static ::com::sun::star::uno::Sequence< Type > + static css::uno::Sequence< Type > VectorToSequence( const ::std::vector< Type >& rVector ); /** Returns the service name provided via the XServiceName interface, or an empty string on error. */ @@ -80,16 +80,16 @@ public: /** Opens a password dialog and returns the encryption data. @return The encryption data or an empty sequence on 'Cancel' or any error. */ - static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > QueryEncryptionDataForMedium( SfxMedium& rMedium, + static css::uno::Sequence< css::beans::NamedValue > QueryEncryptionDataForMedium( SfxMedium& rMedium, ::comphelper::IDocPasswordVerifier& rVerifier, const ::std::vector< OUString >* pDefaultPasswords = 0 ); }; template< typename Type > -::com::sun::star::uno::Sequence< Type > ScfApiHelper::VectorToSequence( const ::std::vector< Type >& rVector ) +css::uno::Sequence< Type > ScfApiHelper::VectorToSequence( const ::std::vector< Type >& rVector ) { OSL_ENSURE( !rVector.empty(), "ScfApiHelper::VectorToSequence - vector is empty" ); - return ::com::sun::star::uno::Sequence< Type >( &rVector.front(), static_cast< sal_Int32 >( rVector.size() ) ); + return css::uno::Sequence< Type >( &rVector.front(), static_cast< sal_Int32 >( rVector.size() ) ); } // Property sets ============================================================== @@ -125,8 +125,8 @@ public: void Set( css::uno::Reference< css::beans::XPropertySet > xPropSet ); /** Queries the passed interface for an XPropertySet and releases the old UNO property set. */ template< typename InterfaceType > - inline void Set( ::com::sun::star::uno::Reference< InterfaceType > xInterface ) - { Set( css::uno::Reference< css::beans::XPropertySet >( xInterface, ::com::sun::star::uno::UNO_QUERY ) ); } + inline void Set( css::uno::Reference< InterfaceType > xInterface ) + { Set( css::uno::Reference< css::beans::XPropertySet >( xInterface, css::uno::UNO_QUERY ) ); } /** Returns true, if the contained XPropertySet interface is valid. */ inline bool Is() const { return mxPropSet.is(); } @@ -176,7 +176,7 @@ public: /** Puts the passed value into the property set. */ template< typename Type > inline void SetProperty( const OUString& rPropName, const Type& rValue ) - { SetAnyProperty( rPropName, ::com::sun::star::uno::makeAny( rValue ) ); } + { SetAnyProperty( rPropName, css::uno::makeAny( rValue ) ); } /** Puts the passed Boolean value into the property set. */ inline void SetBoolProperty( const OUString& rPropName, bool bValue ) diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index 36e5abe8b15f..65eb0022935a 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -286,8 +286,7 @@ public: void resize( size_t n ) { mvTokens.resize( n ); } /** Appends a new token with the passed op-code, returns its data field. */ - ::com::sun::star::uno::Any& - append( sal_Int32 nOpCode ); + css::uno::Any& append( sal_Int32 nOpCode ); /** Appends a new token with the passed op-code and data. */ template< typename Type > @@ -599,7 +598,7 @@ class OpCodeProvider : public FunctionProvider // not derived from WorkbookHelpe { public: explicit OpCodeProvider( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory, + const css::uno::Reference< css::lang::XMultiServiceFactory >& rxModelFactory, FilterType eFilter, BiffType eBiff, bool bImportFilter, bool bCallerKnowsAboutMacroExport = false ); virtual ~OpCodeProvider(); @@ -612,7 +611,7 @@ public: const FunctionInfo* getFuncInfoFromApiToken( const ApiToken& rToken ) const; /** Returns the op-code map that is used by the OOXML formula parser. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaOpCodeMapEntry > + css::uno::Sequence< css::sheet::FormulaOpCodeMapEntry > getOoxParserMap() const; private: @@ -627,7 +626,7 @@ class ApiParserWrapper : public OpCodeProvider { public: explicit ApiParserWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory, + const css::uno::Reference< css::lang::XMultiServiceFactory >& rxModelFactory, const OpCodeProvider& rOpCodeProv ); /** Returns read/write access to the formula parser property set. */ @@ -636,10 +635,10 @@ public: /** Calls the XFormulaParser::parseFormula() function of the API parser. */ ApiTokenSequence parseFormula( const OUString& rFormula, - const ::com::sun::star::table::CellAddress& rRefPos ); + const css::table::CellAddress& rRefPos ); private: - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser > + css::uno::Reference< css::sheet::XFormulaParser > mxParser; PropertySet maParserProps; }; @@ -659,7 +658,7 @@ public: @param bAbsolute True = adds dollar signs before column and row. */ static OUString generateAddress2dString( - const ::com::sun::star::table::CellAddress& rAddress, + const css::table::CellAddress& rAddress, bool bAbsolute ); /** Generates a cell address string in A1 notation from the passed binary @@ -686,7 +685,7 @@ public: @param rMatrix The matrix containing double values or strings. */ - static OUString generateApiArray( const Matrix< ::com::sun::star::uno::Any >& rMatrix ); + static OUString generateApiArray( const Matrix< css::uno::Any >& rMatrix ); /** Tries to extract a single cell reference from a formula token sequence. @@ -699,7 +698,7 @@ public: com.sun.star.sheet.ComplexReference object. If the token sequence contains too many, or unexpected tokens, an empty Any is returned. */ - ::com::sun::star::uno::Any + css::uno::Any extractReference( const ApiTokenSequence& rTokens ) const; /** Tries to extract a cell range address from a formula token sequence. @@ -721,7 +720,7 @@ public: address which has been extracted to orRange, false otherwise. */ bool extractCellRange( - ::com::sun::star::table::CellRangeAddress& orRange, + css::table::CellRangeAddress& orRange, const ApiTokenSequence& rTokens, bool bAllowRelative ) const; diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx index 26a76db99856..a491b8098457 100644 --- a/sc/source/filter/inc/formulabuffer.hxx +++ b/sc/source/filter/inc/formulabuffer.hxx @@ -37,14 +37,14 @@ public: */ struct SharedFormulaEntry { - com::sun::star::table::CellAddress maAddress; - com::sun::star::table::CellRangeAddress maRange; + css::table::CellAddress maAddress; + css::table::CellRangeAddress maRange; OUString maTokenStr; sal_Int32 mnSharedId; SharedFormulaEntry( - const com::sun::star::table::CellAddress& rAddress, - const com::sun::star::table::CellRangeAddress& rRange, + const css::table::CellAddress& rAddress, + const css::table::CellRangeAddress& rRange, const OUString& rTokenStr, sal_Int32 nSharedId ); }; @@ -53,37 +53,37 @@ public: */ struct SharedFormulaDesc { - com::sun::star::table::CellAddress maAddress; + css::table::CellAddress maAddress; sal_Int32 mnSharedId; OUString maCellValue; sal_Int32 mnValueType; SharedFormulaDesc( - const com::sun::star::table::CellAddress& rAddr, sal_Int32 nSharedId, + const css::table::CellAddress& rAddr, sal_Int32 nSharedId, const OUString& rCellValue, sal_Int32 nValueType ); }; struct TokenAddressItem { OUString maTokenStr; - ::com::sun::star::table::CellAddress maCellAddress; - TokenAddressItem( const OUString& rTokenStr, const ::com::sun::star::table::CellAddress& rCellAddress ) : maTokenStr( rTokenStr ), maCellAddress( rCellAddress ) {} + css::table::CellAddress maCellAddress; + TokenAddressItem( const OUString& rTokenStr, const css::table::CellAddress& rCellAddress ) : maTokenStr( rTokenStr ), maCellAddress( rCellAddress ) {} }; struct TokenRangeAddressItem { TokenAddressItem maTokenAndAddress; - ::com::sun::star::table::CellRangeAddress maCellRangeAddress; - TokenRangeAddressItem( const TokenAddressItem& rTokenAndAddress, const ::com::sun::star::table::CellRangeAddress& rCellRangeAddress ) : maTokenAndAddress( rTokenAndAddress ), maCellRangeAddress( rCellRangeAddress ) {} + css::table::CellRangeAddress maCellRangeAddress; + TokenRangeAddressItem( const TokenAddressItem& rTokenAndAddress, const css::table::CellRangeAddress& rCellRangeAddress ) : maTokenAndAddress( rTokenAndAddress ), maCellRangeAddress( rCellRangeAddress ) {} }; struct FormulaValue { - com::sun::star::table::CellAddress maCellAddress; + css::table::CellAddress maCellAddress; OUString maValueStr; sal_Int32 mnCellType; }; - typedef std::pair<com::sun::star::table::CellAddress, double> ValueAddressPair; + typedef std::pair<css::table::CellAddress, double> ValueAddressPair; struct SheetItem { @@ -118,10 +118,10 @@ private: public: explicit FormulaBuffer( const WorkbookHelper& rHelper ); void finalizeImport(); - void setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, const OUString& ); + void setCellFormula( const css::table::CellAddress& rAddress, const OUString& ); void setCellFormula( - const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, + const css::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rCellValue, sal_Int32 nValueType ); void setCellFormulaValue( diff --git a/sc/source/filter/inc/formulaparser.hxx b/sc/source/filter/inc/formulaparser.hxx index 95500860b4d6..f2158e3c2825 100644 --- a/sc/source/filter/inc/formulaparser.hxx +++ b/sc/source/filter/inc/formulaparser.hxx @@ -105,12 +105,12 @@ public: /** Converts an OOXML formula string. */ ApiTokenSequence importFormula( - const ::com::sun::star::table::CellAddress& rBaseAddr, + const css::table::CellAddress& rBaseAddr, const OUString& rFormulaString ) const; /** Imports and converts a BIFF12 token array from the passed stream. */ ApiTokenSequence importFormula( - const ::com::sun::star::table::CellAddress& rBaseAddr, + const css::table::CellAddress& rBaseAddr, FormulaType eType, SequenceInputStream& rStrm ) const; diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx index c7535e67d1a5..c3928de80750 100644 --- a/sc/source/filter/inc/numberformatsbuffer.hxx +++ b/sc/source/filter/inc/numberformatsbuffer.hxx @@ -35,8 +35,8 @@ namespace xls { struct NumFmtModel { - ::com::sun::star::lang::Locale maLocale; - OUString maFmtCode; + css::lang::Locale maLocale; + OUString maFmtCode; sal_Int16 mnPredefId; explicit NumFmtModel(); @@ -60,17 +60,17 @@ public: void setFormatCode( const OUString& rFmtCode ); /** Sets the passed format code, encoded in UTF-8. */ void setFormatCode( - const ::com::sun::star::lang::Locale& rLocale, + const css::lang::Locale& rLocale, const sal_Char* pcFmtCode ); /** Sets the passed predefined format code identifier. */ void setPredefinedId( - const ::com::sun::star::lang::Locale& rLocale, + const css::lang::Locale& rLocale, sal_Int16 nPredefId ); /** Final processing after import of all style settings. Returns the API format index. */ sal_Int32 finalizeImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& rxNumFmts, - const ::com::sun::star::lang::Locale& rFromLocale ); + const css::uno::Reference< css::util::XNumberFormats >& rxNumFmts, + const css::lang::Locale& rFromLocale ); sal_uLong fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false ) const; /** Writes the number format to the passed property map. */ void writeToPropertyMap( PropertyMap& rPropMap ) const; diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx index 91df7282977e..4520a9f4707b 100644 --- a/sc/source/filter/inc/ooxformulaparser.hxx +++ b/sc/source/filter/inc/ooxformulaparser.hxx @@ -34,9 +34,9 @@ namespace xls { class OOXMLFormulaParserImpl; typedef ::cppu::WeakImplHelper< - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::sheet::XFilterFormulaParser > OOXMLFormulaParser_BASE; + css::lang::XServiceInfo, + css::lang::XInitialization, + css::sheet::XFilterFormulaParser > OOXMLFormulaParser_BASE; /** OOXML formula parser/compiler service for usage in ODF filters. */ class OOXMLFormulaParser : public OOXMLFormulaParser_BASE @@ -48,45 +48,45 @@ public: // com.sun.star.lang.XServiceInfo interface ------------------------------- virtual ::rtl::OUString SAL_CALL - getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rService ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL - getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL + getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // com.sun.star.lang.XInitialization interface ---------------------------- 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.sheet.XFilterFormulaParser interface ---------------------- virtual ::rtl::OUString SAL_CALL getSupportedNamespace() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // com.sun.star.sheet.XFormulaParser interface ---------------------------- - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL + virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL parseFormula( const ::rtl::OUString& rFormula, - const ::com::sun::star::table::CellAddress& rReferencePos ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::table::CellAddress& rReferencePos ) + throw( css::uno::RuntimeException, std::exception ) override; virtual ::rtl::OUString SAL_CALL printFormula( - const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& rTokens, - const ::com::sun::star::table::CellAddress& rReferencePos ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< css::sheet::FormulaToken >& rTokens, + const css::table::CellAddress& rReferencePos ) + throw( css::uno::RuntimeException, std::exception ) override; private: typedef std::shared_ptr< OOXMLFormulaParserImpl > ParserImplRef; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + css::uno::Reference< css::lang::XComponent > mxComponent; ParserImplRef mxParserImpl; /// Implementation of import parser. }; diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index 004f56275dd6..d42a46c0a439 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -460,7 +460,7 @@ class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory int mnProgress; - com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> mxStatusIndicator; + css::uno::Reference<css::task::XStatusIndicator> mxStatusIndicator; public: ScOrcusFactory(ScDocument& rDoc); @@ -480,7 +480,7 @@ public: void incrementProgress(); - void setStatusIndicator(const com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator>& rIndicator); + void setStatusIndicator(const css::uno::Reference<css::task::XStatusIndicator>& rIndicator); }; class ScOrcusTable : public orcus::spreadsheet::iface::import_table diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index 3aa935468cb6..a18c2addf6f1 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -88,7 +88,7 @@ public: /** Returns the type of the item. */ inline sal_Int32 getType() const { return mnType; } /** Returns the value of the item. */ - inline const ::com::sun::star::uno::Any& getValue() const { return maValue; } + inline const css::uno::Any& getValue() const { return maValue; } /** Returns the string representation of the item. */ OUString getName() const; /** Returns true if the item is unused. */ @@ -98,7 +98,7 @@ private: friend class PivotCacheItemList; // #FIXME hack Sets the value of this item to the given string ( and overwrites type if necessary void setStringValue( const OUString& sName ); - ::com::sun::star::uno::Any maValue; /// Value of the item. + css::uno::Any maValue; /// Value of the item. sal_Int32 mnType; /// Value type (OOXML token identifier). bool mbUnused; }; @@ -174,8 +174,8 @@ struct PCSharedItemsModel struct PCFieldGroupModel { - ::com::sun::star::util::DateTime maStartDate; /// Manual or calculated start date for range grouping. - ::com::sun::star::util::DateTime maEndDate; /// Manual or calculated end date for range grouping. + css::util::DateTime maStartDate; /// Manual or calculated start date for range grouping. + css::util::DateTime maEndDate; /// Manual or calculated end date for range grouping. double mfStartValue; /// Manual or calculated start value for range grouping. double mfEndValue; /// Manual or calculated end value for range grouping. double mfInterval; /// Interval for numeric range grouping. @@ -279,13 +279,13 @@ public: /** Creates inplace numeric grouping settings. */ void convertNumericGrouping( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxDPField ) const; + const css::uno::Reference< css::sheet::XDataPilotField >& rxDPField ) const; /** Creates inplace date grouping settings or a new date group field. */ OUString createDateGroupField( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField ) const; + const css::uno::Reference< css::sheet::XDataPilotField >& rxBaseDPField ) const; /** Creates a new grouped DataPilot field and returns its name. */ OUString createParentGroupField( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField, + const css::uno::Reference< css::sheet::XDataPilotField >& rxBaseDPField, const PivotCacheField& rBaseCacheField, PivotCacheGroupItemVector& orItemNames ) const; @@ -358,8 +358,8 @@ struct PCWorksheetSourceModel OUString maRelId; /// Relation identifier for an external document URL. OUString maSheet; /// Sheet name for cell range or sheet-local defined names. OUString maDefName; /// Defined name containing a cell range if present. - ::com::sun::star::table::CellRangeAddress - maRange; /// Source cell range of the data. + css::table::CellRangeAddress + maRange; /// Source cell range of the data. explicit PCWorksheetSourceModel(); }; @@ -397,7 +397,7 @@ public: /** Returns true, if the pivot cache is based on a dummy sheet created in finalizeImport. */ inline bool isBasedOnDummySheet() const { return mbDummySheet; } /** Returns the internal cell range the cache is based on. */ - inline const ::com::sun::star::table::CellRangeAddress& + inline const css::table::CellRangeAddress& getSourceRange() const { return maSheetSrcModel.maRange; } /** Returns the relation identifier of the pivot cache records fragment. */ inline const OUString& getRecordsRelId() const { return maDefModel.maRelId; } diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index 77599286db72..aaef9bb1bdca 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -139,14 +139,14 @@ public: /** Finalizes the field after import, creates grouping and other settings. */ void finalizeImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotDescriptor >& rxDPDesc ); + const css::uno::Reference< css::sheet::XDataPilotDescriptor >& rxDPDesc ); /** Finalizes the grouped date field after import. */ void finalizeDateGroupingImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField, + const css::uno::Reference< css::sheet::XDataPilotField >& rxBaseDPField, sal_Int32 nBaseFieldIdx ); /** Finalizes the grouped field after import. */ void finalizeParentGroupingImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField, + const css::uno::Reference< css::sheet::XDataPilotField >& rxBaseDPField, const PivotCacheField& rBaseCacheField, PivotCacheGroupItemVector& orItemNames ); @@ -166,7 +166,7 @@ public: private: /** Converts dimension and other settings for row, column, page, or hidden fields. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField > + css::uno::Reference< css::sheet::XDataPilotField > convertRowColPageField( sal_Int32 nAxis ); private: @@ -271,7 +271,7 @@ struct PTDefinitionModel : public AutoFormatModel struct PTLocationModel { - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress maRange; /// Target cell range for the pivot table. sal_Int32 mnFirstHeaderRow; /// First row of header cells (relative in pivot table). sal_Int32 mnFirstDataRow; /// First row of data cells (relative in pivot table). @@ -321,22 +321,22 @@ public: void finalizeImport(); /** Creates all date group fields for the specified cache field after import. */ void finalizeDateGroupingImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField, + const css::uno::Reference< css::sheet::XDataPilotField >& rxBaseDPField, sal_Int32 nBaseFieldIdx ); /** Creates all grouped fields for the specified cache field after import. */ void finalizeParentGroupingImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField, + const css::uno::Reference< css::sheet::XDataPilotField >& rxBaseDPField, const PivotCacheField& rBaseCacheField, PivotCacheGroupItemVector& orItemNames ); /** Returns the associated data pilot field for the specified pivot table field. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField > + css::uno::Reference< css::sheet::XDataPilotField > getDataPilotField( const OUString& rFieldName ) const; /** Returns the associated data pilot field for the specified pivot table field. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField > + css::uno::Reference< css::sheet::XDataPilotField > getDataPilotField( sal_Int32 nFieldIdx ) const; /** Returns the data layout field used to store all data fields in row/col dimension. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField > + css::uno::Reference< css::sheet::XDataPilotField > getDataLayoutField() const; /** Returns the cache field with the specified index. */ @@ -365,19 +365,19 @@ private: static void importFields( IndexVector& orFields, SequenceInputStream& rStrm ); private: - ScDPObject* mpDPObject; + ScDPObject* mpDPObject; PivotTableFieldVector maFields; /// All pivot table fields. - PivotTableField maDataField; /// Data layout field. - IndexVector maRowFields; /// Indexes to fields in row dimension. - IndexVector maColFields; /// Indexes to fields in column dimension. - PageFieldVector maPageFields; /// Settings for all fields in page dimension. - DataFieldVector maDataFields; /// Settings for all fields in data area. + PivotTableField maDataField; /// Data layout field. + IndexVector maRowFields; /// Indexes to fields in row dimension. + IndexVector maColFields; /// Indexes to fields in column dimension. + PageFieldVector maPageFields; /// Settings for all fields in page dimension. + DataFieldVector maDataFields; /// Settings for all fields in data area. PivotTableFilterVector maFilters; /// All field filters. - PTDefinitionModel maDefModel; /// Global pivot table settings. - PTLocationModel maLocationModel; /// Location settings of the pivot table. - const PivotCache* mpPivotCache; /// The pivot cache this table is based on. - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotDescriptor > - mxDPDescriptor; /// Descriptor of the DataPilot object. + PTDefinitionModel maDefModel; /// Global pivot table settings. + PTLocationModel maLocationModel; /// Location settings of the pivot table. + const PivotCache* mpPivotCache; /// The pivot cache this table is based on. + css::uno::Reference< css::sheet::XDataPilotDescriptor > + mxDPDescriptor; /// Descriptor of the DataPilot object. }; class PivotTableBuffer : public WorkbookHelper diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index 5635fed17330..766193710810 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -67,12 +67,12 @@ public: /** Converts the portion and replaces or appends to the passed XText. */ void convert( - const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rxText, + const css::uno::Reference< css::text::XText >& rxText, const oox::xls::Font* pFont, bool bReplace ); void convert( ScEditEngineDefaulter& rEE, ESelection& rSelection, const oox::xls::Font* pFont ); void writeFontProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rxText, + const css::uno::Reference< css::text::XText >& rxText, const oox::xls::Font* pFont ) const; private: @@ -256,7 +256,7 @@ public: @param pFirstPortionFont Optional font providing additional rich-text formatting for the first text portion, e.g. font escapement. */ void convert( - const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rxText, + const css::uno::Reference< css::text::XText >& rxText, bool bReplaceOld, const oox::xls::Font* pFirstPortionFont = 0 ) const; ::EditTextObject* convert( ScEditEngineDefaulter& rEE, const oox::xls::Font* pFont ) const; diff --git a/sc/source/filter/inc/scenariobuffer.hxx b/sc/source/filter/inc/scenariobuffer.hxx index 6afad59b8b8c..784548f31fa2 100644 --- a/sc/source/filter/inc/scenariobuffer.hxx +++ b/sc/source/filter/inc/scenariobuffer.hxx @@ -30,8 +30,8 @@ namespace xls { struct ScenarioCellModel { - ::com::sun::star::table::CellAddress maPos; - OUString maValue; + css::table::CellAddress maPos; + OUString maValue; sal_Int32 mnNumFmtId; bool mbDeleted; diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index c703bb641d52..a44db3431741 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -37,7 +37,7 @@ namespace xls { /** Stores basic data about cell values and formatting. */ struct CellModel { - ::com::sun::star::table::CellAddress + css::table::CellAddress maCellAddr; /// The address of the current cell. sal_Int32 mnCellType; /// Data type of the cell value. sal_Int32 mnXfId; /// XF (cell formatting) identifier. @@ -49,7 +49,7 @@ struct CellModel /** Stores data about cell formulas. */ struct CellFormulaModel { - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress maFormulaRef; /// Formula range for array/shared formulas and data tables. sal_Int32 mnFormulaType; /// Type of the formula (regular, array, shared, table). sal_Int32 mnSharedId; /// Identifier of a shared formula (OOXML only). @@ -57,9 +57,9 @@ struct CellFormulaModel explicit CellFormulaModel(); /** Returns true, if the passed cell address is valid for an array formula. */ - bool isValidArrayRef( const ::com::sun::star::table::CellAddress& rCellAddr ); + bool isValidArrayRef( const css::table::CellAddress& rCellAddr ); /** Returns true, if the passed cell address is valid for a shared formula. */ - bool isValidSharedRef( const ::com::sun::star::table::CellAddress& rCellAddr ); + bool isValidSharedRef( const css::table::CellAddress& rCellAddr ); }; /** Stores data about table operations. */ @@ -112,7 +112,7 @@ public: /** Inserts a shared string cell into the sheet. */ void setStringCell( const CellModel& rModel, sal_Int32 nStringId ); /** Inserts a date/time cell into the sheet and adjusts number format. */ - void setDateTimeCell( const CellModel& rModel, const ::com::sun::star::util::DateTime& rDateTime ); + void setDateTimeCell( const CellModel& rModel, const css::util::DateTime& rDateTime ); /** Inserts a boolean cell into the sheet and adjusts number format. */ void setBooleanCell( const CellModel& rModel, bool bValue ); /** Inserts an error cell from the passed error code into the sheet. */ @@ -125,25 +125,25 @@ public: void setDateCell( const CellModel& rModel, const OUString& rDateString ); void createSharedFormula( - const com::sun::star::table::CellAddress& rRange, + const css::table::CellAddress& rRange, const ApiTokenSequence& rTokens); /** Inserts the passed token array as array formula. */ void createArrayFormula( - const ::com::sun::star::table::CellRangeAddress& rRange, + const css::table::CellRangeAddress& rRange, const ApiTokenSequence& rTokens ); /** Sets a multiple table operation to the passed range. */ void createTableOperation( - const ::com::sun::star::table::CellRangeAddress& rRange, + const css::table::CellRangeAddress& rRange, const DataTableModel& rModel ); /** Sets default cell formatting for the specified range of rows. */ void setRowFormat( sal_Int32 nRow, sal_Int32 nXfId, bool bCustomFormat ); /** Merges the cells in the passed cell range. */ - void setMergedRange( const ::com::sun::star::table::CellRangeAddress& rRange ); + void setMergedRange( const css::table::CellRangeAddress& rRange ); /** Sets a standard number format (constant from com.sun.star.util.NumberFormat) to the specified cell. */ void setStandardNumFmt( - const ::com::sun::star::table::CellAddress& rCellAddr, + const css::table::CellAddress& rCellAddr, sal_Int16 nStdNumFmt ); /** Processes the cell formatting data of the passed cell. @param nNumFmtId If set, overrides number format of the cell XF. */ @@ -154,7 +154,7 @@ public: /** Sets the passed formula token array into a cell. */ void setCellFormula( - const ::com::sun::star::table::CellAddress& rCellAddr, + const css::table::CellAddress& rCellAddr, const ApiTokenSequence& rTokens ); private: @@ -166,22 +166,22 @@ private: /** Inserts the passed array formula into the sheet. */ void finalizeArrayFormula( - const ::com::sun::star::table::CellRangeAddress& rRange, + const css::table::CellRangeAddress& rRange, const ApiTokenSequence& rTokens ) const; /** Inserts the passed table operation into the sheet. */ void finalizeTableOperation( - const ::com::sun::star::table::CellRangeAddress& rRange, const DataTableModel& rModel ); + const css::table::CellRangeAddress& rRange, const DataTableModel& rModel ); /** Writes all cell formatting attributes to the passed cell range list. (depreciates writeXfIdRangeProperties) */ - void applyCellMerging( const ::com::sun::star::table::CellRangeAddress& rRange ); - void addColXfStyle( sal_Int32 nXfId, sal_Int32 nFormatId, const ::com::sun::star::table::CellRangeAddress& rAddress, bool bProcessRowRange = false ); + void applyCellMerging( const css::table::CellRangeAddress& rRange ); + void addColXfStyle( sal_Int32 nXfId, sal_Int32 nFormatId, const css::table::CellRangeAddress& rAddress, bool bProcessRowRange = false ); private: /** Stores cell range address and formula token array of an array formula. */ - typedef ::std::pair< ::com::sun::star::table::CellRangeAddress, ApiTokenSequence > ArrayFormula; + typedef ::std::pair< css::table::CellRangeAddress, ApiTokenSequence > ArrayFormula; typedef ::std::list< ArrayFormula > ArrayFormulaList; /** Stores cell range address and settings of a table operation. */ - typedef ::std::pair< ::com::sun::star::table::CellRangeAddress, DataTableModel > TableOperation; + typedef ::std::pair< css::table::CellRangeAddress, DataTableModel > TableOperation; typedef ::std::list< TableOperation > TableOperationList; /** Stores information about a range of rows with equal cell formatting. */ @@ -217,13 +217,13 @@ private: /** Stores information about a merged cell range. */ struct MergedRange { - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress maRange; /// The formatted cell range. sal_Int32 mnHorAlign; /// Horizontal alignment in the range. - explicit MergedRange( const ::com::sun::star::table::CellRangeAddress& rRange ); - explicit MergedRange( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nHorAlign ); - bool tryExpand( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nHorAlign ); + explicit MergedRange( const css::table::CellRangeAddress& rRange ); + explicit MergedRange( const css::table::CellAddress& rAddress, sal_Int32 nHorAlign ); + bool tryExpand( const css::table::CellAddress& rAddress, sal_Int32 nHorAlign ); }; typedef ::std::list< MergedRange > MergedRangeList; @@ -233,7 +233,7 @@ private: TableOperationList maTableOperations; /// All table operations in the sheet. ::std::map< BinAddress, ApiTokenSequence > maSharedFormulas; /// Maps shared formula base address to defined name token index. - ::com::sun::star::table::CellAddress + css::table::CellAddress maSharedFmlaAddr; /// Address of a cell containing a pending shared formula. css::table::CellAddress maSharedBaseAddr; /// Base address of the pending shared formula. XfIdRowRange maXfIdRowRange; /// Cached XF identifier for a range of rows. diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index c3c4e6bd74c7..a1d2aea4e9d6 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -250,7 +250,7 @@ public: void finalizeImport(); /** Returns an API font descriptor with own font information. */ - const ::com::sun::star::awt::FontDescriptor& getFontDescriptor() const { return maApiData.maDesc;} + const css::awt::FontDescriptor& getFontDescriptor() const { return maApiData.maDesc;} /** Returns true, if the font requires rich text formatting in Calc. @descr Example: Font escapement is a cell attribute in Excel, but Calc needs an rich text cell for this attribute. */ @@ -357,7 +357,7 @@ struct ProtectionModel /** Contains all API cell protection attributes. */ struct ApiProtectionData { - typedef ::com::sun::star::util::CellProtection ApiCellProtection; + typedef css::util::CellProtection ApiCellProtection; ApiCellProtection maCellProt; @@ -421,7 +421,7 @@ struct BorderModel /** Contains API attributes of a complete cell border. */ struct ApiBorderData { - typedef ::com::sun::star::table::BorderLine2 ApiBorderLine; + typedef css::table::BorderLine2 ApiBorderLine; ApiBorderLine maLeft; /// Left line format ApiBorderLine maRight; /// Right line format @@ -476,7 +476,7 @@ private: /** Converts border line data to an API struct, returns true, if the line is marked as used. */ bool convertBorderLine( - ::com::sun::star::table::BorderLine2& rBorderLine, + css::table::BorderLine2& rBorderLine, const BorderLineModel& rModel ); private: diff --git a/sc/source/filter/inc/tablebuffer.hxx b/sc/source/filter/inc/tablebuffer.hxx index c18c57ab13ad..55eb2bdd4d5a 100644 --- a/sc/source/filter/inc/tablebuffer.hxx +++ b/sc/source/filter/inc/tablebuffer.hxx @@ -30,10 +30,10 @@ namespace xls { struct TableModel { - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress maRange; /// Original (unchecked) range of the table. - OUString maProgName; /// Programmatical name. - OUString maDisplayName; /// Display name. + OUString maProgName; /// Programmatical name. + OUString maDisplayName; /// Display name. sal_Int32 mnId; /// Unique table identifier. sal_Int32 mnType; /// Table type (worksheet, query, etc.). sal_Int32 mnHeaderRows; /// Number of header rows. @@ -69,9 +69,9 @@ public: inline const OUString& getDisplayName() const { return maModel.maDisplayName; } /** Returns the original (unchecked) total range of the table. */ - inline const ::com::sun::star::table::CellRangeAddress& getOriginalRange() const { return maModel.maRange; } + inline const css::table::CellRangeAddress& getOriginalRange() const { return maModel.maRange; } /** Returns the cell range of this table. */ - inline const ::com::sun::star::table::CellRangeAddress& getRange() const { return maDestRange; } + inline const css::table::CellRangeAddress& getRange() const { return maDestRange; } /** Returns the number of columns of this table. */ inline sal_Int32 getWidth() const { return maDestRange.EndColumn - maDestRange.StartColumn + 1; } /** Returns the number of rows of this table. */ @@ -86,7 +86,7 @@ private: AutoFilterBuffer maAutoFilters; /// Filter settings for this table. TableColumnsBuffer maTableColumns; /// Column names of this table. OUString maDBRangeName; /// Name of the database range in the Calc document. - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress maDestRange; /// Validated range of the table in the worksheet. sal_Int32 mnTokenIndex; /// Token index used in API token array. }; diff --git a/sc/source/filter/inc/unitconverter.hxx b/sc/source/filter/inc/unitconverter.hxx index 47db0e8e099e..0453ac7f15be 100644 --- a/sc/source/filter/inc/unitconverter.hxx +++ b/sc/source/filter/inc/unitconverter.hxx @@ -68,7 +68,7 @@ public: /** Final processing after import of all style settings. */ void finalizeImport(); /** Updates internal nulldate for date/serial conversion. */ - void finalizeNullDate( const ::com::sun::star::util::Date& rNullDate ); + void finalizeNullDate( const css::util::Date& rNullDate ); /** Converts the passed value between the passed units. */ double scaleValue( double fValue, Unit eFromUnit, Unit eToUnit ) const; @@ -79,9 +79,9 @@ public: double scaleFromMm100( sal_Int32 nMm100, Unit eUnit ) const; /** Returns the serial value of the passed datetime, based on current nulldate. */ - double calcSerialFromDateTime( const ::com::sun::star::util::DateTime& rDateTime ) const; + double calcSerialFromDateTime( const css::util::DateTime& rDateTime ) const; /** Returns the datetime of the passed serial value, based on current nulldate. */ - ::com::sun::star::util::DateTime calcDateTimeFromSerial( double fSerial ) const; + css::util::DateTime calcDateTimeFromSerial( double fSerial ) const; /** Returns a BIFF error code from the passed error string. */ sal_uInt8 calcBiffErrorCode( const OUString& rErrorCode ) const; diff --git a/sc/source/filter/inc/viewsettings.hxx b/sc/source/filter/inc/viewsettings.hxx index 15ba52db8a6a..5e8b5b656807 100644 --- a/sc/source/filter/inc/viewsettings.hxx +++ b/sc/source/filter/inc/viewsettings.hxx @@ -32,7 +32,7 @@ namespace xls { /** Contains all settings for a selection in a single pane of a sheet. */ struct PaneSelectionModel { - ::com::sun::star::table::CellAddress maActiveCell; /// Position of active cell (cursor). + css::table::CellAddress maActiveCell; /// Position of active cell (cursor). ApiCellRangeList maSelection; /// Selected cell ranges. sal_Int32 mnActiveCellId; /// Index of active cell in selection list. @@ -46,8 +46,8 @@ struct SheetViewModel PaneSelectionModelMap maPaneSelMap; /// Selections of all panes. Color maGridColor; /// Grid color. - ::com::sun::star::table::CellAddress maFirstPos; /// First visible cell. - ::com::sun::star::table::CellAddress maSecondPos; /// First visible cell in additional panes. + css::table::CellAddress maFirstPos; /// First visible cell. + css::table::CellAddress maSecondPos; /// First visible cell in additional panes. sal_Int32 mnWorkbookViewId; /// Index into list of workbookView elements. sal_Int32 mnViewType; /// View type (normal, page break, layout). sal_Int32 mnActivePaneId; /// Active pane (with cell cursor). @@ -164,10 +164,10 @@ public: /** Stores converted view settings for a specific worksheet. */ void setSheetViewSettings( sal_Int16 nSheet, const SheetViewModelRef& rxSheetView, - const ::com::sun::star::uno::Any& rProperties ); + const css::uno::Any& rProperties ); /** Stores the used area for a specific worksheet. */ void setSheetUsedArea( - const ::com::sun::star::table::CellRangeAddress& rUsedArea ); + const css::table::CellRangeAddress& rUsedArea ); /** Converts all imported document view settings. */ void finalizeImport(); @@ -181,14 +181,14 @@ private: private: typedef RefVector< WorkbookViewModel > WorkbookViewModelVec; typedef RefMap< sal_Int16, SheetViewModel > SheetViewModelMap; - typedef ::std::map< sal_Int16, ::com::sun::star::uno::Any > SheetPropertiesMap; - typedef ::std::map< sal_Int16, ::com::sun::star::table::CellRangeAddress > SheetUsedAreaMap; + typedef ::std::map< sal_Int16, css::uno::Any > SheetPropertiesMap; + typedef ::std::map< sal_Int16, css::table::CellRangeAddress > SheetUsedAreaMap; WorkbookViewModelVec maBookViews; /// Workbook view models. SheetViewModelMap maSheetViews; /// Active view model for each sheet. SheetPropertiesMap maSheetProps; /// Converted property sequences for each sheet. SheetUsedAreaMap maSheetUsedAreas; /// Used area (cell range) of every sheet. - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress maOleSize; /// Visible area if this is an embedded OLE object. bool mbValidOleSize; /// True = imported OLE size is a valid cell range. }; diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index 9609b2428608..91c544b3084f 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -154,26 +154,26 @@ public: ScEditEngineDefaulter& getEditEngine() const; /** Returns a reference to the source/target spreadsheet document model. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > + css::uno::Reference< css::sheet::XSpreadsheetDocument > getDocument() const; /** Returns a reference to the specified spreadsheet in the document model. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > + css::uno::Reference< css::sheet::XSpreadsheet > getSheetFromDoc( sal_Int32 nSheet ) const; /** Returns a reference to the specified spreadsheet in the document model. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > + css::uno::Reference< css::sheet::XSpreadsheet > getSheetFromDoc( const OUString& rSheet ) const; /** Returns the XCellRange interface for the passed cell range address. */ - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > + css::uno::Reference< css::table::XCellRange > getCellRangeFromDoc( - const ::com::sun::star::table::CellRangeAddress& rRange ) const; + const css::table::CellRangeAddress& rRange ) const; /** Returns the cell or page styles container from the Calc document. */ - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > getStyleFamily( bool bPageStyles ) const; /** Returns the specified cell or page style from the Calc document. */ - ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > + css::uno::Reference< css::style::XStyle > getStyleObject( const OUString& rStyleName, bool bPageStyle ) const; /** Creates and returns a defined name on-the-fly in the Calc document. @@ -181,7 +181,7 @@ public: @param orName (in/out-parameter) Returns the resulting used name. */ ScRangeData* createNamedRangeObject( OUString& orName, - const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken>& rTokens, + const css::uno::Sequence< css::sheet::FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags = 0 ) const; @@ -190,29 +190,29 @@ public: @param orName (in/out-parameter) Returns the resulting used name. */ ScRangeData* createLocalNamedRangeObject( OUString& orName, - const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken>& rTokens, + const css::uno::Sequence< css::sheet::FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags = 0, sal_Int32 nTab = -1 ) const; /** Creates and returns a database range on-the-fly in the Calc document. The range will not be buffered in the global table buffer. @param orName (in/out-parameter) Returns the resulting used name. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDatabaseRange > + css::uno::Reference< css::sheet::XDatabaseRange > createDatabaseRangeObject( OUString& orName, - const ::com::sun::star::table::CellRangeAddress& rRangeAddr ) const; + const css::table::CellRangeAddress& rRangeAddr ) const; /** Creates and returns an unnamed database range on-the-fly in the Calc document. The range will not be buffered in the global table buffer. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDatabaseRange > + css::uno::Reference< css::sheet::XDatabaseRange > createUnnamedDatabaseRangeObject( - const ::com::sun::star::table::CellRangeAddress& rRangeAddr ) const; + const css::table::CellRangeAddress& rRangeAddr ) const; /** Finds the (already existing) database range of the given formula token index. */ ScDBData* findDatabaseRangeByIndex( sal_uInt16 nIndex ) const; /** Creates and returns a com.sun.star.style.Style object for cells or pages. */ - ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > + css::uno::Reference< css::style::XStyle > createStyleObject( OUString& orStyleName, bool bPageStyle ) const; diff --git a/sc/source/filter/inc/workbooksettings.hxx b/sc/source/filter/inc/workbooksettings.hxx index 0e6b3787f250..e384dec70853 100644 --- a/sc/source/filter/inc/workbooksettings.hxx +++ b/sc/source/filter/inc/workbooksettings.hxx @@ -98,7 +98,7 @@ public: /** Returns the show objects mode (considered a view setting in Calc). */ sal_Int16 getApiShowObjectMode() const; /** Returns the nulldate of this workbook. */ - ::com::sun::star::util::Date getNullDate() const; + css::util::Date getNullDate() const; private: /** Updates date mode and unit converter nulldate. */ diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index 41d86dedd3bc..b7aec9c88660 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -127,9 +127,9 @@ struct PageBreakModel /** Stores data about a hyperlink range. */ struct HyperlinkModel : public ::oox::ole::StdHlinkInfo { - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress maRange; /// The cell area containing the hyperlink. - OUString maTooltip; /// Additional tooltip text. + OUString maTooltip; /// Additional tooltip text. explicit HyperlinkModel(); }; @@ -193,26 +193,26 @@ public: /** Returns the index of the current sheet. */ sal_Int32 getSheetIndex() const; /** Returns the XSpreadsheet interface of the current sheet. */ - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet >& + const css::uno::Reference< css::sheet::XSpreadsheet >& getSheet() const; /** Returns the XCell interface for the passed cell address. */ - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > - getCell( const ::com::sun::star::table::CellAddress& rAddress ) const; + css::uno::Reference< css::table::XCell > + getCell( const css::table::CellAddress& rAddress ) const; /** Returns the XCellRange interface for the passed cell range address. */ - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > - getCellRange( const ::com::sun::star::table::CellRangeAddress& rRange ) const; + css::uno::Reference< css::table::XCellRange > + getCellRange( const css::table::CellRangeAddress& rRange ) const; /** Returns the XDrawPage interface of the draw page of the current sheet. */ - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > + css::uno::Reference< css::drawing::XDrawPage > getDrawPage() const; /** Returns the absolute cell position in 1/100 mm. */ - ::com::sun::star::awt::Point getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) const; + css::awt::Point getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the cell size in 1/100 mm. */ - ::com::sun::star::awt::Size getCellSize( sal_Int32 nCol, sal_Int32 nRow ) const; + css::awt::Size getCellSize( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the size of the entire drawing page in 1/100 mm. */ - ::com::sun::star::awt::Size getDrawPageSize() const; + css::awt::Size getDrawPageSize() const; /** Returns the buffer for cell contents and cell formatting. */ SheetDataBuffer& getSheetData() const; @@ -247,11 +247,11 @@ public: void setVmlDrawingPath( const OUString& rVmlDrawingPath ); /** Extends the used area of this sheet by the passed cell position. */ - void extendUsedArea( const ::com::sun::star::table::CellAddress& rAddress ); + void extendUsedArea( const css::table::CellAddress& rAddress ); /** Extends the used area of this sheet by the passed cell range. */ - void extendUsedArea( const ::com::sun::star::table::CellRangeAddress& rRange ); + void extendUsedArea( const css::table::CellRangeAddress& rRange ); /** Extends the shape bounding box by the position and size of the passed rectangle (in 1/100 mm). */ - void extendShapeBoundingBox( const ::com::sun::star::awt::Rectangle& rShapeRect ); + void extendShapeBoundingBox( const css::awt::Rectangle& rShapeRect ); /** Sets base width for all columns (without padding pixels). This value is only used, if width has not been set with setDefaultColumnWidth(). */ @@ -274,17 +274,17 @@ public: void setRowModel( const RowModel& rModel ); /** Inserts a value cell directly into the Calc sheet. */ - void putValue( const com::sun::star::table::CellAddress& rAddress, double fValue ); + void putValue( const css::table::CellAddress& rAddress, double fValue ); /** Inserts a string cell directly into the Calc sheet. */ - void putString( const com::sun::star::table::CellAddress& rAddress, const OUString& rText ); + void putString( const css::table::CellAddress& rAddress, const OUString& rText ); /** Inserts a rich-string cell directly into the Calc sheet. */ void putRichString( - const com::sun::star::table::CellAddress& rAddress, + const css::table::CellAddress& rAddress, const RichString& rString, const oox::xls::Font* pFirstPortionFont ); /** Inserts a formula cell directly into the Calc sheet. */ void putFormulaTokens( - const com::sun::star::table::CellAddress& rAddress, const ApiTokenSequence& rTokens ); + const css::table::CellAddress& rAddress, const ApiTokenSequence& rTokens ); /** Initial conversion before importing the worksheet. */ void initializeWorksheetImport(); @@ -293,17 +293,17 @@ public: /** Final import of drawing objects. Has to be called after all content has been imported */ void finalizeDrawingImport(); - void setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& ); + void setCellFormula( const css::table::CellAddress& rTokenAddress, const OUString& ); void setCellFormula( - const com::sun::star::table::CellAddress& rAddr, sal_Int32 nSharedId, + const css::table::CellAddress& rAddr, sal_Int32 nSharedId, const OUString& rCellValue, sal_Int32 nValueType ); - void setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& ); + void setCellArrayFormula( const css::table::CellRangeAddress& rRangeAddress, const css::table::CellAddress& rTokenAddress, const OUString& ); void createSharedFormulaMapEntry( - const com::sun::star::table::CellAddress& rAddress, - const com::sun::star::table::CellRangeAddress& rRange, + const css::table::CellAddress& rAddress, + const css::table::CellRangeAddress& rRange, sal_Int32 nSharedId, const OUString& rTokens ); void setCellFormulaValue( diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index 76e09398976a..3c02a9500ad0 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -57,9 +57,9 @@ class EscherExHostAppData; class ShapeInteractionHelper { public: - static XclExpShapeObj* CreateShapeObj( XclExpObjectManager& rObjMgr, const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape, ScDocument* pDoc ); - static void PopulateShapeInteractionInfo( XclExpObjectManager& rObjMgr, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, EscherExHostAppData& rHostAppData ); + static XclExpShapeObj* CreateShapeObj( XclExpObjectManager& rObjMgr, const css::uno::Reference< + css::drawing::XShape >& xShape, ScDocument* pDoc ); + static void PopulateShapeInteractionInfo( XclExpObjectManager& rObjMgr, const css::uno::Reference< css::drawing::XShape >& xShape, EscherExHostAppData& rHostAppData ); }; class XclEscherEx : public EscherEx, protected XclExpRoot @@ -92,7 +92,7 @@ public: XclExpDffAnchorBase* CreateDffAnchor( const SdrObject& rSdrObj ) const; virtual EscherExHostAppData* StartShape( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& rxShape, + const css::uno::Reference< css::drawing::XShape>& rxShape, const Rectangle* pChildAnchor ) override; virtual void EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ) override; virtual EscherExHostAppData* EnterAdditionalTextGroup() override; @@ -102,35 +102,34 @@ public: /** Creates an OCX form control OBJ record from the passed form control. @descr Writes the form control data to the 'Ctls' stream. */ std::unique_ptr<XclExpOcxControlObj> CreateOCXCtrlObj( - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, + css::uno::Reference< css::drawing::XShape > xShape, const Rectangle* pChildAnchor ); private: tools::SvRef<SotStorageStream> mxCtlsStrm; /// The 'Ctls' stream. /** Creates a TBX form control OBJ record from the passed form control. */ std::unique_ptr<XclExpTbxControlObj> CreateTBXCtrlObj( - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, + css::uno::Reference< css::drawing::XShape > xShape, const Rectangle* pChildAnchor ); private: /** Tries to get the name of a Basic macro from a control. */ void ConvertTbxMacro( XclExpTbxControlObj& rTbxCtrlObj, - ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XControlModel > xCtrlModel ); + css::uno::Reference< css::awt::XControlModel > xCtrlModel ); void DeleteCurrAppData(); private: - XclExpObjectManager& mrObjMgr; - std::stack< std::pair< XclObj*, XclEscherHostAppData* > > aStack; - XclObj* pCurrXclObj; - XclEscherHostAppData* pCurrAppData; - XclEscherClientData* pTheClientData; // always the same - XclEscherClientTextbox* pAdditionalText; - sal_uInt16 nAdditionalText; - sal_uInt32 mnNextKey; - bool mbIsRootDff; + XclExpObjectManager& mrObjMgr; + std::stack< std::pair< XclObj*, XclEscherHostAppData* > > aStack; + XclObj* pCurrXclObj; + XclEscherHostAppData* pCurrAppData; + XclEscherClientData* pTheClientData; // always the same + XclEscherClientTextbox* pAdditionalText; + sal_uInt16 nAdditionalText; + sal_uInt32 mnNextKey; + bool mbIsRootDff; }; // --- class XclEscherHostAppData ------------------------------------ diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index e227170d5d35..6d34a3410aa5 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -248,20 +248,20 @@ protected: public: XclObjAny( XclExpObjectManager& rObjMgr, - const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, + const css::uno::Reference< css::drawing::XShape >& rShape, ScDocument* pDoc); virtual ~XclObjAny(); - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > + css::uno::Reference< css::drawing::XShape > GetShape() const { return mxShape; } virtual void Save( XclExpStream& rStrm ) override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; static void WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj ); - static void WriteFromTo( XclExpXmlStream& rStrm, const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, SCTAB nTab ); + static void WriteFromTo( XclExpXmlStream& rStrm, const css::uno::Reference< css::drawing::XShape >& rShape, SCTAB nTab ); private: - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > + css::uno::Reference< css::drawing::XShape > mxShape; ScDocument* mpDoc; }; diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 35dd574675dc..001666a9c63a 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -113,7 +113,7 @@ public: /** Converts the passed vertical coordinate from 1/100 mm to Excel chart units. */ sal_Int32 CalcChartYFromHmm( sal_Int32 nPosY ) const; /** Converts the passed rectangle from 1/100 mm to Excel chart units. */ - XclChRectangle CalcChartRectFromHmm( const ::com::sun::star::awt::Rectangle& rRect ) const; + XclChRectangle CalcChartRectFromHmm( const css::awt::Rectangle& rRect ) const; /** Reads all line properties from the passed property set. */ void ConvertLineFormat( @@ -943,7 +943,7 @@ public: explicit XclExpChLabelRange( const XclExpChRoot& rRoot ); /** Converts category axis scaling settings. */ - void Convert( const ::com::sun::star::chart2::ScaleData& rScaleData, + void Convert( const css::chart2::ScaleData& rScaleData, const ScfPropertySet& rChart1Axis, bool bMirrorOrient ); /** Converts position settings of a crossing axis at this axis. */ void ConvertAxisPosition( const ScfPropertySet& rPropSet ); @@ -968,7 +968,7 @@ public: explicit XclExpChValueRange( const XclExpChRoot& rRoot ); /** Converts value axis scaling settings. */ - void Convert( const ::com::sun::star::chart2::ScaleData& rScaleData ); + void Convert( const css::chart2::ScaleData& rScaleData ); /** Converts position settings of a crossing axis at this axis. */ void ConvertAxisPosition( const ScfPropertySet& rPropSet ); @@ -1165,7 +1165,7 @@ class XclExpChartDrawing : public XclExpRecordBase, protected XclExpRoot public: explicit XclExpChartDrawing( const XclExpRoot& rRoot, - const ::com::sun::star::uno::Reference< css::frame::XModel >& rxModel, + const css::uno::Reference< css::frame::XModel >& rxModel, const Size& rChartSize ); virtual ~XclExpChartDrawing(); diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 33b992d10e02..2113e1e52ae2 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -169,7 +169,7 @@ public: protected: /** Tries to get spreadsheet cell link and source range link from the passed shape. */ void ConvertSheetLinks( - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); + css::uno::Reference< css::drawing::XShape > xShape ); /** Returns the Excel token array of the cell link, or 0, if no link present. */ inline const XclTokenArray* GetCellLinkTokArr() const { return mxCellLink.get(); } @@ -201,7 +201,7 @@ public: void WriteMacroSubRec( XclExpStream& rStrm ); /** Sets the name of a macro for object of passed type @return true = The passed event descriptor was valid, macro name has been found. */ - bool SetMacroLink( const ::com::sun::star::script::ScriptEventDescriptor& rEvent, const XclTbxEventType& nEventType ); + bool SetMacroLink( const css::script::ScriptEventDescriptor& rEvent, const XclTbxEventType& nEventType ); /** Sets the name of a macro @return true = The passed macro name has been found. */ @@ -211,7 +211,7 @@ public: class XclExpShapeObj : public XclObjAny, public XclMacroHelper { public: - explicit XclExpShapeObj( XclExpObjectManager& rRoot, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, ScDocument* pDoc ); + explicit XclExpShapeObj( XclExpObjectManager& rRoot, css::uno::Reference< css::drawing::XShape > xShape, ScDocument* pDoc ); virtual ~XclExpShapeObj(); private: virtual void WriteSubRecs( XclExpStream& rStrm ) override; @@ -226,7 +226,7 @@ class XclExpOcxControlObj : public XclObj, public XclExpControlHelper public: explicit XclExpOcxControlObj( XclExpObjectManager& rObjMgr, - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, + css::uno::Reference< css::drawing::XShape > xShape, const Rectangle* pChildAnchor, const OUString& rClassName, sal_uInt32 nStrmStart, sal_uInt32 nStrmSize ); @@ -248,12 +248,12 @@ class XclExpTbxControlObj : public XclObj, public XclMacroHelper public: explicit XclExpTbxControlObj( XclExpObjectManager& rObjMgr, - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, + css::uno::Reference< css::drawing::XShape > xShape, const Rectangle* pChildAnchor ); /** Sets the name of a macro attached to this control. @return true = The passed event descriptor was valid, macro name has been found. */ - bool SetMacroLink( const ::com::sun::star::script::ScriptEventDescriptor& rEvent ); + bool SetMacroLink( const css::script::ScriptEventDescriptor& rEvent ); private: virtual void WriteSubRecs( XclExpStream& rStrm ) override; @@ -291,7 +291,7 @@ class XclExpChartObj : public XclObj, protected XclExpRoot public: explicit XclExpChartObj( XclExpObjectManager& rObjMgr, - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, + css::uno::Reference< css::drawing::XShape > xShape, const Rectangle* pChildAnchor ); virtual ~XclExpChartObj(); @@ -401,7 +401,7 @@ public: std::shared_ptr< XclExpRecordBase > ProcessDrawing( SdrPage* pSdrPage ); /** Processes a collection of UNO shapes and returns the record block containing all related records (MSODRAWING, OBJ, TXO, charts, etc.). */ - std::shared_ptr< XclExpRecordBase > ProcessDrawing( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ); + std::shared_ptr< XclExpRecordBase > ProcessDrawing( const css::uno::Reference< css::drawing::XShapes >& rxShapes ); /** Finalizes the object manager after conversion of all sheets. */ void EndDocument(); diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx index dd7d646031dd..d52a8edc6679 100644 --- a/sc/source/filter/inc/xeroot.hxx +++ b/sc/source/filter/inc/xeroot.hxx @@ -175,9 +175,9 @@ public: bool IsDocumentEncrypted() const; - static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateEncryptionData( const OUString& aPass ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetEncryptionData() const; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateDefaultEncryptionData() const; + static css::uno::Sequence< css::beans::NamedValue > GenerateEncryptionData( const OUString& aPass ); + css::uno::Sequence< css::beans::NamedValue > GetEncryptionData() const; + css::uno::Sequence< css::beans::NamedValue > GenerateDefaultEncryptionData() const; private: diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 5b95a74bcd0e..a13a39650f75 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -216,7 +216,7 @@ public: void EncryptBytes( SvStream& rStrm, ::std::vector<sal_uInt8>& aBytes ); private: - void Init( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ); + void Init( const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ); static sal_uInt32 GetBlockPos( sal_Size nStrmPos ); static sal_uInt16 GetOffsetInBlock( sal_Size nStrmPos ); @@ -293,7 +293,7 @@ public: class XclExpXmlStream : public oox::core::XmlFilterBase { public: - XclExpXmlStream( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rCC, bool bExportVBA ); + XclExpXmlStream( const css::uno::Reference< css::uno::XComponentContext >& rCC, bool bExportVBA ); virtual ~XclExpXmlStream(); /** Returns the filter root data. */ @@ -314,7 +314,7 @@ public: sax_fastparser::FSHelperPtr CreateOutputStream ( const OUString& sFullStream, const OUString& sRelativeStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xParentRelation, + const css::uno::Reference< css::io::XOutputStream >& xParentRelation, const char* sContentType, const char* sRelationshipType, OUString* pRelationshipId = NULL ); diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 038db9d51e13..dd012cf090f4 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -107,17 +107,17 @@ public: /** Starts the API chart document conversion. Must be called once before all API conversion. */ void InitConversion( - const ::com::sun::star::uno::Reference< - com::sun::star::chart2::XChartDocument>& xChartDoc, const Rectangle& rChartRect ) const; + const css::uno::Reference< css::chart2::XChartDocument>& xChartDoc, + const Rectangle& rChartRect ) const; /** Finishes the API chart document conversion. Must be called once after all API conversion. */ void FinishConversion( XclImpDffConverter& rDffConv ) const; /** Returns the data provider for the chart document. */ - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > + css::uno::Reference< css::chart2::data::XDataProvider > GetDataProvider() const; /** Returns the drawing shape interface of the specified title object. */ - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + css::uno::Reference< css::drawing::XShape > GetTitleShape( const XclChTextKey& rTitleKey ) const; /** Converts the passed horizontal coordinate from Excel chart units into 1/100 mm. */ @@ -125,7 +125,7 @@ public: /** Converts the passed vertical coordinate from Excel chart units into 1/100 mm. */ sal_Int32 CalcHmmFromChartY( sal_Int32 nPosY ) const; /** Converts the passed rectangle from Excel chart units into 1/100 mm. */ - ::com::sun::star::awt::Rectangle CalcHmmFromChartRect( const XclChRectangle& rRect ) const; + css::awt::Rectangle CalcHmmFromChartRect( const XclChRectangle& rRect ) const; /** Converts the passed horizontal coordinate from 1/100 mm into a relative position. */ double CalcRelativeFromHmmX( sal_Int32 nPosX ) const; @@ -1305,8 +1305,7 @@ public: /** Converts and writes all properties to the passed chart. */ void Convert( - const ::com::sun::star::uno::Reference< - com::sun::star::chart2::XChartDocument>& xChartDoc, + const css::uno::Reference< css::chart2::XChartDocument>& xChartDoc, XclImpDffConverter& rDffConv, const OUString& rObjName, const Rectangle& rChartRect ) const; @@ -1331,7 +1330,7 @@ private: void FinalizeTitle(); /** Creates and returns a new diagram object and converts global chart settings. */ - com::sun::star::uno::Reference<com::sun::star::chart2::XDiagram> + css::uno::Reference<css::chart2::XDiagram> CreateDiagram() const; private: @@ -1362,7 +1361,7 @@ public: /** Converts all objects and inserts them into the chart drawing page. */ void ConvertObjects( XclImpDffConverter& rDffConv, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, + const css::uno::Reference< css::frame::XModel >& rxModel, const Rectangle& rChartRect ); /** Calculate the resulting rectangle of the passed anchor. */ diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 989afd934d72..85536e6a6a3a 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -470,7 +470,7 @@ public: /** Returns the SdrObject from the passed control shape and sets the bounding rectangle. */ SdrObjectPtr CreateSdrObjectFromShape( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, + const css::uno::Reference< css::drawing::XShape >& rxShape, const Rectangle& rAnchorRect ) const; /** Sets additional properties to the form control model, calls virtual DoProcessControl(). */ @@ -486,7 +486,7 @@ protected: virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; void ApplySheetLinkProps() const; - mutable ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + mutable css::uno::Reference< css::drawing::XShape > mxShape; /// The UNO wrapper of the control shape. std::shared_ptr< ScAddress > mxCellLink; /// Linked cell in the Calc document. private: @@ -497,7 +497,7 @@ private: private: const XclImpRoot& mrRoot; /// Not derived from XclImpRoot to allow multiple inheritance. - std::shared_ptr< ScRange > mxSrcRange; /// Source data range in the Calc document. + std::shared_ptr< ScRange > mxSrcRange; /// Source data range in the Calc document. XclCtrlBindMode meBindMode; /// Value binding mode. }; @@ -514,7 +514,7 @@ public: inline OUString GetServiceName() const { return DoGetServiceName(); } /** Fills the passed macro event descriptor. */ bool FillMacroDescriptor( - ::com::sun::star::script::ScriptEventDescriptor& rDescriptor ) const; + css::script::ScriptEventDescriptor& rDescriptor ) const; protected: /** Sets control text formatting. */ @@ -984,11 +984,11 @@ private: /** Inserts the passed control rxFComp into the form. Needs call to SetCurrentForm() before. */ virtual bool InsertControl( - const ::com::sun::star::uno::Reference< - ::com::sun::star::form::XFormComponent >& rxFormComp, - const ::com::sun::star::awt::Size& rSize, - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >* pxShape, + const css::uno::Reference< + css::form::XFormComponent >& rxFormComp, + const css::awt::Size& rSize, + css::uno::Reference< + css::drawing::XShape >* pxShape, bool bFloatingCtrl ) override; private: @@ -999,7 +999,7 @@ private: SdrModel& mrSdrModel; /// The SdrModel of the drawing manager. SdrPage& mrSdrPage; /// The SdrPage of the drawing manager. XclImpSolverContainer maSolverCont; /// The solver container for connector rules. - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > + css::uno::Reference< css::form::XForm > mxCtrlForm; /// Controls form of current drawing page. sal_Int32 mnLastCtrlIndex; /// Last insertion index of a form control (for macro events). bool mbHasCtrlForm; /// True = mxCtrlForm is initialized (but maybe still null). @@ -1169,7 +1169,7 @@ public: ScRange GetUsedArea( SCTAB nScTab ) const; /** Sets the container to receive overridden shape/ctrl names from the filter. */ - void SetOleNameOverrideInfo( const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& rxOverrideInfo ) { mxOleCtrlNameOverride = rxOverrideInfo; } + void SetOleNameOverrideInfo( const css::uno::Reference< css::container::XNameContainer >& rxOverrideInfo ) { mxOleCtrlNameOverride = rxOverrideInfo; } /** Returns the name of overridden name ( or zero length string ) for associated object id. */ OUString GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId ); @@ -1179,7 +1179,7 @@ private: typedef std::shared_ptr< XclImpSheetDrawing > XclImpSheetDrawingRef; typedef std::map< SCTAB, XclImpSheetDrawingRef > XclImpSheetDrawingMap; - com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > mxOleCtrlNameOverride; + css::uno::Reference< css::container::XNameContainer > mxOleCtrlNameOverride; DefObjNameMap maDefObjNames; /// Default base names for all object types. SvMemoryStream maDggStrm; /// Copy of global DFF data (DGG container) in memory. XclImpSheetDrawingMap maSheetDrawings; /// Drawing managers of all sheets. diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index c575c4ead6ab..d5fc51a201be 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -55,8 +55,8 @@ public: XclImpDecrypterRef Clone() const; /** Implementation of the ::comphelper::IDocPasswordVerifier interface */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) override; - virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) override; + virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) override; /** Updates the decrypter on start of a new record or after seeking stream. */ void Update( SvStream& rStrm, sal_uInt16 nRecSize ); @@ -73,9 +73,9 @@ private: virtual XclImpDecrypter* OnClone() const = 0; /** Derived classes implement password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > + virtual css::uno::Sequence< css::beans::NamedValue > OnVerifyPassword( const OUString& rPassword ) = 0; - virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) = 0; + virtual bool OnVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) = 0; /** Implementation of updating the decrypter. */ virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) = 0; @@ -101,9 +101,9 @@ private: /** Implementation of cloning this object. */ virtual XclImpBiff5Decrypter* OnClone() const override; /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > + virtual css::uno::Sequence< css::beans::NamedValue > OnVerifyPassword( const OUString& rPassword ) override; - virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; + virtual bool OnVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) override; /** Implementation of updating the decrypter. */ virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) override; /** Implementation of the decryption. */ @@ -111,7 +111,7 @@ private: private: ::msfilter::MSCodec_XorXLS95 maCodec; /// Crypto algorithm implementation. - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > maEncryptionData; + css::uno::Sequence< css::beans::NamedValue > maEncryptionData; sal_uInt16 mnKey; sal_uInt16 mnHash; }; @@ -130,9 +130,9 @@ private: /** Implementation of cloning this object. */ virtual XclImpBiff8Decrypter* OnClone() const override; /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > + virtual css::uno::Sequence< css::beans::NamedValue > OnVerifyPassword( const OUString& rPassword ) override; - virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; + virtual bool OnVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) override; /** Implementation of updating the decrypter. */ virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) override; /** Implementation of the decryption. */ @@ -145,7 +145,7 @@ private: private: ::msfilter::MSCodec_Std97 maCodec; /// Crypto algorithm implementation. - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > maEncryptionData; + css::uno::Sequence< css::beans::NamedValue > maEncryptionData; ::std::vector< sal_uInt8 > maSalt; ::std::vector< sal_uInt8 > maVerifier; ::std::vector< sal_uInt8 > maVerifierHash; diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 3c3234737455..0007685e956a 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -1273,8 +1273,8 @@ struct XclChTextKey : public ::std::pair< XclChTextType, ::std::pair< sal_uInt16 }; /** Function prototype receiving a chart document and returning a title shape. */ -typedef ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - (*XclChGetShapeFunc)( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDocument >& ); +typedef css::uno::Reference< css::drawing::XShape > + (*XclChGetShapeFunc)( const css::uno::Reference< css::chart::XChartDocument >& ); // Property helpers =========================================================== @@ -1287,7 +1287,7 @@ public: /** Returns a named formatting object from the chart document. */ css::uno::Any GetObject( const OUString& rObjName ); /** Insertes a named formatting object into the chart document. */ - OUString InsertObject( const ::com::sun::star::uno::Any& rObj ); + OUString InsertObject( const css::uno::Any& rObj ); private: css::uno::Reference< css::lang::XMultiServiceFactory > mxFactory; /// Factory to create the container. @@ -1398,7 +1398,7 @@ struct XclChRootData typedef std::shared_ptr< XclChObjectTable > XclChObjectTableRef; typedef std::map< XclChTextKey, XclChGetShapeFunc > XclChGetShapeFuncMap; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > + css::uno::Reference< css::chart2::XChartDocument > mxChartDoc; /// The chart document. Rectangle maChartRect; /// Position and size of the chart shape. XclChTypeProvRef mxTypeInfoProv; /// Provides info about chart types. @@ -1419,13 +1419,13 @@ struct XclChRootData /** Starts the API chart document conversion. Must be called once before any API access. */ void InitConversion( const XclRoot& rRoot, - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc, + const css::uno::Reference< css::chart2::XChartDocument >& rxChartDoc, const Rectangle& rChartRect ); /** Finishes the API chart document conversion. Must be called once before any API access. */ void FinishConversion(); /** Returns the drawing shape interface of the specified title object. */ - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + css::uno::Reference< css::drawing::XShape > GetTitleShape( const XclChTextKey& rTitleKey ) const; }; diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx index d877a6a07416..eacc4ff243d8 100644 --- a/sc/source/filter/inc/xlescher.hxx +++ b/sc/source/filter/inc/xlescher.hxx @@ -430,18 +430,18 @@ class XclControlHelper { public: /** Returns the API control model from the passed API shape object. */ - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > - GetControlModel( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); + static css::uno::Reference< css::awt::XControlModel > + GetControlModel( css::uno::Reference< css::drawing::XShape > xShape ); /** Fills the macro descriptor according to the passed macro name. */ static bool FillMacroDescriptor( - ::com::sun::star::script::ScriptEventDescriptor& rDescriptor, + css::script::ScriptEventDescriptor& rDescriptor, XclTbxEventType eEventType, const OUString& rXclMacroName, SfxObjectShell* pDocShell = 0 ); /** Tries to extract an Excel macro name from the passed macro descriptor. */ static OUString ExtractFromMacroDescriptor( - const ::com::sun::star::script::ScriptEventDescriptor& rDescriptor, + const css::script::ScriptEventDescriptor& rDescriptor, XclTbxEventType eEventType, SfxObjectShell* pShell = NULL ); }; diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index b0afc1a9363a..67158c3bfa52 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -596,9 +596,9 @@ struct XclPTFieldInfo : public XclPTVisNameInfo /** Returns the API enum representing the orientation (first of row/col/page/data). @param nMask Restricts the axes taken into account. @return The first found axis orientation, that is allowed in nMask parameter. */ - ::com::sun::star::sheet::DataPilotFieldOrientation GetApiOrient( sal_uInt16 nMask ) const; + css::sheet::DataPilotFieldOrientation GetApiOrient( sal_uInt16 nMask ) const; /** Adds the axis orientation represented by the passed API enum. */ - void AddApiOrient( ::com::sun::star::sheet::DataPilotFieldOrientation eOrient ); + void AddApiOrient( css::sheet::DataPilotFieldOrientation eOrient ); /** Returns a vector of all set subtotal functions. */ void GetSubtotals( XclPTSubtotalVec& rSubtotals ) const; @@ -676,9 +676,9 @@ struct XclPTDataFieldInfo : public XclPTVisNameInfo explicit XclPTDataFieldInfo(); /** Returns the API enum representing the aggregation function. */ - ::com::sun::star::sheet::GeneralFunction GetApiAggFunc() const; + css::sheet::GeneralFunction GetApiAggFunc() const; /** Sets the aggregation function represented by the passed API enum. */ - void SetApiAggFunc( ::com::sun::star::sheet::GeneralFunction eAggFunc ); + void SetApiAggFunc( css::sheet::GeneralFunction eAggFunc ); /** Returns the API constant representing the result reference type. */ sal_Int32 GetApiRefType() const; diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx index 645fe797db82..80d1b74b07c7 100644 --- a/sc/source/filter/inc/xlroot.hxx +++ b/sc/source/filter/inc/xlroot.hxx @@ -181,7 +181,7 @@ public: /** Returns the default password used for stream encryption. */ inline const OUString& GetDefaultPassword() const { return mrData.maDefPassword; } /** Requests and verifies a password from the medium or the user. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > + css::uno::Sequence< css::beans::NamedValue > RequestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ) const; /** Returns the OLE2 root storage of the imported/exported file. diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx index f6b00a6590ed..f861cecd9bb7 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -361,7 +361,7 @@ struct XclFontData /** Returns the API font text encoding. */ sal_Int16 GetApiFontEncoding() const; /** Returns the API font posture. */ - ::com::sun::star::awt::FontSlant GetApiPosture() const; + css::awt::FontSlant GetApiPosture() const; /** Returns the API font weight. */ float GetApiWeight() const; /** Returns the API font underline style. */ @@ -376,7 +376,7 @@ struct XclFontData /** Sets the API font family. */ void SetApiFamily( sal_Int16 nApiFamily ); /** Sets the API font posture. */ - void SetApiPosture( ::com::sun::star::awt::FontSlant eApiPosture ); + void SetApiPosture( css::awt::FontSlant eApiPosture ); /** Sets the API font weight. */ void SetApiWeight( float fApiWeight ); /** Sets the API font underline style. */ |