forms: FORMS_CONSTASCII_STRING is no longer needed

Change-Id: I2b666f0e48db4c97cc4c641480a82681f5057ac2

2 files changed, 14 insertions, 39 deletions

diff --git a/forms/source/misc/frm_strings.cxx b/forms/source/misc/frm_strings.cxx
deleted file mode 100644
index 5e3710ab4ede..000000000000
--- a/forms/source/misc/frm_strings.cxx
+++ /dev/null
@@ -1,25 +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 FORMS_IMPLEMENT_STRINGS
-#include "frm_strings.hxx"
-#include "services.hxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index db4342bc11fe..dfbd656d01a6 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -130,31 +130,31 @@ void registerClassInfo(
 //.......................................................................................
 #define REGISTER_CLASS1(classImplName, service1) \
     aServices.realloc(1); \
-    aServices.getArray()[0] = frm::service1; \
+    aServices.getArray()[0] = service1; \
     REGISTER_CLASS_CORE(classImplName)
 
 //.......................................................................................
 #define REGISTER_CLASS2(classImplName, service1, service2) \
     aServices.realloc(2); \
-    aServices.getArray()[0] = frm::service1; \
-    aServices.getArray()[1] = frm::service2; \
+    aServices.getArray()[0] = service1; \
+    aServices.getArray()[1] = service2; \
     REGISTER_CLASS_CORE(classImplName)
 
 //.......................................................................................
 #define REGISTER_CLASS3(classImplName, service1, service2, service3) \
     aServices.realloc(3); \
-    aServices.getArray()[0] = frm::service1; \
-    aServices.getArray()[1] = frm::service2; \
-    aServices.getArray()[2] = frm::service3; \
+    aServices.getArray()[0] = service1; \
+    aServices.getArray()[1] = service2; \
+    aServices.getArray()[2] = service3; \
     REGISTER_CLASS_CORE(classImplName)
 
 //.......................................................................................
 #define REGISTER_CLASS4(classImplName, service1, service2, service3, service4) \
     aServices.realloc(4); \
-    aServices.getArray()[0] = frm::service1; \
-    aServices.getArray()[1] = frm::service2; \
-    aServices.getArray()[2] = frm::service3; \
-    aServices.getArray()[3] = frm::service4; \
+    aServices.getArray()[0] = service1; \
+    aServices.getArray()[1] = service2; \
+    aServices.getArray()[2] = service3; \
+    aServices.getArray()[3] = service4; \
     REGISTER_CLASS_CORE(classImplName)
 
 //---------------------------------------------------------------------------------------
@@ -213,10 +213,10 @@ void ensureClassInfos()
     // register the wrapper for the FormattedField, as it handles the XPersistObject::write
     // so that version <= 5.1 are able to read it
     aServices.realloc(4);
-    aServices.getArray()[0] = frm::FRM_COMPONENT_FORMATTEDFIELD;
-    aServices.getArray()[1] = frm::FRM_SUN_COMPONENT_FORMATTEDFIELD;
-    aServices.getArray()[2] = frm::FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD;
-    aServices.getArray()[3] = frm::BINDABLE_DATABASE_FORMATTED_FIELD;
+    aServices.getArray()[0] = FRM_COMPONENT_FORMATTEDFIELD;
+    aServices.getArray()[1] = FRM_SUN_COMPONENT_FORMATTEDFIELD;
+    aServices.getArray()[2] = FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD;
+    aServices.getArray()[3] = BINDABLE_DATABASE_FORMATTED_FIELD;
 
     registerClassInfo(OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"),
         aServices,