diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /starmath/inc | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'starmath/inc')
-rw-r--r-- | starmath/inc/action.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/cursor.hxx | 4 | ||||
-rw-r--r-- | starmath/inc/dialog.hxx | 12 | ||||
-rw-r--r-- | starmath/inc/document.hxx | 4 | ||||
-rw-r--r-- | starmath/inc/node.hxx | 4 | ||||
-rw-r--r-- | starmath/inc/parse.hxx | 4 | ||||
-rw-r--r-- | starmath/inc/rect.hxx | 10 | ||||
-rw-r--r-- | starmath/inc/unomodel.hxx | 10 | ||||
-rw-r--r-- | starmath/inc/utility.hxx | 2 |
9 files changed, 26 insertions, 26 deletions
diff --git a/starmath/inc/action.hxx b/starmath/inc/action.hxx index e55d445a0523..9a89fedf9ac9 100644 --- a/starmath/inc/action.hxx +++ b/starmath/inc/action.hxx @@ -37,7 +37,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rDocSh); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; #endif diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx index b7a0d9c618e9..bcc8397b09d5 100644 --- a/starmath/inc/cursor.hxx +++ b/starmath/inc/cursor.hxx @@ -139,7 +139,7 @@ public: void DeletePrev(OutputDevice* pDev); /** Insert text at the current position */ - void InsertText(rtl::OUString aString); + void InsertText(OUString aString); /** Insert an element into the formula */ void InsertElement(SmFormulaElement element); @@ -166,7 +166,7 @@ public: * For more complex expressions use InsertCommandText, this method doesn't * use SmParser, this means that it's faster, but not as strong. */ - void InsertSpecial(rtl::OUString aString); + void InsertSpecial(OUString aString); /** Create sub-/super script * diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 51782f0ecb91..ac0508f4ae29 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -196,8 +196,8 @@ public: class SmCategoryDesc : public Resource { - rtl::OUString Name; - rtl::OUString *Strings[4]; + OUString Name; + OUString *Strings[4]; Bitmap *Graphics[4]; /* regular bitmaps */ sal_uInt16 Minimum[4]; sal_uInt16 Maximum[4]; @@ -207,8 +207,8 @@ public: SmCategoryDesc(const ResId &rResId, sal_uInt16 nCategoryIdx); ~SmCategoryDesc(); - const rtl::OUString& GetName() const { return Name; } - const rtl::OUString* GetString(sal_uInt16 Index) const { return Strings[Index]; } + const OUString& GetName() const { return Name; } + const OUString* GetString(sal_uInt16 Index) const { return Strings[Index]; } sal_uInt16 GetMinimum(sal_uInt16 Index) { return Minimum[Index]; } sal_uInt16 GetMaximum(sal_uInt16 Index) { return Maximum[Index]; } sal_uInt16 GetValue(sal_uInt16 Index) const { return Value[Index]; } @@ -251,7 +251,7 @@ class SmDistanceDialog : public ModalDialog DECL_LINK(CheckBoxClickHdl, CheckBox *); using Window::SetHelpId; - void SetHelpId(MetricField &rField, const rtl::OString& sHelpId); + void SetHelpId(MetricField &rField, const OString& sHelpId); void SetCategory(sal_uInt16 Category); public: @@ -357,7 +357,7 @@ class SmSymbolDialog : public ModalDialog SmViewShell &rViewSh; SmSymbolManager &rSymbolMgr; - rtl::OUString aSymbolSetName; + OUString aSymbolSetName; SymbolPtrVec_t aSymbolSet; OutputDevice *pFontListDev; diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index b08a59a870e5..d4f132455abc 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -109,7 +109,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener sal_uInt16 nModifyCount; bool bIsFormulaArranged; SmCursor *pCursor; - std::set< rtl::OUString > aUsedSymbols; // to export used symbols only when saving + std::set< OUString > aUsedSymbols; // to export used symbols only when saving @@ -195,7 +195,7 @@ public: const SmNode * GetFormulaTree() const { return pTree; } void SetFormulaTree(SmNode *&rTree) { pTree = rTree; } - const std::set< rtl::OUString > & GetUsedSymbols() const { return aUsedSymbols; } + const std::set< OUString > & GetUsedSymbols() const { return aUsedSymbols; } OUString GetAccessibleText(); diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index 7a89a7a2d64b..8d4bc8c15630 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -563,7 +563,7 @@ protected: { sal_Unicode cChar = GetToken().cMathChar; if ((sal_Unicode) '\0' != cChar) - SetText(rtl::OUString(cChar)); + SetText(OUString(cChar)); } public: @@ -640,7 +640,7 @@ public: SmErrorNode(SmParseError /*eError*/, const SmToken &rNodeToken) : SmMathSymbolNode(NERROR, rNodeToken) { - SetText(rtl::OUString(MS_ERROR)); + SetText(OUString(MS_ERROR)); } virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell); diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx index d5affc7e84f0..f4118032dc41 100644 --- a/starmath/inc/parse.hxx +++ b/starmath/inc/parse.hxx @@ -197,7 +197,7 @@ class SmParser m_bExportSymNames; // map of used symbols (used to reduce file size by exporting only actually used symbols) - std::set< rtl::OUString > m_aUsedSymbols; + std::set< OUString > m_aUsedSymbols; //! locale where '.' is decimal seperator! ::com::sun::star::lang::Locale m_aDotLoc; @@ -281,7 +281,7 @@ public: const SmErrorDesc* GetError(size_t i = size_t(-1) ); static const SmTokenTableEntry* GetTokenTableEntry( const String &rName ); bool IsUsedSymbol( const String &rSymbolName ) const { return m_aUsedSymbols.find( rSymbolName ) != m_aUsedSymbols.end(); } - std::set< rtl::OUString > GetUsedSymbols() const { return m_aUsedSymbols; } + std::set< OUString > GetUsedSymbols() const { return m_aUsedSymbols; } }; diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx index 254d59ffab59..17ed2da1ced1 100644 --- a/starmath/inc/rect.hxx +++ b/starmath/inc/rect.hxx @@ -31,9 +31,9 @@ bool SmGetGlyphBoundRect(const OutputDevice &rDev, - const rtl::OUString &rText, Rectangle &rRect); + const OUString &rText, Rectangle &rRect); -bool SmIsMathAlpha(const rtl::OUString &rText); +bool SmIsMathAlpha(const OUString &rText); inline long SmFromTo(long nFrom, long nTo, double fRelDist) @@ -101,9 +101,9 @@ class SmRect protected: void BuildRect (const OutputDevice &rDev, const SmFormat *pFormat, - const rtl::OUString &rText, sal_uInt16 nBorderWidth); + const OUString &rText, sal_uInt16 nBorderWidth); void Init(const OutputDevice &rDev, const SmFormat *pFormat, - const rtl::OUString &rText, sal_uInt16 nBorderWidth); + const OUString &rText, sal_uInt16 nBorderWidth); void ClearBaseline() { bHasBaseline = false; }; inline void CopyMBL(const SmRect& rRect); @@ -114,7 +114,7 @@ protected: public: SmRect(); SmRect(const OutputDevice &rDev, const SmFormat *pFormat, - const rtl::OUString &rText, long nBorderWidth); + const OUString &rText, long nBorderWidth); SmRect(long nWidth, long nHeight); SmRect(const SmRect &rRect); diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx index dbf4b1fcb9a4..d5fe5e6f8e7b 100644 --- a/starmath/inc/unomodel.hxx +++ b/starmath/inc/unomodel.hxx @@ -85,9 +85,9 @@ public: virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& rSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rxOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xParent ) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException ); @@ -98,8 +98,8 @@ public: virtual void readFormulaOoxml( oox::formulaimport::XmlStream& stream ); virtual Size getFormulaSize() const; - static ::com::sun::star::uno::Sequence< rtl::OUString > getSupportedServiceNames_Static(); - static ::rtl::OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static(); }; //////////////////////////////////////////////////////////// diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 1184c8522afd..0f4a7484f105 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -89,7 +89,7 @@ public: Font(), nBorderWidth(-1) { Impl_Init(); } SmFace(const Font& rFont) : Font(rFont), nBorderWidth(-1) { Impl_Init(); } - SmFace(const rtl::OUString& rName, const Size& rSize) : + SmFace(const OUString& rName, const Size& rSize) : Font(rName, rSize), nBorderWidth(-1) { Impl_Init(); } SmFace( FontFamily eFamily, const Size& rSize) : Font(eFamily, rSize), nBorderWidth(-1) { Impl_Init(); } |