summaryrefslogtreecommitdiff
path: root/sd/source/ui/slidesorter/view
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/slidesorter/view')
-rw-r--r--sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx1
-rw-r--r--sd/source/ui/slidesorter/view/SlsResource.src42
-rw-r--r--sd/source/ui/slidesorter/view/SlsTheme.cxx5
3 files changed, 4 insertions, 44 deletions
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
index 49dfc8ec1f36..b4d41cc4ddff 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
@@ -25,6 +25,7 @@
#include "tools/IconCache.hxx"
#include "Window.hxx"
#include "res_bmp.hrc"
+#include "bitmaps.hlst"
namespace sd { namespace slidesorter { namespace view {
diff --git a/sd/source/ui/slidesorter/view/SlsResource.src b/sd/source/ui/slidesorter/view/SlsResource.src
deleted file mode 100644
index 20134d804a2a..000000000000
--- a/sd/source/ui/slidesorter/view/SlsResource.src
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "glob.hrc"
-
-Bitmap IMAGE_SHADOW
-{
- File = "slide_sorter_shadow.png";
-};
-
-Bitmap IMAGE_INSERT_SHADOW
-{
- File = "slide_sorter_insert_shadow.png";
-};
-
-Bitmap IMAGE_HIDE_SLIDE_OVERLAY
-{
- File = "slide_sorter_hide_slide_overlay.png";
-};
-
-Bitmap IMAGE_FOCUS_BORDER
-{
- File = "slide_sorter_focus_border.png";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index 7bc1b983b2a2..c204140ab45f 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -18,6 +18,7 @@
*/
#include "glob.hrc"
+#include "bitmaps.hlst"
#include "view/SlsTheme.hxx"
#include "controller/SlsProperties.hxx"
#include "sdresid.hxx"
@@ -238,11 +239,11 @@ Theme::GradientDescriptor& Theme::GetGradient (const GradientColorType eType)
}
}
-void Theme::InitializeIcon (const IconType eType, sal_uInt16 nResourceId)
+void Theme::InitializeIcon(const IconType eType, const OUString& rResourceId)
{
if (eType>=0 && size_t(eType)<maIcons.size())
{
- const BitmapEx aIcon((SdResId(nResourceId)));
+ const BitmapEx aIcon(rResourceId);
maIcons[eType] = aIcon;
}
else