summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-04-16 19:15:28 +0200
committerDavid Tardon <dtardon@redhat.com>2012-04-16 20:23:23 +0200
commit4845405d405164a92792d7fc2ee98bb13394b9e9 (patch)
treeb73c53829db0a0c3cfe765022b6703c801dfaeb5 /sd
parente6c997c96226cb4e8244f7ded91a8a0fde91c93b (diff)
WaE: could not convert ... from 'const char*' to 'const rtl::OUString'
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx4
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterView.cxx6
-rw-r--r--sd/source/ui/accessibility/AccessibleTreeNode.cxx4
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx13
4 files changed, 13 insertions, 14 deletions
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 17e479ecfec1..abc07623e84d 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -535,8 +535,8 @@ uno::Sequence< ::rtl::OUString> SAL_CALL
ThrowIfDisposed ();
static const OUString sServiceNames[2] = {
- "com.sun.star.accessibility.Accessible",
- "com.sun.star.accessibility.AccessibleContext"
+ OUString("com.sun.star.accessibility.Accessible"),
+ OUString("com.sun.star.accessibility.AccessibleContext")
};
return uno::Sequence<OUString> (sServiceNames, 2);
}
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 31cc1cea2054..c470c60d3526 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -761,9 +761,9 @@ uno::Sequence< ::rtl::OUString> SAL_CALL
ThrowIfDisposed ();
static const OUString sServiceNames[3] = {
- "com.sun.star.accessibility.Accessible",
- "com.sun.star.accessibility.AccessibleContext",
- "com.sun.star.drawing.AccessibleSlideSorterView"
+ OUString("com.sun.star.accessibility.Accessible"),
+ OUString("com.sun.star.accessibility.AccessibleContext"),
+ OUString("com.sun.star.drawing.AccessibleSlideSorterView")
};
return uno::Sequence<OUString> (sServiceNames, 3);
}
diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
index 871995ecbbc4..5a0c014183db 100644
--- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx
+++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
@@ -602,8 +602,8 @@ uno::Sequence< ::rtl::OUString> SAL_CALL
{
ThrowIfDisposed ();
static const OUString sServiceNames[2] = {
- "com.sun.star.accessibility.Accessible",
- "com.sun.star.accessibility.AccessibleContext",
+ OUString("com.sun.star.accessibility.Accessible"),
+ OUString("com.sun.star.accessibility.AccessibleContext"),
};
return uno::Sequence<OUString> (sServiceNames, 2);
}
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index a48aaaefa01c..59a41bd7eeeb 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -85,13 +85,12 @@ static const OUString* getPropertyNames()
{
static const OUString gPropNames[ CB_BANDED_COLUMNS-CB_HEADER_ROW+1 ] =
{
-
- "UseFirstRowStyle" ,
- "UseLastRowStyle" ,
- "UseBandingRowStyle" ,
- "UseFirstColumnStyle" ,
- "UseLastColumnStyle" ,
- "UseBandingColumnStyle"
+ OUString("UseFirstRowStyle") ,
+ OUString("UseLastRowStyle") ,
+ OUString("UseBandingRowStyle") ,
+ OUString("UseFirstColumnStyle") ,
+ OUString("UseLastColumnStyle") ,
+ OUString("UseBandingColumnStyle")
};
return &gPropNames[0];
}