From 1016cd785685118fb6c69fe59ba9bd0647a76f63 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 5 Jan 2017 12:21:31 +0000 Subject: flatten and simplify this resource hierarchy Change-Id: I622dae5f36b44c08e597d94fe8184ad92504d038 --- svx/source/inc/AccessibleFrameSelector.hxx | 3 +-- svx/source/inc/frmsel.hrc | 31 ------------------------------ svx/source/inc/frmselimpl.hxx | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 svx/source/inc/frmsel.hrc (limited to 'svx/source/inc') diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index 1a8e3c361f74..9c2ad91e5205 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -53,8 +53,7 @@ class AccFrameSelector : css::accessibility::XAccessibleComponent, css::accessibility::XAccessibleEventBroadcaster, css::lang::XServiceInfo - >, - public Resource + > { public: explicit AccFrameSelector( FrameSelector& rFrameSel, FrameBorderType eBorder ); diff --git a/svx/source/inc/frmsel.hrc b/svx/source/inc/frmsel.hrc deleted file mode 100644 index 5ec3567b36db..000000000000 --- a/svx/source/inc/frmsel.hrc +++ /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 . - */ - -#ifndef SVX_FRMSEL_HRC -#define SVX_FRMSEL_HRC - -#define ARR_TEXTS 1 -#define ARR_DESCRIPTIONS 2 - -// image: arrows and markers -#define BMP_FRMSEL_ARROWS 3 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index 73bbe558043a..07e85eda7035 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -95,7 +95,7 @@ private: typedef std::vector< FrameBorder* > FrameBorderPtrVec; -struct FrameSelectorImpl : public Resource +struct FrameSelectorImpl { FrameSelector& mrFrameSel; /// The control itself. ScopedVclPtr mpVirDev; /// For all buffered drawing operations. -- cgit