summaryrefslogtreecommitdiff
path: root/sdext/source/presenter/PresenterNotesView.cxx
diff options
context:
space:
mode:
authorJean-Noël Rouvignac <jn.rouvignac@gmail.com>2013-01-30 11:44:23 +0100
committerLuboš Luňák <l.lunak@suse.cz>2013-01-30 12:54:40 +0000
commit97eb8a6e0eb830f37dcba64a51d725aab4c5ff53 (patch)
treea1a95b8249052d846a997ad1729758168d6a3b24 /sdext/source/presenter/PresenterNotesView.cxx
parentf8569cd9a28a3a8856dba4ad53218aa6cc073521 (diff)
Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRING
Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd Reviewed-on: https://gerrit.libreoffice.org/1924 Tested-by: Luboš Luňák <l.lunak@suse.cz> Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'sdext/source/presenter/PresenterNotesView.cxx')
-rw-r--r--sdext/source/presenter/PresenterNotesView.cxx16
1 files changed, 7 insertions, 9 deletions
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index f3dbdbe432fc..deb248f6485f 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -47,8 +47,6 @@ 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)))
-
static const sal_Int32 gnSpaceBelowSeparator (10);
static const sal_Int32 gnSpaceAboveSeparator (10);
static const sal_Int32 gnPartHeight (128);
@@ -111,7 +109,7 @@ PresenterNotesView::PresenterNotesView (
mpPresenterController->GetTheme(),
mxParentWindow,
mxCanvas,
- A2S("NotesViewCloser"));
+ "NotesViewCloser");
if (mxParentWindow.is())
{
@@ -223,15 +221,15 @@ void PresenterNotesView::CreateToolBar (
rpPresenterController,
PresenterToolBar::Left);
mpToolBar->Initialize(
- A2S("PresenterScreenSettings/ToolBars/NotesToolBar"));
+ "PresenterScreenSettings/ToolBars/NotesToolBar");
}
void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesPage)
{
static const ::rtl::OUString sNotesShapeName (
- A2S("com.sun.star.presentation.NotesShape"));
+ "com.sun.star.presentation.NotesShape");
static const ::rtl::OUString sTextShapeName (
- A2S("com.sun.star.drawing.TextShape"));
+ "com.sun.star.drawing.TextShape");
Reference<container::XIndexAccess> xIndexAccess (rxNotesPage, UNO_QUERY);
if (xIndexAccess.is())
@@ -660,8 +658,8 @@ void PresenterNotesView::ChangeFontSize (const sal_Int32 nSizeChange)
if (pConfiguration.get()==NULL || ! pConfiguration->IsValid())
return;
- pConfiguration->GoToChild(A2S("Font"));
- pConfiguration->SetProperty(A2S("Size"), Any((sal_Int32)(nNewSize+0.5)));
+ pConfiguration->GoToChild(OUString("Font"));
+ pConfiguration->SetProperty("Size", Any((sal_Int32)(nNewSize+0.5)));
pConfiguration->CommitChanges();
}
catch (Exception&)
@@ -703,7 +701,7 @@ void PresenterNotesView::ThrowIfDisposed (void)
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
throw lang::DisposedException (
- A2S("PresenterNotesView object has already been disposed"),
+ "PresenterNotesView object has already been disposed",
static_cast<uno::XWeak*>(this));
}
}