diff options
Diffstat (limited to 'reportdesign/source/ui/inspection')
6 files changed, 67 insertions, 418 deletions
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 3eba1fced3e4..b7eec893da1c 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -22,7 +22,7 @@ #include <comphelper/property.hxx> #include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> -#include "uistrings.hrc" +#include "strings.hxx" #include <toolkit/helper/vclunohelper.hxx> #include <unotools/syslocale.hxx> #include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp> @@ -47,8 +47,9 @@ #include "metadata.hxx" #include <vcl/svapp.hxx> #include <osl/mutex.hxx> +#include "core_resource.hxx" #include "helpids.hrc" -#include "RptResId.hrc" +#include "strings.hrc" #include "PropertyForward.hxx" namespace rptui @@ -495,13 +496,13 @@ bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutex aSeq[2] <<= aParam; aParam.Name = "Explanation"; - aParam.Value <<= OUString(ModuleRes(RID_STR_EXPLANATION)); + aParam.Value <<= RptResId(RID_STR_EXPLANATION); aSeq[3] <<= aParam; aParam.Name = "DetailLabel"; - aParam.Value <<= OUString(ModuleRes(RID_STR_DETAILLABEL)); + aParam.Value <<= RptResId(RID_STR_DETAILLABEL); aSeq[4] <<= aParam; aParam.Name = "MasterLabel"; - aParam.Value <<= OUString(ModuleRes(RID_STR_MASTERLABEL)); + aParam.Value <<= RptResId(RID_STR_MASTERLABEL); aSeq[5] <<= aParam; uno::Reference< ui::dialogs::XExecutableDialog > xDialog( diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 72ccc2b5211b..b832c74bc759 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -19,8 +19,8 @@ #include "DefaultInspection.hxx" #include <com/sun/star/ucb/AlreadyInitializedException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <RptResId.hrc> -#include "ModuleHelper.hxx" +#include <strings.hrc> +#include "core_resource.hxx" #include "helpids.hrc" #include <cppuhelper/supportsservice.hxx> #include <rtl/ustrbuf.hxx> @@ -201,7 +201,7 @@ namespace rptui const struct { const sal_Char* programmaticName; - sal_uInt16 uiNameResId; + const char* uiNameResId; OString helpId; } aCategories[] = { { "General", RID_STR_PROPPAGE_DEFAULT, HID_RPT_PROPDLG_TAB_GENERAL }, @@ -214,7 +214,7 @@ namespace rptui for ( size_t i=0; i<nCategories; ++i, ++pReturn ) { pReturn->ProgrammaticName = OUString::createFromAscii( aCategories[i].programmaticName ); - pReturn->UIName = ModuleRes( aCategories[i].uiNameResId ); + pReturn->UIName = RptResId( aCategories[i].uiNameResId ); pReturn->HelpURL = HelpIdUrl::getHelpURL( aCategories[i].helpId ); } diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index c865a1293f8b..0b409b0a5767 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -29,7 +29,7 @@ #include <comphelper/mimeconfighelper.hxx> #include <cppuhelper/supportsservice.hxx> -#include "uistrings.hrc" +#include "strings.hxx" #include "reportformula.hxx" #include <i18nutil/searchopt.hxx> @@ -69,8 +69,9 @@ #include <tools/fldunit.hxx> #include <vcl/stdtext.hxx> -#include "ModuleHelper.hxx" -#include "RptResId.hrc" +#include "core_resource.hxx" +#include "stringarray.hrc" +#include "strings.hrc" #include "RptDef.hxx" #include "UITools.hxx" @@ -668,16 +669,14 @@ beans::PropertyState SAL_CALL GeometryHandler::getPropertyState(const OUString & void GeometryHandler::implCreateListLikeControl( const uno::Reference< inspection::XPropertyControlFactory >& _rxControlFactory ,inspection::LineDescriptor & out_Descriptor - ,sal_uInt16 _nResId + ,const char** pResId ,bool _bReadOnlyControl ,bool _bTrueIfListBoxFalseIfComboBox ) { - ModuleRes aRes(_nResId); - ResStringArray aResList(aRes); std::vector<OUString> aList; - for (sal_uInt32 i = 0; i < aResList.Count(); ++i) - aList.push_back(aResList.GetString(i)); + for (const char** pItem = pResId; *pItem; ++pItem) + aList.push_back(RptResId(*pItem)); implCreateListLikeControl(_rxControlFactory, out_Descriptor, aList, _bReadOnlyControl, _bTrueIfListBoxFalseIfComboBox); } @@ -760,10 +759,10 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const case PROPERTY_ID_BACKTRANSPARENT: case PROPERTY_ID_CONTROLBACKGROUNDTRANSPARENT: { - sal_uInt16 nResId = RID_STR_BOOL; + const char** pResId = RID_STR_BOOL; if ( PROPERTY_ID_KEEPTOGETHER == nId && uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is()) - nResId = RID_STR_KEEPTOGETHER_CONST; - implCreateListLikeControl(_xControlFactory,aOut,nResId,false,true); + pResId = RID_STR_KEEPTOGETHER_CONST; + implCreateListLikeControl(_xControlFactory,aOut,pResId,false,true); } break; case PROPERTY_ID_INITIALFORMULA: @@ -928,13 +927,14 @@ beans::Property GeometryHandler::getProperty(const OUString & PropertyName) return beans::Property(); return *pFind; } -uno::Any GeometryHandler::getConstantValue(bool _bToControlValue,sal_uInt16 _nResId,const uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName ) +uno::Any GeometryHandler::getConstantValue(bool _bToControlValue,const char** pResId,const uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName ) { - ModuleRes aRes(_nResId); - ResStringArray aResList(aRes); - uno::Sequence< OUString > aSeq(aResList.Count()); - for (sal_uInt32 i = 0; i < aResList.Count(); ++i) - aSeq[i] = aResList.GetString(i); + std::vector<OUString> aList; + for (const char** pItem = pResId; *pItem; ++pItem) + aList.push_back(RptResId(*pItem)); + uno::Sequence< OUString > aSeq(aList.size()); + for (size_t i = 0; i < aList.size(); ++i) + aSeq[i] = aList[i]; uno::Reference< inspection::XStringRepresentation > xConversionHelper = inspection::StringRepresentation::createConstant( m_xContext,m_xTypeConverter,_sConstantName,aSeq); if ( _bToControlValue ) @@ -1069,16 +1069,17 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope { OUString sValue; _rControlValue >>= sValue; - ModuleRes aRes(RID_STR_TYPE_CONST); - ResStringArray aResList(aRes); + sal_uInt32 nFound(RESARRAY_INDEX_NOTFOUND); - for (sal_uInt32 i = 0; i < aResList.Count(); ++i) + sal_uInt32 i = 0; + for (const char** pItem = RID_STR_TYPE_CONST; *pItem; ++pItem) { - if (aResList.GetString(i) == sValue) + if (sValue == RptResId(*pItem)) { nFound = i; break; } + ++i; } if (nFound != RESARRAY_INDEX_NOTFOUND) aPropertyValue <<= nFound; @@ -1091,16 +1092,17 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope { OUString sValue; _rControlValue >>= sValue; - ModuleRes aRes(RID_STR_VERTICAL_ALIGN_CONST); - ResStringArray aResList(aRes); + sal_uInt32 nFound(RESARRAY_INDEX_NOTFOUND); - for (sal_uInt32 i = 0; i < aResList.Count(); ++i) + sal_uInt32 i = 0; + for (const char** pItem = RID_STR_VERTICAL_ALIGN_CONST; *pItem; ++pItem) { - if (aResList.GetString(i) == sValue) + if (sValue == RptResId(*pItem)) { nFound = i; break; } + ++i; } if (nFound != RESARRAY_INDEX_NOTFOUND) aPropertyValue <<= static_cast<style::VerticalAlignment>(nFound); @@ -1110,17 +1112,19 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope { OUString sValue; _rControlValue >>= sValue; - ModuleRes aRes(RID_STR_PARAADJUST_CONST); - ResStringArray aResList(aRes); + sal_uInt32 nFound(RESARRAY_INDEX_NOTFOUND); - for (sal_uInt32 i = 0; i < aResList.Count(); ++i) + sal_uInt32 i = 0; + for (const char** pItem = RID_STR_PARAADJUST_CONST; *pItem; ++pItem) { - if (aResList.GetString(i) == sValue) + if (sValue == RptResId(*pItem)) { nFound = i; break; } + ++i; } + if (nFound != RESARRAY_INDEX_NOTFOUND) aPropertyValue <<= static_cast<sal_Int16>(nFound); } @@ -1236,30 +1240,24 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper break; case PROPERTY_ID_TYPE: { - ModuleRes aRes(RID_STR_TYPE_CONST); - ResStringArray aResList(aRes); - if (m_nDataFieldType < aResList.Count()) - aControlValue <<= aResList.GetString(m_nDataFieldType); + if (m_nDataFieldType < SAL_N_ELEMENTS(RID_STR_TYPE_CONST) - 1) + aControlValue <<= RptResId(RID_STR_TYPE_CONST[m_nDataFieldType]); } break; case PROPERTY_ID_VERTICALALIGN: { style::VerticalAlignment nParagraphVertAlign = style::VerticalAlignment_TOP; aPropertyValue >>= nParagraphVertAlign; - ModuleRes aRes(RID_STR_VERTICAL_ALIGN_CONST); - ResStringArray aResList(aRes); - if (sal_uInt32(nParagraphVertAlign) < aResList.Count()) - aControlValue <<= aResList.GetString((sal_uInt32)nParagraphVertAlign); + if (sal_uInt32(nParagraphVertAlign) < SAL_N_ELEMENTS(RID_STR_VERTICAL_ALIGN_CONST) - 1) + aControlValue <<= RptResId(RID_STR_VERTICAL_ALIGN_CONST[(sal_uInt32)nParagraphVertAlign]); } break; case PROPERTY_ID_PARAADJUST: { sal_Int16 nParagraphAdjust = (sal_Int16)style::ParagraphAdjust_LEFT; aPropertyValue >>= nParagraphAdjust; - ModuleRes aRes(RID_STR_PARAADJUST_CONST); - ResStringArray aResList(aRes); - if (static_cast<sal_uInt32>(nParagraphAdjust) < aResList.Count()) - aControlValue <<= aResList.GetString(nParagraphAdjust); + if (static_cast<sal_uInt32>(nParagraphAdjust) < SAL_N_ELEMENTS(RID_STR_PARAADJUST_CONST) - 1) + aControlValue <<= RptResId(RID_STR_VERTICAL_ALIGN_CONST[nParagraphAdjust]); } break; case PROPERTY_ID_BACKCOLOR: @@ -1607,7 +1605,7 @@ bool GeometryHandler::impl_dialogFilter_nothrow( OUString& _out_rSelectedClause, // create the dialog uno::Reference< ui::dialogs::XExecutableDialog > xDialog = sdb::FilterDialog::createWithQuery(m_xContext, xComposer, m_xRowSet, xInspectorWindow); - const OUString sPropertyUIName(OUString(ModuleRes(RID_STR_FILTER))); + const OUString sPropertyUIName(RptResId(RID_STR_FILTER)); // initialize the dialog xDialog->setTitle( sPropertyUIName ); @@ -1640,7 +1638,7 @@ void GeometryHandler::checkPosAndSize( const awt::Point& _aNewPos, ::Point aPos(VCLPoint(_aNewPos)); if ( aPos.X() < 0 || aPos.Y() < 0 ) // TODO: have to check size with pos aka || (aPos.X() + aAwtSize.Width) > m_xSection->getReportDefinition()-> - throw beans::PropertyVetoException(ModuleRes(RID_STR_ILLEGAL_POSITION),xSourceReportComponent); + throw beans::PropertyVetoException(RptResId(RID_STR_ILLEGAL_POSITION),xSourceReportComponent); ::tools::Rectangle aSourceRect(aPos,VCLSize(_aSize)); @@ -1653,7 +1651,7 @@ void GeometryHandler::checkPosAndSize( const awt::Point& _aNewPos, const ::tools::Rectangle aBoundRect(VCLPoint(xReportComponent->getPosition()),VCLSize(xReportComponent->getSize())); const ::tools::Rectangle aRect = aSourceRect.GetIntersection(aBoundRect); if ( !aRect.IsEmpty() && (aRect.Left() != aRect.Right() && aRect.Top() != aRect.Bottom() ) ) - throw beans::PropertyVetoException(ModuleRes( RID_STR_OVERLAP_OTHER_CONTROL),xSourceReportComponent); + throw beans::PropertyVetoException(RptResId( RID_STR_OVERLAP_OTHER_CONTROL),xSourceReportComponent); } } } @@ -1745,7 +1743,7 @@ void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< OUString >& _out else if ( xSection == xReportDefinition->getDetail() ) nPos = xGroups->getCount()-1; - const OUString sGroup = ModuleRes(RID_STR_SCOPE_GROUP); + const OUString sGroup = RptResId(RID_STR_SCOPE_GROUP); for (sal_Int32 i = 0 ; i <= nPos ; ++i) { xGroup.set(xGroups->getByIndex(i),uno::UNO_QUERY_THROW); @@ -1772,7 +1770,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUS const uno::Reference< report::XGroup> xGroup(xSection->getGroup(),uno::UNO_QUERY); if ( xGroup.is() ) { - OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP); + OUString sGroupName = RptResId(RID_STR_SCOPE_GROUP); _rsNamePostfix = xGroup->getExpression(); m_sScope = sGroupName.replaceFirst("%1",_rsNamePostfix); xReturn = xGroup.get(); @@ -1784,7 +1782,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUS if ( nCount ) { const uno::Reference< report::XGroup> xGroup2(xGroups->getByIndex(nCount - 1),uno::UNO_QUERY_THROW); - OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP); + OUString sGroupName = RptResId(RID_STR_SCOPE_GROUP); _rsNamePostfix = xGroup2->getExpression(); m_sScope = sGroupName.replaceFirst("%1",_rsNamePostfix); xReturn = xGroup2.get(); @@ -1809,7 +1807,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUS for (sal_Int32 i = 0 ; i < nCount; ++i) { const uno::Reference< report::XGroup> xGroup(xGroups->getByIndex(i),uno::UNO_QUERY_THROW); - OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP); + OUString sGroupName = RptResId(RID_STR_SCOPE_GROUP); if ( m_sScope == sGroupName.replaceFirst("%1",xGroup->getExpression()) ) { _rsNamePostfix = xGroup->getExpression(); @@ -1855,7 +1853,7 @@ bool GeometryHandler::isDefaultFunction( const OUString& _sQuotedFunction uno::Reference< report::XGroup> xGroup(aFind.first->second.second,uno::UNO_QUERY); if ( xGroup.is() ) { - OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP); + OUString sGroupName = RptResId(RID_STR_SCOPE_GROUP); m_sScope = sGroupName.replaceFirst("%1",xGroup->getExpression()); } else @@ -1920,7 +1918,7 @@ void GeometryHandler::loadDefaultFunctions() if ( m_aDefaultFunctions.empty() ) { m_aCounterFunction.m_bPreEvaluated = false; - m_aCounterFunction.m_sName = ModuleRes(RID_STR_F_COUNTER); + m_aCounterFunction.m_sName = RptResId(RID_STR_F_COUNTER); m_aCounterFunction.m_sFormula = "rpt:[%FunctionName] + 1"; m_aCounterFunction.m_sSearchString = "rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*[:digit:]*"; m_aCounterFunction.m_sInitialFormula.IsPresent = true; @@ -1930,21 +1928,21 @@ void GeometryHandler::loadDefaultFunctions() aDefault.m_bPreEvaluated = true; - aDefault.m_sName = ModuleRes(RID_STR_F_ACCUMULATION); + aDefault.m_sName = RptResId(RID_STR_F_ACCUMULATION); aDefault.m_sFormula = "rpt:[%Column] + [%FunctionName]"; aDefault.m_sSearchString = "rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]"; aDefault.m_sInitialFormula.IsPresent = true; aDefault.m_sInitialFormula.Value = "rpt:[%Column]"; m_aDefaultFunctions.push_back(aDefault); - aDefault.m_sName = ModuleRes(RID_STR_F_MINIMUM); + aDefault.m_sName = RptResId(RID_STR_F_MINIMUM); aDefault.m_sFormula = "rpt:IF([%Column] < [%FunctionName];[%Column];[%FunctionName])"; aDefault.m_sSearchString = "rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*<[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)"; aDefault.m_sInitialFormula.IsPresent = true; aDefault.m_sInitialFormula.Value = "rpt:[%Column]"; m_aDefaultFunctions.push_back(aDefault); - aDefault.m_sName = ModuleRes(RID_STR_F_MAXIMUM); + aDefault.m_sName = RptResId(RID_STR_F_MAXIMUM); aDefault.m_sFormula = "rpt:IF([%Column] > [%FunctionName];[%Column];[%FunctionName])"; aDefault.m_sSearchString = "rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*>[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)"; aDefault.m_sInitialFormula.IsPresent = true; @@ -2112,7 +2110,7 @@ bool GeometryHandler::impl_isCounterFunction_throw(const OUString& _sQuotedFunct const uno::Reference< report::XGroup > xGroup(aFind.first->second.second,uno::UNO_QUERY); if ( xGroup.is() ) { - OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP); + OUString sGroupName = RptResId(RID_STR_SCOPE_GROUP); Out_sScope = sGroupName.replaceFirst("%1",xGroup->getExpression()); } else diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index 552938e817cd..7cbd0cb839c7 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -20,7 +20,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/NullPointerException.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include "uistrings.hrc" +#include "strings.hxx" #include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/reportdesign/source/ui/inspection/inspection.src b/reportdesign/source/ui/inspection/inspection.src deleted file mode 100644 index 7720b82aa816..000000000000 --- a/reportdesign/source/ui/inspection/inspection.src +++ /dev/null @@ -1,348 +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 "RptResId.hrc" -#include "rptui_slotid.hrc" -#include <svx/svxids.hrc> - -String RID_STR_PROPPAGE_DEFAULT -{ - Text [ en-US ] = "General" ; -}; - -String RID_STR_PROPPAGE_DATA -{ - Text [ en-US ] = "Data" ; -}; - -StringArray RID_STR_BOOL -{ - ItemList [ en-US ] = - { - < "No" ; >; - < "Yes" ; >; - }; -}; - -String RID_STR_FORCENEWPAGE -{ - Text [ en-US ] = "Force New Page" ; -}; - -StringArray RID_STR_FORCENEWPAGE_CONST -{ - ItemList [ en-US ] = - { - < "None" ; >; - < "Before Section" ; >; - < "After Section" ; >; - < "Before & After Section" ; >; - }; -}; - -String RID_STR_NEWROWORCOL -{ - Text [ en-US ] = "New Row Or Column" ; -}; - -String RID_STR_KEEPTOGETHER -{ - Text [ en-US ] = "Keep Together" ; -}; - -StringArray RID_STR_KEEPTOGETHER_CONST -{ - ItemList [ en-US ] = - { - < "No" ; >; - < "Whole Group" ; >; - < "With First Detail" ; >; - }; -}; -String RID_STR_CANGROW -{ - Text [ en-US ] = "Can Grow" ; -}; -String RID_STR_CANSHRINK -{ - Text [ en-US ] = "Can Shrink" ; -}; -String RID_STR_REPEATSECTION -{ - Text [ en-US ] = "Repeat Section" ; -}; -String RID_STR_PRINTREPEATEDVALUES -{ - Text [ en-US ] = "Print repeated values" ; -}; -String RID_STR_CONDITIONALPRINTEXPRESSION -{ - Text [ en-US ] = "Conditional Print Expression" ; -}; -String RID_STR_STARTNEWCOLUMN -{ - Text [ en-US ] = "Start new column" ; -}; -String RID_STR_STARTNEWPAGE -{ - Text [ en-US ] = "Start new page" ; -}; -String RID_STR_RESETPAGENUMBER -{ - Text [ en-US ] = "Reset page number" ; -}; -String RID_STR_CHARTTYPE -{ - Text [ en-US ] = "Chart type" ; -}; -String RID_STR_PRINTWHENGROUPCHANGE -{ - Text [ en-US ] = "Print repeated value on group change" ; -}; -String RID_STR_VISIBLE -{ - Text [ en-US ] = "Visible" ; -}; -String RID_STR_GROUPKEEPTOGETHER -{ - Text [ en-US ] = "Group keep together" ; -}; - -StringArray RID_STR_GROUPKEEPTOGETHER_CONST -{ - ItemList [ en-US ] = - { - < "Per Page" ; >; - < "Per Column" ; >; - }; -}; - -StringArray RID_STR_SECTIONPAGEBREAK_CONST -{ - ItemList [ en-US ] = - { - < "None" ; >; - < "Section" ; >; - < "Automatic" ; >; - }; -}; - -String RID_STR_PAGEHEADEROPTION -{ - Text [ en-US ] = "Page header" ; -}; - -String RID_STR_PAGEFOOTEROPTION -{ - Text [ en-US ] = "Page footer" ; -}; - -StringArray RID_STR_REPORTPRINTOPTION_CONST -{ - ItemList [ en-US ] = - { - < "All Pages" ; >; - < "Not With Report Header" ; >; - < "Not With Report Footer" ; >; - < "Not With Report Header/Footer" ; >; - }; -}; -String RID_STR_DEEPTRAVERSING -{ - Text [ en-US ] = "Deep traversing" ; -}; -String RID_STR_PREEVALUATED -{ - Text [ en-US ] = "Pre evaluation" ; -}; -String RID_STR_POSITIONX -{ - Text [ en-US ] = "Position X"; -}; -String RID_STR_POSITIONY -{ - Text [ en-US ] = "Position Y"; -}; -String RID_STR_WIDTH -{ - Text [ en-US ] = "Width"; -}; -String RID_STR_HEIGHT -{ - Text [ en-US ] = "Height"; -}; -String RID_STR_INITIALFORMULA -{ - Text [ en-US ] = "Initial value" ; -}; -String RID_STR_PRESERVEIRI -{ - Text [ en-US ] = "Preserve as Link" ; -}; -String RID_STR_FORMULA -{ - Text [ en-US ] = "Formula" ; -}; -String RID_STR_DATAFIELD -{ - Text [ en-US ] = "Data field" ; -}; -String RID_STR_FONT -{ - Text [ en-US ] = "Font" ; -}; -String RID_STR_BACKCOLOR -{ - Text [ en-US ] = "Background color"; -}; -String RID_STR_BACKTRANSPARENT -{ - Text [ en-US ] = "Background Transparent"; -}; -String RID_STR_CONTROLBACKGROUNDTRANSPARENT -{ - Text [ en-US ] = "Background Transparent"; -}; -String RID_STR_OVERLAP_OTHER_CONTROL -{ - Text [ en-US ] = "This operation is not allowed. The control overlaps with another one."; -}; -String RID_STR_ILLEGAL_POSITION -{ - Text [ en-US ] = "This position can not be set. It is invalid."; -}; -String RID_STR_SCOPE_GROUP -{ - Text [ en-US ] = "Group: %1"; -}; -String RID_STR_FORMULALIST -{ - Text [ en-US ] = "Function"; -}; -String RID_STR_SCOPE -{ - Text [ en-US ] = "Scope"; -}; -String RID_STR_TYPE -{ - Text [ en-US ] = "Data Field Type"; -}; - -StringArray RID_STR_TYPE_CONST -{ - ItemList [ en-US ] = - { - < "Field or Formula"; >; - < "Function"; >; - < "Counter"; >; - < "User defined Function"; >; - }; -}; - -String RID_STR_MASTERFIELDS -{ - Text [ en-US ] = "Link master fields" ; -}; - -String RID_STR_DETAILFIELDS -{ - Text [ en-US ] = "Link slave fields" ; -}; - -String RID_STR_EXPLANATION -{ - Text [ en-US ] = "Charts can be used to display detailed data about the current record of the report. To do this, you can specify which columns in the chart match which columns in the report."; -}; - -String RID_STR_DETAILLABEL -{ - Text [ en-US ] = "Chart" ; -}; - -String RID_STR_MASTERLABEL -{ - Text [ en-US ] = "Report" ; -}; - -String RID_STR_PREVIEW_COUNT -{ - Text [ en-US ] = "Preview Row(s)" ; -}; - -String RID_STR_AREA -{ - Text [ en-US ] = "Area" ; -}; - -String RID_STR_MIMETYPE -{ - Text [ en-US ] = "Report Output Format" ; -}; - -String RID_STR_VERTICALALIGN -{ - Text [ en-US ] = "Vert. Alignment" ; -}; - -StringArray RID_STR_VERTICAL_ALIGN_CONST -{ - ItemList [ en-US ] = - { - < "Top"; >; - < "Middle"; >; - < "Bottom"; >; - }; -}; - -String RID_STR_PARAADJUST -{ - Text [ en-US ] = "Horz. Alignment" ; -}; - -StringArray RID_STR_PARAADJUST_CONST -{ - ItemList [ en-US ] = - { - < "Left"; >; - < "Right"; >; - < "Block"; >; - < "Center"; >; - }; -}; - -String RID_STR_F_COUNTER -{ - Text [ en-US ] = "Counter" ; -}; - -String RID_STR_F_ACCUMULATION -{ - Text [ en-US ] = "Accumulation" ; -}; - -String RID_STR_F_MINIMUM -{ - Text [ en-US ] = "Minimum" ; -}; - -String RID_STR_F_MAXIMUM -{ - Text [ en-US ] = "Maximum" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index 7b3e73b8cf2b..adae3e8f6505 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -19,9 +19,10 @@ #include "metadata.hxx" #include <com/sun/star/inspection/XPropertyHandler.hpp> #include <comphelper/extract.hxx> +#include "core_resource.hxx" #include "helpids.hrc" -#include "RptResId.hrc" -#include "uistrings.hrc" +#include "strings.hrc" +#include "strings.hxx" #include <algorithm> @@ -78,7 +79,7 @@ namespace rptui #define DEF_INFO( ident, uinameres, helpid, flags ) \ OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \ - OUString( ModuleRes( RID_STR_##uinameres ) ), HID_RPT_PROP_##helpid, flags ) + RptResId( RID_STR_##uinameres ), HID_RPT_PROP_##helpid, flags ) #define DEF_INFO_1( ident, uinameres, helpid, flag1 ) \ DEF_INFO( ident, uinameres, helpid, PropUIFlags::flag1 ) @@ -94,9 +95,6 @@ namespace rptui if ( s_pPropertyInfos ) return s_pPropertyInfos; - OModuleClient aResourceAccess; - // this ensures that we have our resource file loaded - static OPropertyInfoImpl aPropertyInfos[] = { /* |