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 | |
| 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')
36 files changed, 203 insertions, 209 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(); } diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx index b64a5849a459..3f067be4b35e 100644 --- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx +++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx @@ -49,7 +49,7 @@ struct assertion_traits<String> static std::string toString(const String& x) { OStringStream ost; - ost << rtl::OUStringToOString(x, RTL_TEXTENCODING_UTF8).getStr(); + ost << OUStringToOString(x, RTL_TEXTENCODING_UTF8).getStr(); return ost.str(); } }; diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index f493354748ee..f4bf3f1b5bec 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -126,15 +126,15 @@ void Test::tearDown() void Test::editMarker() { { - rtl::OUString sMarkedText("<?> under <?> under <?>"); + OUString sMarkedText("<?> under <?> under <?>"); m_pEditWindow->SetText(sMarkedText); m_pEditWindow->Flush(); - rtl::OUString sFinalText = m_pEditWindow->GetText(); + OUString sFinalText = m_pEditWindow->GetText(); CPPUNIT_ASSERT_MESSAGE("Should be equal text", sFinalText == sMarkedText); } { - rtl::OUString sTargetText("a under b under c"); + OUString sTargetText("a under b under c"); m_pEditWindow->SelNextMark(); m_pEditWindow->Delete(); @@ -150,12 +150,12 @@ void Test::editMarker() m_pEditWindow->InsertText("b"); m_pEditWindow->Flush(); - rtl::OUString sFinalText = m_pEditWindow->GetText(); + OUString sFinalText = m_pEditWindow->GetText(); CPPUNIT_ASSERT_MESSAGE("Should be a under b under c", sFinalText == sTargetText); } { - m_pEditWindow->SetText(rtl::OUString()); + m_pEditWindow->SetText(OUString()); m_pEditWindow->Flush(); } } @@ -189,19 +189,19 @@ void Test::editUndoRedo() { EditEngine &rEditEngine = m_xDocShRef->GetEditEngine(); - rtl::OUString sStringOne("a under b"); + OUString sStringOne("a under b"); { rEditEngine.SetText(0, sStringOne); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Strings must match", sStringOne == sFinalText); } - rtl::OUString sStringTwo("a over b"); + OUString sStringTwo("a over b"); { rEditEngine.SetText(0, sStringTwo); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Strings must match", sStringTwo == sFinalText); } @@ -210,14 +210,14 @@ void Test::editUndoRedo() { m_xDocShRef->Execute(aUndo); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Strings much match", sStringOne == sFinalText); } { m_xDocShRef->Execute(aUndo); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Must now be empty", !sFinalText.getLength()); } @@ -225,15 +225,15 @@ void Test::editUndoRedo() { m_xDocShRef->Execute(aRedo); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Strings much match", sStringOne == sFinalText); } { - rEditEngine.SetText(0, rtl::OUString()); + rEditEngine.SetText(0, OUString()); m_xDocShRef->UpdateText(); rEditEngine.ClearModifyFlag(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Must be empty", !sFinalText.getLength()); } @@ -245,11 +245,11 @@ void Test::viewZoom() EditEngine &rEditEngine = m_xDocShRef->GetEditEngine(); - rtl::OUString sStringOne("a under b"); + OUString sStringOne("a under b"); { rEditEngine.SetText(0, sStringOne); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Strings must match", sStringOne == sFinalText); } diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index d88d4906e808..02ed5f8739b4 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -53,7 +53,6 @@ #include <document.hxx> #include <view.hxx> -using rtl::OUString; using namespace com::sun::star; using namespace com::sun::star::lang; using namespace com::sun::star::uno; @@ -469,7 +468,7 @@ sal_Unicode SAL_CALL SmGraphicAccessible::getCharacter( sal_Int32 nIndex ) Sequence< beans::PropertyValue > SAL_CALL SmGraphicAccessible::getCharacterAttributes( sal_Int32 nIndex, - const uno::Sequence< ::rtl::OUString > & /*rRequestedAttributes*/ ) + const uno::Sequence< OUString > & /*rRequestedAttributes*/ ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aGuard; @@ -766,7 +765,7 @@ sal_Bool SAL_CALL SmGraphicAccessible::copyText( Reference< datatransfer::clipboard::XClipboard > xClipboard = pWin->GetClipboard(); if ( xClipboard.is() ) { - ::rtl::OUString sText( getTextRange(nStartIndex, nEndIndex) ); + OUString sText( getTextRange(nStartIndex, nEndIndex) ); ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText ); const sal_uInt32 nRef = Application::ReleaseSolarMutex(); @@ -1858,14 +1857,14 @@ sal_Int16 SAL_CALL SmEditAccessible::getAccessibleRole( ) return AccessibleRole::PANEL /*TEXT ?*/; } -rtl::OUString SAL_CALL SmEditAccessible::getAccessibleDescription( ) +OUString SAL_CALL SmEditAccessible::getAccessibleDescription( ) throw (RuntimeException) { SolarMutexGuard aGuard; return OUString(); // empty as agreed with product-management } -rtl::OUString SAL_CALL SmEditAccessible::getAccessibleName( ) +OUString SAL_CALL SmEditAccessible::getAccessibleName( ) throw (RuntimeException) { SolarMutexGuard aGuard; diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index cac3fdc0a170..b311508a6f12 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -117,8 +117,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -131,25 +131,25 @@ public: virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) 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( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) 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( ) throw (::com::sun::star::uno::RuntimeException); }; ////////////////////////////////////////////////////////////////////// @@ -369,8 +369,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -380,9 +380,9 @@ public: virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) 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( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) 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( ) throw (::com::sun::star::uno::RuntimeException); }; ////////////////////////////////////////////////////////////////////// diff --git a/starmath/source/action.cxx b/starmath/source/action.cxx index 67dd8ca22da9..41ac8a23ea21 100644 --- a/starmath/source/action.cxx +++ b/starmath/source/action.cxx @@ -47,7 +47,7 @@ void SmFormatAction::Repeat(SfxRepeatTarget& rDocSh) dynamic_cast< SmDocShell & >(rDocSh).SetFormat(aNewFormat); } -rtl::OUString SmFormatAction::GetComment() const +OUString SmFormatAction::GetComment() const { return SmResId(RID_UNDOFORMATNAME).toString(); } diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 56ba7bc77a8a..e180fcaebb8e 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::beans; -using ::rtl::OUString; static const char aRootName[] = "Office.Math"; @@ -380,27 +379,27 @@ const String SmFontFormatList::GetFontFormatId( size_t nPos ) const } -const rtl::OUString SmFontFormatList::GetNewFontFormatId() const +const OUString SmFontFormatList::GetNewFontFormatId() const { // returns first unused FormatId - rtl::OUString aPrefix("Id"); + OUString aPrefix("Id"); sal_Int32 nCnt = GetCount(); for (sal_Int32 i = 1; i <= nCnt + 1; ++i) { - rtl::OUString aTmpId = aPrefix + rtl::OUString::valueOf(i); + OUString aTmpId = aPrefix + OUString::valueOf(i); if (!GetFontFormat(aTmpId)) return aTmpId; } OSL_ENSURE( !this, "failed to create new FontFormatId" ); - return rtl::OUString(); + return OUString(); } ///////////////////////////////////////////////////////////////// SmMathConfig::SmMathConfig() : - ConfigItem(rtl::OUString(aRootName)) + ConfigItem(OUString(aRootName)) { pFormat = 0; pOther = 0; @@ -441,8 +440,8 @@ void SmMathConfig::SetFontFormatListModified( bool bVal ) void SmMathConfig::ReadSymbol( SmSym &rSymbol, - const rtl::OUString &rSymbolName, - const rtl::OUString &rBaseNode ) const + const OUString &rSymbolName, + const OUString &rBaseNode ) const { Sequence< OUString > aNames = lcl_GetSymbolPropertyNames(); sal_Int32 nProps = aNames.getLength(); @@ -1271,7 +1270,7 @@ void SmMathConfig::SetShowFormulaCursor( bool bVal ) SetOtherIfNotEqual( pOther->bFormulaCursor, bVal ); } -void SmMathConfig::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +void SmMathConfig::Notify( const com::sun::star::uno::Sequence< OUString >& ) {} ///////////////////////////////////////////////////////////////// diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx index ba548618219e..cf4c3ea2a3bf 100644 --- a/starmath/source/cfgitem.hxx +++ b/starmath/source/cfgitem.hxx @@ -95,7 +95,7 @@ public: const String GetFontFormatId( const SmFontFormat &rFntFmt ) const; const String GetFontFormatId( const SmFontFormat &rFntFmt, bool bAdd ); const String GetFontFormatId( size_t nPos ) const; - const rtl::OUString GetNewFontFormatId() const; + const OUString GetNewFontFormatId() const; size_t GetCount() const { return aEntries.size(); } bool IsModified() const { return bModified; } @@ -125,11 +125,11 @@ class SmMathConfig : public utl::ConfigItem void Save(); void ReadSymbol( SmSym &rSymbol, - const rtl::OUString &rSymbolName, - const rtl::OUString &rBaseNode ) const; + const OUString &rSymbolName, + const OUString &rBaseNode ) const; void ReadFontFormat( SmFontFormat &rFontFormat, - const rtl::OUString &rSymbolName, - const rtl::OUString &rBaseNode ) const; + const OUString &rSymbolName, + const OUString &rBaseNode ) const; void SetOtherIfNotEqual( bool &rbItem, bool bNewVal ); @@ -159,7 +159,7 @@ public: virtual ~SmMathConfig(); // utl::ConfigItem - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ); virtual void Commit(); SmSymbolManager & GetSymbolManager(); diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx index c4f7c304c685..1658cd46c178 100644 --- a/starmath/source/cursor.cxx +++ b/starmath/source/cursor.cxx @@ -984,7 +984,7 @@ void SmCursor::InsertFraction() { FinishEdit(pLineList, pLineParent, nParentIndex, SmCaretPos(pSelectedNode, 1)); } -void SmCursor::InsertText(rtl::OUString aString) +void SmCursor::InsertText(OUString aString) { BeginEdit(); @@ -1113,7 +1113,7 @@ void SmCursor::InsertElement(SmFormulaElement element){ EndEdit(); } -void SmCursor::InsertSpecial(rtl::OUString aString) +void SmCursor::InsertSpecial(OUString aString) { BeginEdit(); Delete(); diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 29c0328239a4..005b41a383b4 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -313,7 +313,7 @@ IMPL_LINK( SmFontDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ ) Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString( "HID_SMA_FONTDIALOG" ), &aHelpButton1 ); + pHelp->Start( OUString( "HID_SMA_FONTDIALOG" ), &aHelpButton1 ); } return 0; } @@ -436,7 +436,7 @@ IMPL_LINK( SmFontSizeDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString( "HID_SMA_FONTSIZEDIALOG" ), &aHelpButton1 ); + pHelp->Start( OUString( "HID_SMA_FONTSIZEDIALOG" ), &aHelpButton1 ); } return 0; } @@ -556,7 +556,7 @@ IMPL_LINK( SmFontTypeDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString( "HID_SMA_FONTTYPEDIALOG" ), &aHelpButton1 ); + pHelp->Start( OUString( "HID_SMA_FONTTYPEDIALOG" ), &aHelpButton1 ); } return 0; } @@ -687,7 +687,7 @@ SmCategoryDesc::SmCategoryDesc(const ResId& rResId, sal_uInt16 nCategoryIdx) : if (IsAvailableRes(ResId(nI2,*rResId.GetResMgr()).SetRT(RSC_STRING))) { - Strings [i] = new rtl::OUString(ResId(nI2,*rResId.GetResMgr()).toString()); + Strings [i] = new OUString(ResId(nI2,*rResId.GetResMgr()).toString()); Graphics [i] = new Bitmap(ResId(10*nI2,*rResId.GetResMgr())); } else @@ -769,7 +769,7 @@ IMPL_LINK( SmDistanceDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString( "HID_SMA_DISTANCEDIALOG" ), &aHelpButton1 ); + pHelp->Start( OUString( "HID_SMA_DISTANCEDIALOG" ), &aHelpButton1 ); } return 0; } @@ -789,7 +789,7 @@ IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, CheckBox *, pCheckBox ) } -void SmDistanceDialog::SetHelpId(MetricField &rField, const rtl::OString& sHelpId) +void SmDistanceDialog::SetHelpId(MetricField &rField, const OString& sHelpId) { const OUString aEmptyText; @@ -884,7 +884,7 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory) { eUnit = FUNIT_CUSTOM; nDigits = 0; - pMF->SetCustomUnitText(rtl::OUString('%')); + pMF->SetCustomUnitText(OUString('%')); } else { @@ -1083,7 +1083,7 @@ IMPL_LINK( SmAlignDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ ) Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString( "HID_SMA_ALIGNDIALOG" ), &aHelpButton1 ); + pHelp->Start( OUString( "HID_SMA_ALIGNDIALOG" ), &aHelpButton1 ); } return 0; } @@ -1526,7 +1526,7 @@ IMPL_LINK( SmSymbolDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ ) Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString( "HID_SMA_SYMBOLDIALOG" ), &aHelpBtn ); + pHelp->Start( OUString( "HID_SMA_SYMBOLDIALOG" ), &aHelpBtn ); } return 0; } @@ -1551,7 +1551,7 @@ SmSymbolDialog::SmSymbolDialog(Window *pParent, OutputDevice *pFntListDevice, FreeResource(); aHelpBtn.SetClickHdl(LINK(this, SmSymbolDialog, HelpButtonClickHdl)); - aSymbolSetName = rtl::OUString(); + aSymbolSetName = OUString(); aSymbolSet.clear(); FillSymbolSets(); if (aSymbolSets.GetEntryCount() > 0) @@ -1616,7 +1616,7 @@ bool SmSymbolDialog::SelectSymbolSet(const OUString &rSymbolSetName) bool bRet = false; sal_uInt16 nPos = aSymbolSets.GetEntryPos(rSymbolSetName); - aSymbolSetName = rtl::OUString(); + aSymbolSetName = OUString(); aSymbolSet.clear(); if (nPos != LISTBOX_ENTRY_NOTFOUND) { @@ -1717,7 +1717,7 @@ void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, bool bDeleteText) rComboBox.Clear(); if (bDeleteText) - rComboBox.SetText(rtl::OUString()); + rComboBox.SetText(OUString()); ComboBox &rBox = &rComboBox == &aOldSymbols ? aOldSymbolSets : aSymbolSets; SymbolPtrVec_t aSymSet( aSymbolMgrCopy.GetSymbolSet( rBox.GetText() ) ); @@ -1735,7 +1735,7 @@ void SmSymDefineDialog::FillSymbolSets(ComboBox &rComboBox, bool bDeleteText) rComboBox.Clear(); if (bDeleteText) - rComboBox.SetText(rtl::OUString()); + rComboBox.SetText(OUString()); const std::set< OUString > aSymbolSetNames( aSymbolMgrCopy.GetSymbolSetNames() ); std::set< OUString >::const_iterator aIt( aSymbolSetNames.begin() ); @@ -1766,7 +1766,7 @@ void SmSymDefineDialog::FillStyles(bool bDeleteText) { aStyles.Clear(); if (bDeleteText) - aStyles.SetText(rtl::OUString()); + aStyles.SetText(OUString()); OUString aText (aFonts.GetSelectEntry()); if (!aText.isEmpty()) @@ -1910,7 +1910,7 @@ IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl) UpdateButtons(); // display Unicode position as symbol name while iterating over characters - const OUString aHex(rtl::OUString::valueOf(static_cast<sal_Int64>(cChar), 16 ).toAsciiUpperCase()); + const OUString aHex(OUString::valueOf(static_cast<sal_Int64>(cChar), 16 ).toAsciiUpperCase()); const OUString aPattern( (aHex.getLength() > 4) ? OUString("Ux000000") : OUString("Ux0000") ); OUString aUnicodePos( aPattern.copy( 0, aPattern.getLength() - aHex.getLength() ) ); aUnicodePos += aHex; @@ -1974,7 +1974,7 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton ) // clear display for original symbol if necessary if (bNameChanged) - SetOrigSymbol(NULL, rtl::OUString()); + SetOrigSymbol(NULL, OUString()); // update display of new symbol aSymbolDisplay.SetSymbol( &aNewSymbol ); @@ -2006,7 +2006,7 @@ IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, EMPTYARG pButton ) aSymbolMgrCopy.RemoveSymbol( pOrigSymbol->GetName() ); // clear display for original symbol - SetOrigSymbol(NULL, rtl::OUString()); + SetOrigSymbol(NULL, OUString()); // update list box entries FillSymbolSets(aOldSymbolSets, false); @@ -2063,7 +2063,7 @@ IMPL_LINK( SmSymDefineDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString( "HID_SMA_SYMDEFINEDIALOG" ), &aHelpBtn ); + pHelp->Start( OUString( "HID_SMA_SYMDEFINEDIALOG" ), &aHelpBtn ); } return 0; } @@ -2254,7 +2254,7 @@ bool SmSymDefineDialog::SelectSymbolSet(ComboBox &rComboBox, bRet = true; } else if (bDeleteText) - rComboBox.SetText(rtl::OUString()); + rComboBox.SetText(OUString()); bool bIsOld = &rComboBox == &aOldSymbolSets; @@ -2301,7 +2301,7 @@ void SmSymDefineDialog::SetOrigSymbol(const SmSym *pSymbol, } else { // delete displayed symbols - aOldSymbolDisplay.SetText(rtl::OUString()); + aOldSymbolDisplay.SetText(OUString()); aOldSymbolDisplay.Invalidate(); } aOldSymbolName .SetText(aSymName); @@ -2359,7 +2359,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox, bRet = true; } else if (bDeleteText) - rComboBox.SetText(rtl::OUString()); + rComboBox.SetText(OUString()); if (bIsOld) { @@ -2467,7 +2467,7 @@ bool SmSymDefineDialog::SelectStyle(const OUString &rStyleName, bool bApplyFont) bRet = sal_True; } else - aStyles.SetText(rtl::OUString()); + aStyles.SetText(OUString()); UpdateButtons(); diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 6f6222163e48..37e0b4d448c7 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -387,14 +387,14 @@ EditEngine& SmDocShell::GetEditEngine() pEditEngine->EnableUndo( true ); pEditEngine->SetDefTab( sal_uInt16( - Application::GetDefaultDevice()->GetTextWidth(rtl::OUString("XXXX"))) ); + Application::GetDefaultDevice()->GetTextWidth(OUString("XXXX"))) ); pEditEngine->SetControlWord( (pEditEngine->GetControlWord() | EE_CNTRL_AUTOINDENTING) & (~EE_CNTRL_UNDOATTRIBS) & (~EE_CNTRL_PASTESPECIAL) ); - pEditEngine->SetWordDelimiters( rtl::OUString(" .=+-*/(){}[];\"" ) ); + pEditEngine->SetWordDelimiters( OUString(" .=+-*/(){}[];\"" ) ); pEditEngine->SetRefMapMode( MAP_PIXEL ); pEditEngine->SetPaperSize( Size( 800, 0 ) ); @@ -770,7 +770,7 @@ sal_Bool SmDocShell::ConvertFrom(SfxMedium &rMedium) if ( SotStorage::IsStorageFile( pStream ) ) { SvStorageRef aStorage = new SotStorage( pStream, false ); - if ( aStorage->IsStream(rtl::OUString("Equation Native")) ) + if ( aStorage->IsStream(OUString("Equation Native")) ) { // is this a MathType Storage? MathType aEquation( aText ); @@ -817,12 +817,12 @@ sal_Bool SmDocShell::Load( SfxMedium& rMedium ) uno::Reference < container::XNameAccess > xAccess (xStorage, uno::UNO_QUERY); if ( ( - xAccess->hasByName( rtl::OUString("content.xml") ) && - xStorage->isStreamElement( rtl::OUString("content.xml") ) + xAccess->hasByName( OUString("content.xml") ) && + xStorage->isStreamElement( OUString("content.xml") ) ) || ( - xAccess->hasByName( rtl::OUString("Content.xml") ) && - xStorage->isStreamElement( rtl::OUString("Content.xml") ) + xAccess->hasByName( OUString("Content.xml") ) && + xStorage->isStreamElement( OUString("Content.xml") ) ) ) { @@ -1257,7 +1257,7 @@ void SmDocShell::GetState(SfxItemSet &rSet) sal_Unicode cMod = ' '; if (IsModified()) cMod = '*'; - rSet.Put(SfxStringItem(SID_MODIFYSTATUS, rtl::OUString(cMod))); + rSet.Put(SfxStringItem(SID_MODIFYSTATUS, OUString(cMod))); } break; @@ -1290,7 +1290,7 @@ void SmDocShell::GetState(SfxItemSet &rSet) ::svl::IUndoManager* pTmpUndoMgr = GetUndoManager(); if( pTmpUndoMgr ) { - rtl::OUString(::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const; + OUString(::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const; sal_uInt16 nCount; if( SID_GETUNDOSTRINGS == nWh ) diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 9d9e1641cba3..395e274a2548 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -225,7 +225,7 @@ void SmEditWindow::DataChanged( const DataChangedEvent& ) //! see also SmDocShell::GetEditEngine() ! //! - pEditEngine->SetDefTab(sal_uInt16(GetTextWidth(rtl::OUString("XXXX")))); + pEditEngine->SetDefTab(sal_uInt16(GetTextWidth(OUString("XXXX")))); SetEditEngineDefaultFonts(*pEditEngineItemPool); @@ -343,7 +343,7 @@ void SmEditWindow::Command(const CommandEvent& rCEvt) aEvent.SourceWindow = VCLUnoHelper::GetInterface( this ); aEvent.ExecutePosition.X = aPoint.X(); aEvent.ExecutePosition.Y = aPoint.Y(); - ::rtl::OUString sDummy; + OUString sDummy; if ( GetView()->TryContextMenuInterception( *pPopupMenu, sDummy, pMenu, aEvent ) ) { if ( pMenu ) diff --git a/starmath/source/eqnolefilehdr.cxx b/starmath/source/eqnolefilehdr.cxx index 23a4be0789ce..a017963d41bf 100644 --- a/starmath/source/eqnolefilehdr.cxx +++ b/starmath/source/eqnolefilehdr.cxx @@ -33,7 +33,7 @@ sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ) // code snippet copied from MathType::Parse // SvStorageStreamRef xSrc = pStor->OpenSotStream( - rtl::OUString("Equation Native"), + OUString("Equation Native"), STREAM_STD_READ | STREAM_NOCREATE); if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError())) return bSuccess; diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx index 9fa5b616960a..c18b4923077e 100644 --- a/starmath/source/format.cxx +++ b/starmath/source/format.cxx @@ -73,7 +73,7 @@ String GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent ) "index out opd range" ); if (FNT_MATH == nIdent) - return rtl::OUString(FNTNAME_MATH); + return OUString(FNTNAME_MATH); else { const sal_uInt16 *pTable; @@ -139,10 +139,10 @@ SmFormat::SmFormat() vFont[FNT_FUNCTION] = vFont[FNT_NUMBER] = vFont[FNT_TEXT] = - vFont[FNT_SERIF] = SmFace(rtl::OUString(FNTNAME_TIMES), aBaseSize); - vFont[FNT_SANS] = SmFace(rtl::OUString(FNTNAME_HELV), aBaseSize); - vFont[FNT_FIXED] = SmFace(rtl::OUString(FNTNAME_COUR), aBaseSize); - vFont[FNT_MATH] = SmFace(rtl::OUString(FNTNAME_MATH), aBaseSize); + vFont[FNT_SERIF] = SmFace(OUString(FNTNAME_TIMES), aBaseSize); + vFont[FNT_SANS] = SmFace(OUString(FNTNAME_HELV), aBaseSize); + vFont[FNT_FIXED] = SmFace(OUString(FNTNAME_COUR), aBaseSize); + vFont[FNT_MATH] = SmFace(OUString(FNTNAME_MATH), aBaseSize); vFont[FNT_MATH].SetCharSet( RTL_TEXTENCODING_UNICODE ); diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index f18ebbc2ec5f..d87195dfd8e1 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -82,8 +82,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #define EXPORT_SVC_NAME "com.sun.star.xml.XMLExportFilter" @@ -532,7 +530,7 @@ throw( uno::Exception ) // XServiceInfo // override empty method from parent class -rtl::OUString SAL_CALL SmXMLExport::getImplementationName() +OUString SAL_CALL SmXMLExport::getImplementationName() throw(uno::RuntimeException) { OUString aTxt; @@ -714,7 +712,7 @@ void SmXMLExport::GetConfigurationSettings( Sequence < PropertyValue > & rProps) { pProps->Name = rPropName; - rtl::OUString aActualName( rPropName ); + OUString aActualName( rPropName ); // handle 'save used symbols only' if (bUsedSymbolsOnly && rPropName == "Symbols" ) diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx index 98da8d7e8ee0..52b558eeb51e 100644 --- a/starmath/source/mathmlexport.hxx +++ b/starmath/source/mathmlexport.hxx @@ -108,7 +108,7 @@ public: virtual ~SmXMLExport() {}; // XServiceInfo (override parent method) - ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); // XUnoTunnel sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException); diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 3d730eb63d80..3487a386be29 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -77,8 +77,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #define IMPORT_SVC_NAME "com.sun.star.xml.XMLImportFilter" @@ -507,7 +505,7 @@ uno::Reference< uno::XInterface > SAL_CALL SmXMLImportSettings_createInstance( // XServiceInfo // override empty method from parent class -rtl::OUString SAL_CALL SmXMLImport::getImplementationName() +OUString SAL_CALL SmXMLImport::getImplementationName() throw(uno::RuntimeException) { OUString aTxt; diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx index 3e3c45092865..483256e7b554 100644 --- a/starmath/source/mathmlimport.hxx +++ b/starmath/source/mathmlimport.hxx @@ -92,7 +92,7 @@ public: virtual ~SmXMLImport() throw (); // XServiceInfo (override parent method) - ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); // XUnoTunnel sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException); @@ -103,131 +103,131 @@ public: ::com::sun::star::uno::RuntimeException ); SvXMLImportContext *CreateContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateMathContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateRowContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateFracContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateNumberContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateTextContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateAnnotationContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateStringContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateIdentifierContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateOperatorContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateSpaceContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateSqrtContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateRootContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateStyleContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreatePaddedContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreatePhantomContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateFencedContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateErrorContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateSubContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateSupContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateSubSupContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateUnderContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateOverContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateUnderOverContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateMultiScriptsContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateNoneContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreatePrescriptsContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateTableContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateTableRowContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateTableCellContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateAlignGroupContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateActionContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index c003c9d9ce8b..8a73c1a604b3 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -555,7 +555,7 @@ void MathType::TypeFaceToString(String &rTxt,sal_uInt8 nFace) int MathType::Parse(SotStorage *pStor) { SvStorageStreamRef xSrc = pStor->OpenSotStream( - rtl::OUString("Equation Native"), + OUString("Equation Native"), STREAM_STD_READ | STREAM_NOCREATE); if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError())) return 0; @@ -658,7 +658,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector, int i,nRet=1,newline=0; bool bSilent=false; int nPart=0; - rtl::OUString sPush,sMainTerm; + OUString sPush,sMainTerm; int nSetSize=0,nSetAlign=0; int nCurRow=0,nCurCol=0; bool bOpenString=false; @@ -1898,7 +1898,7 @@ int MathType::ConvertFromStarMath( SfxMedium& rMedium ) SvGlobalName aGName(0x0002ce02L, 0x0000, 0x0000,0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46 ); - pStor->SetClass( aGName, 0, rtl::OUString("Microsoft Equation 3.0")); + pStor->SetClass( aGName, 0, OUString("Microsoft Equation 3.0")); static sal_uInt8 const aCompObj[] = { 0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00, @@ -1915,7 +1915,7 @@ int MathType::ConvertFromStarMath( SfxMedium& rMedium ) 0xB2, 0x71, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - SvStorageStreamRef xStor( pStor->OpenSotStream(rtl::OUString("\1CompObj"))); + SvStorageStreamRef xStor( pStor->OpenSotStream(OUString("\1CompObj"))); xStor->Write(aCompObj,sizeof(aCompObj)); static sal_uInt8 const aOle[] = { @@ -1923,12 +1923,12 @@ int MathType::ConvertFromStarMath( SfxMedium& rMedium ) 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - SvStorageStreamRef xStor2( pStor->OpenSotStream(rtl::OUString("\1Ole"))); + SvStorageStreamRef xStor2( pStor->OpenSotStream(OUString("\1Ole"))); xStor2->Write(aOle,sizeof(aOle)); xStor.Clear(); xStor2.Clear(); - SvStorageStreamRef xSrc = pStor->OpenSotStream(rtl::OUString("Equation Native")); + SvStorageStreamRef xSrc = pStor->OpenSotStream(OUString("Equation Native")); if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError())) return 0; diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index fd857d9c7657..ee6b8b39213e 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -563,7 +563,7 @@ void SmNode::DumpAsDot(std::ostream &out, OUString* label, int number, int& id, eq = eq.replaceAll("\\", "\\\\"); eq = eq.replaceAll("\"", "\\\""); out<<"label= \"Equation: \\\""; - out<< rtl::OUStringToOString(eq, RTL_TEXTENCODING_UTF8).getStr(); + out<< OUStringToOString(eq, RTL_TEXTENCODING_UTF8).getStr(); out<<"\\\"\";"<<std::endl; } } @@ -604,13 +604,13 @@ void SmNode::DumpAsDot(std::ostream &out, OUString* label, int number, int& id, case NPLACE: out<<"SmPlaceNode"; break; case NTEXT: out<<"SmTextNode: "; - out<< rtl::OUStringToOString(((SmTextNode*)this)->GetText(), RTL_TEXTENCODING_UTF8).getStr(); + out<< OUStringToOString(((SmTextNode*)this)->GetText(), RTL_TEXTENCODING_UTF8).getStr(); break; case NSPECIAL: out<<"SmSpecialNode"; break; case NGLYPH_SPECIAL: out<<"SmGlyphSpecialNode"; break; case NMATH: out<<"SmMathSymbolNode: "; - out<< rtl::OUStringToOString(((SmMathSymbolNode*)this)->GetText(), RTL_TEXTENCODING_UTF8).getStr(); + out<< OUStringToOString(((SmMathSymbolNode*)this)->GetText(), RTL_TEXTENCODING_UTF8).getStr(); break; case NBLANK: out<<"SmBlankNode"; break; case NERROR: out<<"SmErrorNode"; break; @@ -864,7 +864,7 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SmTmpDevice aTmpDev ((OutputDevice &) rDev, sal_True); aTmpDev.SetFont(GetFont()); - SmRect aRect = (SmRect(aTmpDev, &rFormat, rtl::OUString("a"), + SmRect aRect = (SmRect(aTmpDev, &rFormat, OUString("a"), GetFont().GetBorderWidth())); nFormulaBaseline = GetAlignM(); // move from middle position by constant - distance @@ -924,7 +924,7 @@ void SmLineNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) //! be sure to use a character that has explicitly defined HiAttribut //! line in rect.cxx such as 'a' in order to make 'vec a' look same to //! 'vec {a}'. - SmRect::operator = (SmRect(aTmpDev, &rFormat, rtl::OUString("a"), + SmRect::operator = (SmRect(aTmpDev, &rFormat, OUString("a"), GetFont().GetBorderWidth())); // make sure that the rectangle occupies (almost) no space SetWidth(1); @@ -2643,7 +2643,7 @@ SmMathSymbolNode::SmMathSymbolNode(const SmToken &rNodeToken) { sal_Unicode cChar = GetToken().cMathChar; if ((sal_Unicode) '\0' != cChar) - SetText(rtl::OUString(cChar)); + SetText(OUString(cChar)); } void SmMathSymbolNode::AdaptToX(const OutputDevice &rDev, sal_uLong nWidth) @@ -3056,7 +3056,7 @@ void SmBlankNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) nSpace = nNum * nDist; // get a SmRect with Baseline and all the bells and whistles - SmRect::operator = (SmRect(aTmpDev, &rFormat, rtl::OUString(' '), + SmRect::operator = (SmRect(aTmpDev, &rFormat, OUString(' '), GetFont().GetBorderWidth())); // and resize it to the requested size diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 78734943b5b5..04278e1e2d9a 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -1023,7 +1023,7 @@ void SmParser::Align() if (CONVERT_40_TO_50 == GetConversion()) // encapsulate expression to be aligned in group braces // (here group-open brace) - { Insert(rtl::OUString('{'), GetTokenIndex()); + { Insert(OUString('{'), GetTokenIndex()); bNeedGroupClose = true; // get first valid align statement in sequence @@ -1061,7 +1061,7 @@ void SmParser::Align() Expression(); if (bNeedGroupClose) - Insert(rtl::OUString('}'), GetTokenIndex()); + Insert(OUString('}'), GetTokenIndex()); if (pSNode) { @@ -1551,7 +1551,7 @@ void SmParser::Term() else // encapsulate old 4.0 style parsing in braces { // insert opening brace - Insert(rtl::OUString('{'), GetTokenIndex()); + Insert(OUString('{'), GetTokenIndex()); // // parse in 4.0 style @@ -1568,7 +1568,7 @@ void SmParser::Term() } // insert closing brace - Insert(rtl::OUString('}'), GetTokenIndex()); + Insert(OUString('}'), GetTokenIndex()); SmStructureNode *pSNode = new SmExpressionNode(pFunc->GetToken()); pSNode->SetSubNodes(pFunc, lcl_popOrZero(m_aNodeStack)); @@ -1901,7 +1901,7 @@ void SmParser::Font() // gets number used as arguments in Math formulas (e.g. 'size' command) // Format: no negative numbers, must start with a digit, no exponent notation, ... -static bool lcl_IsNumber(const rtl::OUString& rText) +static bool lcl_IsNumber(const OUString& rText) { bool bPoint = false; const sal_Unicode* pBuffer = rText.getStr(); @@ -1959,7 +1959,7 @@ void SmParser::FontSize() Fraction aValue( 1L ); if (lcl_IsNumber( m_aCurToken.aText )) { - double fTmp = rtl::OUString(m_aCurToken.aText).toDouble(); + double fTmp = OUString(m_aCurToken.aText).toDouble(); if (fTmp != 0.0) { aValue = fTmp; diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx index 1d3be5b0dda8..93f7d4dbd9ee 100644 --- a/starmath/source/rect.cxx +++ b/starmath/source/rect.cxx @@ -48,7 +48,7 @@ static sal_Unicode const aMathAlpha[] = sal_Unicode('\0') }; -bool SmIsMathAlpha(const rtl::OUString &rText) +bool SmIsMathAlpha(const OUString &rText) // true iff symbol (from StarMath Font) should be treated as letter { if (rText.isEmpty()) @@ -126,7 +126,7 @@ void SmRect::CopyAlignInfo(const SmRect &rRect) void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat, - const rtl::OUString &rText, sal_uInt16 nBorder) + const OUString &rText, sal_uInt16 nBorder) { OSL_ENSURE(aTopLeft == Point(0, 0), "Sm: Ooops..."); @@ -221,7 +221,7 @@ void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat, void SmRect::Init(const OutputDevice &rDev, const SmFormat *pFormat, - const rtl::OUString &rText, sal_uInt16 nEBorderWidth) + const OUString &rText, sal_uInt16 nEBorderWidth) // get rectangle fitting for drawing 'rText' on OutputDevice 'rDev' { BuildRect(rDev, pFormat, rText, nEBorderWidth); @@ -229,7 +229,7 @@ void SmRect::Init(const OutputDevice &rDev, const SmFormat *pFormat, SmRect::SmRect(const OutputDevice &rDev, const SmFormat *pFormat, - const rtl::OUString &rText, long nEBorderWidth) + const OUString &rText, long nEBorderWidth) { OSL_ENSURE( nEBorderWidth >= 0, "BorderWidth is negative" ); if (nEBorderWidth < 0) @@ -601,7 +601,7 @@ SmRect SmRect::AsGlyphRect() const } bool SmGetGlyphBoundRect(const OutputDevice &rDev, - const rtl::OUString &rText, Rectangle &rRect) + const OUString &rText, Rectangle &rRect) // basically the same as 'GetTextBoundRect' (in class 'OutputDevice') // but with a string as argument. { diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx index 0cc0a7d769d4..8bd7db94462c 100644 --- a/starmath/source/smdetect.hxx +++ b/starmath/source/smdetect.hxx @@ -62,7 +62,7 @@ public: //---------------------------------------------------------------------------------- // XExtendedFilterDetect //---------------------------------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); }; #endif diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx index f1ee279f4c7a..8395c09d63e9 100644 --- a/starmath/source/smdll.cxx +++ b/starmath/source/smdll.cxx @@ -56,7 +56,7 @@ namespace SmModule *pModule = new SmModule( &rFactory ); *ppShlPtr = pModule; - rFactory.SetDocumentServiceName( rtl::OUString("com.sun.star.formula.FormulaProperties") ); + rFactory.SetDocumentServiceName( OUString("com.sun.star.formula.FormulaProperties") ); SmModule::RegisterInterface(pModule); SmDocShell::RegisterInterface(pModule); diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 8c33c1af06fa..8fd26f90959e 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -226,7 +226,7 @@ SmModule::SmModule(SfxObjectFactory* pObjFact) : pSysLocale( 0 ), pVirtualDev( 0 ) { - SetName(rtl::OUString("StarMath")); + SetName(OUString("StarMath")); SvxModifyControl::RegisterControl(SID_DOC_MODIFIED, this); } diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx index 138ff10530d9..8a38ea19016b 100644 --- a/starmath/source/unodoc.cxx +++ b/starmath/source/unodoc.cxx @@ -28,14 +28,14 @@ using namespace ::com::sun::star; -::rtl::OUString SAL_CALL SmDocument_getImplementationName() throw() +OUString SAL_CALL SmDocument_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Math.FormulaDocument" ); + return OUString( "com.sun.star.comp.Math.FormulaDocument" ); } -uno::Sequence< rtl::OUString > SAL_CALL SmDocument_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL SmDocument_getSupportedServiceNames() throw() { - uno::Sequence< rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); aSeq[0] = "com.sun.star.formula.FormulaProperties"; return aSeq; } diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 6efe36f70275..7b6415e28e89 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -83,8 +83,8 @@ SmPrintUIOptions::SmPrintUIOptions() m_aUIProperties.realloc( nNumProps ); // load the math PrinterOptions into the custom tab - m_aUIProperties[nIdx].Name = rtl::OUString("OptionsUIFile"); - m_aUIProperties[nIdx++].Value <<= rtl::OUString("modules/smath/ui/printeroptions.ui"); + m_aUIProperties[nIdx].Name = OUString("OptionsUIFile"); + m_aUIProperties[nIdx++].Value <<= OUString("modules/smath/ui/printeroptions.ui"); // create Section for formula (results in an extra tab page in dialog) SvtModuleOptions aOpt; @@ -94,7 +94,7 @@ SmPrintUIOptions::SmPrintUIOptions() m_aUIProperties[nIdx++].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage"); // create subgroup for print options - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("contents", aLocalizedStrings.GetString(1), rtl::OUString()); + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("contents", aLocalizedStrings.GetString(1), OUString()); // create a bool option for title row (matches to SID_PRINTTITLE) m_aUIProperties[nIdx++].Value = setBoolControlOpt("title", aLocalizedStrings.GetString( 2 ), @@ -113,23 +113,23 @@ SmPrintUIOptions::SmPrintUIOptions() pConfig->IsPrintFrame()); // create subgroup for print format - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("size", aLocalizedStrings.GetString(5), rtl::OUString()); + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("size", aLocalizedStrings.GetString(5), OUString()); // create a radio button group for print format (matches to SID_PRINTSIZE) - Sequence< rtl::OUString > aChoices( 3 ); + Sequence< OUString > aChoices( 3 ); aChoices[0] = aLocalizedStrings.GetString( 6 ); aChoices[1] = aLocalizedStrings.GetString( 7 ); aChoices[2] = aLocalizedStrings.GetString( 8 ); - Sequence< rtl::OUString > aHelpIds( 3 ); + Sequence< OUString > aHelpIds( 3 ); aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:0"; aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:1"; aHelpIds[2] = ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:2"; - Sequence< rtl::OUString > aWidgetIds( 3 ); + Sequence< OUString > aWidgetIds( 3 ); aWidgetIds[0] = "originalsize"; aWidgetIds[1] = "fittopage"; aWidgetIds[2] = "scaling"; OUString aPrintFormatProp( PRTUIOPT_PRINT_FORMAT ); - m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(), + m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), aHelpIds, aPrintFormatProp, aChoices, static_cast< sal_Int32 >(pConfig->GetPrintSize()) @@ -137,7 +137,7 @@ SmPrintUIOptions::SmPrintUIOptions() // create a numeric box for scale dependent on PrintFormat = "Scaling" (matches to SID_PRINTZOOM) vcl::PrinterOptionsHelper::UIControlOptions aRangeOpt( aPrintFormatProp, 2, sal_True ); - m_aUIProperties[nIdx++].Value = setRangeControlOpt("scalingspin", rtl::OUString(), + m_aUIProperties[nIdx++].Value = setRangeControlOpt("scalingspin", OUString(), ".HelpID:vcl:PrintDialog:PrintScale:NumericField", PRTUIOPT_PRINT_SCALE, pConfig->GetPrintZoomFactor(), // initial value @@ -294,7 +294,7 @@ static PropertySetInfo * lcl_createModelPropertyInfo () { RTL_CONSTASCII_STRINGPARAM( "RelativeSymbolPrimaryHeight" ), HANDLE_RELATIVE_SYMBOL_PRIMARY_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ORNAMENTSIZE }, { RTL_CONSTASCII_STRINGPARAM( "RelativeUpperLimitDistance" ), HANDLE_RELATIVE_UPPER_LIMIT_DISTANCE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_UPPERLIMIT }, { RTL_CONSTASCII_STRINGPARAM( "RightMargin" ), HANDLE_RIGHT_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_RIGHTSPACE }, - { RTL_CONSTASCII_STRINGPARAM( "RuntimeUID" ), HANDLE_RUNTIME_UID , &::getCppuType(static_cast< const rtl::OUString * >(0)), PropertyAttribute::READONLY, 0 }, + { RTL_CONSTASCII_STRINGPARAM( "RuntimeUID" ), HANDLE_RUNTIME_UID , &::getCppuType(static_cast< const OUString * >(0)), PropertyAttribute::READONLY, 0 }, { RTL_CONSTASCII_STRINGPARAM( "Symbols" ), HANDLE_SYMBOLS , &::getCppuType((const Sequence < SymbolDescriptor > *)0), PROPERTY_NONE, 0 }, { RTL_CONSTASCII_STRINGPARAM( "UserDefinedSymbolsInUse" ), HANDLE_USED_SYMBOLS , &::getCppuType((const Sequence < SymbolDescriptor > *)0), PropertyAttribute::READONLY, 0 }, { RTL_CONSTASCII_STRINGPARAM( "TopMargin" ), HANDLE_TOP_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_TOPSPACE }, @@ -407,9 +407,9 @@ OUString SmModel::getImplementationName(void) throw( uno::RuntimeException ) } -::rtl::OUString SmModel::getImplementationName_Static() +OUString SmModel::getImplementationName_Static() { - return rtl::OUString("com.sun.star.comp.math.FormulaDocument"); + return OUString("com.sun.star.comp.math.FormulaDocument"); } sal_Bool SmModel::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) @@ -863,7 +863,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu case HANDLE_USED_SYMBOLS: { const bool bUsedSymbolsOnly = (*ppEntries)->mnHandle == HANDLE_USED_SYMBOLS; - const std::set< rtl::OUString > &rUsedSymbols = pDocSh->GetUsedSymbols(); + const std::set< OUString > &rUsedSymbols = pDocSh->GetUsedSymbols(); // this is get SmModule *pp = SM_MOD(); diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 964e284f3df6..bca602edade9 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -527,7 +527,7 @@ void SmGraphicWindow::KeyInput(const KeyEvent& rKEvt) rCursor.MoveAfterBracket(pBraceNode); }else{ if(code != 0){ - rCursor.InsertText(rtl::OUString(code)); + rCursor.InsertText(OUString(code)); }else if (! (GetView() && GetView()->KeyInput(rKEvt)) ) ScrollableWindow::KeyInput(rKEvt); } @@ -1003,7 +1003,7 @@ Size SmViewShell::GetTextLineSize(OutputDevice& rDevice, const String& rLine) if (nTabs > 0) { - long TabPos = rDevice.GetTextWidth(rtl::OUString('n')) * 8; + long TabPos = rDevice.GetTextWidth(OUString('n')) * 8; aSize.Width() = 0; @@ -1093,7 +1093,7 @@ void SmViewShell::DrawTextLine(OutputDevice& rDevice, const Point& rPosition, co if (nTabs > 0) { - long TabPos = rDevice.GetTextWidth(rtl::OUString('n')) * 8; + long TabPos = rDevice.GetTextWidth(OUString('n')) * 8; for (sal_uInt16 i = 0; i < nTabs; i++) { @@ -1453,7 +1453,7 @@ bool SmViewShell::Insert( SfxMedium& rMedium ) uno::Reference< container::XNameAccess > xNameAccess( xStorage, uno::UNO_QUERY ); if ( xNameAccess.is() && xNameAccess->getElementNames().getLength() ) { - if ( xNameAccess->hasByName( rtl::OUString("content.xml") ) || xNameAccess->hasByName( rtl::OUString("Content.xml") )) + if ( xNameAccess->hasByName( OUString("content.xml") ) || xNameAccess->hasByName( OUString("Content.xml") )) { // is this a fabulous math package ? Reference<com::sun::star::frame::XModel> xModel(pDoc->GetModel()); @@ -1953,7 +1953,7 @@ SmViewShell::SmViewShell(SfxViewFrame *pFrame_, SfxViewShell *): SetStatusText(OUString()); SetWindow(&aGraphic); - SfxShell::SetName(rtl::OUString("SmView")); + SfxShell::SetName(OUString("SmView")); SfxShell::SetUndoManager( &GetDoc()->GetEditEngine().GetUndoManager() ); SetHelpId( HID_SMA_VIEWSHELL_DOCUMENT ); } |