fix up compat ids

Change-Id: Id783db750885404457e0c4f96eca74c39ec63394

3 files changed, 4 insertions, 184 deletions

diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index aaab82fa8848..5b3e990b69c3 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -26,7 +26,6 @@
 #include "view.hxx"
 #include "wrtsh.hxx"
 
-#include "optcomp.hrc"
 #include "globals.hrc"
 #include <unotools/configmgr.hxx>
 #include <vcl/layout.hxx>
@@ -114,10 +113,10 @@ SwCompatibilityOptPage::SwCompatibilityOptPage(Window* pParent, const SfxItemSet
     for (sal_uInt16 nId = COPT_USE_PRINTERDEVICE; nId <= COPT_EXPAND_WORDSPACE; ++nId)
     {
         String sEntry = m_pFormattingLB->GetEntry(nId);
-        if ( STR_TAB_ALIGNMENT == nId ||
-             STR_LINE_SPACING == nId ||
-             STR_USE_OBJPOSITIONING == nId ||
-             STR_USE_OURTEXTWRAPPING == nId )
+        if ( COPT_USE_OUR_TABSTOPS == nId ||
+             COPT_USE_LINESPACING == nId ||
+             COPT_USE_OBJECTPOSITIONING == nId ||
+             COPT_USE_OUR_TEXTWRAPPING == nId )
             ReplaceFormatName( sEntry );
         SvTreeListEntry* pEntry = m_pOptionsLB->SvTreeListBox::InsertEntry( sEntry );
         if ( pEntry )
diff --git a/sw/source/ui/config/optcomp.hrc b/sw/source/ui/config/optcomp.hrc
deleted file mode 100644
index 6f07218e78c4..000000000000
--- a/sw/source/ui/config/optcomp.hrc
+++ /dev/null
@@ -1,48 +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 .
- */
-
-// the controls
-
-#define FL_MAIN         10
-#define FT_FORMATTING   11
-#define LB_FORMATTING   12
-#define FT_OPTIONS      13
-#define LB_OPTIONS      14
-#define PB_RESET        15
-#define PB_DEFAULT      16
-
-// the option strings
-
-#define STR_USERENTRY                   10
-
-#define STR_COMP_OPTIONS_START          100
-#define STR_PRINTER_METRICS             (STR_COMP_OPTIONS_START + 0)
-#define STR_MERGE_PARA_DIST             (STR_COMP_OPTIONS_START + 1)
-#define STR_MERGE_PARA_DIST_PAGESTART   (STR_COMP_OPTIONS_START + 2)
-#define STR_TAB_ALIGNMENT               (STR_COMP_OPTIONS_START + 3)
-#define STR_EXTERNAL_LEADING            (STR_COMP_OPTIONS_START + 4)
-#define STR_LINE_SPACING                (STR_COMP_OPTIONS_START + 5)
-#define STR_ADD_TABLESPACING            (STR_COMP_OPTIONS_START + 6)
-#define STR_USE_OBJPOSITIONING          (STR_COMP_OPTIONS_START + 7)
-#define STR_USE_OURTEXTWRAPPING         (STR_COMP_OPTIONS_START + 8)
-#define STR_CONSIDER_WRAPPINGSTYLE      (STR_COMP_OPTIONS_START + 9)
-#define STR_EXPAND_WORDSPACE            (STR_COMP_OPTIONS_START + 10)
-#define STR_COMP_OPTIONS_END            (STR_EXPAND_WORDSPACE + 1)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optcomp.src b/sw/source/ui/config/optcomp.src
deleted file mode 100644
index bb43e6e0b190..000000000000
--- a/sw/source/ui/config/optcomp.src
+++ /dev/null
@@ -1,131 +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 "optcomp.hrc"
-#include "globals.hrc"
-#include "helpid.h"
-
-// TabPage TP_OPTCOMPATIBILITY_PAGE --------------------------------------
-
-TabPage TP_OPTCOMPATIBILITY_PAGE
-{
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    Hide = TRUE ;
-    FixedLine FL_MAIN
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Compatibility options for %DOCNAME";
-    };
-    FixedText FT_FORMATTING
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 236 , 8 ) ;
-        Text [ en-US ] = "Recommended ~formatting options for";
-    };
-    ListBox LB_FORMATTING
-    {
-        HelpID = "sw:ListBox:TP_OPTCOMPATIBILITY_PAGE:LB_FORMATTING";
-        Pos = MAP_APPFONT ( 12 , 25 ) ;
-        Size = MAP_APPFONT ( 118 , 24 ) ;
-        DropDown = TRUE;
-    };
-    FixedText FT_OPTIONS
-    {
-        Pos = MAP_APPFONT ( 12 , 40 ) ;
-        Size = MAP_APPFONT ( 236 , 8 ) ;
-        Text [ en-US ] = "~Options";
-    };
-    Control LB_OPTIONS
-    {
-        HelpId = HID_COMPATIBILITY_OPTIONS_BOX ;
-        Pos = MAP_APPFONT ( 12 , 51 ) ;
-        Size = MAP_APPFONT ( 236 , 108 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-    };
-    PushButton PB_RESET
-    {
-        HelpID = "sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_RESET";
-        Pos = MAP_APPFONT ( 125 , 165 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        Text [ en-US ] = "~Reset";
-    };
-    PushButton PB_DEFAULT
-    {
-        HelpID = "sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_DEFAULT";
-        Pos = MAP_APPFONT ( 188 , 165 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        Text [ en-US ] = "Use as ~Default";
-    };
-
-    String STR_USERENTRY
-    {
-        Text [ en-US ] = "<User settings>";
-    };
-
-// the option strings ----------------------------------------------------
-
-    String STR_PRINTER_METRICS
-    {
-        Text [ en-US ] = "Use printer metrics for document formatting";
-    };
-    String STR_MERGE_PARA_DIST
-    {
-        Text [ en-US ] = "Add spacing between paragraphs and tables (in current document)";
-    };
-    String STR_MERGE_PARA_DIST_PAGESTART
-    {
-        Text [ en-US ] = "Add paragraph and table spacing at tops of pages (in current document)";
-    };
-    String STR_TAB_ALIGNMENT
-    {
-        Text [ en-US ] = "Use %WRITERCOMPATIBILITYVERSIONOOO11 tabstop formatting";
-    };
-    String STR_EXTERNAL_LEADING
-    {
-        Text [ en-US ] = "Do not add leading (extra space) between lines of text";
-    };
-    String STR_LINE_SPACING
-    {
-        Text [ en-US ] = "Use %WRITERCOMPATIBILITYVERSIONOOO11 line spacing";
-    };
-    String STR_ADD_TABLESPACING
-    {
-        Text [ en-US ] = "Add paragraph and table spacing at bottom of table cells";
-    };
-    String STR_USE_OBJPOSITIONING
-    {
-        Text [ en-US ] = "Use %WRITERCOMPATIBILITYVERSIONOOO11 object positioning";
-    };
-    String STR_USE_OURTEXTWRAPPING
-    {
-        Text [ en-US ] = "Use %WRITERCOMPATIBILITYVERSIONOOO11 text wrapping around objects";
-    };
-    String STR_CONSIDER_WRAPPINGSTYLE
-    {
-        Text [ en-US ] = "Consider wrapping style when positioning objects";
-    };
-    String STR_EXPAND_WORDSPACE
-    {
-        Text [ en-US ] = "Expand word space on lines with manual line breaks in justified paragraphs";
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */