extensions/source/propctrlr/fontdialog.cxx | 1
extensions/source/propctrlr/formlocalid.hrc | 28 -----------
extensions/source/propctrlr/formres.src | 1
extensions/source/propctrlr/formresid.hrc | 2
extensions/source/propctrlr/pcrmiscres.src | 13 -----
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 1
6 files changed, 1 insertion(+), 45 deletions(-)
New commits:
commit 59ee2791e6c2640666dde6421db4f9b7964077ed
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Oct 13 09:39:17 2016 +0100
drop unused RID_RSC_BUTTON_IMAGES resource
Change-Id: If85a3491c3cb6ebb05a82e1c732083d99e91d6e8
diff --git a/extensions/source/propctrlr/fontdialog.cxx
b/extensions/source/propctrlr/fontdialog.cxx
index 61a8a71..a268635 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -21,7 +21,6 @@
#include "fontdialog.hxx"
#include "formresid.hrc"
#include "modulepcr.hxx"
-#include "formlocalid.hrc"
#include <vcl/svapp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/types.hxx>
diff --git a/extensions/source/propctrlr/formlocalid.hrc
b/extensions/source/propctrlr/formlocalid.hrc
deleted file mode 100644
index 59ca407..0000000
--- a/extensions/source/propctrlr/formlocalid.hrc
+++ /dev/null
@@ -1,28 +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 INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMLOCALID_HRC
-#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMLOCALID_HRC
-
-#define IMG_PLUS 1
-#define IMG_MINUS 2
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/formres.src
b/extensions/source/propctrlr/formres.src
index 6e3df3a..d09d7f9 100644
--- a/extensions/source/propctrlr/formres.src
+++ b/extensions/source/propctrlr/formres.src
@@ -18,7 +18,6 @@
*/
#include "formresid.hrc"
-#include "formlocalid.hrc"
String RID_STR_EDITMASK
{
diff --git a/extensions/source/propctrlr/formresid.hrc
b/extensions/source/propctrlr/formresid.hrc
index 3bf7a80..9f41b8f 100644
--- a/extensions/source/propctrlr/formresid.hrc
+++ b/extensions/source/propctrlr/formresid.hrc
@@ -286,7 +286,7 @@
#define RID_RSC_ENUM_TEXTTYPE ( RID_PROPCONTROLLER_START + 3 )
#define RID_RSC_ENUM_VISUALEFFECT ( RID_PROPCONTROLLER_START + 4 )
#define RID_RSC_ENUM_IMAGE_POSITION ( RID_PROPCONTROLLER_START + 5 )
-#define RID_RSC_BUTTON_IMAGES ( RID_PROPCONTROLLER_START + 6 )
+//available
#define RID_RSC_ENUM_WHITESPACE_HANDLING ( RID_PROPCONTROLLER_START + 7 )
#define RID_RSC_ENUM_VERTICAL_ALIGN ( RID_PROPCONTROLLER_START + 8 )
#define RID_RSC_ENUM_BORDER_TYPE ( RID_PROPCONTROLLER_START + 9 )
diff --git a/extensions/source/propctrlr/pcrmiscres.src
b/extensions/source/propctrlr/pcrmiscres.src
index 59e1e9b..29bed66 100644
--- a/extensions/source/propctrlr/pcrmiscres.src
+++ b/extensions/source/propctrlr/pcrmiscres.src
@@ -18,7 +18,6 @@
*/
#include "formresid.hrc"
-#include "formlocalid.hrc"
String RID_STR_CONFIRM_DELETE_DATA_TYPE
{
@@ -26,18 +25,6 @@ String RID_STR_CONFIRM_DELETE_DATA_TYPE
"Please note that this will affect all controls which are bound
to this data type.";
};
-Resource RID_RSC_BUTTON_IMAGES
-{
- Image IMG_PLUS
- {
- ImageBitmap = Bitmap{ file = "buttonplus.png"; };
- };
- Image IMG_MINUS
- {
- ImageBitmap = Bitmap{ file = "buttonminus.png"; };
- };
-};
-
#define IMAGE_IDS \
IdList = \
{ \
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 012947b..136915e 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -26,7 +26,6 @@
#include "xsddatatypes.hxx"
#include "modulepcr.hxx"
#include "formresid.hrc"
-#include "formlocalid.hrc"
#include "propctrlr.hrc"
#include "newdatatype.hxx"
#include "xsdvalidationhelper.hxx"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
