diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-04-26 12:46:39 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-26 16:18:48 +0200 |
commit | 6022a17e79e2cc0a483122bf7f73fcb3e246caf6 (patch) | |
tree | 459513cb7f83c7efef1a3322dd7137f39eb674f9 /sc/source/ui/sidebar | |
parent | 662f372d3e5751f92609a1e2535ee1388a8fd1cf (diff) |
remove sc bitmaps from .src files
Change-Id: I351b67616b240e3c0c91ea31d8f14ecfa6de8b4a
Reviewed-on: https://gerrit.libreoffice.org/36991
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/sidebar')
-rw-r--r-- | sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 21 | ||||
-rw-r--r-- | sc/source/ui/sidebar/CellAppearancePropertyPanel.src | 75 |
2 files changed, 11 insertions, 85 deletions
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index e622b08c716e..b50292dca6b5 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -21,6 +21,7 @@ #include <sfx2/sidebar/ControlFactory.hxx> #include "CellAppearancePropertyPanel.hxx" #include "scres.hrc" +#include "bitmaps.hlst" #include "scresid.hxx" #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> @@ -58,16 +59,16 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel( maBorderTLBRControl(SID_ATTR_BORDER_DIAG_TLBR, *pBindings, *this), maBorderBLTRControl(SID_ATTR_BORDER_DIAG_BLTR, *pBindings, *this), - maIMGCellBorder(BitmapEx(ScResId(RID_BMP_CELL_BORDER))), - maIMGLineStyle1(BitmapEx(ScResId(RID_BMP_LINE_STYLE1))), - maIMGLineStyle2(BitmapEx(ScResId(RID_BMP_LINE_STYLE2))), - maIMGLineStyle3(BitmapEx(ScResId(RID_BMP_LINE_STYLE3))), - maIMGLineStyle4(BitmapEx(ScResId(RID_BMP_LINE_STYLE4))), - maIMGLineStyle5(BitmapEx(ScResId(RID_BMP_LINE_STYLE5))), - maIMGLineStyle6(BitmapEx(ScResId(RID_BMP_LINE_STYLE6))), - maIMGLineStyle7(BitmapEx(ScResId(RID_BMP_LINE_STYLE7))), - maIMGLineStyle8(BitmapEx(ScResId(RID_BMP_LINE_STYLE8))), - maIMGLineStyle9(BitmapEx(ScResId(RID_BMP_LINE_STYLE9))), + maIMGCellBorder(BitmapEx(RID_BMP_CELL_BORDER)), + maIMGLineStyle1(BitmapEx(RID_BMP_LINE_STYLE1)), + maIMGLineStyle2(BitmapEx(RID_BMP_LINE_STYLE2)), + maIMGLineStyle3(BitmapEx(RID_BMP_LINE_STYLE3)), + maIMGLineStyle4(BitmapEx(RID_BMP_LINE_STYLE4)), + maIMGLineStyle5(BitmapEx(RID_BMP_LINE_STYLE5)), + maIMGLineStyle6(BitmapEx(RID_BMP_LINE_STYLE6)), + maIMGLineStyle7(BitmapEx(RID_BMP_LINE_STYLE7)), + maIMGLineStyle8(BitmapEx(RID_BMP_LINE_STYLE8)), + maIMGLineStyle9(BitmapEx(RID_BMP_LINE_STYLE9)), mnIn(0), mnOut(0), diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src deleted file mode 100644 index 48bab6f36bdc..000000000000 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src +++ /dev/null @@ -1,75 +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 "scres.hrc" -#include "helpids.h" - -Bitmap RID_BMP_CELL_BORDER -{ - File = "sidebar/CellBorder.png"; -}; - -Bitmap RID_BMP_LINE_STYLE1 -{ - File = "sidebar/CellBorderLineStyle_005.png"; -}; - -Bitmap RID_BMP_LINE_STYLE2 -{ - File = "sidebar/CellBorderLineStyle_250.png"; -}; - -Bitmap RID_BMP_LINE_STYLE3 -{ - File = "sidebar/CellBorderLineStyle_400.png"; -}; - -Bitmap RID_BMP_LINE_STYLE4 -{ - File = "sidebar/CellBorderLineStyle_500.png"; -}; - -Bitmap RID_BMP_LINE_STYLE5 -{ - File = "sidebar/CellBorderLineStyle_110.png"; -}; - -Bitmap RID_BMP_LINE_STYLE6 -{ - File = "sidebar/CellBorderLineStyle_260.png"; -}; - -Bitmap RID_BMP_LINE_STYLE7 -{ - File = "sidebar/CellBorderLineStyle_450.png"; -}; - -Bitmap RID_BMP_LINE_STYLE8 -{ - File = "sidebar/CellBorderLineStyle_505.png"; -}; - -Bitmap RID_BMP_LINE_STYLE9 -{ - File = "sidebar/CellBorderLineStyle_750.png"; -}; - -// cell border style popup - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |