summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-11-14 10:41:29 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-11-14 10:45:45 +0100
commit7d989aef3d073e67a4bdbb16f71c8cc38c0c60b0 (patch)
tree08d3fc404cf77a94fe9cabc630dd8156d5d8bb1c /sfx2
parentfab11968a83b988316c94625ea874cb206314da6 (diff)
WaE: Global resources should have an identifier >= 256.
Change-Id: I89416932f46151479459c8fff98934ae6a7fcd60
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/dialog/dialog.hrc2
-rw-r--r--sfx2/source/dialog/newstyle.cxx1
-rw-r--r--sfx2/source/dialog/newstyle.hrc22
-rw-r--r--sfx2/source/dialog/newstyle.src13
4 files changed, 7 insertions, 31 deletions
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index 2ba62ae90992..5759a4e904fb 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -34,7 +34,7 @@
#define RID_DLG_ALIEN_WARNING ( RC_DIALOG_BEGIN + 0)
#define STR_RESET ( RC_DIALOG_BEGIN + 0)
-
+#define MSG_OVERWRITE ( RC_DIALOG_BEGIN + 1)
#define MSG_TABPAGE_INVALIDNAME ( RC_DIALOG_BEGIN + 13)
#define MSG_TABPAGE_INVALIDSTYLE ( RC_DIALOG_BEGIN + 14)
#define DLG_NEW_STYLE_BY_EXAMPLE ( RC_DIALOG_BEGIN + 15)
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 5f8e24e87425..062b86f44df8 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -23,7 +23,6 @@
#include <sfx2/newstyle.hxx>
#include "dialog.hrc"
-#include "newstyle.hrc"
#include <sfx2/sfxresid.hxx>
// PRIVATE METHODES ------------------------------------------------------
diff --git a/sfx2/source/dialog/newstyle.hrc b/sfx2/source/dialog/newstyle.hrc
deleted file mode 100644
index 4725dbdb9d8a..000000000000
--- a/sfx2/source/dialog/newstyle.hrc
+++ /dev/null
@@ -1,22 +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 .
- */
-
-#define MSG_OVERWRITE 3
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/newstyle.src b/sfx2/source/dialog/newstyle.src
index 375bac54ad4e..10c7744e2a46 100644
--- a/sfx2/source/dialog/newstyle.src
+++ b/sfx2/source/dialog/newstyle.src
@@ -19,14 +19,13 @@
#include <sfx2/sfx.hrc>
#include "dialog.hrc"
-#include "newstyle.hrc"
#include <sfx2/sfxcommands.h>
- QueryBox MSG_OVERWRITE
- {
- Buttons = WB_YES_NO ;
- DefButton = WB_DEF_NO ;
- Message [ en-US ] = "Style already exists. Overwrite?" ;
- };
+QueryBox MSG_OVERWRITE
+{
+ Buttons = WB_YES_NO ;
+ DefButton = WB_DEF_NO ;
+ Message [ en-US ] = "Style already exists. Overwrite?" ;
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */