summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-30 09:23:55 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-30 09:32:24 +0100
commit1a777329e8a49bc4b2cf9c0e60397588197c3ca7 (patch)
tree5349b96474b33e0ae75e8f8911192d41c7e9fefd /sd
parent8fef2fef0349d3f21a8c9bfd0f99c72e8b85a9de (diff)
regenerate list
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx23
-rw-r--r--sd/source/ui/accessibility/AccessibleOutlineView.cxx4
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx4
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterView.cxx3
-rw-r--r--sd/source/ui/accessibility/AccessibleViewForwarder.cxx3
-rw-r--r--sd/source/ui/accessibility/SdShapeTypes.cxx2
6 files changed, 13 insertions, 26 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 23613711361c..ef78810b92ef 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -300,7 +300,7 @@ void SAL_CALL
AccessibleDocumentViewBase::propertyChange (rEventObject);
OSL_TRACE ("AccessibleDrawDocumentView::propertyChange");
- if (rEventObject.PropertyName == OUString (RTL_CONSTASCII_USTRINGPARAM("CurrentPage")))
+ if (rEventObject.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CurrentPage")))
{
OSL_TRACE (" current page changed");
@@ -335,7 +335,7 @@ void SAL_CALL
else
OSL_TRACE ("View invalid");
}
- else if (rEventObject.PropertyName == OUString (RTL_CONSTASCII_USTRINGPARAM("VisibleArea")))
+ else if (rEventObject.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("VisibleArea")))
{
OSL_TRACE (" visible area changed");
if (mpChildrenManager != NULL)
@@ -399,10 +399,10 @@ void SAL_CALL
{
uno::Sequence< ::rtl::OUString > aServices( xInfo->getSupportedServiceNames() );
OUString sFirstService = aServices[0];
- if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
+ if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
{
if( aServices.getLength() >= 2 &&
- aServices[1] == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationView")))
+ aServices[1].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationView")))
{
SolarMutexGuard aGuard;
@@ -415,13 +415,13 @@ void SAL_CALL
sName = String( SdResId(SID_SD_A11Y_D_DRAWVIEW_N) );
}
}
- else if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.NotesView")))
+ else if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.NotesView")))
{
SolarMutexGuard aGuard;
sName = String( SdResId(SID_SD_A11Y_I_NOTESVIEW_N) );
}
- else if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.HandoutView")))
+ else if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.HandoutView")))
{
SolarMutexGuard aGuard;
@@ -456,10 +456,10 @@ void SAL_CALL
{
uno::Sequence< ::rtl::OUString > aServices( xInfo->getSupportedServiceNames() );
OUString sFirstService = aServices[0];
- if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
+ if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
{
if( aServices.getLength() >= 2 &&
- aServices[1] == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationView")))
+ aServices[1].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationView")))
{
SolarMutexGuard aGuard;
@@ -472,13 +472,13 @@ void SAL_CALL
sDescription = String( SdResId(SID_SD_A11Y_D_DRAWVIEW_D) );
}
}
- else if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.NotesView")))
+ else if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.NotesView")))
{
SolarMutexGuard aGuard;
sDescription = String( SdResId(SID_SD_A11Y_I_NOTESVIEW_D) );
}
- else if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.HandoutView")))
+ else if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.HandoutView")))
{
SolarMutexGuard aGuard;
@@ -732,9 +732,6 @@ void AccessibleDrawDocumentView::UpdateAccessibleName (void)
SetAccessibleName (sNewName, AutomaticallyCreated);
}
-
-
-
} // end of namespace accessibility
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index cdf091e26acc..bec8f44c06cd 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -227,14 +227,14 @@ void SAL_CALL
AccessibleDocumentViewBase::propertyChange (rEventObject);
OSL_TRACE ("AccessibleOutlineView::propertyChange");
- if (rEventObject.PropertyName == ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("CurrentPage")))
+ if (rEventObject.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CurrentPage")))
{
OSL_TRACE (" current page changed");
// The current page changed. Update the children accordingly.
UpdateChildren();
}
- else if (rEventObject.PropertyName == ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("VisibleArea")))
+ else if (rEventObject.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("VisibleArea")))
{
OSL_TRACE (" visible area changed");
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 989d12c5d4bf..b3c8a597f46e 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -567,9 +567,6 @@ sal_Bool AccessibleSlideSorterObject::IsDisposed (void)
return (rBHelper.bDisposed || rBHelper.bInDispose);
}
-
-
-
SdPage* AccessibleSlideSorterObject::GetPage (void) const
{
::sd::slidesorter::model::SharedPageDescriptor pDescriptor(
@@ -580,7 +577,6 @@ SdPage* AccessibleSlideSorterObject::GetPage (void) const
return NULL;
}
-
} // end of namespace ::accessibility
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 14a24d22afcf..514a91066b18 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -1144,9 +1144,6 @@ IMPL_LINK(AccessibleSlideSorterView::Implementation, VisibilityChangeListener, v
return 1;
}
-
-
-
} // end of namespace ::accessibility
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index 3e59095621d7..43a22461b534 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -151,9 +151,6 @@ Point AccessibleViewForwarder::PixelToLogic (const Point& rPoint) const
return Point();
}
-
-
-
Size AccessibleViewForwarder::PixelToLogic (const Size& rSize) const
{
OSL_ASSERT (mpView != NULL);
diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx
index 731829df1cb5..b30b2fa6ebb5 100644
--- a/sd/source/ui/accessibility/SdShapeTypes.cxx
+++ b/sd/source/ui/accessibility/SdShapeTypes.cxx
@@ -33,7 +33,7 @@
#include "AccessiblePresentationShape.hxx"
#include "AccessiblePresentationGraphicShape.hxx"
#include "AccessiblePresentationOLEShape.hxx"
-#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
namespace accessibility {