summaryrefslogtreecommitdiff
path: root/sdext/source/presenter/PresenterSlideSorter.cxx
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-06-02 13:45:57 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-06-02 13:45:57 -0500
commit0188ebf354cb2776f9d846a5f03b07f8bedf348e (patch)
tree8344ddf70202669555ec7a07012357c87d36d765 /sdext/source/presenter/PresenterSlideSorter.cxx
parent081dc5afdef4a84d60a57ff549f70071b1d26eda (diff)
targeted string re-work
Change-Id: I88cdf9d4c3faab75a80ff72e4268748296a09e50
Diffstat (limited to 'sdext/source/presenter/PresenterSlideSorter.cxx')
-rw-r--r--sdext/source/presenter/PresenterSlideSorter.cxx16
1 files changed, 8 insertions, 8 deletions
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(