extensions: get rid of no longer needed stringdefine.hxx

Change-Id: I53d8a164fe9333c286a04f88a0834feeecacd5ed

extensions/source/propctrlr/cellbindinghelper.cxx

@@ -168,7 +168,7 @@ namespace pcr
 
         Reference< XPropertySet > xConverter(
             createDocumentDependentInstance(
-                _bIsRange ? SERVICE_RANGEADDRESS_CONVERSION : SERVICE_ADDRESS_CONVERSION,
+                _bIsRange ? OUString(SERVICE_RANGEADDRESS_CONVERSION) : OUString(SERVICE_ADDRESS_CONVERSION),
                 ::rtl::OUString(),
                 Any()
             ),
@@ -213,7 +213,7 @@ namespace pcr
     Reference< XValueBinding > CellBindingHelper::createCellBindingFromAddress( const CellAddress& _rAddress, bool _bSupportIntegerExchange ) const
     {
         Reference< XValueBinding > xBinding( createDocumentDependentInstance(
-            _bSupportIntegerExchange ? SERVICE_SHEET_CELL_INT_BINDING : SERVICE_SHEET_CELL_BINDING,
+            _bSupportIntegerExchange ? OUString(SERVICE_SHEET_CELL_INT_BINDING) : OUString(SERVICE_SHEET_CELL_BINDING),
             PROPERTY_BOUND_CELL,
             makeAny( _rAddress )
         ), UNO_QUERY );

extensions/source/propctrlr/formcomponenthandler.cxx

@@ -1691,7 +1691,7 @@ namespace pcr
         // ----- TriState -----
         case PROPERTY_ID_TRISTATE:
             if ( !_bFirstTimeInit )
-                _rxInspectorUI->rebuildPropertyUI( m_eComponentClass == eFormControl ? PROPERTY_DEFAULT_STATE : PROPERTY_STATE );
+                _rxInspectorUI->rebuildPropertyUI( m_eComponentClass == eFormControl ? OUString(PROPERTY_DEFAULT_STATE) : OUString(PROPERTY_STATE) );
             break;  // case PROPERTY_ID_TRISTATE
 
         // ----- DecimalAccuracy -----
@@ -1709,7 +1709,7 @@ namespace pcr
 
             // propagate the changes to the min/max/default fields
             Any aCurrentProp;
-            OUString aAffectedProps[] = { PROPERTY_VALUE, PROPERTY_DEFAULT_VALUE, PROPERTY_VALUEMIN, PROPERTY_VALUEMAX };
+            OUString aAffectedProps[] = { OUString(PROPERTY_VALUE), OUString(PROPERTY_DEFAULT_VALUE), OUString(PROPERTY_VALUEMIN), OUString(PROPERTY_VALUEMAX) };
             for (sal_uInt16 i=0; i<SAL_N_ELEMENTS(aAffectedProps); ++i)
             {
                 Reference< XPropertyControl > xControl;
@@ -1755,7 +1755,7 @@ namespace pcr
 
                 // give each control which has to know this an own copy of the description
                 OUString aFormattedPropertyControls[] = {
-                    PROPERTY_EFFECTIVE_MIN, PROPERTY_EFFECTIVE_MAX, PROPERTY_EFFECTIVE_DEFAULT, PROPERTY_EFFECTIVE_VALUE
+                    OUString(PROPERTY_EFFECTIVE_MIN), OUString(PROPERTY_EFFECTIVE_MAX), OUString(PROPERTY_EFFECTIVE_DEFAULT), OUString(PROPERTY_EFFECTIVE_VALUE)
                 };
                 for ( sal_uInt16 i=0; i<SAL_N_ELEMENTS(aFormattedPropertyControls); ++i )
                 {
@@ -3073,10 +3073,10 @@ namespace pcr
         OUString* FormSQLCommandUI::getPropertiesToDisable()
         {
             static OUString s_aCommandProps[] = {
-                PROPERTY_DATASOURCE,
-                PROPERTY_COMMAND,
-                PROPERTY_COMMANDTYPE,
-                PROPERTY_ESCAPE_PROCESSING,
+                OUString(PROPERTY_DATASOURCE),
+                OUString(PROPERTY_COMMAND),
+                OUString(PROPERTY_COMMANDTYPE),
+                OUString(PROPERTY_ESCAPE_PROCESSING),
                 OUString()
             };
             return s_aCommandProps;
@@ -3167,8 +3167,8 @@ namespace pcr
         OUString* ValueListCommandUI::getPropertiesToDisable()
         {
             static OUString s_aListSourceProps[] = {
-                PROPERTY_LISTSOURCETYPE,
-                PROPERTY_LISTSOURCE,
+                OUString(PROPERTY_LISTSOURCETYPE),
+                OUString(PROPERTY_LISTSOURCE),
                 OUString()
             };
             return s_aListSourceProps;

extensions/source/propctrlr/formgeometryhandler.cxx

@@ -633,7 +633,7 @@ namespace pcr
                     continue;
 
                 sal_Int32 nHeightOrWidth( 0 );
-                OSL_VERIFY( xRowOrColumn->getPropertyValue( _bRows ? PROPERTY_HEIGHT : PROPERTY_WIDTH ) >>= nHeightOrWidth );
+                OSL_VERIFY( xRowOrColumn->getPropertyValue( _bRows ? OUString(PROPERTY_HEIGHT) : OUString(PROPERTY_WIDTH) ) >>= nHeightOrWidth );
 
                 if ( nAccumulated + nHeightOrWidth > rRelativePos )
                     break;

extensions/source/propctrlr/pcrstrings.hxx

@@ -20,15 +20,13 @@
 #ifndef _EXTENSIONS_FORMSCTRLR_PCRSTRINGS_HXX_
 #define _EXTENSIONS_FORMSCTRLR_PCRSTRINGS_HXX_
 
-#include "stringdefine.hxx"
-
 //............................................................................
 namespace pcr
 {
 //............................................................................
 
     // properties
-    PCR_CONSTASCII_STRING( PROPERTY_TABBINGMODEL,           "TabbingModel" );
+    #define PROPERTY_TABBINGMODEL           "TabbingModel"
 
 //............................................................................
 } // namespace pcr

extensions/source/propctrlr/selectlabeldialog.cxx

@@ -103,7 +103,7 @@ namespace pcr
             // check wich service the allowed components must suppport
             sal_Int16 nClassId = 0;
             try { nClassId = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); } catch(...) { }
-            m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? SERVICE_COMPONENT_GROUPBOX : SERVICE_COMPONENT_FIXEDTEXT;
+            m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUString(SERVICE_COMPONENT_GROUPBOX) : OUString(SERVICE_COMPONENT_FIXEDTEXT);
             m_aRequiredControlImage = m_aModelImages.GetImage((FormComponentType::RADIOBUTTON == nClassId) ? RID_SVXIMG_GROUPBOX : RID_SVXIMG_FIXEDTEXT);
 
             // calc the currently set label control (so InsertEntries can calc m_pInitialSelection)

extensions/source/propctrlr/stringdefine.hxx

-/* -*- 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 _EXTENSIONS_FORMSCTRLR_STRINGDEFINE_HXX_
-#define _EXTENSIONS_FORMSCTRLR_STRINGDEFINE_HXX_
-
-#include <rtl/ustring.hxx>
-#include <comphelper/string.hxx>
-
-//............................................................................
-namespace pcr
-{
-    using comphelper::string::ConstAsciiString;
-
-    //============================================================
-    //= concrete strings
-    //============================================================
-    #ifndef PCR_IMPLEMENT_STRINGS
-    #define PCR_CONSTASCII_STRING(ident, string) extern const ConstAsciiString ident
-    #else
-    #define PCR_CONSTASCII_STRING(ident, string) extern const ConstAsciiString ident = {RTL_CONSTASCII_STRINGPARAM(string)}
-    #endif
-
-//............................................................................
-} // namespace pcr
-//............................................................................
-
-#endif // _EXTENSIONS_FORMSCTRLR_STRINGDEFINE_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx

@@ -589,29 +589,29 @@ namespace pcr
             //------------------------------------------------------------
             // show the facets which are available at the data type
             ::rtl::OUString aFacets[] = {
-                PROPERTY_XSD_WHITESPACES, PROPERTY_XSD_PATTERN,
-                PROPERTY_XSD_LENGTH, PROPERTY_XSD_MIN_LENGTH, PROPERTY_XSD_MAX_LENGTH, PROPERTY_XSD_TOTAL_DIGITS,
-                PROPERTY_XSD_FRACTION_DIGITS,
-                PROPERTY_XSD_MAX_INCLUSIVE_INT,
-                PROPERTY_XSD_MAX_EXCLUSIVE_INT,
-                PROPERTY_XSD_MIN_INCLUSIVE_INT,
-                PROPERTY_XSD_MIN_EXCLUSIVE_INT,
-                PROPERTY_XSD_MAX_INCLUSIVE_DOUBLE,
-                PROPERTY_XSD_MAX_EXCLUSIVE_DOUBLE,
-                PROPERTY_XSD_MIN_INCLUSIVE_DOUBLE,
-                PROPERTY_XSD_MIN_EXCLUSIVE_DOUBLE,
-                PROPERTY_XSD_MAX_INCLUSIVE_DATE,
-                PROPERTY_XSD_MAX_EXCLUSIVE_DATE,
-                PROPERTY_XSD_MIN_INCLUSIVE_DATE,
-                PROPERTY_XSD_MIN_EXCLUSIVE_DATE,
-                PROPERTY_XSD_MAX_INCLUSIVE_TIME,
-                PROPERTY_XSD_MAX_EXCLUSIVE_TIME,
-                PROPERTY_XSD_MIN_INCLUSIVE_TIME,
-                PROPERTY_XSD_MIN_EXCLUSIVE_TIME,
-                PROPERTY_XSD_MAX_INCLUSIVE_DATE_TIME,
-                PROPERTY_XSD_MAX_EXCLUSIVE_DATE_TIME,
-                PROPERTY_XSD_MIN_INCLUSIVE_DATE_TIME,
-                PROPERTY_XSD_MIN_EXCLUSIVE_DATE_TIME
+                OUString(PROPERTY_XSD_WHITESPACES), OUString(PROPERTY_XSD_PATTERN),
+                OUString(PROPERTY_XSD_LENGTH), OUString(PROPERTY_XSD_MIN_LENGTH), OUString(PROPERTY_XSD_MAX_LENGTH), OUString(PROPERTY_XSD_TOTAL_DIGITS),
+                OUString(PROPERTY_XSD_FRACTION_DIGITS),
+                OUString(PROPERTY_XSD_MAX_INCLUSIVE_INT),
+                OUString(PROPERTY_XSD_MAX_EXCLUSIVE_INT),
+                OUString(PROPERTY_XSD_MIN_INCLUSIVE_INT),
+                OUString(PROPERTY_XSD_MIN_EXCLUSIVE_INT),
+                OUString(PROPERTY_XSD_MAX_INCLUSIVE_DOUBLE),
+                OUString(PROPERTY_XSD_MAX_EXCLUSIVE_DOUBLE),
+                OUString(PROPERTY_XSD_MIN_INCLUSIVE_DOUBLE),
+                OUString(PROPERTY_XSD_MIN_EXCLUSIVE_DOUBLE),
+                OUString(PROPERTY_XSD_MAX_INCLUSIVE_DATE),
+                OUString(PROPERTY_XSD_MAX_EXCLUSIVE_DATE),
+                OUString(PROPERTY_XSD_MIN_INCLUSIVE_DATE),
+                OUString(PROPERTY_XSD_MIN_EXCLUSIVE_DATE),
+                OUString(PROPERTY_XSD_MAX_INCLUSIVE_TIME),
+                OUString(PROPERTY_XSD_MAX_EXCLUSIVE_TIME),
+                OUString(PROPERTY_XSD_MIN_INCLUSIVE_TIME),
+                OUString(PROPERTY_XSD_MIN_EXCLUSIVE_TIME),
+                OUString(PROPERTY_XSD_MAX_INCLUSIVE_DATE_TIME),
+                OUString(PROPERTY_XSD_MAX_EXCLUSIVE_DATE_TIME),
+                OUString(PROPERTY_XSD_MIN_INCLUSIVE_DATE_TIME),
+                OUString(PROPERTY_XSD_MIN_EXCLUSIVE_DATE_TIME)
             };
 
             size_t i=0;