Skip to content

C
core
Kaydet (Commit) 8ed6f1c2 authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

forms: FORMS_CONSTASCII_STRING is no longer needed 

Change-Id: I2b666f0e48db4c97cc4c641480a82681f5057ac2
üst 9a943e58
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 85 deletions
forms/Library_frm.mk
Dosyayı görüntüle @ 8ed6f1c2
......@@ -103,7 +103,6 @@ $(eval $(call gb_Library_add_exception_objects,frm,\
forms/source/helper/windowstateguard \
forms/source/misc/componenttools \
forms/source/misc/frm_module \
forms/source/misc/frm_strings \
forms/source/misc/ids \
forms/source/misc/InterfaceContainer \
forms/source/misc/limitedformats \
......
forms/source/component/Button.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -137,7 +137,7 @@ StringSequence OButtonModel::getSupportedServiceNames() throw()
//------------------------------------------------------------------------------
OUString OButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_COMMANDBUTTON; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_COMMANDBUTTON); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
......
forms/source/component/CheckBox.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -141,7 +141,7 @@ void OCheckBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) co
//------------------------------------------------------------------------------
OUString SAL_CALL OCheckBoxModel::getServiceName() throw(RuntimeException)
{
return FRM_COMPONENT_CHECKBOX; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_CHECKBOX); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
......
forms/source/component/ComboBox.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -324,7 +324,7 @@ void OComboBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg
//------------------------------------------------------------------------------
OUString SAL_CALL OComboBoxModel::getServiceName() throw(RuntimeException)
{
return FRM_COMPONENT_COMBOBOX; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_COMBOBOX); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
......
forms/source/component/Currency.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -198,7 +198,7 @@ void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) co
//------------------------------------------------------------------------------
OUString SAL_CALL OCurrencyModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_CURRENCYFIELD; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_CURRENCYFIELD); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
......
forms/source/component/DatabaseForm.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -2357,7 +2357,7 @@ void ODatabaseForm::invlidateParameters()
//------------------------------------------------------------------------------
void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException )
{
if ((evt.PropertyName.equalsAsciiL(PROPERTY_ACTIVE_CONNECTION.ascii, PROPERTY_ACTIVE_CONNECTION.length)) && !m_bForwardingConnection)
if (evt.PropertyName == PROPERTY_ACTIVE_CONNECTION && !m_bForwardingConnection)
{
// the rowset changed its active connection itself (without interaction from our side), so
// we need to fire this event, too
......@@ -3862,7 +3862,7 @@ const sal_uInt16 DONTAPPLYFILTER = 0x0002;
//------------------------------------------------------------------------------
OUString ODatabaseForm::getServiceName() throw( RuntimeException )
{
return FRM_COMPONENT_FORM; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_FORM); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
......
forms/source/component/Date.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -162,7 +162,7 @@ StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw()
//------------------------------------------------------------------------------
OUString SAL_CALL ODateModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_DATEFIELD; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_DATEFIELD); // old (non-sun) name for compatibility !
}
// XPropertySet
......
forms/source/component/Edit.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -340,7 +340,7 @@ void OEditModel::disposing()
//------------------------------------------------------------------------------
OUString SAL_CALL OEditModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_EDIT; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_EDIT); // old (non-sun) name for compatibility !
}
// XServiceInfo
......
forms/source/component/File.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -200,7 +200,7 @@ void OFileControlModel::describeFixedProperties( Sequence< Property >& _rProps )
//------------------------------------------------------------------------------
OUString SAL_CALL OFileControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_FILECONTROL; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_FILECONTROL); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
......
forms/source/component/FixedText.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -93,7 +93,7 @@ void OFixedTextModel::describeAggregateProperties( Sequence< Property >& _rAggre
//------------------------------------------------------------------------------
OUString SAL_CALL OFixedTextModel::getServiceName() throw(RuntimeException)
{
return FRM_COMPONENT_FIXEDTEXT; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_FIXEDTEXT); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
......
forms/source/component/FormattedFieldWrapper.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -189,7 +189,7 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw
OUString SAL_CALL OFormattedFieldWrapper::getServiceName() throw(RuntimeException)
{
// return the old compatibility name for an EditModel
return FRM_COMPONENT_EDIT;
return OUString(FRM_COMPONENT_EDIT);
}
//------------------------------------------------------------------
......
forms/source/component/FormsCollection.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -46,7 +46,7 @@ InterfaceRef SAL_CALL OFormsCollection_CreateInstance(const Reference<XMultiServ
//------------------------------------------------------------------------------
OUString SAL_CALL OFormsCollection::getServiceName() throw(RuntimeException)
{
return FRM_SUN_FORMS_COLLECTION;
return OUString(FRM_SUN_FORMS_COLLECTION);
}
//------------------------------------------------------------------------------
......
forms/source/component/Grid.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -870,7 +870,7 @@ void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxO
//------------------------------------------------------------------------------
OUString SAL_CALL OGridControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_GRID; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_GRID); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
......
forms/source/component/GroupBox.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -97,7 +97,7 @@ void OGroupBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg
//------------------------------------------------------------------------------
OUString SAL_CALL OGroupBoxModel::getServiceName() throw(RuntimeException)
{
return FRM_COMPONENT_GROUPBOX; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_GROUPBOX); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
......
forms/source/component/Hidden.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -139,7 +139,7 @@ StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::su
//------------------------------------------------------------------------------
OUString SAL_CALL OHiddenModel::getServiceName() throw(RuntimeException)
{
return FRM_COMPONENT_HIDDEN; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_HIDDEN); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
......
forms/source/component/ImageButton.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -104,7 +104,7 @@ void OImageButtonModel::describeFixedProperties( Sequence< Property >& _rProps )
//------------------------------------------------------------------------------
OUString OImageButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_IMAGEBUTTON; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_IMAGEBUTTON); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
......
forms/source/component/ImageControl.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -359,7 +359,7 @@ void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [
//------------------------------------------------------------------------------
OUString OImageControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_IMAGECONTROL; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_IMAGECONTROL); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
......
forms/source/component/ListBox.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -516,7 +516,7 @@ namespace frm
//------------------------------------------------------------------------------
OUString SAL_CALL OListBoxModel::getServiceName() throw(RuntimeException)
{
return FRM_COMPONENT_LISTBOX; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_LISTBOX); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
......
forms/source/component/Numeric.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -152,7 +152,7 @@ void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps ) con
//------------------------------------------------------------------------------
OUString SAL_CALL ONumericModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_NUMERICFIELD; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_NUMERICFIELD); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
......
forms/source/component/Pattern.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -143,7 +143,7 @@ void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) con
//------------------------------------------------------------------------------
OUString SAL_CALL OPatternModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_PATTERNFIELD; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_PATTERNFIELD); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
......
forms/source/component/RadioButton.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -289,7 +289,7 @@ void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps )
//------------------------------------------------------------------------------
OUString SAL_CALL ORadioButtonModel::getServiceName() throw(RuntimeException)
{
return FRM_COMPONENT_RADIOBUTTON; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_RADIOBUTTON); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
......
forms/source/component/Time.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -159,7 +159,7 @@ IMPLEMENT_DEFAULT_CLONING( OTimeModel )
//------------------------------------------------------------------------------
OUString SAL_CALL OTimeModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_TIMEFIELD; // old (non-sun) name for compatibility !
return OUString(FRM_COMPONENT_TIMEFIELD); // old (non-sun) name for compatibility !
}
// XPropertySet
......
forms/source/component/navigationbar.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -203,7 +203,7 @@ namespace frm
//------------------------------------------------------------------
OUString SAL_CALL ONavigationBarModel::getServiceName() throw ( RuntimeException )
{
return FRM_SUN_COMPONENT_NAVTOOLBAR;
return OUString(FRM_SUN_COMPONENT_NAVTOOLBAR);
}
//------------------------------------------------------------------
......
forms/source/component/scrollbar.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -240,7 +240,7 @@ namespace frm
//--------------------------------------------------------------------
OUString SAL_CALL OScrollBarModel::getServiceName() throw( RuntimeException )
{
return FRM_SUN_COMPONENT_SCROLLBAR;
return OUString(FRM_SUN_COMPONENT_SCROLLBAR);
}
//--------------------------------------------------------------------
......
forms/source/component/spinbutton.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -196,7 +196,7 @@ namespace frm
//--------------------------------------------------------------------
OUString SAL_CALL OSpinButtonModel::getServiceName() throw( RuntimeException )
{
return FRM_SUN_COMPONENT_SPINBUTTON;
return OUString(FRM_SUN_COMPONENT_SPINBUTTON);
}
//--------------------------------------------------------------------
......
forms/source/helper/formnavigation.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -418,25 +418,25 @@ namespace frm
{
static const FeatureURL s_aFeatureURLs[] =
{
FeatureURL( FormFeature::MoveAbsolute, URL_FORM_POSITION.ascii ),
FeatureURL( FormFeature::TotalRecords, URL_FORM_RECORDCOUNT.ascii ),
FeatureURL( FormFeature::MoveToFirst, URL_RECORD_FIRST.ascii ),
FeatureURL( FormFeature::MoveToPrevious, URL_RECORD_PREV.ascii ),
FeatureURL( FormFeature::MoveToNext, URL_RECORD_NEXT.ascii ),
FeatureURL( FormFeature::MoveToLast, URL_RECORD_LAST.ascii ),
FeatureURL( FormFeature::SaveRecordChanges, URL_RECORD_SAVE.ascii ),
FeatureURL( FormFeature::UndoRecordChanges, URL_RECORD_UNDO.ascii ),
FeatureURL( FormFeature::MoveToInsertRow, URL_RECORD_NEW.ascii ),
FeatureURL( FormFeature::DeleteRecord, URL_RECORD_DELETE.ascii ),
FeatureURL( FormFeature::ReloadForm, URL_FORM_REFRESH.ascii ),
FeatureURL( FormFeature::RefreshCurrentControl, URL_FORM_REFRESH_CURRENT_CONTROL.ascii ),
FeatureURL( FormFeature::SortAscending, URL_FORM_SORT_UP.ascii ),
FeatureURL( FormFeature::SortDescending, URL_FORM_SORT_DOWN.ascii ),
FeatureURL( FormFeature::InteractiveSort, URL_FORM_SORT.ascii ),
FeatureURL( FormFeature::AutoFilter, URL_FORM_AUTO_FILTER.ascii ),
FeatureURL( FormFeature::InteractiveFilter, URL_FORM_FILTER.ascii ),
FeatureURL( FormFeature::ToggleApplyFilter, URL_FORM_APPLY_FILTER.ascii ),
FeatureURL( FormFeature::RemoveFilterAndSort, URL_FORM_REMOVE_FILTER.ascii ),
FeatureURL( FormFeature::MoveAbsolute, URL_FORM_POSITION ),
FeatureURL( FormFeature::TotalRecords, URL_FORM_RECORDCOUNT ),
FeatureURL( FormFeature::MoveToFirst, URL_RECORD_FIRST ),
FeatureURL( FormFeature::MoveToPrevious, URL_RECORD_PREV ),
FeatureURL( FormFeature::MoveToNext, URL_RECORD_NEXT ),
FeatureURL( FormFeature::MoveToLast, URL_RECORD_LAST ),
FeatureURL( FormFeature::SaveRecordChanges, URL_RECORD_SAVE ),
FeatureURL( FormFeature::UndoRecordChanges, URL_RECORD_UNDO ),
FeatureURL( FormFeature::MoveToInsertRow, URL_RECORD_NEW ),
FeatureURL( FormFeature::DeleteRecord, URL_RECORD_DELETE ),
FeatureURL( FormFeature::ReloadForm, URL_FORM_REFRESH ),
FeatureURL( FormFeature::RefreshCurrentControl, URL_FORM_REFRESH_CURRENT_CONTROL ),
FeatureURL( FormFeature::SortAscending, URL_FORM_SORT_UP ),
FeatureURL( FormFeature::SortDescending, URL_FORM_SORT_DOWN ),
FeatureURL( FormFeature::InteractiveSort, URL_FORM_SORT ),
FeatureURL( FormFeature::AutoFilter, URL_FORM_AUTO_FILTER ),
FeatureURL( FormFeature::InteractiveFilter, URL_FORM_FILTER ),
FeatureURL( FormFeature::ToggleApplyFilter, URL_FORM_APPLY_FILTER ),
FeatureURL( FormFeature::RemoveFilterAndSort, URL_FORM_REMOVE_FILTER ),
FeatureURL( 0, NULL )
};
return s_aFeatureURLs;
......
forms/source/inc/services.hxx
Dosyayı görüntüle @ 8ed6f1c2
This diff is collapsed.
forms/source/misc/frm_strings.cxx deleted 100644 → 0
Dosyayı görüntüle @ 9a943e58
/* -*- 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: */
forms/source/misc/services.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -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,
......
forms/source/richtext/richtextmodel.cxx
Dosyayı görüntüle @ 8ed6f1c2
......@@ -504,7 +504,7 @@ namespace frm
//--------------------------------------------------------------------
OUString SAL_CALL ORichTextModel::getServiceName() throw ( RuntimeException)
{
return FRM_SUN_COMPONENT_RICHTEXTCONTROL;
return OUString(FRM_SUN_COMPONENT_RICHTEXTCONTROL);
}
//--------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment