diff options
Diffstat (limited to 'sd/source/ui/sidebar')
-rw-r--r-- | sd/source/ui/sidebar/CustomAnimationPanel.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/PanelBase.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/PanelFactory.cxx | 5 | ||||
-rw-r--r-- | sd/source/ui/sidebar/SlideTransitionPanel.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/TableDesignPanel.cxx | 2 |
6 files changed, 7 insertions, 8 deletions
diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx index 04d0009967c2..c2f8350c3f2b 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx @@ -40,7 +40,7 @@ CustomAnimationPanel::CustomAnimationPanel ( rViewShellBase) { #ifdef DEBUG - SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sd:CustomAnimationPanel"))); + SetText(OUString("sd:CustomAnimationPanel")); #endif } diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index ef6ae63b2a7c..0e4b23497f0f 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -152,7 +152,7 @@ LayoutMenu::LayoutMenu ( SetColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Paint_PanelBackground)); #ifdef DEBUG - SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sd:LayoutMenu"))); + SetText(OUString("sd:LayoutMenu")); #endif } diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx index 350eb8852345..0c04e97a0363 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -34,7 +34,7 @@ PanelBase::PanelBase ( OSL_TRACE("created PanelBase at %x for parent %x", this, pParentWindow); #ifdef DEBUG - SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sd:PanelBase"))); + SetText(OUString("sd:PanelBase")); #endif } diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index 2b457819b28f..53fbe580219e 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -44,7 +44,7 @@ using namespace cssu; using namespace ::sd::framework; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (OUString(pString)) namespace sd { extern ::Window * createTableDesignPanel (::Window* pParent, ViewShellBase& rBase); @@ -91,8 +91,7 @@ Reference<XInterface> SAL_CALL PanelFactory_createInstance ( ::rtl::OUString PanelFactory_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.Draw.framework.PanelFactory")); + return OUString("org.openoffice.comp.Draw.framework.PanelFactory"); } diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx index 3b4d994d207b..79b2ae2bc831 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx @@ -38,7 +38,7 @@ SlideTransitionPanel::SlideTransitionPanel ( : PanelBase(pParentWindow, rViewShellBase) { #ifdef DEBUG - SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sd:SlideTransitionPanel"))); + SetText(OUString("sd:SlideTransitionPanel")); #endif } diff --git a/sd/source/ui/sidebar/TableDesignPanel.cxx b/sd/source/ui/sidebar/TableDesignPanel.cxx index 28ceb65cfbbd..a8634a4b1f00 100644 --- a/sd/source/ui/sidebar/TableDesignPanel.cxx +++ b/sd/source/ui/sidebar/TableDesignPanel.cxx @@ -36,7 +36,7 @@ TableDesignPanel::TableDesignPanel ( : PanelBase(pParentWindow, rViewShellBase) { #ifdef DEBUG - SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sd:TableDesignPanel"))); + SetText(OUString("sd:TableDesignPanel")); #endif } |