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 /sdext/source/presenter | |
| 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 'sdext/source/presenter')
54 files changed, 230 insertions, 259 deletions
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 59d2396c6117..b442f76d3148 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; //===== PresenterAccessibleObject ============================================= @@ -70,7 +69,7 @@ public: AccessibleObject ( const css::lang::Locale aLocale, const sal_Int16 nRole, - const ::rtl::OUString& rsName); + const OUString& rsName); void LateInitialization (void); virtual ~AccessibleObject (void); @@ -88,7 +87,7 @@ public: void RemoveChild (const ::rtl::Reference<AccessibleObject>& rpChild); void SetIsFocused (const bool bIsFocused); - void SetAccessibleName (const ::rtl::OUString& rsName); + void SetAccessibleName (const OUString& rsName); void FireAccessibleEvent ( const sal_Int16 nEventId, @@ -130,10 +129,10 @@ public: virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (cssu::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription (void) + virtual OUString SAL_CALL getAccessibleDescription (void) throw (cssu::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName (void) + virtual OUString SAL_CALL getAccessibleName (void) throw (cssu::RuntimeException); virtual cssu::Reference<cssa::XAccessibleRelationSet> SAL_CALL @@ -210,7 +209,7 @@ public: throw (cssu::RuntimeException); protected: - ::rtl::OUString msName; + OUString msName; cssu::Reference<css::awt::XWindow2> mxContentWindow; cssu::Reference<css::awt::XWindow2> mxBorderWindow; const css::lang::Locale maLocale; @@ -328,7 +327,7 @@ public: AccessibleParagraph ( const css::lang::Locale aLocale, const sal_Int16 nRole, - const ::rtl::OUString& rsName, + const OUString& rsName, const SharedPresenterTextParagraph& rpParagraph, const sal_Int32 nParagraphIndex); @@ -354,7 +353,7 @@ public: virtual cssu::Sequence<css::beans::PropertyValue> SAL_CALL getCharacterAttributes ( ::sal_Int32 nIndex, - const cssu::Sequence<rtl::OUString>& rRequestedAttributes) + const cssu::Sequence<OUString>& rRequestedAttributes) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex) @@ -366,7 +365,7 @@ public: virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint) throw (cssu::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSelectedText (void) + virtual OUString SAL_CALL getSelectedText (void) throw (cssu::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionStart (void) @@ -378,10 +377,10 @@ public: virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText (void) + virtual OUString SAL_CALL getText (void) throw (cssu::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTextRange ( + virtual OUString SAL_CALL getTextRange ( sal_Int32 nStartIndex, sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); @@ -490,7 +489,7 @@ public: AccessibleNotes ( const css::lang::Locale aLocale, const sal_Int16 nRole, - const ::rtl::OUString& rsName); + const OUString& rsName); static rtl::Reference<PresenterAccessible::AccessibleObject> Create ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, @@ -642,7 +641,7 @@ void PresenterAccessible::UpdateAccessibilityHierarchy (void) void PresenterAccessible::UpdateAccessibilityHierarchy ( const Reference<awt::XWindow>& rxPreviewContentWindow, const Reference<awt::XWindow>& rxPreviewBorderWindow, - const ::rtl::OUString& rsTitle, + const OUString& rsTitle, const Reference<awt::XWindow>& rxNotesContentWindow, const Reference<awt::XWindow>& rxNotesBorderWindow, const ::boost::shared_ptr<PresenterTextView>& rpNotesTextView) @@ -710,7 +709,7 @@ void PresenterAccessible::NotifyCurrentSlideChange ( mpAccessiblePreview->SetAccessibleName( (pPreviewPane&&pPreviewPane->mxPane.is() ? pPreviewPane->mxPane->GetTitle() - : rtl::OUString())); + : OUString())); } // Play some focus ping-pong to trigger AT tools. @@ -1270,7 +1269,7 @@ void PresenterAccessible::AccessibleObject::SetIsFocused (const bool bIsFocused) } } -void PresenterAccessible::AccessibleObject::SetAccessibleName (const ::rtl::OUString& rsName) +void PresenterAccessible::AccessibleObject::SetAccessibleName (const OUString& rsName) { if (msName != rsName) { @@ -1601,7 +1600,7 @@ sal_Unicode SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacter (sal Sequence<css::beans::PropertyValue> SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterAttributes ( ::sal_Int32 nIndex, - const cssu::Sequence<rtl::OUString>& rRequestedAttributes) + const cssu::Sequence<OUString>& rRequestedAttributes) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException) { ThrowIfDisposed(); @@ -1678,7 +1677,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint ( return nIndex; } -::rtl::OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText (void) +OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText (void) throw (cssu::RuntimeException) { ThrowIfDisposed(); @@ -1713,26 +1712,26 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection ( return setCaretPosition(nStartIndex); } -::rtl::OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText (void) +OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText (void) throw (cssu::RuntimeException) { ThrowIfDisposed(); - ::rtl::OUString sText; + OUString sText; if (mpParagraph) sText = mpParagraph->GetText(); return sText; } -::rtl::OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getTextRange ( +OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getTextRange ( sal_Int32 nLocalStartIndex, sal_Int32 nLocalEndIndex) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException) { ThrowIfDisposed(); - ::rtl::OUString sText; + OUString sText; if (mpParagraph) { const TextSegment aSegment ( @@ -1867,7 +1866,7 @@ bool PresenterAccessible::AccessibleParagraph::GetWindowState (const sal_Int16 n AccessibleNotes::AccessibleNotes ( const css::lang::Locale aLocale, const sal_Int16 nRole, - const ::rtl::OUString& rsName) + const OUString& rsName) : AccessibleObject(aLocale,nRole,rsName), mpTextView() { diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index 6a70c9ed625e..10740d193d93 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -121,7 +121,7 @@ private: void UpdateAccessibilityHierarchy ( const css::uno::Reference<css::awt::XWindow>& rxPreviewContentWindow, const css::uno::Reference<css::awt::XWindow>& rxPreviewBorderWindow, - const ::rtl::OUString& rsTitle, + const OUString& rsTitle, const css::uno::Reference<css::awt::XWindow>& rxNotesContentWindow, const css::uno::Reference<css::awt::XWindow>& rxNotesBorderWindow, const ::boost::shared_ptr<PresenterTextView>& rpNotesTextView); diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index 66d0cf86a25a..37e2f08a7c7c 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -31,14 +31,13 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::std; -using ::rtl::OUString; namespace sdext { namespace presenter { //===== PresenterBitmapContainer ============================================== PresenterBitmapContainer::PresenterBitmapContainer ( - const ::rtl::OUString& rsConfigurationBase, + const OUString& rsConfigurationBase, const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer, const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, @@ -141,7 +140,7 @@ void PresenterBitmapContainer::LoadBitmaps ( SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode, - const ::rtl::OUString& rsPath, + const OUString& rsPath, const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const SharedBitmapDescriptor& rpDefault) diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx index 60f029629f29..c88dfb5082f6 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.hxx +++ b/sdext/source/presenter/PresenterBitmapContainer.hxx @@ -92,7 +92,7 @@ public: bitmap sets. */ PresenterBitmapContainer ( - const ::rtl::OUString& rsConfigurationBase, + const OUString& rsConfigurationBase, const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer, const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, @@ -110,18 +110,18 @@ public: /** Return the bitmap set that is associated with the given name. */ - ::boost::shared_ptr<BitmapDescriptor> GetBitmap (const ::rtl::OUString& rsName) const; + ::boost::shared_ptr<BitmapDescriptor> GetBitmap (const OUString& rsName) const; static ::boost::shared_ptr<BitmapDescriptor> LoadBitmap ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode, - const ::rtl::OUString& rsPathToBitmapNode, + const OUString& rsPathToBitmapNode, const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const ::boost::shared_ptr<BitmapDescriptor>& rpDefaultBitmap); private: ::boost::shared_ptr<PresenterBitmapContainer> mpParentContainer; - typedef ::std::map<rtl::OUString, ::boost::shared_ptr<BitmapDescriptor> > BitmapContainer; + typedef ::std::map<OUString, ::boost::shared_ptr<BitmapDescriptor> > BitmapContainer; BitmapContainer maIconContainer; css::uno::Reference<css::rendering::XCanvas> mxCanvas; css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper; @@ -129,7 +129,7 @@ private: void LoadBitmaps ( const css::uno::Reference<css::container::XNameAccess>& rsRootNode); void ProcessBitmap ( - const ::rtl::OUString& rsKey, + const OUString& rsKey, const css::uno::Reference<css::beans::XPropertySet>& rProperties); static ::boost::shared_ptr<BitmapDescriptor> LoadBitmap ( const css::uno::Reference<css::beans::XPropertySet>& rxProperties, @@ -137,7 +137,7 @@ private: const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const ::boost::shared_ptr<PresenterBitmapContainer::BitmapDescriptor>& rpDefault); static BitmapDescriptor::TexturingMode - StringToTexturingMode (const ::rtl::OUString& rsTexturingMode); + StringToTexturingMode (const OUString& rsTexturingMode); }; typedef PresenterBitmapContainer::BitmapDescriptor PresenterBitmapDescriptor; diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index bc9a1274a4d0..0326735277f9 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index 2c56e2195498..069b647207c8 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -63,7 +63,7 @@ public: const ::boost::shared_ptr<PresenterTheme>& rpTheme, const css::uno::Reference<css::awt::XWindow>& rxParentWindow, const css::uno::Reference<css::rendering::XCanvas>& rxParentCanvas, - const ::rtl::OUString& rsConfigurationName); + const OUString& rsConfigurationName); ~PresenterButton (void); virtual void SAL_CALL disposing (void); @@ -125,10 +125,10 @@ private: css::uno::Reference<css::awt::XWindow> mxWindow; css::uno::Reference<css::rendering::XCanvas> mxCanvas; css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper; - const ::rtl::OUString msText; + const OUString msText; const PresenterTheme::SharedFontDescriptor mpFont; const PresenterTheme::SharedFontDescriptor mpMouseOverFont; - const ::rtl::OUString msAction; + const OUString msAction; css::geometry::RealPoint2D maCenter; css::geometry::IntegerSize2D maButtonSize; PresenterBitmapDescriptor::Mode meState; @@ -142,8 +142,8 @@ private: const css::uno::Reference<css::awt::XWindow>& rxParentWindow, const PresenterTheme::SharedFontDescriptor& rFont, const PresenterTheme::SharedFontDescriptor& rMouseOverFont, - const ::rtl::OUString& rxText, - const ::rtl::OUString& rxAction); + const OUString& rxText, + const OUString& rxAction); void RenderButton ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::geometry::IntegerSize2D& rSize, @@ -160,7 +160,7 @@ private: void SetupButtonBitmaps (void); static css::uno::Reference<css::beans::XPropertySet> GetConfigurationProperties ( const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, - const ::rtl::OUString& rsConfgurationName); + const OUString& rsConfgurationName); void ThrowIfDisposed (void) const throw (::com::sun::star::lang::DisposedException); diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx index 92f3f1ac6200..596fda71237c 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.cxx +++ b/sdext/source/presenter/PresenterCanvasHelper.cxx @@ -261,7 +261,7 @@ void PresenterCanvasHelper::SetDeviceColor( css::geometry::RealRectangle2D PresenterCanvasHelper::GetTextBoundingBox ( const css::uno::Reference<css::rendering::XCanvasFont>& rxFont, - const ::rtl::OUString& rsText, + const OUString& rsText, const sal_Int8 nTextDirection) { if (rxFont.is() && !rsText.isEmpty()) @@ -279,7 +279,7 @@ css::geometry::RealRectangle2D PresenterCanvasHelper::GetTextBoundingBox ( css::geometry::RealSize2D PresenterCanvasHelper::GetTextSize ( const css::uno::Reference<css::rendering::XCanvasFont>& rxFont, - const ::rtl::OUString& rsText, + const OUString& rsText, const sal_Int8 nTextDirection) { const geometry::RealRectangle2D aTextBBox (GetTextBoundingBox(rxFont, rsText, nTextDirection)); diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sdext/source/presenter/PresenterCanvasHelper.hxx index d9e10dd04967..dc5477e85229 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.hxx +++ b/sdext/source/presenter/PresenterCanvasHelper.hxx @@ -63,12 +63,12 @@ public: static css::geometry::RealRectangle2D GetTextBoundingBox ( const css::uno::Reference<css::rendering::XCanvasFont>& rxFont, - const ::rtl::OUString& rsText, + const OUString& rsText, const sal_Int8 = css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT); static css::geometry::RealSize2D GetTextSize ( const css::uno::Reference<css::rendering::XCanvasFont>& rxFont, - const ::rtl::OUString& rsText, + const OUString& rsText, const sal_Int8 = css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT); private: diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx index de18f450ea0e..f285d1346898 100644 --- a/sdext/source/presenter/PresenterComponent.cxx +++ b/sdext/source/presenter/PresenterComponent.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace cppu; using namespace osl; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index be5d839af0bf..3a36cb332623 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -27,11 +27,10 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sdext { namespace presenter { -const ::rtl::OUString PresenterConfigurationAccess::msPresenterScreenRootName = +const OUString PresenterConfigurationAccess::msPresenterScreenRootName = "/org.openoffice.Office.PresenterScreen/"; PresenterConfigurationAccess::PresenterConfigurationAccess ( @@ -78,7 +77,7 @@ PresenterConfigurationAccess::PresenterConfigurationAccess ( catch (const Exception& rException) { OSL_TRACE ("caught exception while opening configuration: %s", - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } } @@ -99,7 +98,7 @@ Any PresenterConfigurationAccess::GetConfigurationNode (const OUString& sPathToN sPathToNode); } -bool PresenterConfigurationAccess::GoToChild (const ::rtl::OUString& rsPathToNode) +bool PresenterConfigurationAccess::GoToChild (const OUString& rsPathToNode) { if ( ! IsValid()) return false; @@ -132,7 +131,7 @@ bool PresenterConfigurationAccess::GoToChild (const Predicate& rPredicate) } bool PresenterConfigurationAccess::SetProperty ( - const ::rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const Any& rValue) { Reference<beans::XPropertySet> xProperties (maNode, UNO_QUERY); @@ -162,8 +161,8 @@ Any PresenterConfigurationAccess::GetConfigurationNode ( catch (const Exception& rException) { OSL_TRACE ("caught exception while getting configuration node %s: %s", - ::rtl::OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } return Any(); @@ -171,7 +170,7 @@ Any PresenterConfigurationAccess::GetConfigurationNode ( Reference<beans::XPropertySet> PresenterConfigurationAccess::GetNodeProperties ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode, - const ::rtl::OUString& rsPathToNode) + const OUString& rsPathToNode) { return Reference<beans::XPropertySet>(GetConfigurationNode(rxNode, rsPathToNode), UNO_QUERY); } @@ -257,8 +256,8 @@ Any PresenterConfigurationAccess::Find ( } bool PresenterConfigurationAccess::IsStringPropertyEqual ( - const ::rtl::OUString& rsValue, - const ::rtl::OUString& rsPropertyName, + const OUString& rsValue, + const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertySet>& rxNode) { OUString sValue; diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx index ee2035a2dab4..ea663e46a3c0 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.hxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx @@ -49,9 +49,9 @@ class PresenterConfigurationAccess public: enum WriteMode { READ_WRITE, READ_ONLY }; typedef ::boost::function<bool( - const ::rtl::OUString&, + const OUString&, const css::uno::Reference<css::beans::XPropertySet>&)> Predicate; - static const ::rtl::OUString msPresenterScreenRootName; + static const OUString msPresenterScreenRootName; /** Create a new object to access the configuration entries below the given root. @@ -64,7 +64,7 @@ public: */ PresenterConfigurationAccess( const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const ::rtl::OUString& rsRootName, + const OUString& rsRootName, WriteMode eMode); ~PresenterConfigurationAccess (void); @@ -74,7 +74,7 @@ public: The relative path from the root (as given the constructor) to the node. */ css::uno::Any GetConfigurationNode ( - const ::rtl::OUString& rsPathToNode); + const OUString& rsPathToNode); /** Return <TRUE/> when opening the configuration (via creating a new PresenterConfigurationAccess object) or previous calls to @@ -85,7 +85,7 @@ public: /** Move the focused node to the (possibly indirect) child specified by the given path. */ - bool GoToChild (const ::rtl::OUString& rsPathToNode); + bool GoToChild (const OUString& rsPathToNode); /** Move the focused node to the first direct child that fulfills the given predicate. */ @@ -95,7 +95,7 @@ public: mind to call CommitChanges() to write the change back to the configuration. */ - bool SetProperty (const ::rtl::OUString& rsPropertyName, const css::uno::Any& rValue); + bool SetProperty (const OUString& rsPropertyName, const css::uno::Any& rValue); /** Return a configuration node below the given node. @param rxNode @@ -109,11 +109,11 @@ public: */ static css::uno::Any GetConfigurationNode ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode, - const ::rtl::OUString& rsPathToNode); + const OUString& rsPathToNode); static css::uno::Reference<css::beans::XPropertySet> GetNodeProperties ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode, - const ::rtl::OUString& rsPathToNode); + const OUString& rsPathToNode); /** Write any changes that have been made back to the configuration. This call is ignored when the called ConfigurationAccess object was @@ -122,10 +122,10 @@ public: void CommitChanges (void); typedef ::boost::function<void( - const ::rtl::OUString&, + const OUString&, const ::std::vector<css::uno::Any>&) > ItemProcessor; typedef ::boost::function<void( - const ::rtl::OUString&, + const OUString&, const css::uno::Reference<css::beans::XPropertySet>&) > PropertySetProcessor; /** Execute a functor for all elements of the given container. @@ -142,7 +142,7 @@ public: */ static void ForAll ( const css::uno::Reference<css::container::XNameAccess>& rxContainer, - const ::std::vector<rtl::OUString>& rArguments, + const ::std::vector<OUString>& rArguments, const ItemProcessor& rProcessor); static void ForAll ( const css::uno::Reference<css::container::XNameAccess>& rxContainer, @@ -153,8 +153,8 @@ public: const Predicate& rPredicate); static bool IsStringPropertyEqual ( - const ::rtl::OUString& rsValue, - const ::rtl::OUString& rsPropertyName, + const OUString& rsValue, + const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertySet>& rxNode); /** This method wraps a call to getPropertyValue() and returns an empty @@ -163,7 +163,7 @@ public: */ static css::uno::Any GetProperty ( const css::uno::Reference<css::beans::XPropertySet>& rxProperties, - const ::rtl::OUString& rsKey); + const OUString& rsKey); private: css::uno::Reference<css::uno::XInterface> mxRoot; diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 18d0aa943f17..0532de6b6f93 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -60,8 +60,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace { const sal_Int32 ResourceActivationEventType = 0; @@ -429,7 +427,7 @@ void PresenterController::UpdateViews (void) } SharedBitmapDescriptor - PresenterController::GetViewBackground (const ::rtl::OUString& rsViewURL) const + PresenterController::GetViewBackground (const OUString& rsViewURL) const { if (mpTheme.get() != NULL) { @@ -440,7 +438,7 @@ SharedBitmapDescriptor } PresenterTheme::SharedFontDescriptor - PresenterController::GetViewFont (const ::rtl::OUString& rsViewURL) const + PresenterController::GetViewFont (const OUString& rsViewURL) const { if (mpTheme.get() != NULL) { @@ -555,7 +553,7 @@ Reference<css::frame::XDispatch> PresenterController::GetDispatch (const util::U frame::FrameSearchFlag::SELF); } -util::URL PresenterController::CreateURLFromString (const ::rtl::OUString& rsURL) const +util::URL PresenterController::CreateURLFromString (const OUString& rsURL) const { util::URL aURL; diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index fb66f31b2e4b..e8b4ec6c2c9a 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -97,9 +97,9 @@ public: void UpdateCurrentSlide (const sal_Int32 nOffset); SharedBitmapDescriptor - GetViewBackground (const ::rtl::OUString& rsViewURL) const; + GetViewBackground (const OUString& rsViewURL) const; PresenterTheme::SharedFontDescriptor - GetViewFont (const ::rtl::OUString& rsViewURL) const; + GetViewFont (const OUString& rsViewURL) const; ::boost::shared_ptr<PresenterTheme> GetTheme (void) const; ::rtl::Reference<PresenterWindowManager> GetWindowManager (void) const; css::uno::Reference<css::presentation::XSlideShowController> @@ -111,13 +111,13 @@ public: ::boost::shared_ptr<PresenterPaintManager> GetPaintManager (void) const; void HideSlideSorter (void); double GetSlideAspectRatio (void) const; - void ShowView (const ::rtl::OUString& rsViewURL); - void HideView (const ::rtl::OUString& rsViewURL); + void ShowView (const OUString& rsViewURL); + void HideView (const OUString& rsViewURL); void SwitchMonitors (void); - void DispatchUnoCommand (const ::rtl::OUString& rsCommand) const; + void DispatchUnoCommand (const OUString& rsCommand) const; css::uno::Reference<css::frame::XDispatch> GetDispatch ( const css::util::URL& rURL) const; - css::util::URL CreateURLFromString (const ::rtl::OUString& rsURL) const; + css::util::URL CreateURLFromString (const OUString& rsURL) const; css::uno::Reference<css::drawing::framework::XConfigurationController> GetConfigurationController (void) const; css::uno::Reference<css::drawing::XDrawPage> GetCurrentSlide (void) const; diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx index ef77190e8d92..d9ba2009158a 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx @@ -21,7 +21,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -106,7 +105,7 @@ void SAL_CALL PresenterCurrentSlideObserver::slideEnded (sal_Bool bReverse) mpPresenterController->UpdateCurrentSlide(+1); } -void SAL_CALL PresenterCurrentSlideObserver::hyperLinkClicked (const rtl::OUString &) +void SAL_CALL PresenterCurrentSlideObserver::hyperLinkClicked (const OUString &) throw (css::uno::RuntimeException) { } diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx index 1c009c3af53d..cddb6d64af02 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -63,7 +63,7 @@ public: virtual void SAL_CALL slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL slideAnimationsEnded( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL hyperLinkClicked( const ::rtl::OUString& hyperLink ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) throw (::com::sun::star::uno::RuntimeException); // XAnimationListener virtual void SAL_CALL beginEvent( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node ) throw (::com::sun::star::uno::RuntimeException); diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx index 0c318463a198..782742bf20ea 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.cxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx index 57153bdcf188..b855793fb3a2 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.hxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx @@ -57,7 +57,7 @@ public: throw (css::uno::RuntimeException); private: - ::rtl::OUString msEventType; + OUString msEventType; css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController; Predicate maPredicate; Action maAction; @@ -75,7 +75,7 @@ private: */ PresenterFrameworkObserver ( const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController, - const ::rtl::OUString& rsEventName, + const OUString& rsEventName, const Predicate& rPredicate, const Action& rAction); virtual ~PresenterFrameworkObserver (void); diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index 638b72855964..70fe8b87af17 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::std::vector; namespace sdext { namespace presenter { @@ -88,9 +87,9 @@ namespace { const OUString msText; ::boost::shared_ptr<vector<LineDescriptor> > mpLineDescriptors; - void SplitText (const ::rtl::OUString& rsText, vector<rtl::OUString>& rTextParts); + void SplitText (const OUString& rsText, vector<OUString>& rTextParts); void FormatText ( - const vector<rtl::OUString>& rTextParts, + const vector<OUString>& rTextParts, const css::uno::Reference<css::rendering::XCanvasFont>& rxFont, const sal_Int32 nMaximalWidth); }; diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx index 0145eb922ff1..1e5fae0b47c1 100644 --- a/sdext/source/presenter/PresenterHelper.cxx +++ b/sdext/source/presenter/PresenterHelper.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::presentation; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sdext/source/presenter/PresenterHelper.hxx index d0145afffc53..b140d464a0fa 100644 --- a/sdext/source/presenter/PresenterHelper.hxx +++ b/sdext/source/presenter/PresenterHelper.hxx @@ -35,19 +35,19 @@ class PresenterHelper : ::boost::noncopyable { public: - static const ::rtl::OUString msPaneURLPrefix; - static const ::rtl::OUString msCenterPaneURL; - static const ::rtl::OUString msFullScreenPaneURL; + static const OUString msPaneURLPrefix; + static const OUString msCenterPaneURL; + static const OUString msFullScreenPaneURL; - static const ::rtl::OUString msViewURLPrefix; - static const ::rtl::OUString msPresenterScreenURL; - static const ::rtl::OUString msSlideSorterURL; + static const OUString msViewURLPrefix; + static const OUString msPresenterScreenURL; + static const OUString msSlideSorterURL; - static const ::rtl::OUString msResourceActivationEvent; - static const ::rtl::OUString msResourceDeactivationEvent; + static const OUString msResourceActivationEvent; + static const OUString msResourceDeactivationEvent; - static const ::rtl::OUString msDefaultPaneStyle; - static const ::rtl::OUString msDefaultViewStyle; + static const OUString msDefaultPaneStyle; + static const OUString msDefaultViewStyle; /** Return the slide show controller of a running presentation that has the same document as the given framework controller. diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index 2ffb8ceb7b59..90450a414d97 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; static const sal_Int32 gnSpaceBelowSeparator (10); static const sal_Int32 gnSpaceAboveSeparator (10); @@ -226,15 +225,15 @@ void PresenterNotesView::CreateToolBar ( void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesPage) { - static const ::rtl::OUString sNotesShapeName ( + static const OUString sNotesShapeName ( "com.sun.star.presentation.NotesShape"); - static const ::rtl::OUString sTextShapeName ( + static const OUString sTextShapeName ( "com.sun.star.drawing.TextShape"); Reference<container::XIndexAccess> xIndexAccess (rxNotesPage, UNO_QUERY); if (xIndexAccess.is()) { - ::rtl::OUString sText; + OUString sText; // Iterate over all shapes and find the one that holds the text. sal_Int32 nCount (xIndexAccess->getCount()); @@ -258,7 +257,7 @@ void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesP xIndexAccess->getByIndex(nIndex), UNO_QUERY); if (xShapeDescriptor.is()) { - ::rtl::OUString sType (xShapeDescriptor->getShapeType()); + OUString sType (xShapeDescriptor->getShapeType()); if (sType.equals(sNotesShapeName) || sType.equals(sTextShapeName)) { Reference<text::XTextRange> xText ( diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index 8f79086e61dc..458ea7d6c38f 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx index 67bf1814c2f4..61ec241d5cb3 100644 --- a/sdext/source/presenter/PresenterPane.hxx +++ b/sdext/source/presenter/PresenterPane.hxx @@ -50,8 +50,8 @@ public: const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterPane (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext) SAL_THROW((css::uno::Exception)); diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index d20b530b7be4..2ded1b0e3c31 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -117,7 +116,7 @@ void PresenterPaneBase::SetTitle (const OUString& rsTitle) mpPresenterController->GetPaintManager()->Invalidate(mxBorderWindow); } -::rtl::OUString PresenterPaneBase::GetTitle (void) const +OUString PresenterPaneBase::GetTitle (void) const { return msTitle; } @@ -448,7 +447,7 @@ void PresenterPaneBase::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - ::rtl::OUString( "PresenterPane object has already been disposed"), + OUString( "PresenterPane object has already been disposed"), static_cast<uno::XWeak*>(this)); } } diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index eb9fa8d9b3a3..170a743c299c 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -74,8 +74,8 @@ public: css::uno::Reference<css::awt::XWindow> GetBorderWindow (void) const; void SetBackground (const SharedBitmapDescriptor& rpBackground); - void SetTitle (const ::rtl::OUString& rsTitle); - ::rtl::OUString GetTitle (void) const; + void SetTitle (const OUString& rsTitle); + OUString GetTitle (void) const; css::uno::Reference<css::drawing::framework::XPaneBorderPainter> GetPaneBorderPainter (void) const; void SetCalloutAnchor (const css::awt::Point& rAnchorPosition); css::awt::Point GetCalloutAnchor (void) const; @@ -122,7 +122,7 @@ protected: css::uno::Reference<css::drawing::framework::XResourceId> mxPaneId; css::uno::Reference<css::drawing::framework::XPaneBorderPainter> mxBorderPainter; css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper; - ::rtl::OUString msTitle; + OUString msTitle; css::uno::Reference<css::uno::XComponentContext> mxComponentContext; SharedBitmapDescriptor mpViewBackground; bool mbHasCallout; diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx index 7f09074721c7..5cb992a6d1de 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.cxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -52,9 +51,9 @@ OUString PresenterPaneBorderManager::getImplementationName_static (void) Sequence<OUString> PresenterPaneBorderManager::getSupportedServiceNames_static (void) { - static const ::rtl::OUString sServiceName( + static const OUString sServiceName( "com.sun.star.drawing.PresenterPaneBorderManager"); - return Sequence<rtl::OUString>(&sServiceName, 1); + return Sequence<OUString>(&sServiceName, 1); } Reference<XInterface> PresenterPaneBorderManager::Create (const Reference<uno::XComponentContext>& rxContext) @@ -504,7 +503,7 @@ void PresenterPaneBorderManager::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - ::rtl::OUString( "PresenterPaneBorderManager object has already been disposed"), + OUString( "PresenterPaneBorderManager object has already been disposed"), static_cast<uno::XWeak*>(this)); } } diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx b/sdext/source/presenter/PresenterPaneBorderManager.hxx index a37fde6db78e..e95147a5dfdd 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.hxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.hxx @@ -71,8 +71,8 @@ public: virtual void SAL_CALL disposing (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext) SAL_THROW((css::uno::Exception)); diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index bcee08161b8e..9b03dc3a576e 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -173,7 +172,7 @@ PresenterPaneBorderPainter::~PresenterPaneBorderPainter (void) //----- XPaneBorderPainter ---------------------------------------------------- awt::Rectangle SAL_CALL PresenterPaneBorderPainter::addBorder ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, drawing::framework::BorderType eBorderType) throw(css::uno::RuntimeException) @@ -186,7 +185,7 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::addBorder ( } awt::Rectangle SAL_CALL PresenterPaneBorderPainter::removeBorder ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, drawing::framework::BorderType eBorderType) throw(css::uno::RuntimeException) @@ -199,11 +198,11 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::removeBorder ( } void SAL_CALL PresenterPaneBorderPainter::paintBorder ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, - const rtl::OUString& rsTitle) + const OUString& rsTitle) throw(css::uno::RuntimeException) { ThrowIfDisposed(); @@ -234,11 +233,11 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorder ( } void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, - const rtl::OUString& rsTitle, + const OUString& rsTitle, const css::awt::Point& rCalloutAnchor) throw(css::uno::RuntimeException) { @@ -271,7 +270,7 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout ( } awt::Point SAL_CALL PresenterPaneBorderPainter::getCalloutOffset ( - const rtl::OUString& rsPaneBorderStyleName) + const OUString& rsPaneBorderStyleName) throw(css::uno::RuntimeException) { ThrowIfDisposed(); @@ -351,7 +350,7 @@ void PresenterPaneBorderPainter::SetTheme (const ::boost::shared_ptr<PresenterTh } awt::Rectangle PresenterPaneBorderPainter::AddBorder ( - const ::rtl::OUString& rsPaneURL, + const OUString& rsPaneURL, const awt::Rectangle& rInnerBox, const css::drawing::framework::BorderType eBorderType) const { @@ -365,7 +364,7 @@ awt::Rectangle PresenterPaneBorderPainter::AddBorder ( } awt::Rectangle PresenterPaneBorderPainter::RemoveBorder ( - const ::rtl::OUString& rsPaneURL, + const OUString& rsPaneURL, const css::awt::Rectangle& rOuterBox, const css::drawing::framework::BorderType eBorderType) const { diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx index 50f630038712..3866db4bfc8f 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx @@ -65,7 +65,7 @@ public: The rectangle of the inner window content. */ css::awt::Rectangle AddBorder ( - const ::rtl::OUString& rsPaneURL, + const OUString& rsPaneURL, const css::awt::Rectangle& rInnerBox, const css::drawing::framework::BorderType eBorderType) const; @@ -80,7 +80,7 @@ public: supposed to contain the window title. */ css::awt::Rectangle RemoveBorder ( - const ::rtl::OUString& rsPaneURL, + const OUString& rsPaneURL, const css::awt::Rectangle& rOuterBox, const css::drawing::framework::BorderType eBorderType) const; @@ -91,36 +91,36 @@ public: // XPaneBorderPainter virtual css::awt::Rectangle SAL_CALL addBorder ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, css::drawing::framework::BorderType eBorderType) throw(css::uno::RuntimeException); virtual css::awt::Rectangle SAL_CALL removeBorder ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, css::drawing::framework::BorderType eBorderType) throw(css::uno::RuntimeException); virtual void SAL_CALL paintBorder ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, - const rtl::OUString& rsTitle) + const OUString& rsTitle) throw(css::uno::RuntimeException); virtual void SAL_CALL paintBorderWithCallout ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, - const rtl::OUString& rsTitle, + const OUString& rsTitle, const css::awt::Point& rCalloutAnchor) throw(css::uno::RuntimeException); virtual css::awt::Point SAL_CALL getCalloutOffset ( - const rtl::OUString& rsPaneBorderStyleName) + const OUString& rsPaneBorderStyleName) throw(css::uno::RuntimeException); private: diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index 9a06197cd04d..76ead71214d5 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -327,7 +326,7 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::FindViewURL return SharedPaneDescriptor(); } -::rtl::OUString PresenterPaneContainer::GetPaneURLForViewURL (const ::rtl::OUString& rsViewURL) +OUString PresenterPaneContainer::GetPaneURLForViewURL (const OUString& rsViewURL) { SharedPaneDescriptor pDescriptor (FindViewURL(rsViewURL)); if (pDescriptor.get() != NULL) diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx index 951ee1564c40..abe7df99e6f7 100644 --- a/sdext/source/presenter/PresenterPaneContainer.hxx +++ b/sdext/source/presenter/PresenterPaneContainer.hxx @@ -82,14 +82,14 @@ public: typedef ::boost::function<void(bool)> Activator; typedef ::boost::function<boost::shared_ptr<PresenterSprite>()> SpriteProvider; css::uno::Reference<css::drawing::framework::XResourceId> mxPaneId; - ::rtl::OUString msViewURL; + OUString msViewURL; ::rtl::Reference<PresenterPaneBase> mxPane; css::uno::Reference<css::drawing::framework::XView> mxView; css::uno::Reference<css::awt::XWindow> mxContentWindow; css::uno::Reference<css::awt::XWindow> mxBorderWindow; - ::rtl::OUString msTitleTemplate; - ::rtl::OUString msAccessibleTitleTemplate; - ::rtl::OUString msTitle; + OUString msTitleTemplate; + OUString msAccessibleTitleTemplate; + OUString msTitle; ViewInitializationFunction maViewInitialization; double mnLeft; double mnTop; @@ -113,9 +113,9 @@ public: void PreparePane ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, - const ::rtl::OUString& rsViewURL, - const ::rtl::OUString& rsTitle, - const ::rtl::OUString& rsAccessibleTitle, + const OUString& rsViewURL, + const OUString& rsTitle, + const OUString& rsAccessibleTitle, const bool bIsOpaque, const ViewInitializationFunction& rViewIntialization, const double nLeft, @@ -156,16 +156,16 @@ public: /** Find the pane whose pane URL is identical to the given URL string. */ - SharedPaneDescriptor FindPaneURL (const ::rtl::OUString& rsPaneURL); + SharedPaneDescriptor FindPaneURL (const OUString& rsPaneURL); /** Find the pane whose resource id is identical to the given one. */ SharedPaneDescriptor FindPaneId (const css::uno::Reference< css::drawing::framework::XResourceId>& rxPaneId); - SharedPaneDescriptor FindViewURL (const ::rtl::OUString& rsViewURL); + SharedPaneDescriptor FindViewURL (const OUString& rsViewURL); - ::rtl::OUString GetPaneURLForViewURL (const ::rtl::OUString& rsViewURL); + OUString GetPaneURLForViewURL (const OUString& rsViewURL); void ToTop (const SharedPaneDescriptor& rpDescriptor); @@ -178,7 +178,7 @@ public: private: css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper; - PaneList::const_iterator FindIteratorForPaneURL (const ::rtl::OUString& rsPaneURL); + PaneList::const_iterator FindIteratorForPaneURL (const OUString& rsPaneURL); }; } } // end of namespace ::sdext::presenter diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index 775244ddfc8b..958bc363e1ab 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -36,24 +36,23 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { -const ::rtl::OUString PresenterPaneFactory::msCurrentSlidePreviewPaneURL( +const OUString PresenterPaneFactory::msCurrentSlidePreviewPaneURL( "private:resource/pane/Presenter/Pane1"); -const ::rtl::OUString PresenterPaneFactory::msNextSlidePreviewPaneURL( +const OUString PresenterPaneFactory::msNextSlidePreviewPaneURL( "private:resource/pane/Presenter/Pane2"); -const ::rtl::OUString PresenterPaneFactory::msNotesPaneURL( +const OUString PresenterPaneFactory::msNotesPaneURL( "private:resource/pane/Presenter/Pane3"); -const ::rtl::OUString PresenterPaneFactory::msToolBarPaneURL( +const OUString PresenterPaneFactory::msToolBarPaneURL( "private:resource/pane/Presenter/Pane4"); -const ::rtl::OUString PresenterPaneFactory::msSlideSorterPaneURL( +const OUString PresenterPaneFactory::msSlideSorterPaneURL( "private:resource/pane/Presenter/Pane5"); -const ::rtl::OUString PresenterPaneFactory::msHelpPaneURL( +const OUString PresenterPaneFactory::msHelpPaneURL( "private:resource/pane/Presenter/Pane6"); -const ::rtl::OUString PresenterPaneFactory::msOverlayPaneURL( +const OUString PresenterPaneFactory::msOverlayPaneURL( "private:resource/pane/Presenter/Overlay"); //===== PresenterPaneFactory ================================================== diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index c03674dd69ad..ec2db5a54357 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -53,13 +53,13 @@ class PresenterPaneFactory public PresenterPaneFactoryInterfaceBase { public: - static const ::rtl::OUString msCurrentSlidePreviewPaneURL; - static const ::rtl::OUString msNextSlidePreviewPaneURL; - static const ::rtl::OUString msNotesPaneURL; - static const ::rtl::OUString msToolBarPaneURL; - static const ::rtl::OUString msSlideSorterPaneURL; - static const ::rtl::OUString msHelpPaneURL; - static const ::rtl::OUString msOverlayPaneURL; + static const OUString msCurrentSlidePreviewPaneURL; + static const OUString msNextSlidePreviewPaneURL; + static const OUString msNotesPaneURL; + static const OUString msToolBarPaneURL; + static const OUString msSlideSorterPaneURL; + static const OUString msHelpPaneURL; + static const OUString msOverlayPaneURL; /** Create a new instance of this class and register it as resource factory in the drawing framework of the given controller. @@ -73,8 +73,8 @@ public: const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterPaneFactory (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext) SAL_THROW((css::uno::Exception)); @@ -101,7 +101,7 @@ private: css::uno::WeakReference<css::drawing::framework::XConfigurationController> mxConfigurationControllerWeak; ::rtl::Reference<PresenterController> mpPresenterController; - typedef ::std::map<rtl::OUString, css::uno::Reference<css::drawing::framework::XResource> > + typedef ::std::map<OUString, css::uno::Reference<css::drawing::framework::XResource> > ResourceContainer; ::boost::scoped_ptr<ResourceContainer> mpResourceCache; @@ -113,10 +113,10 @@ private: css::uno::Reference<css::drawing::framework::XResource> CreatePane ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, - const ::rtl::OUString& rsTitle); + const OUString& rsTitle); css::uno::Reference<css::drawing::framework::XResource> CreatePane ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, - const ::rtl::OUString& rsTitle, + const OUString& rsTitle, const css::uno::Reference<css::drawing::framework::XPane>& rxParentPane, const bool bIsSpritePane); diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 18500ee0e2ab..60068de88daf 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -241,8 +240,8 @@ OUString PresenterProtocolHandler::getImplementationName_static (void) Sequence<OUString> PresenterProtocolHandler::getSupportedServiceNames_static (void) { - static const ::rtl::OUString sServiceName("com.sun.star.frame.ProtocolHandler"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.frame.ProtocolHandler"); + return Sequence<OUString>(&sServiceName, 1); } Reference<XInterface> PresenterProtocolHandler::Create ( @@ -295,7 +294,7 @@ void SAL_CALL PresenterProtocolHandler::initialize (const Sequence<Any>& aArgume Reference<frame::XDispatch> SAL_CALL PresenterProtocolHandler::queryDispatch ( const css::util::URL& rURL, - const rtl::OUString& rsTargetFrameName, + const OUString& rsTargetFrameName, sal_Int32 nSearchFlags) throw(RuntimeException) { diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx index 0d3994fa24d1..1e8db5f584da 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.hxx +++ b/sdext/source/presenter/PresenterProtocolHandler.hxx @@ -51,8 +51,8 @@ public: void SAL_CALL disposing (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext) SAL_THROW((css::uno::Exception)); @@ -68,7 +68,7 @@ public: virtual css::uno::Reference<css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL, - const rtl::OUString& aTargetFrameName, + const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException); diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 202888710519..8fe7fcebaf8f 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -99,7 +98,7 @@ OUString PresenterScreenJob::getImplementationName_static (void) Sequence<OUString> PresenterScreenJob::getSupportedServiceNames_static (void) { - return Sequence<rtl::OUString>(); + return Sequence<OUString>(); } Reference<XInterface> PresenterScreenJob::Create (const Reference<uno::XComponentContext>& rxContext) @@ -684,7 +683,7 @@ void PresenterScreen::ProcessLayout ( OUString("Layout")), UNO_QUERY_THROW); - ::std::vector<rtl::OUString> aProperties (6); + ::std::vector<OUString> aProperties (6); aProperties[0] = OUString("PaneURL"); aProperties[1] = OUString("ViewURL"); aProperties[2] = OUString("RelativeX"); @@ -715,7 +714,7 @@ void PresenterScreen::ProcessViewDescriptions ( rConfiguration.GetConfigurationNode("Presenter/Views"), UNO_QUERY_THROW); - ::std::vector<rtl::OUString> aProperties (4); + ::std::vector<OUString> aProperties (4); aProperties[0] = OUString("ViewURL"); aProperties[1] = OUString("Title"); aProperties[2] = OUString("AccessibleTitle"); diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index 2538fea31219..1647f84b99d7 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -62,8 +62,8 @@ class PresenterScreenJob public PresenterScreenJobInterfaceBase { public: - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext) SAL_THROW((css::uno::Exception)); @@ -153,7 +153,7 @@ private: { } }; - typedef ::std::map<rtl::OUString,ViewDescriptor> ViewDescriptorContainer; + typedef ::std::map<OUString,ViewDescriptor> ViewDescriptorContainer; ViewDescriptorContainer maViewDescriptors; void ShutdownPresenterScreen (void); @@ -181,7 +181,7 @@ private: */ void ProcessLayout ( PresenterConfigurationAccess& rConfiguration, - const ::rtl::OUString& rsLayoutName, + const OUString& rsLayoutName, const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId); @@ -189,7 +189,7 @@ private: configuration list. */ void ProcessComponent ( - const ::rtl::OUString& rsKey, + const OUString& rsKey, const ::std::vector<css::uno::Any>& rValues, const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId); @@ -202,14 +202,14 @@ private: /** Called by ProcessViewDescriptions for a single entry. */ void ProcessViewDescription ( - const ::rtl::OUString& rsKey, + const OUString& rsKey, const ::std::vector<css::uno::Any>& rValues); void SetupView ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId, - const ::rtl::OUString& rsPaneURL, - const ::rtl::OUString& rsViewURL, + const OUString& rsPaneURL, + const OUString& rsViewURL, const PresenterPaneContainer::ViewInitializationFunction& rViewInitialization, const double nLeft, const double nTop, diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 774d5dfa00b9..c48b8d148a34 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; const static double gnScrollBarGap (10); diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index 1829d9c1da7d..e7b7b51b6594 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace { @@ -356,7 +355,7 @@ void PresenterSlidePreview::ThrowIfDisposed (void) if (PresenterSlidePreviewInterfaceBase::rBHelper.bDisposed || PresenterSlidePreviewInterfaceBase::rBHelper.bInDispose) { throw lang::DisposedException ( - ::rtl::OUString( "PresenterSlidePreview object has already been disposed"), + OUString( "PresenterSlidePreview object has already been disposed"), static_cast<uno::XWeak*>(this)); } } diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index e0ddc680c520..34457f18d9d8 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index ed676c13ccb3..a392842d2e99 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -235,9 +235,9 @@ private: bool mbIsInModifyNotification; bool mbIsForcedPaintPending; bool mbIsPaintPending; - ::rtl::OUString msClickToExitPresentationText; - ::rtl::OUString msClickToExitPresentationTitle; - ::rtl::OUString msTitleTemplate; + OUString msClickToExitPresentationText; + OUString msClickToExitPresentationTitle; + OUString msTitleTemplate; bool mbIsEndSlideVisible; css::uno::Reference<css::drawing::XDrawPage> mxCurrentSlide; diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index a49ba0aeeab0..daad9e1c5284 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace { const static sal_Int32 gnVerticalGap (10); diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index c7364477eef7..b1bd9045f332 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx index 43687e3b87df..8787c4505ca2 100644 --- a/sdext/source/presenter/PresenterSpritePane.hxx +++ b/sdext/source/presenter/PresenterSpritePane.hxx @@ -61,8 +61,8 @@ public: ::boost::shared_ptr<PresenterSprite> GetSprite (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext) SAL_THROW((css::uno::Exception)); diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 2be9a4b9b3b2..4463ea236c10 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -712,7 +712,7 @@ void PresenterTextParagraph::AddWord ( if ( ! maLines.empty()) nLineStart = rCurrentLine.startPos; - const ::rtl::OUString sLineCandidate ( + const OUString sLineCandidate ( msParagraphText.copy(nLineStart, nWordBoundary-nLineStart)); css::geometry::RealRectangle2D aLineBox ( @@ -792,7 +792,7 @@ sal_Unicode PresenterTextParagraph::GetCharacter ( } } -::rtl::OUString PresenterTextParagraph::GetText (void) const +OUString PresenterTextParagraph::GetText (void) const { return msParagraphText; } @@ -859,7 +859,7 @@ TextSegment PresenterTextParagraph::GetTextSegment ( return CreateTextSegment(nIndex+nOffset, nIndex+nOffset+1); } - return TextSegment(::rtl::OUString(), 0,0); + return TextSegment(OUString(), 0,0); } TextSegment PresenterTextParagraph::GetWordTextSegment ( @@ -913,7 +913,7 @@ TextSegment PresenterTextParagraph::CreateTextSegment ( { if (nEndIndex <= nStartIndex) return TextSegment( - ::rtl::OUString(), + OUString(), nStartIndex, nEndIndex); else @@ -1239,7 +1239,7 @@ void PresenterTextParagraph::Line::ProvideCellBoxes (void) } void PresenterTextParagraph::Line::ProvideLayoutedLine ( - const ::rtl::OUString& rsParagraphText, + const OUString& rsParagraphText, const PresenterTheme::SharedFontDescriptor& rpFont, const sal_Int8 nTextDirection) { diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index 5eba5bfb1457..2cbb37517558 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -111,7 +111,7 @@ public: void SetCharacterOffset (const sal_Int32 nCharacterOffset); sal_Int32 GetCharacterCount (void) const; sal_Unicode GetCharacter (const sal_Int32 nGlobalCharacterIndex) const; - ::rtl::OUString GetText (void) const; + OUString GetText (void) const; cssa::TextSegment GetTextSegment ( const sal_Int32 nOffset, const sal_Int32 nGlobalCharacterIndex, @@ -142,7 +142,7 @@ public: css::awt::Size GetSize (void); private: - ::rtl::OUString msParagraphText; + OUString msParagraphText; const sal_Int32 mnParagraphIndex; SharedPresenterTextCaret mpCaret; @@ -174,7 +174,7 @@ private: cssu::Sequence<css::geometry::RealRectangle2D> maCellBoxes; void ProvideLayoutedLine ( - const ::rtl::OUString& rsParagraphText, + const OUString& rsParagraphText, const PresenterTheme::SharedFontDescriptor& rpFont, const sal_Int8 nTextDirection); void ProvideCellBoxes (void); diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 58ee37b4ecb9..5a37c1e281ea 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::std; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -103,7 +102,7 @@ public: */ static PresenterTheme::SharedFontDescriptor ReadFont ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxTheme, - const ::rtl::OUString& rsFontPath, + const OUString& rsFontPath, const PresenterTheme::SharedFontDescriptor& rpDefault); static PresenterTheme::SharedFontDescriptor ReadFont ( const Reference<beans::XPropertySet>& rxFontProperties, @@ -159,7 +158,7 @@ public: private: void ProcessPaneStyle ( ReadContext& rReadContext, - const ::rtl::OUString& rsKey, + const OUString& rsKey, const ::std::vector<css::uno::Any>& rValues); }; @@ -220,7 +219,7 @@ private: void ProcessStyleAssociation( ReadContext& rReadContext, - const ::rtl::OUString& rsKey, + const OUString& rsKey, const ::std::vector<css::uno::Any>& rValues); }; @@ -249,7 +248,7 @@ public: StyleAssociationContainer maStyleAssociations; Reference<container::XHierarchicalNameAccess> mxThemeRoot; ::boost::shared_ptr<PresenterBitmapContainer> mpIconContainer; - typedef map<rtl::OUString,SharedFontDescriptor> FontContainer; + typedef map<OUString,SharedFontDescriptor> FontContainer; FontContainer maFontContainer; SharedPaneStyle GetPaneStyle (const OUString& rsStyleName) const; @@ -266,7 +265,7 @@ private: PresenterTheme::PresenterTheme ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const rtl::OUString& rsThemeName, + const OUString& rsThemeName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) : mxContext(rxContext), msThemeName(rsThemeName), @@ -307,7 +306,7 @@ void PresenterTheme::ProvideCanvas (const Reference<rendering::XCanvas>& rxCanva } } -OUString PresenterTheme::GetStyleName (const ::rtl::OUString& rsResourceURL) const +OUString PresenterTheme::GetStyleName (const OUString& rsResourceURL) const { OUString sStyleName; ::boost::shared_ptr<Theme> pTheme (mpTheme); @@ -320,7 +319,7 @@ OUString PresenterTheme::GetStyleName (const ::rtl::OUString& rsResourceURL) con } ::std::vector<sal_Int32> PresenterTheme::GetBorderSize ( - const ::rtl::OUString& rsStyleName, + const OUString& rsStyleName, const bool bOuter) const { OSL_ASSERT(mpTheme.get() != NULL); @@ -366,7 +365,7 @@ bool PresenterTheme::ConvertToColor ( } ::boost::shared_ptr<PresenterConfigurationAccess> PresenterTheme::GetNodeForViewStyle ( - const ::rtl::OUString& rsStyleName) const + const OUString& rsStyleName) const { if (mpTheme.get() == NULL) return ::boost::shared_ptr<PresenterConfigurationAccess>(); @@ -853,7 +852,7 @@ void PaneStyleContainer::Read ( UNO_QUERY); if (xPaneStyleList.is()) { - ::std::vector<rtl::OUString> aProperties; + ::std::vector<OUString> aProperties; aProperties.reserve(6); aProperties.push_back("StyleName"); aProperties.push_back("ParentStyle"); @@ -1117,7 +1116,7 @@ void StyleAssociationContainer::Read ( UNO_QUERY); if (xStyleAssociationList.is()) { - ::std::vector<rtl::OUString> aProperties (2); + ::std::vector<OUString> aProperties (2); aProperties[0] = "ResourceURL"; aProperties[1] = "StyleName"; PresenterConfigurationAccess::ForAll( diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index 436758f123e1..45bb5da01b46 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -60,16 +60,16 @@ class PresenterTheme public: PresenterTheme ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const rtl::OUString& rsThemeName, + const OUString& rsThemeName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas); ~PresenterTheme (void); bool HasCanvas (void) const; void ProvideCanvas (const css::uno::Reference<css::rendering::XCanvas>& rxCanvas); - ::rtl::OUString GetStyleName (const ::rtl::OUString& rsResourceURL) const; + OUString GetStyleName (const OUString& rsResourceURL) const; ::std::vector<sal_Int32> GetBorderSize ( - const ::rtl::OUString& rsStyleName, + const OUString& rsStyleName, const bool bOuter) const; class Theme; @@ -78,11 +78,11 @@ public: public: explicit FontDescriptor (const ::boost::shared_ptr<FontDescriptor>& rpDescriptor); - ::rtl::OUString msFamilyName; - ::rtl::OUString msStyleName; + OUString msFamilyName; + OUString msStyleName; sal_Int32 mnSize; sal_uInt32 mnColor; - ::rtl::OUString msAnchor; + OUString msAnchor; sal_Int32 mnXOffset; sal_Int32 mnYOffset; css::uno::Reference<css::rendering::XCanvasFont> mxFont; @@ -100,20 +100,20 @@ public: typedef ::boost::shared_ptr<FontDescriptor> SharedFontDescriptor; SharedBitmapDescriptor GetBitmap ( - const ::rtl::OUString& rsStyleName, - const ::rtl::OUString& rsBitmapName) const; + const OUString& rsStyleName, + const OUString& rsBitmapName) const; SharedBitmapDescriptor GetBitmap ( - const ::rtl::OUString& rsBitmapName) const; + const OUString& rsBitmapName) const; ::boost::shared_ptr<PresenterBitmapContainer> GetBitmapContainer (void) const; SharedFontDescriptor GetFont ( - const ::rtl::OUString& rsStyleName) const; + const OUString& rsStyleName) const; static SharedFontDescriptor ReadFont ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode, - const ::rtl::OUString& rsFontPath, + const OUString& rsFontPath, const SharedFontDescriptor& rDefaultFount); static bool ConvertToColor ( @@ -121,11 +121,11 @@ public: sal_uInt32& rColor); ::boost::shared_ptr<PresenterConfigurationAccess> GetNodeForViewStyle ( - const ::rtl::OUString& rsStyleName) const; + const OUString& rsStyleName) const; private: css::uno::Reference<css::uno::XComponentContext> mxContext; - const ::rtl::OUString msThemeName; + const OUString msThemeName; ::boost::shared_ptr<Theme> mpTheme; ::boost::shared_ptr<PresenterBitmapContainer> mpBitmapContainer; css::uno::Reference<css::rendering::XCanvas> mxCanvas; diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 76aaa7ca4fec..ce5c61f41ac6 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -56,7 +56,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -105,7 +104,7 @@ namespace { void ReadElementMode ( const Reference<beans::XPropertySet>& rxProperties, - const ::rtl::OUString& rsModeName, + const OUString& rsModeName, ::boost::shared_ptr<ElementMode>& rpDefaultMode, ::sdext::presenter::PresenterToolBar::Context& rContext); }; @@ -387,7 +386,7 @@ PresenterToolBar::PresenterToolBar ( } void PresenterToolBar::Initialize ( - const ::rtl::OUString& rsConfigurationPath) + const OUString& rsConfigurationPath) { try { @@ -621,7 +620,7 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterToolBar::getCurrentPage (void) //----------------------------------------------------------------------------- void PresenterToolBar::CreateControls ( - const ::rtl::OUString& rsConfigurationPath) + const OUString& rsConfigurationPath) { if ( ! mxWindow.is()) return; @@ -1806,7 +1805,7 @@ TimeFormatter::TimeFormatter (void) OUString TimeFormatter::FormatTime (const oslDateTime& rTime) { - ::rtl::OUStringBuffer sText; + OUStringBuffer sText; const sal_Int32 nHours (sal::static_int_cast<sal_Int32>(rTime.Hours)); const sal_Int32 nMinutes (sal::static_int_cast<sal_Int32>(rTime.Minutes)); diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index d289394067a9..edbd55a5f979 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -91,7 +91,7 @@ public: virtual ~PresenterToolBar (void); void Initialize ( - const ::rtl::OUString& rsConfigurationPath); + const OUString& rsConfigurationPath); virtual void SAL_CALL disposing (void); @@ -184,7 +184,7 @@ private: css::geometry::RealSize2D maMinimalSize; void CreateControls ( - const ::rtl::OUString& rsConfigurationPath); + const OUString& rsConfigurationPath); void Layout (const css::uno::Reference<css::rendering::XCanvas>& rxCanvas); css::geometry::RealSize2D CalculatePartSize ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 46c763a08cfd..4ebc8fe59245 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -41,21 +41,20 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { -const ::rtl::OUString PresenterViewFactory::msCurrentSlidePreviewViewURL( +const OUString PresenterViewFactory::msCurrentSlidePreviewViewURL( "private:resource/view/Presenter/CurrentSlidePreview"); -const ::rtl::OUString PresenterViewFactory::msNextSlidePreviewViewURL( +const OUString PresenterViewFactory::msNextSlidePreviewViewURL( "private:resource/view/Presenter/NextSlidePreview"); -const ::rtl::OUString PresenterViewFactory::msNotesViewURL( +const OUString PresenterViewFactory::msNotesViewURL( "private:resource/view/Presenter/Notes"); -const ::rtl::OUString PresenterViewFactory::msToolBarViewURL( +const OUString PresenterViewFactory::msToolBarViewURL( "private:resource/view/Presenter/ToolBar"); -const ::rtl::OUString PresenterViewFactory::msSlideSorterURL( +const OUString PresenterViewFactory::msSlideSorterURL( "private:resource/view/Presenter/SlideSorter"); -const ::rtl::OUString PresenterViewFactory::msHelpViewURL( +const OUString PresenterViewFactory::msHelpViewURL( "private:resource/view/Presenter/Help"); //===== SimpleView ============================================================ diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index 80df427fa171..5d616f34ed92 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -79,12 +79,12 @@ class PresenterViewFactory public PresenterViewFactoryInterfaceBase { public: - static const ::rtl::OUString msCurrentSlidePreviewViewURL; - static const ::rtl::OUString msNextSlidePreviewViewURL; - static const ::rtl::OUString msNotesViewURL; - static const ::rtl::OUString msToolBarViewURL; - static const ::rtl::OUString msSlideSorterURL; - static const ::rtl::OUString msHelpViewURL; + static const OUString msCurrentSlidePreviewViewURL; + static const OUString msNextSlidePreviewViewURL; + static const OUString msNotesViewURL; + static const OUString msToolBarViewURL; + static const OUString msSlideSorterURL; + static const OUString msHelpViewURL; /** Create a new instance of this class and register it as resource factory in the drawing framework of the given controller. @@ -98,8 +98,8 @@ public: const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterViewFactory (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext) SAL_THROW((css::uno::Exception)); @@ -127,7 +127,7 @@ private: ::rtl::Reference<PresenterController> mpPresenterController; typedef ::std::pair<css::uno::Reference<css::drawing::framework::XView>, css::uno::Reference<css::drawing::framework::XPane> > ViewResourceDescriptor; - typedef ::std::map<rtl::OUString, ViewResourceDescriptor> ResourceContainer; + typedef ::std::map<OUString, ViewResourceDescriptor> ResourceContainer; ::boost::scoped_ptr<ResourceContainer> mpResourceCache; PresenterViewFactory ( diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index c195c5b4bc44..fddf3e53554e 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -56,7 +56,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index 02c45fee05c0..3544c45aaeed 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -79,7 +79,7 @@ public: void SetTheme (const ::boost::shared_ptr<PresenterTheme>& rpTheme); void NotifyViewCreation (const css::uno::Reference<css::drawing::framework::XView>& rxView); void SetPanePosSizeAbsolute ( - const ::rtl::OUString& rsPaneURL, + const OUString& rsPaneURL, const double nX, const double nY, const double nWidth, @@ -214,7 +214,7 @@ private: css::awt::Size CalculatePaneSize ( const double nOuterWidth, - const ::rtl::OUString& rsPaneURL); + const OUString& rsPaneURL); /** Notify changes of the layout mode and of the slide sorter state. */ |