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/pagedlg | |
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/pagedlg')
-rw-r--r-- | sc/source/ui/pagedlg/areasdlg.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/pagedlg.hrc | 27 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/pagedlg.src | 31 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/tptable.cxx | 4 |
4 files changed, 2 insertions, 61 deletions
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 4649fe2dabf7..628f2c6ce216 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -33,7 +33,6 @@ #include "tabvwsh.hxx" #include "docsh.hxx" #include "globstr.hrc" -#include "pagedlg.hrc" #include "compiler.hxx" #include "markdata.hxx" diff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrc deleted file mode 100644 index f975939af8a8..000000000000 --- a/sc/source/ui/pagedlg/pagedlg.hrc +++ /dev/null @@ -1,27 +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" - -// TabPage: Tabelle - -#define BMP_LEFTRIGHT (SC_DIALOGS_START + 43 + 23) -#define BMP_TOPDOWN (SC_DIALOGS_START + 43 + 24) - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src deleted file mode 100644 index 16972ce51921..000000000000 --- a/sc/source/ui/pagedlg/pagedlg.src +++ /dev/null @@ -1,31 +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 "pagedlg.hrc" - -Bitmap BMP_LEFTRIGHT -{ - File = "lftrgt.png"; -}; - -Bitmap BMP_TOPDOWN -{ - File = "topdown.png"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 5b3dbff4a43d..1190ef82fbc7 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -28,7 +28,7 @@ #include "attrib.hxx" #include "scresid.hxx" #include "sc.hrc" -#include "pagedlg.hrc" +#include "bitmaps.hlst" // Static Data @@ -117,7 +117,7 @@ ScTablePage::ScTablePage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ) : void ScTablePage::ShowImage() { - Image aImg(BitmapEx(ScResId((m_pBtnLeftRight->IsChecked()) ? BMP_LEFTRIGHT : BMP_TOPDOWN))); + Image aImg(BitmapEx(m_pBtnLeftRight->IsChecked() ? OUString(BMP_LEFTRIGHT) : OUString(BMP_TOPDOWN))); m_pBmpPageDir->SetImage( aImg ); m_pBmpPageDir->SetOutputSizePixel( aImg.GetSizePixel() ); } |