diff options
Diffstat (limited to 'svx/source/form')
25 files changed, 109 insertions, 696 deletions
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index d9e0a43e4b5c..333907a5b35a 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -20,14 +20,14 @@ #include <sal/macros.h> #include "svx/ParseContext.hxx" -#include "svx/fmresids.hrc" +#include "svx/strings.hrc" #include <svx/dialmgr.hxx> #include <unotools/syslocale.hxx> -#include <tools/resary.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> +#include "fmstring.hrc" using namespace svxform; using namespace ::connectivity; @@ -35,10 +35,8 @@ using namespace ::connectivity; OSystemParseContext::OSystemParseContext() : IParseContext() { - SolarMutexGuard aGuard; - ResStringArray aLocalizedKeywords(ResId(RID_RSC_SQL_INTERNATIONAL, DIALOG_MGR())); - for (sal_uInt32 i = 0; i < aLocalizedKeywords.Count(); ++i) - m_aLocalizedKeywords.push_back(aLocalizedKeywords.GetString(i)); + for (size_t i = 0; i < SAL_N_ELEMENTS(RID_RSC_SQL_INTERNATIONAL); ++i) + m_aLocalizedKeywords.push_back(SvxResId(RID_RSC_SQL_INTERNATIONAL[i])); } OSystemParseContext::~OSystemParseContext() diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index e461c58e9bb7..83ec24fd291d 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -21,7 +21,7 @@ #include "svx/databaselocationinput.hxx" #include "svx/dialmgr.hxx" -#include "svx/fmresids.hrc" +#include "svx/strings.hrc" #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 1c2ece9f4891..1efc8de7081a 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -27,15 +27,15 @@ #include "fmhelp.hrc" #include "bitmaps.hlst" +#include "fpicker/fpicker.hrc" #include <svx/svxids.hrc> -#include <tools/rcid.h> #include <tools/diagnose_ex.h> +#include <tools/resmgr.hxx> #include <svx/xmlexchg.hxx> #include <svx/fmshell.hxx> #include <svtools/miscopt.hxx> #include <unotools/pathoptions.hxx> #include <unotools/viewoptions.hxx> -#include <svtools/svtools.hrc> #include "svtools/treelistentry.hxx" #include <sfx2/app.hxx> #include <sfx2/filedlghelper.hxx> @@ -517,7 +517,7 @@ namespace svxform ItemNode* pNode = nullptr; Reference< css::xml::dom::XNode > xParentNode; Reference< XPropertySet > xNewBinding; - sal_uInt16 nResId = 0; + const char* pResId = nullptr; bool bIsElement = true; if ( DGTInstance == m_eGroup ) { @@ -537,7 +537,7 @@ namespace svxform { try { - nResId = RID_STR_DATANAV_ADD_ELEMENT; + pResId = RID_STR_DATANAV_ADD_ELEMENT; xNewNode = m_xUIHelper->createElement( xParentNode, NEW_ELEMENT ); } catch ( Exception& ) @@ -547,7 +547,7 @@ namespace svxform } else { - nResId = RID_STR_DATANAV_ADD_ATTRIBUTE; + pResId = RID_STR_DATANAV_ADD_ATTRIBUTE; bIsElement = false; eType = DITAttribute; try @@ -605,7 +605,7 @@ namespace svxform { try { - nResId = RID_STR_DATANAV_ADD_BINDING; + pResId = RID_STR_DATANAV_ADD_BINDING; xNewBinding = xModel->createBinding(); Reference< XSet > xBindings( xModel->getBindings(), UNO_QUERY ); xBindings->insert( makeAny( xNewBinding ) ); @@ -619,7 +619,7 @@ namespace svxform } ScopedVclPtrInstance< AddDataItemDialog > aDlg( this, pNode, m_xUIHelper ); - aDlg->SetText( SvxResId( nResId ) ); + aDlg->SetText( SvxResId( pResId ) ); aDlg->InitText( eType ); short nReturn = aDlg->Execute(); if ( DGTInstance == m_eGroup ) @@ -693,7 +693,7 @@ namespace svxform ScopedVclPtrInstance< AddDataItemDialog > aDlg( this, pNode, m_xUIHelper ); DataItemType eType = DITElement; - sal_uInt16 nResId = RID_STR_DATANAV_EDIT_ELEMENT; + const char* pResId = RID_STR_DATANAV_EDIT_ELEMENT; if ( pNode && pNode->m_xNode.is() ) { try @@ -701,7 +701,7 @@ namespace svxform css::xml::dom::NodeType eChildType = pNode->m_xNode->getNodeType(); if ( eChildType == css::xml::dom::NodeType_ATTRIBUTE_NODE ) { - nResId = RID_STR_DATANAV_EDIT_ATTRIBUTE; + pResId = RID_STR_DATANAV_EDIT_ATTRIBUTE; eType = DITAttribute; } } @@ -712,10 +712,10 @@ namespace svxform } else if ( DGTBinding == m_eGroup ) { - nResId = RID_STR_DATANAV_EDIT_BINDING; + pResId = RID_STR_DATANAV_EDIT_BINDING; eType = DITBinding; } - aDlg->SetText( SvxResId( nResId ) ); + aDlg->SetText( SvxResId( pResId ) ); aDlg->InitText( eType ); if ( aDlg->Execute() == RET_OK ) { @@ -951,9 +951,9 @@ namespace svxform DBG_ASSERT( pNode->m_xNode.is(), "XFormsPage::RemoveEntry(): no XNode" ); css::xml::dom::NodeType eChildType = pNode->m_xNode->getNodeType(); bool bIsElement = ( eChildType == css::xml::dom::NodeType_ELEMENT_NODE ); - sal_uInt16 nResId = bIsElement ? RID_STR_QRY_REMOVE_ELEMENT : RID_STR_QRY_REMOVE_ATTRIBUTE; + const char* pResId = bIsElement ? RID_STR_QRY_REMOVE_ELEMENT : RID_STR_QRY_REMOVE_ATTRIBUTE; OUString sVar = bIsElement ? OUString(ELEMENTNAME) : OUString(ATTRIBUTENAME); - ScopedVclPtrInstance< MessageDialog > aQBox(this, SvxResId(nResId), VclMessageType::Question, VclButtonsType::YesNo); + ScopedVclPtrInstance< MessageDialog > aQBox(this, SvxResId(pResId), VclMessageType::Question, VclButtonsType::YesNo); OUString sMessText = aQBox->get_primary_text(); sMessText = sMessText.replaceFirst( sVar, m_xUIHelper->getNodeDisplayName( pNode->m_xNode, false ) ); @@ -983,7 +983,7 @@ namespace svxform { DBG_ASSERT( pNode->m_xPropSet.is(), "XFormsPage::RemoveEntry(): no propset" ); bool bSubmission = ( DGTSubmission == m_eGroup ); - sal_uInt16 nResId = bSubmission ? RID_STR_QRY_REMOVE_SUBMISSION : RID_STR_QRY_REMOVE_BINDING; + const char* pResId = bSubmission ? RID_STR_QRY_REMOVE_SUBMISSION : RID_STR_QRY_REMOVE_BINDING; OUString sProperty = bSubmission ? OUString(PN_SUBMISSION_ID) : OUString(PN_BINDING_ID); OUString sSearch = bSubmission ? OUString(SUBMISSIONNAME) : OUString(BINDINGNAME); OUString sName; @@ -995,7 +995,7 @@ namespace svxform { SAL_WARN( "svx.form", "XFormsPage::RemoveEntry(): exception caught" ); } - ScopedVclPtrInstance<MessageDialog> aQBox(this, SvxResId(nResId), + ScopedVclPtrInstance<MessageDialog> aQBox(this, SvxResId(pResId), VclMessageType::Question, VclButtonsType::YesNo); OUString sMessText = aQBox->get_primary_text(); sMessText = sMessText.replaceFirst( sSearch, sName); @@ -1314,8 +1314,8 @@ namespace svxform } if ( DGTInstance == m_eGroup ) { - sal_uInt16 nResId1 = RID_STR_DATANAV_EDIT_ELEMENT; - sal_uInt16 nResId2 = RID_STR_DATANAV_REMOVE_ELEMENT; + const char* pResId1 = RID_STR_DATANAV_EDIT_ELEMENT; + const char* pResId2 = RID_STR_DATANAV_REMOVE_ELEMENT; if ( pEntry ) { ItemNode* pNode = static_cast< ItemNode* >( pEntry->GetUserData() ); @@ -1326,8 +1326,8 @@ namespace svxform css::xml::dom::NodeType eChildType = pNode->m_xNode->getNodeType(); if ( eChildType == css::xml::dom::NodeType_ATTRIBUTE_NODE ) { - nResId1 = RID_STR_DATANAV_EDIT_ATTRIBUTE; - nResId2 = RID_STR_DATANAV_REMOVE_ATTRIBUTE; + pResId1 = RID_STR_DATANAV_EDIT_ATTRIBUTE; + pResId2 = RID_STR_DATANAV_REMOVE_ATTRIBUTE; } } catch ( Exception& ) @@ -1336,12 +1336,12 @@ namespace svxform } } } - m_pToolBox->SetItemText( m_nEditId, SvxResId( nResId1 ) ); - m_pToolBox->SetItemText( m_nRemoveId, SvxResId( nResId2 ) ); + m_pToolBox->SetItemText( m_nEditId, SvxResId( pResId1 ) ); + m_pToolBox->SetItemText( m_nRemoveId, SvxResId( pResId2 ) ); if ( _pMenu ) { - _pMenu->SetItemText(_pMenu->GetItemId("edit"), SvxResId( nResId1 ) ); - _pMenu->SetItemText(_pMenu->GetItemId("delete"), SvxResId( nResId2 ) ); + _pMenu->SetItemText(_pMenu->GetItemId("edit"), SvxResId( pResId1 ) ); + _pMenu->SetItemText(_pMenu->GetItemId("delete"), SvxResId( pResId2 ) ); } } } @@ -3354,8 +3354,8 @@ namespace svxform m_pURLED->DisableHistory(); m_pFilePickerBtn->SetClickHdl( LINK( this, AddInstanceDialog, FilePickerHdl ) ); - // load the filter name from fps_office resource - m_sAllFilterName = ResId(STR_FILTERNAME_ALL, *ResMgr::CreateResMgr("fps_office")); + // load the filter name from fps resource + m_sAllFilterName = Translate::get(STR_FILTERNAME_ALL, Translate::Create("fps", Application::GetSettings().GetUILanguageTag())); } AddInstanceDialog::~AddInstanceDialog() diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src deleted file mode 100644 index cca33a4c7bf1..000000000000 --- a/svx/source/form/datanavi.src +++ /dev/null @@ -1,209 +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 "svx/dialogs.hrc" -#include "svx/fmresids.hrc" -#include "fmhelp.hrc" - -String RID_STR_QRY_REMOVE_MODEL -{ - Text [ en-US ] = "Deleting the model '$MODELNAME' affects all controls currently bound to this model.\nDo you really want to delete this model?" ; -}; - -String RID_STR_QRY_REMOVE_INSTANCE -{ - Text [ en-US ] = "Deleting the instance '$INSTANCENAME' affects all controls currently bound to this instance.\nDo you really want to delete this instance?" ; -}; - -String RID_STR_QRY_REMOVE_ELEMENT -{ - Text [ en-US ] = "Deleting the element '$ELEMENTNAME' affects all controls currently bound to this element.\nDo you really want to delete this element?" ; -}; - -String RID_STR_QRY_REMOVE_ATTRIBUTE -{ - Text [ en-US ] = "Do you really want to delete the attribute '$ATTRIBUTENAME'?" ; -}; - -String RID_STR_QRY_REMOVE_SUBMISSION -{ - Text [ en-US ] = "Deleting the submission '$SUBMISSIONNAME' affects all controls currently bound to this submission.\n\nDo you really want to delete this submission?" ; -}; - -String RID_STR_QRY_REMOVE_BINDING -{ - Text [ en-US ] = "Deleting the binding '$BINDINGNAME' affects all controls currently bound to this binding.\n\nDo you really want to delete this binding?" ; -}; - -String RID_STR_INVALID_XMLNAME -{ - Text [ en-US ] = "The name '%1' is not valid in XML. Please enter a different name." ; -}; - -String RID_STR_INVALID_XMLPREFIX -{ - Text [ en-US ] = "The prefix '%1' is not valid in XML. Please enter a different prefix." ; -}; - -String RID_STR_DOUBLE_MODELNAME -{ - Text [ en-US ] = "The name '%1' already exists. Please enter a new name." ; -}; - -String RID_STR_EMPTY_SUBMISSIONNAME -{ - Text [ en-US ] = "The submission must have a name." ; -}; - -String RID_STR_METHOD_POST -{ - Text [ en-US ] = "Post" ; -}; - -String RID_STR_METHOD_PUT -{ - Text [ en-US ] = "Put" ; -}; - -String RID_STR_METHOD_GET -{ - Text [ en-US ] = "Get" ; -}; - -String RID_STR_REPLACE_NONE -{ - Text [ en-US ] = "None" ; -}; - -String RID_STR_REPLACE_INST -{ - Text [ en-US ] = "Instance" ; -}; - -String RID_STR_REPLACE_DOC -{ - Text [ en-US ] = "Document" ; -}; - -String RID_STR_DATANAV_SUBM_BIND -{ - Text [ en-US ] = "Binding: " ; -}; - -String RID_STR_DATANAV_SUBM_REF -{ - Text [ en-US ] = "Reference: " ; -}; - -String RID_STR_DATANAV_SUBM_ACTION -{ - Text [ en-US ] = "Action: " ; -}; - -String RID_STR_DATANAV_SUBM_METHOD -{ - Text [ en-US ] = "Method: " ; -}; - -String RID_STR_DATANAV_SUBM_REPLACE -{ - Text [ en-US ] = "Replace: " ; -}; - -String RID_STR_DATANAV_ADD_ELEMENT -{ - Text [ en-US ] = "Add Element" ; -}; - -String RID_STR_DATANAV_EDIT_ELEMENT -{ - Text [ en-US ] = "Edit Element" ; -}; - -String RID_STR_DATANAV_REMOVE_ELEMENT -{ - Text [ en-US ] = "Delete Element" ; -}; - -String RID_STR_DATANAV_ADD_ATTRIBUTE -{ - Text [ en-US ] = "Add Attribute" ; -}; - -String RID_STR_DATANAV_EDIT_ATTRIBUTE -{ - Text [ en-US ] = "Edit Attribute" ; -}; - -String RID_STR_DATANAV_REMOVE_ATTRIBUTE -{ - Text [ en-US ] = "Delete Attribute" ; -}; - -String RID_STR_DATANAV_ADD_BINDING -{ - Text [ en-US ] = "Add Binding" ; -}; - -String RID_STR_DATANAV_EDIT_BINDING -{ - Text [ en-US ] = "Edit Binding" ; -}; - -String RID_STR_DATANAV_REMOVE_BINDING -{ - Text [ en-US ] = "Delete Binding" ; -}; - -String RID_STR_DATANAV_ADD_SUBMISSION -{ - Text [ en-US ] = "Add Submission" ; -}; - -String RID_STR_DATANAV_EDIT_SUBMISSION -{ - Text [ en-US ] = "Edit Submission" ; -}; - -String RID_STR_DATANAV_REMOVE_SUBMISSION -{ - Text [ en-US ] = "Delete Submission" ; -}; - -String RID_STR_ELEMENT -{ - Text [ en-US ] = "Element" ; -}; - -String RID_STR_ATTRIBUTE -{ - Text [ en-US ] = "Attribute" ; -}; - -String RID_STR_BINDING -{ - Text [ en-US ] = "Binding" ; -}; - -String RID_STR_BINDING_EXPR -{ - Text [ en-US ] = "Binding expression" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index e6a855e860d4..3eb21268652d 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -23,7 +23,7 @@ #include "fmhelp.hrc" #include "fmitems.hxx" #include "fmprop.hrc" -#include "svx/fmresids.hrc" +#include <svx/strings.hrc> #include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/awt/XControl.hpp> diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 93f7c5bd2339..c0611b084cd9 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -23,7 +23,7 @@ #include "fmhelp.hrc" #include "fmprop.hrc" #include "fmPropBrw.hxx" -#include "svx/fmresids.hrc" +#include "svx/strings.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" #include "fmpgeimp.hxx" @@ -104,7 +104,7 @@ const long STD_MIN_SIZE_Y = 250; OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) { - sal_uInt16 nClassNameResourceId = 0; + const char* pClassNameResourceId = nullptr; switch ( nClassId ) { @@ -112,12 +112,12 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) { Reference< XInterface > xIFace; aUnoObj >>= xIFace; - nClassNameResourceId = RID_STR_PROPTITLE_EDIT; + pClassNameResourceId = RID_STR_PROPTITLE_EDIT; if (xIFace.is()) { // we have a chance to check if it's a formatted field model Reference< XServiceInfo > xInfo(xIFace, UNO_QUERY); if (xInfo.is() && (xInfo->supportsService(FM_SUN_COMPONENT_FORMATTEDFIELD))) - nClassNameResourceId = RID_STR_PROPTITLE_FORMATTED; + pClassNameResourceId = RID_STR_PROPTITLE_FORMATTED; else if (!xInfo.is()) { // couldn't distinguish between formatted and edit with the service name, so try with the properties @@ -126,7 +126,7 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) { Reference< XPropertySetInfo > xPropsInfo = xProps->getPropertySetInfo(); if (xPropsInfo.is() && xPropsInfo->hasPropertyByName(FM_PROP_FORMATSSUPPLIER)) - nClassNameResourceId = RID_STR_PROPTITLE_FORMATTED; + pClassNameResourceId = RID_STR_PROPTITLE_FORMATTED; } } } @@ -134,51 +134,51 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) break; case FormComponentType::COMMANDBUTTON: - nClassNameResourceId = RID_STR_PROPTITLE_PUSHBUTTON; break; + pClassNameResourceId = RID_STR_PROPTITLE_PUSHBUTTON; break; case FormComponentType::RADIOBUTTON: - nClassNameResourceId = RID_STR_PROPTITLE_RADIOBUTTON; break; + pClassNameResourceId = RID_STR_PROPTITLE_RADIOBUTTON; break; case FormComponentType::CHECKBOX: - nClassNameResourceId = RID_STR_PROPTITLE_CHECKBOX; break; + pClassNameResourceId = RID_STR_PROPTITLE_CHECKBOX; break; case FormComponentType::LISTBOX: - nClassNameResourceId = RID_STR_PROPTITLE_LISTBOX; break; + pClassNameResourceId = RID_STR_PROPTITLE_LISTBOX; break; case FormComponentType::COMBOBOX: - nClassNameResourceId = RID_STR_PROPTITLE_COMBOBOX; break; + pClassNameResourceId = RID_STR_PROPTITLE_COMBOBOX; break; case FormComponentType::GROUPBOX: - nClassNameResourceId = RID_STR_PROPTITLE_GROUPBOX; break; + pClassNameResourceId = RID_STR_PROPTITLE_GROUPBOX; break; case FormComponentType::IMAGEBUTTON: - nClassNameResourceId = RID_STR_PROPTITLE_IMAGEBUTTON; break; + pClassNameResourceId = RID_STR_PROPTITLE_IMAGEBUTTON; break; case FormComponentType::FIXEDTEXT: - nClassNameResourceId = RID_STR_PROPTITLE_FIXEDTEXT; break; + pClassNameResourceId = RID_STR_PROPTITLE_FIXEDTEXT; break; case FormComponentType::GRIDCONTROL: - nClassNameResourceId = RID_STR_PROPTITLE_DBGRID; break; + pClassNameResourceId = RID_STR_PROPTITLE_DBGRID; break; case FormComponentType::FILECONTROL: - nClassNameResourceId = RID_STR_PROPTITLE_FILECONTROL; break; + pClassNameResourceId = RID_STR_PROPTITLE_FILECONTROL; break; case FormComponentType::DATEFIELD: - nClassNameResourceId = RID_STR_PROPTITLE_DATEFIELD; break; + pClassNameResourceId = RID_STR_PROPTITLE_DATEFIELD; break; case FormComponentType::TIMEFIELD: - nClassNameResourceId = RID_STR_PROPTITLE_TIMEFIELD; break; + pClassNameResourceId = RID_STR_PROPTITLE_TIMEFIELD; break; case FormComponentType::NUMERICFIELD: - nClassNameResourceId = RID_STR_PROPTITLE_NUMERICFIELD; break; + pClassNameResourceId = RID_STR_PROPTITLE_NUMERICFIELD; break; case FormComponentType::CURRENCYFIELD: - nClassNameResourceId = RID_STR_PROPTITLE_CURRENCYFIELD; break; + pClassNameResourceId = RID_STR_PROPTITLE_CURRENCYFIELD; break; case FormComponentType::PATTERNFIELD: - nClassNameResourceId = RID_STR_PROPTITLE_PATTERNFIELD; break; + pClassNameResourceId = RID_STR_PROPTITLE_PATTERNFIELD; break; case FormComponentType::IMAGECONTROL: - nClassNameResourceId = RID_STR_PROPTITLE_IMAGECONTROL; break; + pClassNameResourceId = RID_STR_PROPTITLE_IMAGECONTROL; break; case FormComponentType::HIDDENCONTROL: - nClassNameResourceId = RID_STR_PROPTITLE_HIDDEN; break; + pClassNameResourceId = RID_STR_PROPTITLE_HIDDEN; break; case FormComponentType::SCROLLBAR: - nClassNameResourceId = RID_STR_PROPTITLE_SCROLLBAR; break; + pClassNameResourceId = RID_STR_PROPTITLE_SCROLLBAR; break; case FormComponentType::SPINBUTTON: - nClassNameResourceId = RID_STR_PROPTITLE_SPINBUTTON; break; + pClassNameResourceId = RID_STR_PROPTITLE_SPINBUTTON; break; case FormComponentType::NAVIGATIONBAR: - nClassNameResourceId = RID_STR_PROPTITLE_NAVBAR; break; + pClassNameResourceId = RID_STR_PROPTITLE_NAVBAR; break; case FormComponentType::CONTROL: default: - nClassNameResourceId = RID_STR_CONTROL; break; + pClassNameResourceId = RID_STR_CONTROL; break; } - return SvxResId(nClassNameResourceId); + return SvxResId(pClassNameResourceId); } FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* _pBindings, diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 39be171835b2..5d0b439e6fd4 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -18,7 +18,7 @@ */ -#include "svx/fmresids.hrc" +#include <svx/strings.hrc> #include "fmexpl.hxx" #include "fmhelp.hrc" diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index acb25f5758b9..a792f3919b53 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -21,7 +21,6 @@ #include "fmprop.hrc" #include "fmvwimp.hxx" #include "fmpgeimp.hxx" -#include "svx/fmresids.hrc" #include "svx/fmview.hxx" #include "svx/fmglob.hxx" #include "svx/fmpage.hxx" diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 8755138a576d..924010787f16 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -35,9 +35,7 @@ #include <svx/svxids.hrc> #include "tbxform.hxx" -#include <tools/resid.hxx> -#include "svx/fmresids.hrc" #include <svx/dialmgr.hxx> #include "tabwin.hxx" #include "fmexpl.hxx" diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 394dd5a863a0..ef2c1d7a0fd9 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -26,7 +26,6 @@ #include "fmobj.hxx" -#include <svx/fmresids.hrc> #include <svx/dialmgr.hxx> #include "fmpgeimp.hxx" diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 3da638ebcc24..cd579f0fe24a 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -27,7 +27,7 @@ #include "fmobj.hxx" #include "formcontrolfactory.hxx" #include "svx/svditer.hxx" -#include "svx/fmresids.hrc" +#include "svx/strings.hrc" #include "treevisitor.hxx" #include <com/sun/star/sdb/CommandType.hpp> @@ -39,7 +39,6 @@ #include <svx/fmglob.hxx> #include <svx/fmpage.hxx> #include <svx/fmmodel.hxx> -#include <tools/resid.hxx> #include <tools/diagnose_ex.h> #include <vcl/stdtext.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 1d6e48f2ebdf..5d700e69a4d6 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -55,7 +55,6 @@ #include <svx/svxids.hrc> -#include "svx/fmresids.hrc" #include "fmexch.hxx" #include <svx/fmglob.hxx> #include <svl/eitem.hxx> @@ -77,7 +76,7 @@ #include "formtoolbars.hxx" #include <svx/svxdlg.hxx> -#include <svx/dialogs.hrc> +#include <svx/strings.hrc> #include "svx/sdrobjectfilter.hxx" diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 0e285474c6ad..d463f66b8ffc 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -24,7 +24,6 @@ #include "fmpgeimp.hxx" #include "svx/fmtools.hxx" #include "fmprop.hrc" -#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" #include "fmtextcontrolshell.hxx" @@ -35,7 +34,7 @@ #include "gridcols.hxx" #include "svx/svditer.hxx" #include "svx/dialmgr.hxx" -#include "svx/dialogs.hrc" +#include "svx/strings.hrc" #include "svx/fmglob.hxx" #include "svx/fmmodel.hxx" #include "svx/fmpage.hxx" diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index cbcc635a3296..cd5e94199c46 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -19,7 +19,6 @@ #include <rtl/strbuf.hxx> -#include "svx/fmresids.hrc" #include "svx/fmtools.hxx" #include "svx/fmsrccfg.hxx" #include <tools/debug.hxx> diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src deleted file mode 100644 index f2b0f1e2963e..000000000000 --- a/svx/source/form/fmstring.src +++ /dev/null @@ -1,366 +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 "svx/fmresids.hrc" -/* Strings for translation */ -String RID_ERR_FIELDREQUIRED -{ - Text [ en-US ] = "Input required in field '#'. Please enter a value."; -}; -String RID_STR_FORMS -{ - Text [ en-US ] = "Forms"; -}; -String RID_STR_NO_PROPERTIES -{ - Text [ en-US ] = "No control selected"; -}; -String RID_STR_PROPERTIES_CONTROL -{ - Text [ en-US ] = "Properties: "; -}; -String RID_STR_PROPERTIES_FORM -{ - Text [ en-US ] = "Form Properties"; -}; -String RID_STR_FMEXPLORER -{ - Text [ en-US ] = "Form Navigator"; -}; -String RID_STR_FORM -{ - Text [ en-US ] = "Form"; -}; -StringArray RID_RSC_TABWIN_PREFIX -{ - ItemList [ en-US ] = - { - < "Table"; >; - < "Query"; >; - < "SQL"; >; - }; -}; -String RID_STR_STDFORMNAME -{ - Text [ en-US ]= "Form"; -}; -String RID_STR_PROPTITLE_HIDDEN -{ - Text [ en-US ] = "Hidden Control"; -}; -String RID_STR_CONTROL -{ - Text [ en-US ] = "Control"; -}; -String RID_STR_REC_TEXT -{ - Text [ en-US ] = "Record"; -}; -String RID_STR_REC_FROM_TEXT -{ - Text [ en-US ] = "of"; -}; -String RID_STR_FIELDSELECTION -{ - Text [ en-US ] = "Add field:"; -}; -String RID_STR_WRITEERROR -{ - Text [ en-US ] = "Error writing data to database"; -}; - -String RID_STR_SYNTAXERROR -{ - Text [ en-US ] = "Syntax error in query expression"; -}; - -String RID_STR_DELETECONFIRM_RECORD -{ - Text [ en-US ] = "You intend to delete 1 record."; -}; -String RID_STR_DELETECONFIRM_RECORDS -{ - Text [ en-US ] = "# records will be deleted."; -}; -String RID_STR_DELETECONFIRM -{ - Text [ en-US ] = "If you click Yes, you won't be able to undo this operation.\nDo you want to continue anyway?"; -}; - -String RID_STR_NAVIGATIONBAR -{ - Text [ en-US ] = "Navigation bar"; -}; -String RID_STR_COLUMN -{ - Text [ en-US ] = "Col"; -}; -String RID_STR_UNDO_PROPERTY -{ - Text [ en-US ] = "Set property '#'"; -}; -String RID_STR_UNDO_CONTAINER_INSERT -{ - Text [ en-US ] = "Insert in container"; -}; -String RID_STR_UNDO_CONTAINER_REMOVE -{ - Text [ en-US ] = "Delete #"; -}; -String RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE -{ - Text [ en-US ] = "Delete # objects"; -}; -String RID_STR_UNDO_CONTAINER_REPLACE -{ - Text [ en-US ] = "Replace a container element"; -}; -String RID_STR_UNDO_MODEL_REPLACE -{ - Text [ en-US ] = "Replace Control"; -}; -String RID_STR_PROPTITLE_PUSHBUTTON -{ - Text [ en-US ] = "Push Button"; -}; -String RID_STR_PROPTITLE_RADIOBUTTON -{ - Text [ en-US ] = "Option Button"; -}; -String RID_STR_PROPTITLE_CHECKBOX -{ - Text [ en-US ] = "Check Box"; -}; -String RID_STR_PROPTITLE_FIXEDTEXT -{ - Text [ en-US ] = "Label Field"; -}; -String RID_STR_PROPTITLE_GROUPBOX -{ - Text [ en-US ] = "Group Box"; -}; -String RID_STR_PROPTITLE_EDIT -{ - Text [ en-US ] = "Text Box"; -}; -String RID_STR_PROPTITLE_FORMATTED -{ - Text [ en-US ] = "Formatted Field"; -}; -String RID_STR_PROPTITLE_LISTBOX -{ - Text [ en-US ] = "List Box"; -}; -String RID_STR_PROPTITLE_COMBOBOX -{ - Text [ en-US ] = "Combo Box"; -}; -String RID_STR_PROPTITLE_IMAGEBUTTON -{ - Text [ en-US ] = "Image Button"; -}; -String RID_STR_PROPTITLE_IMAGECONTROL -{ - Text [ en-US ] = "Image Control"; -}; -String RID_STR_PROPTITLE_FILECONTROL -{ - Text [ en-US ] = "File Selection"; -}; -String RID_STR_PROPTITLE_DATEFIELD -{ - Text [ en-US ] = "Date Field"; -}; -String RID_STR_PROPTITLE_TIMEFIELD -{ - Text [ en-US ] = "Time Field"; -}; -String RID_STR_PROPTITLE_NUMERICFIELD -{ - Text [ en-US ] = "Numeric Field"; -}; -String RID_STR_PROPTITLE_CURRENCYFIELD -{ - Text [ en-US ] = "Currency Field"; -}; -String RID_STR_PROPTITLE_PATTERNFIELD -{ - Text [ en-US ] = "Pattern Field"; -}; -String RID_STR_PROPTITLE_DBGRID -{ - Text [ en-US ] = "Table Control "; -}; -String RID_STR_PROPTITLE_SCROLLBAR -{ - Text [ en-US ] = "Scrollbar"; -}; -String RID_STR_PROPTITLE_SPINBUTTON -{ - Text [ en-US ] = "Spin Button"; -}; -String RID_STR_PROPTITLE_NAVBAR -{ - Text [ en-US ] = "Navigation Bar"; -}; -String RID_STR_PROPTITLE_MULTISELECT -{ - Text [ en-US ] = "Multiselection"; -}; -String RID_STR_NODATACONTROLS -{ - Text [ en-US ] = "No data-related controls in the current form!"; -}; -String RID_STR_POSTFIX_DATE -{ - Text [ en-US ] = " (Date)"; -}; -String RID_STR_POSTFIX_TIME -{ - Text [ en-US ] = " (Time)"; -}; -String RID_STR_FILTER_NAVIGATOR -{ - Text [ en-US ] = "Filter navigator"; -}; - -String RID_STR_FILTER_FILTER_FOR -{ - Text [ en-US ] = "Filter for"; -}; - -String RID_STR_FILTER_FILTER_OR -{ - Text [ en-US ] = "Or"; -}; - -String RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY -{ - Text [ en-US ] = "Valid bound controls which can be used in the table view do not exist in the current form."; -}; -String RID_STR_AUTOFIELD -{ - Text [ en-US ] = "<AutoField>"; -}; - -StringArray RID_RSC_SQL_INTERNATIONAL -{ - ItemList [ en-US ] = - { - < "LIKE"; >; - < "NOT"; >; - < "EMPTY"; >; - < "TRUE"; >; - < "FALSE"; >; - < "IS"; >; - < "BETWEEN"; >; - < "OR"; >; - < "AND"; >; - < "Average"; >; - < "Count"; >; - < "Maximum"; >; - < "Minimum"; >; - < "Sum"; >; - < "Every"; >; - < "Any"; >; - < "Some"; >; - < "STDDEV_POP"; >; - < "STDDEV_SAMP"; >; - < "VAR_SAMP"; >; - < "VAR_POP"; >; - < "Collect"; >; - < "Fusion"; >; - < "Intersection"; >; - }; -}; - -String RID_STR_SVT_SQL_SYNTAX_ERROR -{ - Text [ en-US ] = "Syntax error in SQL statement"; -}; - -String RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE -{ - Text [ en-US ] = "The value #1 cannot be used with LIKE."; -}; - -String RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE -{ - Text [ en-US ] = "LIKE cannot be used with this field."; -}; - -String RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID -{ - Text [ en-US ] = "The value entered is not a valid date. Please enter a date in a valid format, for example, MM/DD/YY."; -}; - -String RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID -{ - Text [ en-US ] = "The field cannot be compared with an integer."; -}; -String RID_STR_SVT_SQL_SYNTAX_TABLE -{ - Text [ en-US ] = "The database does not contain a table named \"#\"."; -}; -String RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY -{ - Text [ en-US ] = "The database does contain neither a table nor a query named \"#\"."; -}; -String RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS -{ - Text [ en-US ] = "The database already contains a table or view with name \"#\"."; -}; -String RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS -{ - Text [ en-US ] = "The database already contains a query with name \"#\"."; -}; -String RID_STR_SVT_SQL_SYNTAX_COLUMN -{ - Text [ en-US ] = "The column \"#1\" is unknown in the table \"#2\"."; -}; -String RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID -{ - Text [ en-US ] = "The field cannot be compared with a floating point number."; -}; - -String RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE -{ - Text [ en-US ] = "The entered criterion cannot be compared with this field."; -}; - -String RID_STR_DATANAVIGATOR -{ - Text [ en-US ] = "Data Navigator"; -}; - -String RID_STR_READONLY_VIEW -{ - Text [ en-US ] = " (read-only)"; -}; - -String RID_STR_ALREADYEXISTOVERWRITE -{ - Text [ en-US ] = "The file already exists. Overwrite?" ; -}; -String RID_STR_OBJECT_LABEL -{ - Text [ en-US ] = "#object# label"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index 2a8580e6827b..e2b298b99728 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -20,6 +20,7 @@ #include "fmtextcontroldialogs.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> +#include <svx/strings.hrc> #include <editeng/eeitem.hxx> diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 9d742c2f600b..5d71b38977f6 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -19,7 +19,6 @@ #include "fmprop.hrc" -#include "svx/fmresids.hrc" #include "fmtextcontroldialogs.hxx" #include "fmtextcontrolfeature.hxx" #include "fmtextcontrolshell.hxx" diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index dd149236bfe3..7e3bd870fe77 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -27,7 +27,7 @@ #include "svx/svditer.hxx" #include "fmobj.hxx" #include "fmprop.hrc" -#include "svx/fmresids.hrc" +#include "svx/strings.hrc" #include "svx/fmglob.hxx" #include "svx/dialmgr.hxx" #include "svx/fmmodel.hxx" diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 019419d204cd..029f2d6cc708 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -23,7 +23,7 @@ #include "fmobj.hxx" #include "fmpgeimp.hxx" #include "fmprop.hrc" -#include "svx/fmresids.hrc" +#include "svx/strings.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" #include "svx/fmtools.hxx" diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 8224dcc6b79a..728166409e43 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -21,7 +21,7 @@ #include "formcontrolfactory.hxx" #include "fmcontrollayout.hxx" #include "fmprop.hrc" -#include "svx/fmresids.hrc" +#include "svx/strings.hrc" #include "fmservs.hxx" #include "svx/dialmgr.hxx" #include "svx/svdouno.hxx" @@ -464,18 +464,18 @@ namespace svxform OUString sInitialLabel; OSL_VERIFY( _rxControlModel->getPropertyValue( FM_PROP_NAME ) >>= sInitialLabel ); - sal_uInt16 nTitleResId = 0; + const char* pTitleResId = nullptr; switch ( nClassId ) { - case FormComponentType::COMMANDBUTTON: nTitleResId = RID_STR_PROPTITLE_PUSHBUTTON; break; - case FormComponentType::RADIOBUTTON: nTitleResId = RID_STR_PROPTITLE_RADIOBUTTON; break; - case FormComponentType::CHECKBOX: nTitleResId = RID_STR_PROPTITLE_CHECKBOX; break; - case FormComponentType::GROUPBOX: nTitleResId = RID_STR_PROPTITLE_GROUPBOX; break; - case FormComponentType::FIXEDTEXT: nTitleResId = RID_STR_PROPTITLE_FIXEDTEXT; break; + case FormComponentType::COMMANDBUTTON: pTitleResId = RID_STR_PROPTITLE_PUSHBUTTON; break; + case FormComponentType::RADIOBUTTON: pTitleResId = RID_STR_PROPTITLE_RADIOBUTTON; break; + case FormComponentType::CHECKBOX: pTitleResId = RID_STR_PROPTITLE_CHECKBOX; break; + case FormComponentType::GROUPBOX: pTitleResId = RID_STR_PROPTITLE_GROUPBOX; break; + case FormComponentType::FIXEDTEXT: pTitleResId = RID_STR_PROPTITLE_FIXEDTEXT; break; } - if ( nTitleResId ) - sInitialLabel = SvxResId(nTitleResId); + if (pTitleResId) + sInitialLabel = SvxResId(pTitleResId); _rxControlModel->setPropertyValue( FM_PROP_LABEL, @@ -644,42 +644,42 @@ namespace svxform OUString FormControlFactory::getDefaultName( sal_Int16 _nClassId, const Reference< XServiceInfo >& _rxObject ) { - sal_uInt16 nResId(0); + const char* pResId(nullptr); switch ( _nClassId ) { - case FormComponentType::COMMANDBUTTON: nResId = RID_STR_PROPTITLE_PUSHBUTTON; break; - case FormComponentType::RADIOBUTTON: nResId = RID_STR_PROPTITLE_RADIOBUTTON; break; - case FormComponentType::CHECKBOX: nResId = RID_STR_PROPTITLE_CHECKBOX; break; - case FormComponentType::LISTBOX: nResId = RID_STR_PROPTITLE_LISTBOX; break; - case FormComponentType::COMBOBOX: nResId = RID_STR_PROPTITLE_COMBOBOX; break; - case FormComponentType::GROUPBOX: nResId = RID_STR_PROPTITLE_GROUPBOX; break; - case FormComponentType::IMAGEBUTTON: nResId = RID_STR_PROPTITLE_IMAGEBUTTON; break; - case FormComponentType::FIXEDTEXT: nResId = RID_STR_PROPTITLE_FIXEDTEXT; break; - case FormComponentType::GRIDCONTROL: nResId = RID_STR_PROPTITLE_DBGRID; break; - case FormComponentType::FILECONTROL: nResId = RID_STR_PROPTITLE_FILECONTROL; break; - case FormComponentType::DATEFIELD: nResId = RID_STR_PROPTITLE_DATEFIELD; break; - case FormComponentType::TIMEFIELD: nResId = RID_STR_PROPTITLE_TIMEFIELD; break; - case FormComponentType::NUMERICFIELD: nResId = RID_STR_PROPTITLE_NUMERICFIELD; break; - case FormComponentType::CURRENCYFIELD: nResId = RID_STR_PROPTITLE_CURRENCYFIELD; break; - case FormComponentType::PATTERNFIELD: nResId = RID_STR_PROPTITLE_PATTERNFIELD; break; - case FormComponentType::IMAGECONTROL: nResId = RID_STR_PROPTITLE_IMAGECONTROL; break; - case FormComponentType::HIDDENCONTROL: nResId = RID_STR_PROPTITLE_HIDDEN; break; - case FormComponentType::SCROLLBAR: nResId = RID_STR_PROPTITLE_SCROLLBAR; break; - case FormComponentType::SPINBUTTON: nResId = RID_STR_PROPTITLE_SPINBUTTON; break; - case FormComponentType::NAVIGATIONBAR: nResId = RID_STR_PROPTITLE_NAVBAR; break; + case FormComponentType::COMMANDBUTTON: pResId = RID_STR_PROPTITLE_PUSHBUTTON; break; + case FormComponentType::RADIOBUTTON: pResId = RID_STR_PROPTITLE_RADIOBUTTON; break; + case FormComponentType::CHECKBOX: pResId = RID_STR_PROPTITLE_CHECKBOX; break; + case FormComponentType::LISTBOX: pResId = RID_STR_PROPTITLE_LISTBOX; break; + case FormComponentType::COMBOBOX: pResId = RID_STR_PROPTITLE_COMBOBOX; break; + case FormComponentType::GROUPBOX: pResId = RID_STR_PROPTITLE_GROUPBOX; break; + case FormComponentType::IMAGEBUTTON: pResId = RID_STR_PROPTITLE_IMAGEBUTTON; break; + case FormComponentType::FIXEDTEXT: pResId = RID_STR_PROPTITLE_FIXEDTEXT; break; + case FormComponentType::GRIDCONTROL: pResId = RID_STR_PROPTITLE_DBGRID; break; + case FormComponentType::FILECONTROL: pResId = RID_STR_PROPTITLE_FILECONTROL; break; + case FormComponentType::DATEFIELD: pResId = RID_STR_PROPTITLE_DATEFIELD; break; + case FormComponentType::TIMEFIELD: pResId = RID_STR_PROPTITLE_TIMEFIELD; break; + case FormComponentType::NUMERICFIELD: pResId = RID_STR_PROPTITLE_NUMERICFIELD; break; + case FormComponentType::CURRENCYFIELD: pResId = RID_STR_PROPTITLE_CURRENCYFIELD; break; + case FormComponentType::PATTERNFIELD: pResId = RID_STR_PROPTITLE_PATTERNFIELD; break; + case FormComponentType::IMAGECONTROL: pResId = RID_STR_PROPTITLE_IMAGECONTROL; break; + case FormComponentType::HIDDENCONTROL: pResId = RID_STR_PROPTITLE_HIDDEN; break; + case FormComponentType::SCROLLBAR: pResId = RID_STR_PROPTITLE_SCROLLBAR; break; + case FormComponentType::SPINBUTTON: pResId = RID_STR_PROPTITLE_SPINBUTTON; break; + case FormComponentType::NAVIGATIONBAR: pResId = RID_STR_PROPTITLE_NAVBAR; break; case FormComponentType::TEXTFIELD: - nResId = RID_STR_PROPTITLE_EDIT; + pResId = RID_STR_PROPTITLE_EDIT; if ( _rxObject.is() && _rxObject->supportsService( FM_SUN_COMPONENT_FORMATTEDFIELD ) ) - nResId = RID_STR_PROPTITLE_FORMATTED; + pResId = RID_STR_PROPTITLE_FORMATTED; break; default: - nResId = RID_STR_CONTROL; break; + pResId = RID_STR_CONTROL; break; } - return SvxResId(nResId); + return SvxResId(pResId); } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 37e4bb1b3676..1c8baa032b56 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -26,7 +26,7 @@ #include "formcontrolling.hxx" #include "fmprop.hrc" #include "svx/dialmgr.hxx" -#include "svx/fmresids.hrc" +#include "svx/strings.hrc" #include "fmservs.hxx" #include "svx/fmtools.hxx" #include "fmurl.hxx" diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index a81783be56bd..ef6d24af1eed 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -27,7 +27,6 @@ #include "fmhelp.hrc" #include "fmexpl.hxx" -#include "svx/fmresids.hrc" #include "fmshimp.hxx" #include "fmservs.hxx" #include "fmundo.hxx" @@ -50,7 +49,7 @@ #include <svx/sdrpaintwindow.hxx> #include <svx/svxdlg.hxx> -#include <svx/dialogs.hrc> +#include <svx/strings.hrc> #include "bitmaps.hlst" #include "svtools/treelistentry.hxx" diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index f7d6d3673973..b176b61fd5bf 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -31,7 +31,7 @@ #include "fmundo.hxx" #include "fmhelp.hrc" #include "fmexpl.hxx" -#include "svx/fmresids.hrc" +#include "svx/strings.hrc" #include "fmshimp.hxx" #include "fmobj.hxx" #include <sfx2/objsh.hxx> diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index c426054fcb7c..df06fec08719 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -22,6 +22,7 @@ #include "svx/fmtools.hxx" #include "fmservs.hxx" +#include <svx/strings.hrc> #include <svx/svxids.hrc> #include <svx/dbaexchange.hxx> #include <com/sun/star/sdb/CommandType.hpp> @@ -41,7 +42,6 @@ #include "fmprop.hrc" -#include "svx/fmresids.hrc" #include <svx/dialmgr.hxx> #include <svx/svdpagv.hxx> #include <sfx2/objitem.hxx> @@ -50,8 +50,8 @@ #include <sfx2/frame.hxx> #include <svx/dataaccessdescriptor.hxx> #include "svtools/treelistentry.hxx" -#include <tools/resary.hxx> #include <vcl/settings.hxx> +#include "tabwin.hrc" const long STD_WIN_SIZE_X = 120; const long STD_WIN_SIZE_Y = 150; @@ -332,18 +332,17 @@ void FmFieldWin::UpdateContent(const css::uno::Reference< css::form::XForm > & x // set prefix OUString aPrefix; - ResStringArray aPrefixes(ResId(RID_RSC_TABWIN_PREFIX, DIALOG_MGR())); switch (m_nObjectType) { case CommandType::TABLE: - aPrefix = aPrefixes.GetString(0); + aPrefix = SvxResId(RID_RSC_TABWIN_PREFIX[0]); break; case CommandType::QUERY: - aPrefix = aPrefixes.GetString(1); + aPrefix = SvxResId(RID_RSC_TABWIN_PREFIX[1]); break; default: - aPrefix = aPrefixes.GetString(2); + aPrefix = SvxResId(RID_RSC_TABWIN_PREFIX[2]); break; } diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index b2051704ce33..90b4cae4aa74 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -30,10 +30,10 @@ #include <svx/dialmgr.hxx> -#include <svx/dialogs.hrc> +#include <svx/svxids.hrc> +#include <svx/strings.hrc> #include "svx/tbxctl.hxx" #include "tbxform.hxx" -#include "svx/fmresids.hrc" #include "fmhelp.hrc" #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> |