diff options
Diffstat (limited to 'sdext/source/presenter')
20 files changed, 113 insertions, 132 deletions
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 522e4b899bad..b48dbe7b4acd 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -57,7 +57,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(s) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))) +#define A2S(s) (::rtl::OUString(s)) //===== PresenterAccessibleObject ============================================= @@ -444,7 +444,7 @@ public: OUString sName (A2S("Presenter Console")); PresenterConfigurationAccess aConfiguration ( rxContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Console/String")) >>= sName; @@ -474,7 +474,7 @@ public: { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Preview/String")) >>= sName; @@ -1895,7 +1895,7 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Notes/String")) >>= sName; diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index 64649b45db15..cfe1d6a1591e 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (::rtl::OUString(pString)) namespace sdext { namespace presenter { @@ -126,7 +126,7 @@ PresenterButton::PresenterButton ( mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), rxComponentContext), UNO_QUERY_THROW); @@ -521,8 +521,7 @@ void PresenterButton::ThrowIfDisposed (void) const if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterButton object has already been disposed")), + OUString( "PresenterButton object has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 76d0ea43359f..2b1c3e46ac0e 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -77,7 +77,7 @@ namespace { const sal_Int32 ConfigurationUpdateEndEventType = 2; } -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (::rtl::OUString(pString)) namespace sdext { namespace presenter { @@ -1121,8 +1121,8 @@ double PresenterController::GetSlideAspectRatio (void) const Reference<beans::XPropertySet> xProperties(xSlides->getByIndex(0),UNO_QUERY_THROW); sal_Int32 nWidth (28000); sal_Int32 nHeight (21000); - if ((xProperties->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Width"))) >>= nWidth) - && (xProperties->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Height"))) >>= nHeight) + if ((xProperties->getPropertyValue(OUString("Width")) >>= nWidth) + && (xProperties->getPropertyValue(OUString("Height")) >>= nHeight) && nHeight > 0) { nSlideAspectRatio = double(nWidth) / double(nHeight); @@ -1172,8 +1172,7 @@ void PresenterController::ThrowIfDisposed (void) const if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterController object has already been disposed")), + OUString( "PresenterController object has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index 21f67326f362..5e461a940964 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; using ::std::vector; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (::rtl::OUString(pString)) namespace sdext { namespace presenter { @@ -355,7 +355,7 @@ void PresenterHelpView::ReadHelpStrings (void) mpTextContainer.reset(new TextContainer()); PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); Reference<container::XNameAccess> xStrings ( aConfiguration.GetConfigurationNode(A2S("PresenterScreenSettings/HelpView/HelpStrings")), @@ -502,8 +502,7 @@ void PresenterHelpView::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterHelpView has been already disposed")), + OUString( "PresenterHelpView has been already disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx index 42395cc1fb56..5689ee3347cd 100644 --- a/sdext/source/presenter/PresenterHelper.cxx +++ b/sdext/source/presenter/PresenterHelper.cxx @@ -40,29 +40,19 @@ using ::rtl::OUString; namespace sdext { namespace presenter { -const OUString PresenterHelper::msPaneURLPrefix( - RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/")); -const OUString PresenterHelper::msCenterPaneURL( - msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("CenterPane"))); -const OUString PresenterHelper::msFullScreenPaneURL( - msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("FullScreenPane"))); +const OUString PresenterHelper::msPaneURLPrefix( "private:resource/pane/"); +const OUString PresenterHelper::msCenterPaneURL( msPaneURLPrefix + OUString("CenterPane")); +const OUString PresenterHelper::msFullScreenPaneURL( msPaneURLPrefix + OUString("FullScreenPane")); -const OUString PresenterHelper::msViewURLPrefix( - RTL_CONSTASCII_USTRINGPARAM("private:resource/view/")); -const OUString PresenterHelper::msPresenterScreenURL( - msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterScreen"))); -const OUString PresenterHelper::msSlideSorterURL( - msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("SlideSorter"))); +const OUString PresenterHelper::msViewURLPrefix( "private:resource/view/"); +const OUString PresenterHelper::msPresenterScreenURL( msViewURLPrefix + OUString("PresenterScreen")); +const OUString PresenterHelper::msSlideSorterURL( msViewURLPrefix + OUString("SlideSorter")); -const OUString PresenterHelper::msResourceActivationEvent( - RTL_CONSTASCII_USTRINGPARAM("ResourceActivation")); -const OUString PresenterHelper::msResourceDeactivationEvent( - RTL_CONSTASCII_USTRINGPARAM("ResourceDeactivation")); +const OUString PresenterHelper::msResourceActivationEvent( "ResourceActivation"); +const OUString PresenterHelper::msResourceDeactivationEvent( "ResourceDeactivation"); -const OUString PresenterHelper::msDefaultPaneStyle ( - RTL_CONSTASCII_USTRINGPARAM("DefaultPaneStyle")); -const OUString PresenterHelper::msDefaultViewStyle ( - RTL_CONSTASCII_USTRINGPARAM("DefaultViewStyle")); +const OUString PresenterHelper::msDefaultPaneStyle ( "DefaultPaneStyle"); +const OUString PresenterHelper::msDefaultViewStyle ( "DefaultViewStyle"); Reference<presentation::XSlideShowController> PresenterHelper::GetSlideShowController ( const Reference<frame::XController>& rxController) diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index ca1deabab7f0..3f2f98a4a21b 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -54,7 +54,7 @@ PresenterPane::PresenterPane ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), mxComponentContext), UNO_QUERY_THROW); } diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index a912230930d7..d50a1bc098fb 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -181,7 +181,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! mxComponentContext.is()) { throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterSpritePane: missing component context")), + OUString("PresenterSpritePane: missing component context"), static_cast<XWeak*>(this)); } @@ -193,7 +193,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! (rArguments[0] >>= mxPaneId)) { throw lang::IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid pane id")), + OUString("PresenterPane: invalid pane id"), static_cast<XWeak*>(this), 0); } @@ -201,7 +201,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! (rArguments[1] >>= mxParentWindow)) { throw lang::IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid parent window")), + OUString("PresenterPane: invalid parent window"), static_cast<XWeak*>(this), 1); } @@ -210,7 +210,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! (rArguments[2] >>= xParentCanvas)) { throw lang::IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid parent canvas")), + OUString("PresenterPane: invalid parent canvas"), static_cast<XWeak*>(this), 2); } @@ -218,7 +218,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! (rArguments[3] >>= msTitle)) { throw lang::IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid title")), + OUString("PresenterPane: invalid title"), static_cast<XWeak*>(this), 3); } @@ -226,7 +226,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! (rArguments[4] >>= mxBorderPainter)) { throw lang::IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid border painter")), + OUString("PresenterPane: invalid border painter"), static_cast<XWeak*>(this), 4); } @@ -235,7 +235,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if (rArguments.getLength()>5 && ! (rArguments[5] >>= bIsWindowVisibleOnCreation)) { throw lang::IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid window visibility flag")), + OUString("PresenterPane: invalid window visibility flag"), static_cast<XWeak*>(this), 5); } @@ -263,7 +263,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) else { throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterSpritePane: invalid number of arguments")), + OUString("PresenterSpritePane: invalid number of arguments"), static_cast<XWeak*>(this)); } } @@ -457,8 +457,7 @@ void PresenterPaneBase::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterPane object has already been disposed")), + ::rtl::OUString( "PresenterPane object has already been disposed"), static_cast<uno::XWeak*>(this)); } } diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx index 02cf34660cee..426a3810e908 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.cxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx @@ -56,13 +56,13 @@ namespace sdext { namespace presenter { OUString PresenterPaneBorderManager::getImplementationName_static (void) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterPaneBorderManager")); + return OUString("com.sun.star.comp.Draw.PresenterPaneBorderManager"); } Sequence<OUString> PresenterPaneBorderManager::getSupportedServiceNames_static (void) { static const ::rtl::OUString sServiceName( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterPaneBorderManager")); + "com.sun.star.drawing.PresenterPaneBorderManager"); return Sequence<rtl::OUString>(&sServiceName, 1); } @@ -95,13 +95,13 @@ PresenterPaneBorderManager::PresenterPaneBorderManager ( { mxPointer = Reference<awt::XPointer>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Pointer")), + OUString("com.sun.star.awt.Pointer"), rxContext), UNO_QUERY_THROW); mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), rxContext), UNO_QUERY_THROW); } @@ -257,7 +257,7 @@ void SAL_CALL PresenterPaneBorderManager::initialize (const Sequence<Any>& rArgu else { throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid number of arguments")), + OUString("PresenterPane: invalid number of arguments"), static_cast<XWeak*>(this)); } } @@ -513,8 +513,7 @@ void PresenterPaneBorderManager::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterPaneBorderManager object has already been disposed")), + ::rtl::OUString( "PresenterPaneBorderManager object has already been disposed"), static_cast<uno::XWeak*>(this)); } } diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 05051a2410cd..cecf92501f1e 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; -#define A2S(s) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))) +#define A2S(s) (::rtl::OUString(s)) namespace sdext { namespace presenter { @@ -394,8 +394,8 @@ void PresenterPaneBorderPainter::ThrowIfDisposed (void) const if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterPaneBorderPainter object has already been disposed")), + OUString( + "PresenterPaneBorderPainter object has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } @@ -421,7 +421,7 @@ PresenterPaneBorderPainter::Renderer::Renderer ( { mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), rxContext), UNO_QUERY_THROW); } @@ -624,7 +624,7 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle ( RendererPaneStyleContainer::const_iterator iStyle (maRendererPaneStyles.find(rsResourceURL)); if (iStyle == maRendererPaneStyles.end()) { - OUString sPaneStyleName (RTL_CONSTASCII_USTRINGPARAM("DefaultRendererPaneStyle")); + OUString sPaneStyleName ("DefaultRendererPaneStyle"); // Get pane layout name for resource URL. const OUString sStyleName (mpTheme->GetStyleName(rsResourceURL)); @@ -865,7 +865,7 @@ RendererPaneStyle::RendererPaneStyle ( // Get font description. mpFont = rpTheme->GetFont(rsStyleName); - OUString sAnchor (RTL_CONSTASCII_USTRINGPARAM("Left")); + OUString sAnchor ("Left"); if (mpFont.get() != NULL) { sAnchor = mpFont->msAnchor; diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index 3e26b156445f..74e56c138d1e 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -52,7 +52,7 @@ PresenterPaneContainer::PresenterPaneContainer ( { mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), rxContext), UNO_QUERY_THROW); } diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index ebdae6f7df7d..7091ff9efe57 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -50,20 +50,20 @@ using ::rtl::OUString; namespace sdext { namespace presenter { const ::rtl::OUString PresenterPaneFactory::msCurrentSlidePreviewPaneURL( - RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane1")); + "private:resource/pane/Presenter/Pane1"); const ::rtl::OUString PresenterPaneFactory::msNextSlidePreviewPaneURL( - RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane2")); + "private:resource/pane/Presenter/Pane2"); const ::rtl::OUString PresenterPaneFactory::msNotesPaneURL( - RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane3")); + "private:resource/pane/Presenter/Pane3"); const ::rtl::OUString PresenterPaneFactory::msToolBarPaneURL( - RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane4")); + "private:resource/pane/Presenter/Pane4"); const ::rtl::OUString PresenterPaneFactory::msSlideSorterPaneURL( - RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane5")); + "private:resource/pane/Presenter/Pane5"); const ::rtl::OUString PresenterPaneFactory::msHelpPaneURL( - RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane6")); + "private:resource/pane/Presenter/Pane6"); const ::rtl::OUString PresenterPaneFactory::msOverlayPaneURL( - RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Overlay")); + "private:resource/pane/Presenter/Overlay"); //===== PresenterPaneFactory ================================================== @@ -106,7 +106,7 @@ void PresenterPaneFactory::Register (const Reference<frame::XController>& rxCont else { xCC->addResourceFactory( - OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/*")), + OUString("private:resource/pane/Presenter/*"), this); } } @@ -337,8 +337,7 @@ void PresenterPaneFactory::ThrowIfDisposed (void) const if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterPaneFactory object has already been disposed")), + OUString( "PresenterPaneFactory object has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index d6e505711f23..f89af706d239 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -56,7 +56,7 @@ using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(s) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))) +#define A2S(s) (::rtl::OUString(s)) namespace sdext { namespace presenter { @@ -170,7 +170,7 @@ Any SAL_CALL PresenterScreenJob::execute( } Reference< XServiceInfo > xInfo( xModel, UNO_QUERY ); - if( xInfo.is() && xInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) ) ) + if( xInfo.is() && xInfo->supportsService( OUString( "com.sun.star.presentation.PresentationDocument" ) ) ) { // Create a new listener that waits for the full screen presentation // to start and to end. It takes care of its own lifetime. @@ -265,8 +265,8 @@ void PresenterScreenListener::ThrowIfDisposed (void) const throw ( if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterScreenListener object has already been disposed")), + OUString( + "PresenterScreenListener object has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } @@ -507,11 +507,11 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber ( Reference<XComponentContext> xContext (mxContextWeak); PresenterConfigurationAccess aConfiguration ( xContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); bool bStartAlways (false); if (aConfiguration.GetConfigurationNode( - OUString(RTL_CONSTASCII_USTRINGPARAM("Presenter/StartAlways"))) >>= bStartAlways) + OUString("Presenter/StartAlways")) >>= bStartAlways) { if (bStartAlways) return GetPresenterScreenFromScreen(nScreenNumber); @@ -656,13 +656,13 @@ void PresenterScreen::SetupConfiguration ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.extension.PresenterScreen")), + OUString("org.openoffice.Office.extension.PresenterScreen"), PresenterConfigurationAccess::READ_ONLY); maViewDescriptors.clear(); ProcessViewDescriptions(aConfiguration); - OUString sLayoutName (RTL_CONSTASCII_USTRINGPARAM("DefaultLayout")); + OUString sLayoutName ("DefaultLayout"); aConfiguration.GetConfigurationNode( - OUString(RTL_CONSTASCII_USTRINGPARAM("Presenter/CurrentLayout"))) >>= sLayoutName; + OUString("Presenter/CurrentLayout")) >>= sLayoutName; ProcessLayout(aConfiguration, sLayoutName, rxContext, rxAnchorId); } catch (RuntimeException&) @@ -680,14 +680,14 @@ void PresenterScreen::ProcessLayout ( { Reference<container::XHierarchicalNameAccess> xLayoutNode ( rConfiguration.GetConfigurationNode( - OUString(RTL_CONSTASCII_USTRINGPARAM("Presenter/Layouts/"))+rsLayoutName), + OUString("Presenter/Layouts/")+rsLayoutName), UNO_QUERY_THROW); // Read the parent layout first, if one is referenced. OUString sParentLayout; rConfiguration.GetConfigurationNode( xLayoutNode, - OUString(RTL_CONSTASCII_USTRINGPARAM("ParentLayout"))) >>= sParentLayout; + OUString("ParentLayout")) >>= sParentLayout; if (!sParentLayout.isEmpty()) { // Prevent infinite recursion. @@ -699,16 +699,16 @@ void PresenterScreen::ProcessLayout ( Reference<container::XNameAccess> xList ( rConfiguration.GetConfigurationNode( xLayoutNode, - OUString(RTL_CONSTASCII_USTRINGPARAM("Layout"))), + OUString("Layout")), UNO_QUERY_THROW); ::std::vector<rtl::OUString> aProperties (6); - aProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("PaneURL")); - aProperties[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("ViewURL")); - aProperties[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeX")); - aProperties[3] = OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeY")); - aProperties[4] = OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeWidth")); - aProperties[5] = OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeHeight")); + aProperties[0] = OUString("PaneURL"); + aProperties[1] = OUString("ViewURL"); + aProperties[2] = OUString("RelativeX"); + aProperties[3] = OUString("RelativeY"); + aProperties[4] = OUString("RelativeWidth"); + aProperties[5] = OUString("RelativeHeight"); mnComponentIndex = 1; PresenterConfigurationAccess::ForAll( xList, @@ -734,10 +734,10 @@ void PresenterScreen::ProcessViewDescriptions ( UNO_QUERY_THROW); ::std::vector<rtl::OUString> aProperties (4); - aProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("ViewURL")); - aProperties[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); - aProperties[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleTitle")); - aProperties[3] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsOpaque")); + aProperties[0] = OUString("ViewURL"); + aProperties[1] = OUString("Title"); + aProperties[2] = OUString("AccessibleTitle"); + aProperties[3] = OUString("IsOpaque"); mnComponentIndex = 1; PresenterConfigurationAccess::ForAll( xViewDescriptionsNode, diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index da5dfc69503b..8c86515011dd 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (::rtl::OUString(pString)) const static double gnScrollBarGap (10); @@ -123,7 +123,7 @@ PresenterScrollBar::PresenterScrollBar ( mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), rxComponentContext), UNO_QUERY_THROW); @@ -278,7 +278,7 @@ void PresenterScrollBar::SetCanvas (const Reference<css::rendering::XCanvas>& rx try { mpBitmaps.reset(new PresenterBitmapContainer( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterScreenSettings/ScrollBar/Bitmaps")), + OUString("PresenterScreenSettings/ScrollBar/Bitmaps"), ::boost::shared_ptr<PresenterBitmapContainer>(), mxComponentContext, mxCanvas, diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index 2ac144054dee..884f5273cad3 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -76,8 +76,8 @@ PresenterSlidePreview::PresenterSlidePreview ( || ! rpPresenterController.is()) { throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterSlidePreview can not be constructed due to empty argument")), + OUString( + "PresenterSlidePreview can not be constructed due to empty argument"), static_cast<XWeak*>(this)); } @@ -103,7 +103,7 @@ PresenterSlidePreview::PresenterSlidePreview ( if (xFactory.is()) mxPreviewRenderer = Reference<drawing::XSlideRenderer>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SlideRenderer")), + OUString("com.sun.star.drawing.SlideRenderer"), rxContext), UNO_QUERY); @@ -235,9 +235,9 @@ void PresenterSlidePreview::SetSlide (const Reference<drawing::XDrawPage>& rxPag try { xPropertySet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("Width"))) >>= aSlideSize.Width; + OUString("Width")) >>= aSlideSize.Width; xPropertySet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("Height"))) >>= aSlideSize.Height; + OUString("Height")) >>= aSlideSize.Height; } catch (beans::UnknownPropertyException&) { @@ -365,8 +365,7 @@ void PresenterSlidePreview::ThrowIfDisposed (void) if (PresenterSlidePreviewInterfaceBase::rBHelper.bDisposed || PresenterSlidePreviewInterfaceBase::rBHelper.bInDispose) { throw lang::DisposedException ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterSlidePreview object has already been disposed")), + ::rtl::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 b1dad0911ed5..8892aaeef772 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -53,7 +53,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (::rtl::OUString(pString)) namespace sdext { namespace presenter { @@ -111,7 +111,7 @@ void PresenterSlideShowView::LateInit (void) Reference<lang::XMultiComponentFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); mxPresenterHelper.set (xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), mxComponentContext), UNO_QUERY_THROW); @@ -479,7 +479,7 @@ void SAL_CALL PresenterSlideShowView::setMouseCursor(::sal_Int16 nPointerShape) mxComponentContext, UNO_QUERY); if (xFactory.is()) mxPointer = Reference<awt::XPointer>( - xFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Pointer"))), + xFactory->createInstance(OUString("com.sun.star.awt.Pointer")), UNO_QUERY); } @@ -845,7 +845,7 @@ Reference<awt::XWindow> PresenterSlideShowView::CreateViewWindow ( Reference<awt::XToolkit> xToolkit ( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")), + OUString("com.sun.star.awt.Toolkit"), mxComponentContext), UNO_QUERY_THROW); awt::WindowDescriptor aWindowDescriptor ( @@ -1005,7 +1005,7 @@ void PresenterSlideShowView::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterSlideShowView object has already been disposed")), + OUString("PresenterSlideShowView object has already been disposed"), static_cast<uno::XWeak*>(this)); } } diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 4c466cbcb23f..2aaf8e6018fb 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -57,7 +57,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (::rtl::OUString(pString)) namespace { const static sal_Int32 gnVerticalGap (10); @@ -340,7 +340,7 @@ PresenterSlideSorter::PresenterSlideSorter ( // Create the preview cache. mxPreviewCache = Reference<drawing::XSlidePreviewCache>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterPreviewCache")), + OUString("com.sun.star.drawing.PresenterPreviewCache"), mxComponentContext), UNO_QUERY_THROW); Reference<container::XIndexAccess> xSlides (mxSlideShowController, UNO_QUERY); @@ -361,7 +361,7 @@ PresenterSlideSorter::PresenterSlideSorter ( // Listen for changes of the current slide. Reference<beans::XPropertySet> xControllerProperties (rxController, UNO_QUERY_THROW); xControllerProperties->addPropertyChangeListener( - OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentPage")), + OUString("CurrentPage"), this); // Move the current slide in the center of the window. @@ -831,8 +831,8 @@ double PresenterSlideSorter::GetSlideAspectRatio (void) const Reference<beans::XPropertySet> xProperties(xSlides->getByIndex(0),UNO_QUERY_THROW); sal_Int32 nWidth (28000); sal_Int32 nHeight (21000); - if ((xProperties->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Width"))) >>= nWidth) - && (xProperties->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Height"))) >>= nHeight) + if ((xProperties->getPropertyValue(OUString("Width")) >>= nWidth) + && (xProperties->getPropertyValue(OUString("Height")) >>= nHeight) && nHeight > 0) { nSlideAspectRatio = double(nWidth) / double(nHeight); @@ -1056,8 +1056,8 @@ void PresenterSlideSorter::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterSlideSorter has been already disposed")), + OUString( + "PresenterSlideSorter has been already disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } @@ -1714,7 +1714,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); Reference<container::XHierarchicalNameAccess> xBitmaps ( aConfiguration.GetConfigurationNode( diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index 52895ba13dd8..9eef52d62729 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -52,7 +52,7 @@ PresenterSpritePane::PresenterSpritePane (const Reference<XComponentContext>& rx mxComponentContext->getServiceManager(), UNO_QUERY_THROW); mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), mxComponentContext), UNO_QUERY_THROW); } diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 8990416c19fc..0b600d4ec994 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star::uno; using namespace ::std; using ::rtl::OUString; -#define A2S(s) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))) +#define A2S(s) (::rtl::OUString(s)) namespace sdext { namespace presenter { @@ -302,7 +302,7 @@ PresenterTheme::~PresenterTheme (void) PresenterConfigurationAccess aConfiguration ( mxContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); return aReadContext.ReadTheme(aConfiguration, msThemeName); @@ -390,7 +390,7 @@ bool PresenterTheme::ConvertToColor ( ::boost::shared_ptr<PresenterConfigurationAccess> pConfiguration ( new PresenterConfigurationAccess( mxContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_WRITE)); // Get configuration node for the view style container of the current @@ -517,7 +517,7 @@ PresenterTheme::FontDescriptor::FontDescriptor ( msStyleName(), mnSize(12), mnColor(0x00000000), - msAnchor(OUString(RTL_CONSTASCII_USTRINGPARAM("Left"))), + msAnchor(OUString("Left")), mnXOffset(0), mnYOffset(0) { @@ -737,7 +737,7 @@ ReadContext::ReadContext ( { mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), rxContext), UNO_QUERY_THROW); } diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index b6181bdc5868..c5acb8c6c8b3 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -67,7 +67,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (::rtl::OUString(pString)) namespace sdext { namespace presenter { @@ -638,7 +638,7 @@ void PresenterToolBar::CreateControls ( // Expand the macro in the bitmap file names. PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); const OUString sBasePath (PresenterComponent::GetBasePath(mxComponentContext)); @@ -989,8 +989,7 @@ void PresenterToolBar::ThrowIfDisposed (void) const if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterToolBar has already been disposed")), + OUString( "PresenterToolBar has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index d7f93308de89..bc0866fed2a7 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -66,7 +66,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (::rtl::OUString(pString)) namespace sdext { namespace presenter { @@ -542,7 +542,7 @@ void PresenterWindowManager::RestoreViewMode (void) sal_Int32 nMode (0); PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/InitialViewMode")) >>= nMode; switch (nMode) @@ -568,7 +568,7 @@ void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode) { PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_WRITE); aConfiguration.GoToChild(A2S("Presenter")); Any aValue; @@ -1179,8 +1179,7 @@ void PresenterWindowManager::ThrowIfDisposed (void) const if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterWindowManager has already been disposed")), + OUString( "PresenterWindowManager has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } |