[Libreoffice-commits] core.git: sd/source
Chr. Rossmanith
ChrRossmanith at gmx.de
Fri May 31 00:26:21 PDT 2013
sd/source/ui/sidebar/PanelFactory.cxx | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit a400b31069a913830b257ac8a1b2131665067ec5
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Thu May 30 22:23:34 2013 +0200
Remove #define A2S() in PanelFactory.cxx
Change-Id: I650e5826d26b3a86dcddd517ae1f917d1edaedd1
Reviewed-on: https://gerrit.libreoffice.org/4108
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index 53fbe58..e58ce5d 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -44,8 +44,6 @@ using namespace cssu;
using namespace ::sd::framework;
using ::rtl::OUString;
-#define A2S(pString) (OUString(pString))
-
namespace sd {
extern ::Window * createTableDesignPanel (::Window* pParent, ViewShellBase& rBase);
}
@@ -153,11 +151,11 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
if ( ! xParentWindow.is() || pParentWindow==NULL)
throw RuntimeException(
- A2S("PanelFactory::createUIElement called without ParentWindow"),
+ OUString("PanelFactory::createUIElement called without ParentWindow"),
NULL);
if ( ! xFrame.is())
throw RuntimeException(
- A2S("PanelFactory::createUIElement called without XFrame"),
+ OUString("PanelFactory::createUIElement called without XFrame"),
NULL);
// Tunnel through the controller to obtain a ViewShellBase.
@@ -171,7 +169,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
pBase = pController->GetViewShellBase();
}
if (pBase == NULL)
- throw RuntimeException(A2S("can not get ViewShellBase for frame"), NULL);
+ throw RuntimeException(OUString("can not get ViewShellBase for frame"), NULL);
// Get bindings from given arguments.
const sal_uInt64 nBindingsValue (aArguments.getOrDefault("SfxBindings", sal_uInt64(0)));
More information about the Libreoffice-commits
mailing list