sd/source/ui/sidebar/PanelFactory.cxx | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
New commits:
commit ab731b192f40fde71c796ecab563adc8d7258da8
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Nov 8 12:21:39 2016 +0200
no need to use endsWithAsciiL like this anymore
Change-Id: Ie59d001816661ac19ce19ddae36efd8d880a987f
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx
b/sd/source/ui/sidebar/PanelFactory.cxx
index af4695d..28f94a9 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -113,26 +113,24 @@ Reference<ui::XUIElement> SAL_CALL
PanelFactory::createUIElement (
the entries in
officecfg/registry/data/org/openoffice/Office/Impress.xcu
for the TaskPanelFactory.
*/
-#define EndsWith(s,t) s.endsWithAsciiL(t,strlen(t))
- if (EndsWith(rsUIElementResourceURL, "/CustomAnimations"))
+ if (rsUIElementResourceURL.endsWith("/CustomAnimations"))
pControl = VclPtr<CustomAnimationPanel>::Create(pParentWindow, *pBase,
xFrame);
- else if (EndsWith(rsUIElementResourceURL, "/Layouts"))
+ else if (rsUIElementResourceURL.endsWith("/Layouts"))
pControl = VclPtr<LayoutMenu>::Create(pParentWindow, *pBase, xSidebar);
- else if (EndsWith(rsUIElementResourceURL, "/AllMasterPages"))
+ else if (rsUIElementResourceURL.endsWith("/AllMasterPages"))
pControl = AllMasterPagesSelector::Create(pParentWindow, *pBase,
xSidebar);
- else if (EndsWith(rsUIElementResourceURL, "/RecentMasterPages"))
+ else if (rsUIElementResourceURL.endsWith("/RecentMasterPages"))
pControl = RecentMasterPagesSelector::Create(pParentWindow, *pBase,
xSidebar);
- else if (EndsWith(rsUIElementResourceURL, "/UsedMasterPages"))
+ else if (rsUIElementResourceURL.endsWith("/UsedMasterPages"))
pControl = CurrentMasterPagesSelector::Create(pParentWindow, *pBase,
xSidebar);
- else if (EndsWith(rsUIElementResourceURL, "/SlideTransitions"))
+ else if (rsUIElementResourceURL.endsWith("/SlideTransitions"))
pControl = VclPtr<SlideTransitionPanel>::Create(pParentWindow, *pBase,
xFrame);
- else if (EndsWith(rsUIElementResourceURL, "/TableDesign"))
+ else if (rsUIElementResourceURL.endsWith("/TableDesign"))
pControl = VclPtr<TableDesignPanel>::Create(pParentWindow, *pBase);
- else if (EndsWith(rsUIElementResourceURL, "/NavigatorPanel"))
+ else if (rsUIElementResourceURL.endsWith("/NavigatorPanel"))
pControl = VclPtr<NavigatorWrapper>::Create(pParentWindow, *pBase,
pBindings);
- else if (EndsWith(rsUIElementResourceURL, "/SlideBackgroundPanel"))
+ else if (rsUIElementResourceURL.endsWith("/SlideBackgroundPanel"))
pControl = VclPtr<SlideBackground>::Create(pParentWindow, *pBase,
xFrame, pBindings);
-#undef EndsWith
if (!pControl)
throw lang::IllegalArgumentException();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
