diff options
Diffstat (limited to 'reportdesign/source')
90 files changed, 309 insertions, 1906 deletions
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 5438cba7aedb..be9c96ccdd64 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -18,8 +18,8 @@ */ #include "FixedLine.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> -#include "corestrings.hrc" -#include "core_resource.hrc" +#include "strings.hxx" +#include "strings.hrc" #include "core_resource.hxx" #include <comphelper/property.hxx> #include <cppuhelper/supportsservice.hxx> @@ -136,7 +136,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex ,m_LineTransparence(0) ,m_LineWidth(0) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDLINE); + m_aProps.aComponent.m_sName = RptResId(RID_STR_FIXEDLINE); m_aProps.aComponent.m_nWidth = MIN_WIDTH; } @@ -153,7 +153,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex ,m_LineTransparence(0) ,m_LineWidth(0) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDLINE); + m_aProps.aComponent.m_sName = RptResId(RID_STR_FIXEDLINE); m_aProps.aComponent.m_xFactory = _xFactory; osl_atomic_increment( &m_refCount ); try diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index db3dd5ae2427..0ebad3934f31 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -18,9 +18,9 @@ */ #include "FixedText.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> -#include "corestrings.hrc" +#include "strings.hxx" #include <com/sun/star/beans/XPropertyState.hpp> -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" #include "Tools.hxx" #include <tools/color.hxx> @@ -47,7 +47,7 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContex ,FixedTextPropertySet(_xContext,IMPLEMENTS_PROPERTY_SET,lcl_getFixedTextOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDTEXT); + m_aProps.aComponent.m_sName = RptResId(RID_STR_FIXEDTEXT); m_aProps.aComponent.m_nBorder = 0; // no border } @@ -58,7 +58,7 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContex ,FixedTextPropertySet(_xContext,IMPLEMENTS_PROPERTY_SET,lcl_getFixedTextOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDTEXT); + m_aProps.aComponent.m_sName = RptResId(RID_STR_FIXEDTEXT); m_aProps.aComponent.m_nBorder = 0; // no border m_aProps.aComponent.m_xFactory = _xFactory; osl_atomic_increment( &m_refCount ); diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx index 81687c85ca4a..d5ff822d2678 100644 --- a/reportdesign/source/core/api/FormatCondition.cxx +++ b/reportdesign/source/core/api/FormatCondition.cxx @@ -18,7 +18,7 @@ */ #include "FormatCondition.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> -#include "corestrings.hrc" +#include "strings.hxx" #include <tools/color.hxx> #include <connectivity/dbtools.hxx> #include <comphelper/property.hxx> diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index 4aa4fbd7edb5..b00c5e1d6669 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -19,8 +19,8 @@ #include "FormattedField.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertyState.hpp> -#include "corestrings.hrc" -#include "core_resource.hrc" +#include "strings.hxx" +#include "strings.hrc" #include "core_resource.hxx" #include <tools/color.hxx> #include <connectivity/dbtools.hxx> @@ -54,7 +54,7 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nFormatKey(0) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FORMATTEDFIELD); + m_aProps.aComponent.m_sName = RptResId(RID_STR_FORMATTEDFIELD); } OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const & _xContext @@ -65,7 +65,7 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nFormatKey(0) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FORMATTEDFIELD); + m_aProps.aComponent.m_sName = RptResId(RID_STR_FORMATTEDFIELD); m_aProps.aComponent.m_xFactory = _xFactory; osl_atomic_increment( &m_refCount ); { diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx index 8696f41e3bf4..e365dc928e70 100644 --- a/reportdesign/source/core/api/Function.cxx +++ b/reportdesign/source/core/api/Function.cxx @@ -18,7 +18,7 @@ */ #include "Function.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> -#include "corestrings.hrc" +#include "strings.hxx" #include <connectivity/dbtools.hxx> #include <comphelper/property.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx index 9c9d84bd124c..d70ca0fcf427 100644 --- a/reportdesign/source/core/api/Functions.cxx +++ b/reportdesign/source/core/api/Functions.cxx @@ -19,7 +19,7 @@ #include "Functions.hxx" #include "Function.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include <com/sun/star/lang/NoSupportException.hpp> #include <comphelper/property.hxx> #include <algorithm> @@ -77,7 +77,7 @@ void SAL_CALL OFunctions::insertByIndex( ::sal_Int32 Index, const uno::Any& aEle checkIndex(Index); uno::Reference< report::XFunction > xFunction(aElement,uno::UNO_QUERY); if ( !xFunction.is() ) - throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,2); + throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,2); if ( bAdd ) m_aFunctions.push_back(xFunction); @@ -120,7 +120,7 @@ void SAL_CALL OFunctions::replaceByIndex( ::sal_Int32 Index, const uno::Any& Ele checkIndex(Index); uno::Reference< report::XFunction > xFunction(Element,uno::UNO_QUERY); if ( !xFunction.is() ) - throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,2); + throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,2); TFunctions::iterator aPos = m_aFunctions.begin(); ::std::advance(aPos,Index); aOldElement <<= *aPos; diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index f32a33ed5437..6bcba7b6dbc6 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -22,8 +22,8 @@ #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/report/GroupOn.hpp> #include <com/sun/star/report/KeepTogether.hpp> -#include "corestrings.hrc" -#include "core_resource.hrc" +#include "strings.hxx" +#include "strings.hrc" #include "core_resource.hxx" #include "Tools.hxx" #include <comphelper/property.hxx> @@ -118,7 +118,7 @@ void SAL_CALL OGroup::setHeaderOn( sal_Bool _headeron ) { if ( bool(_headeron) != m_xHeader.is() ) { - OUString sName(RPT_RESSTRING(RID_STR_GROUP_HEADER)); + OUString sName(RptResId(RID_STR_GROUP_HEADER)); setSection(PROPERTY_HEADERON,_headeron,sName,m_xHeader); } } @@ -133,7 +133,7 @@ void SAL_CALL OGroup::setFooterOn( sal_Bool _footeron ) { if ( bool(_footeron) != m_xFooter.is() ) { - OUString sName(RPT_RESSTRING(RID_STR_GROUP_FOOTER)); + OUString sName(RptResId(RID_STR_GROUP_FOOTER)); setSection(PROPERTY_FOOTERON,_footeron,sName,m_xFooter); } } diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx index d94a6e016234..3a4ae59b9872 100644 --- a/reportdesign/source/core/api/Groups.cxx +++ b/reportdesign/source/core/api/Groups.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include <algorithm> namespace reportdesign @@ -81,7 +81,7 @@ void SAL_CALL OGroups::insertByIndex( ::sal_Int32 Index, const uno::Any& aElemen checkIndex(Index); uno::Reference< report::XGroup > xGroup(aElement,uno::UNO_QUERY); if ( !xGroup.is() ) - throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,2); + throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,2); if ( bAdd ) m_aGroups.push_back(xGroup); @@ -122,7 +122,7 @@ void SAL_CALL OGroups::replaceByIndex( ::sal_Int32 Index, const uno::Any& Elemen checkIndex(Index); uno::Reference< report::XGroup > xGroup(Element,uno::UNO_QUERY); if ( !xGroup.is() ) - throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,2); + throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,2); TGroups::iterator aPos = m_aGroups.begin(); ::std::advance(aPos,Index); aOldElement <<= *aPos; diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index a42673323e4b..f0d48b45976a 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -19,8 +19,8 @@ #include "ImageControl.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertyState.hpp> -#include "corestrings.hrc" -#include "core_resource.hrc" +#include "strings.hxx" +#include "strings.hrc" #include "core_resource.hxx" #include "Tools.hxx" #include <tools/color.hxx> @@ -119,7 +119,7 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x ,m_nScaleMode(awt::ImageScaleMode::NONE) ,m_bPreserveIRI(true) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_IMAGECONTROL); + m_aProps.aComponent.m_sName = RptResId(RID_STR_IMAGECONTROL); } OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _xContext @@ -131,7 +131,7 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x ,m_nScaleMode(awt::ImageScaleMode::NONE) ,m_bPreserveIRI(true) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_IMAGECONTROL); + m_aProps.aComponent.m_sName = RptResId(RID_STR_IMAGECONTROL); m_aProps.aComponent.m_xFactory = _xFactory; osl_atomic_increment( &m_refCount ); { diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 3c6c4baac61d..5504abb4a4de 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -18,7 +18,7 @@ */ #include "ReportComponent.hxx" -#include "corestrings.hrc" +#include "strings.hxx" #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> #include <vcl/settings.hxx> diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 1124d6881d83..04f5a8b7679e 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -37,9 +37,9 @@ #include "Shape.hxx" #include "Tools.hxx" #include "UndoEnv.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" -#include "corestrings.hrc" +#include "strings.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> @@ -537,13 +537,13 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co ,m_aProps(new OReportComponentProperties(_xContext)) ,m_pImpl(new OReportDefinitionImpl(m_aMutex)) { - m_aProps->m_sName = RPT_RESSTRING(RID_STR_REPORT); + m_aProps->m_sName = RptResId(RID_STR_REPORT); osl_atomic_increment(&m_refCount); { init(); m_pImpl->m_xGroups = new OGroups(this,m_aProps->m_xContext); m_pImpl->m_xDetail = OSection::createOSection(this,m_aProps->m_xContext); - m_pImpl->m_xDetail->setName(RPT_RESSTRING(RID_STR_DETAIL)); + m_pImpl->m_xDetail->setName(RptResId(RID_STR_DETAIL)); } osl_atomic_decrement( &m_refCount ); } @@ -556,7 +556,7 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co ,m_aProps(new OReportComponentProperties(_xContext)) ,m_pImpl(new OReportDefinitionImpl(m_aMutex)) { - m_aProps->m_sName = RPT_RESSTRING(RID_STR_REPORT); + m_aProps->m_sName = RptResId(RID_STR_REPORT); m_aProps->m_xFactory = _xFactory; osl_atomic_increment(&m_refCount); { @@ -564,7 +564,7 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co init(); m_pImpl->m_xGroups = new OGroups(this,m_aProps->m_xContext); m_pImpl->m_xDetail = OSection::createOSection(this,m_aProps->m_xContext); - m_pImpl->m_xDetail->setName(RPT_RESSTRING(RID_STR_DETAIL)); + m_pImpl->m_xDetail->setName(RptResId(RID_STR_DETAIL)); } osl_atomic_decrement( &m_refCount ); } @@ -855,7 +855,7 @@ void SAL_CALL OReportDefinition::setReportHeaderOn( sal_Bool _reportheaderon ) { if ( bool(_reportheaderon) != m_pImpl->m_xReportHeader.is() ) { - setSection(PROPERTY_REPORTHEADERON,_reportheaderon,RPT_RESSTRING(RID_STR_REPORT_HEADER),m_pImpl->m_xReportHeader); + setSection(PROPERTY_REPORTHEADERON,_reportheaderon,RptResId(RID_STR_REPORT_HEADER),m_pImpl->m_xReportHeader); } } @@ -869,7 +869,7 @@ void SAL_CALL OReportDefinition::setReportFooterOn( sal_Bool _reportfooteron ) { if ( bool(_reportfooteron) != m_pImpl->m_xReportFooter.is() ) { - setSection(PROPERTY_REPORTFOOTERON,_reportfooteron,RPT_RESSTRING(RID_STR_REPORT_FOOTER),m_pImpl->m_xReportFooter); + setSection(PROPERTY_REPORTFOOTERON,_reportfooteron,RptResId(RID_STR_REPORT_FOOTER),m_pImpl->m_xReportFooter); } } @@ -883,7 +883,7 @@ void SAL_CALL OReportDefinition::setPageHeaderOn( sal_Bool _pageheaderon ) { if ( bool(_pageheaderon) != m_pImpl->m_xPageHeader.is() ) { - setSection(PROPERTY_PAGEHEADERON,_pageheaderon,RPT_RESSTRING(RID_STR_PAGE_HEADER),m_pImpl->m_xPageHeader); + setSection(PROPERTY_PAGEHEADERON,_pageheaderon,RptResId(RID_STR_PAGE_HEADER),m_pImpl->m_xPageHeader); } } @@ -897,7 +897,7 @@ void SAL_CALL OReportDefinition::setPageFooterOn( sal_Bool _pagefooteron ) { if ( bool(_pagefooteron) != m_pImpl->m_xPageFooter.is() ) { - setSection(PROPERTY_PAGEFOOTERON,_pagefooteron,RPT_RESSTRING(RID_STR_PAGE_FOOTER),m_pImpl->m_xPageFooter); + setSection(PROPERTY_PAGEFOOTERON,_pagefooteron,RptResId(RID_STR_PAGE_FOOTER),m_pImpl->m_xPageFooter); } } @@ -1281,7 +1281,7 @@ void SAL_CALL OReportDefinition::loadFromStorage( const uno::Reference< embed::X void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XStorage >& _xStorageToSaveTo, const uno::Sequence< beans::PropertyValue >& _aMediaDescriptor ) { if ( !_xStorageToSaveTo.is() ) - throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,1); + throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,1); SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); @@ -1437,7 +1437,7 @@ void SAL_CALL OReportDefinition::switchToStorage( const uno::Reference< embed::XStorage >& xStorage) { if (!xStorage.is()) - throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,1); + throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,1); { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 8661cf2b94bc..2a8b1cd0fb56 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -45,8 +45,8 @@ #include <unotools/sharedunocomponent.hxx> #include "Tools.hxx" -#include "corestrings.hrc" -#include "core_resource.hrc" +#include "strings.hxx" +#include "strings.hrc" #include "core_resource.hxx" #include <connectivity/CommonTools.hxx> @@ -195,7 +195,7 @@ OUString OReportEngineJFree::getNewOutputName() ::utl::TempFile aTestFile(sName, false, &sExt); if ( !aTestFile.IsValid() ) { - sName = RPT_RESSTRING(RID_STR_REPORT); + sName = RptResId(RID_STR_REPORT); ::utl::TempFile aFile(sName, false, &sExt); sFileURL = aFile.GetURL(); } diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index c8b29a7798b4..c712046276d3 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -25,9 +25,9 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include "corestrings.hrc" +#include "strings.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "Tools.hxx" #include "RptModel.hxx" #include "RptPage.hxx" diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index ce0b655d3496..3ed54547b154 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -28,8 +28,8 @@ #include <tools/diagnose_ex.h> #include <svx/unoshape.hxx> -#include "corestrings.hrc" -#include "core_resource.hrc" +#include "strings.hxx" +#include "strings.hrc" #include "core_resource.hxx" #include "Tools.hxx" #include "RptObject.hxx" @@ -59,7 +59,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext) ,m_nZOrder(0) ,m_bOpaque(false) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_SHAPE); + m_aProps.aComponent.m_sName = RptResId(RID_STR_SHAPE); } OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext @@ -73,7 +73,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext ,m_bOpaque(false) ,m_sServiceName(_sServiceName) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_SHAPE); + m_aProps.aComponent.m_sName = RptResId(RID_STR_SHAPE); m_aProps.aComponent.m_xFactory = _xFactory; osl_atomic_increment( &m_refCount ); { diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx index 44c2b0e5ed76..886e7fe16675 100644 --- a/reportdesign/source/core/api/Tools.cxx +++ b/reportdesign/source/core/api/Tools.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "Tools.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" #include <comphelper/property.hxx> @@ -45,7 +45,7 @@ void throwIllegallArgumentException( const OUString& _sTypeName ,sal_Int16 ArgumentPosition_ ) { - OUString sErrorMessage(RPT_RESSTRING(RID_STR_ERROR_WRONG_ARGUMENT)); + OUString sErrorMessage(RptResId(RID_STR_ERROR_WRONG_ARGUMENT)); sErrorMessage = sErrorMessage.replaceAt(sErrorMessage.indexOf('#'),2,_sTypeName); throw lang::IllegalArgumentException(sErrorMessage,ExceptionContext_,ArgumentPosition_); } diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx b/reportdesign/source/core/inc/ReportUndoFactory.hxx index 0f247e4aad36..7829022d4a6f 100644 --- a/reportdesign/source/core/inc/ReportUndoFactory.hxx +++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx @@ -21,13 +21,11 @@ #include <svx/svdundo.hxx> #include <memory> -#include "ModuleHelper.hxx" namespace rptui { class OReportUndoFactory : public SdrUndoFactory { - OModuleClient m_aModuleClient; ::std::unique_ptr<SdrUndoFactory> m_pUndoFactory; OReportUndoFactory(const OReportUndoFactory&) = delete; diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx index 37a7357cf006..64ad3ab96f78 100644 --- a/reportdesign/source/core/inc/Tools.hxx +++ b/reportdesign/source/core/inc/Tools.hxx @@ -28,7 +28,7 @@ #include "Section.hxx" -#include "corestrings.hrc" +#include "strings.hxx" namespace reportdesign { diff --git a/reportdesign/source/core/inc/core_resource.hrc b/reportdesign/source/core/inc/core_resource.hrc deleted file mode 100644 index 9b4e58889fe5..000000000000 --- a/reportdesign/source/core/inc/core_resource.hrc +++ /dev/null @@ -1,46 +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 . - */ - -#ifndef REPORTDESIGN_CORE_RESOURCE_HRC_ -#define REPORTDESIGN_CORE_RESOURCE_HRC_ - -#include <svl/solar.hrc> - -#define RID_CORE_STRINGS_START RID_RPT_START - -//- String-IDs -#define RID_STR_DETAIL ( RID_CORE_STRINGS_START + 0 ) -#define RID_STR_PAGE_HEADER ( RID_CORE_STRINGS_START + 1 ) -#define RID_STR_PAGE_FOOTER ( RID_CORE_STRINGS_START + 2 ) -#define RID_STR_REPORT_HEADER ( RID_CORE_STRINGS_START + 3 ) -#define RID_STR_REPORT_FOOTER ( RID_CORE_STRINGS_START + 4 ) -#define RID_STR_ERROR_WRONG_ARGUMENT ( RID_CORE_STRINGS_START + 6 ) -#define RID_STR_ARGUMENT_IS_NULL ( RID_CORE_STRINGS_START + 7 ) -#define RID_STR_SHAPE ( RID_CORE_STRINGS_START + 8 ) -#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 9 ) -#define RID_STR_IMAGECONTROL ( RID_CORE_STRINGS_START + 10 ) -#define RID_STR_FIXEDTEXT ( RID_CORE_STRINGS_START + 11 ) -#define RID_STR_FORMATTEDFIELD ( RID_CORE_STRINGS_START + 12 ) -#define RID_STR_GROUP_HEADER ( RID_CORE_STRINGS_START + 13 ) -#define RID_STR_GROUP_FOOTER ( RID_CORE_STRINGS_START + 14 ) -#define RID_STR_FIXEDLINE ( RID_CORE_STRINGS_START + 15 ) - -#endif // REPORTDESIGN_CORE_RESOURCE_HRC_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/core_resource.hxx b/reportdesign/source/core/inc/core_resource.hxx deleted file mode 100644 index 797dc6f77de5..000000000000 --- a/reportdesign/source/core/inc/core_resource.hxx +++ /dev/null @@ -1,66 +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 . - */ -#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX -#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX - - -#include <rtl/ustring.hxx> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> - -class SimpleResMgr; - -namespace reportdesign -{ - -#define RPT_RESSTRING(id) ResourceManager::loadString(id) - - - //= ResourceManager - //= handling resources within the DBA-Core library - - class ResourceManager - { - static SimpleResMgr* m_pImpl; - - // no instantiation allowed - ResourceManager() = delete; - - // we'll instantiate one static member of the following class, which, in its dtor, - // ensures that m_pImpl will be deleted - class EnsureDelete - { - public: - EnsureDelete() { } - ~EnsureDelete(); - }; - friend class EnsureDelete; - - public: - /** loads the string with the specified resource id from the FormLayer resource file - */ - static OUString loadString(sal_uInt16 _nResId); - }; - - -} - - -#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index 67813be52298..21718d124830 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "core_resource.hxx" -#include <tools/simplerm.hxx> +#include <tools/resmgr.hxx> // ---- needed as long as we have no contexts for components --- #include <vcl/svapp.hxx> @@ -30,36 +30,11 @@ #include <rtl/uri.hxx> #include <svl/solar.hrc> -#include "ModuleHelper.hxx" -namespace reportdesign +OUString RptResId(const char* pId) { - using namespace ::com::sun::star; - - //= ResourceManager - - SimpleResMgr* ResourceManager::m_pImpl = nullptr; - - - ResourceManager::EnsureDelete::~EnsureDelete() - { - delete ResourceManager::m_pImpl; - } - - OUString ResourceManager::loadString(sal_uInt16 _nResId) - { - if (!m_pImpl) - { - // now that we have an impl class make sure it's deleted on unloading the library - static ResourceManager::EnsureDelete s_aDeleteTheImplClass; - - m_pImpl = SimpleResMgr::Create("rpt", Application::GetSettings().GetUILanguageTag()); - } - return m_pImpl->ReadString(_nResId); - } - - + static std::locale loc = Translate::Create("rpt", Application::GetSettings().GetUILanguageTag()); + return Translate::get(pId, loc); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/resource/strings.src b/reportdesign/source/core/resource/strings.src deleted file mode 100644 index 027f30415769..000000000000 --- a/reportdesign/source/core/resource/strings.src +++ /dev/null @@ -1,97 +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 "core_resource.hrc" - -String RID_STR_DETAIL -{ - Text [ en-US ] = "Detail"; -}; - -String RID_STR_PAGE_HEADER -{ - Text [ en-US ] = "Page Header"; -}; - -String RID_STR_PAGE_FOOTER -{ - Text [ en-US ] = "Page Footer"; -}; - -String RID_STR_GROUP_HEADER -{ - Text [ en-US ] = "Group Header"; -}; - -String RID_STR_GROUP_FOOTER -{ - Text [ en-US ] = "Group Footer"; -}; - -String RID_STR_REPORT_HEADER -{ - Text [ en-US ] = "Report Header"; -}; - -String RID_STR_REPORT_FOOTER -{ - Text [ en-US ] = "Report Footer"; -}; - -String RID_STR_ERROR_WRONG_ARGUMENT -{ - Text [ en-US ] = "You tried to set an illegal argument. Please have a look at '#1' for valid arguments."; -}; - -String RID_STR_ARGUMENT_IS_NULL -{ - Text [ en-US ] = "The element is invalid."; -}; - -String RID_STR_FIXEDTEXT -{ - Text [ en-US ] = "Label field" ; -}; - -String RID_STR_FORMATTEDFIELD -{ - Text [ en-US ] = "Formatted field"; -}; - -String RID_STR_IMAGECONTROL -{ - Text [ en-US ] = "Image control" ; -}; - -String RID_STR_REPORT -{ - Text [ en-US ] = "Report"; -}; - -String RID_STR_SHAPE -{ - Text [ en-US ] = "Shape"; -}; - -String RID_STR_FIXEDLINE -{ - Text [ en-US ] = "Fixed line"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx deleted file mode 100644 index 58f1691227b1..000000000000 --- a/reportdesign/source/core/sdr/ModuleHelper.cxx +++ /dev/null @@ -1,124 +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 <memory> -#include "ModuleHelper.hxx" -#include <comphelper/processfactory.hxx> -#include <osl/thread.h> -#include <com/sun/star/util/XMacroExpander.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <rtl/instance.hxx> -#include <rtl/uri.hxx> -#include <svl/solar.hrc> - -#define ENTER_MOD_METHOD() \ - ::osl::MutexGuard aGuard(theOModuleMutex::get()); \ - ensureImpl() - - -namespace rptui -{ - - using namespace ::com::sun::star; - -//= OModuleImpl - -/** implementation for <type>OModule</type>. not threadsafe, has to be guarded by its owner -*/ -class OModuleImpl -{ - std::unique_ptr<ResMgr> m_pResources; - -public: - /// ctor - OModuleImpl(); - - /// get the manager for the resources of the module - ResMgr* getResManager(); -}; - - -OModuleImpl::OModuleImpl() - :m_pResources(nullptr) -{ -} - - -ResMgr* OModuleImpl::getResManager() -{ - // note that this method is not threadsafe, which counts for the whole class ! - - if (!m_pResources) - { - // create a manager with a fixed prefix - m_pResources.reset( ResMgr::CreateResMgr("rptui") ); - } - return m_pResources.get(); -} - - -//= OModule - - -namespace -{ - // access safety - struct theOModuleMutex : public rtl::Static< osl::Mutex, theOModuleMutex > {}; -} - -sal_Int32 OModule::s_nClients = 0; -OModuleImpl* OModule::s_pImpl = nullptr; - -ResMgr* OModule::getResManager() -{ - ENTER_MOD_METHOD(); - return s_pImpl->getResManager(); -} - - -void OModule::registerClient() -{ - ::osl::MutexGuard aGuard(theOModuleMutex::get()); - ++s_nClients; -} - - -void OModule::revokeClient() -{ - ::osl::MutexGuard aGuard(theOModuleMutex::get()); - if (!--s_nClients && s_pImpl) - { - delete s_pImpl; - s_pImpl = nullptr; - } -} - - -void OModule::ensureImpl() -{ - if (s_pImpl) - return; - s_pImpl = new OModuleImpl(); -} - - -} // namespace dbaui - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index d65386302c23..0b06d5946698 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/sdbcx/XAppend.hpp> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include "corestrings.hrc" +#include "strings.hxx" namespace rptui { diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index 4fb8ca0d3a6c..56573be9421a 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -20,7 +20,7 @@ #include "RptObject.hxx" #include "RptModel.hxx" #include "RptDef.hxx" -#include "corestrings.hrc" +#include "strings.hxx" #include <comphelper/mimeconfighelper.hxx> #include <comphelper/classids.hxx> #include <comphelper/embeddedobjectcontainer.hxx> diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx index 984da1343982..712eb12e8727 100644 --- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx +++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx @@ -19,13 +19,13 @@ #include "ReportUndoFactory.hxx" #include "RptObject.hxx" #include "UndoActions.hxx" -#include "RptResId.hrc" +#include "strings.hrc" namespace rptui { using namespace ::com::sun::star; -SdrUndoAction* lcl_createUndo(SdrObject& rObject,Action _eAction,sal_uInt16 _nCommentId) +SdrUndoAction* lcl_createUndo(SdrObject& rObject, Action _eAction, const char* pCommentId) { OObjectBase* pObj = dynamic_cast<OObjectBase*>(&rObject); if ( !pObj ) @@ -35,9 +35,9 @@ SdrUndoAction* lcl_createUndo(SdrObject& rObject,Action _eAction,sal_uInt16 _nCo uno::Reference< report::XGroup> xGroup = xSection->getGroup(); SdrUndoAction* pUndo = nullptr; if ( xGroup.is() ) - pUndo = new OUndoGroupSectionAction(*rObject.GetModel(),_eAction,OGroupHelper::getMemberFunction(xSection),xGroup,xReportComponent,_nCommentId); + pUndo = new OUndoGroupSectionAction(*rObject.GetModel(),_eAction,OGroupHelper::getMemberFunction(xSection),xGroup,xReportComponent,pCommentId); else - pUndo = new OUndoReportSectionAction(*rObject.GetModel(),_eAction,OReportHelper::getMemberFunction(xSection),xSection->getReportDefinition(),xReportComponent,_nCommentId); + pUndo = new OUndoReportSectionAction(*rObject.GetModel(),_eAction,OReportHelper::getMemberFunction(xSection),xSection->getReportDefinition(),xReportComponent,pCommentId); return pUndo; } diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 4eb29d0c3b89..36a25e337294 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -20,6 +20,7 @@ #include "RptModel.hxx" #include "RptPage.hxx" #include <dbaccess/dbsubcomponentcontroller.hxx> +#include <tools/resmgr.hxx> #include <unotools/pathoptions.hxx> #include <vcl/svapp.hxx> @@ -31,7 +32,7 @@ #include <svx/tbcontrl.hxx> #include "rptui_slotid.hrc" #include "RptDef.hxx" -#include "corestrings.hrc" +#include "strings.hxx" #include "FixedLine.hxx" #include "FormattedField.hxx" #include "FixedText.hxx" @@ -186,5 +187,4 @@ uno::Reference< uno::XInterface > OReportModel::createShape(const OUString& aSer } //rptui - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index d82f4a457851..8e82dcab9b77 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -27,11 +27,10 @@ #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/convert.hxx> #include "RptPage.hxx" -#include "corestrings.hrc" +#include "strings.hxx" #include <dbaccess/dbsubcomponentcontroller.hxx> -#include "ModuleHelper.hxx" -#include <RptResId.hrc> +#include <strings.hrc> #include "strings.hxx" #include <svx/xflclit.hxx> #include <svx/xlnclit.hxx> diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 08edfe1cdc60..68a6023f1a71 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -21,13 +21,13 @@ #include "UndoEnv.hxx" #include "formatnormalizer.hxx" #include "conditionupdater.hxx" -#include "corestrings.hrc" +#include "strings.hxx" #include "rptui_slotid.hrc" #include "RptDef.hxx" -#include "ModuleHelper.hxx" +#include "core_resource.hxx" #include "RptObject.hxx" #include "RptPage.hxx" -#include "RptResId.hrc" +#include "strings.hrc" #include "RptModel.hxx" #include <com/sun/star/container/XChild.hpp> @@ -79,12 +79,12 @@ namespace rptui } -OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,sal_uInt16 nCommentID) +OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,const char* pCommentID) :SdrUndoAction(_rMod) { m_pController = static_cast< OReportModel& >( _rMod ).getController(); - if ( nCommentID ) - m_strComment = ModuleRes(nCommentID); + if (pCommentID) + m_strComment = RptResId(pCommentID); } OCommentUndoAction::~OCommentUndoAction() { @@ -102,8 +102,8 @@ OUndoContainerAction::OUndoContainerAction(SdrModel& _rMod ,Action _eAction ,const uno::Reference< container::XIndexContainer >& rContainer ,const Reference< XInterface > & xElem - ,sal_uInt16 _nCommentId) - :OCommentUndoAction(_rMod,_nCommentId) + ,const char* pCommentId) + :OCommentUndoAction(_rMod, pCommentId) ,m_xElement(xElem) ,m_xContainer(rContainer) ,m_eAction( _eAction ) @@ -246,8 +246,8 @@ OUndoGroupSectionAction::OUndoGroupSectionAction(SdrModel& _rMod ,OGroupHelper> _pMemberFunction ,const uno::Reference< report::XGroup >& _xGroup ,const Reference< XInterface > & xElem - ,sal_uInt16 _nCommentId) -:OUndoContainerAction(_rMod,_eAction,nullptr,xElem,_nCommentId) + ,const char* pCommentId) +:OUndoContainerAction(_rMod,_eAction,nullptr,xElem,pCommentId) ,m_aGroupHelper(_xGroup) ,m_pMemberFunction(_pMemberFunction) { @@ -292,8 +292,8 @@ OUndoReportSectionAction::OUndoReportSectionAction(SdrModel& _rMod ,OReportHelper> _pMemberFunction ,const uno::Reference< report::XReportDefinition >& _xReport ,const Reference< XInterface > & xElem - ,sal_uInt16 _nCommentId) -:OUndoContainerAction(_rMod,_eAction,nullptr,xElem,_nCommentId) + ,const char* pCommentId) +:OUndoContainerAction(_rMod,_eAction,nullptr,xElem,pCommentId) ,m_aReportHelper(_xReport) ,m_pMemberFunction(_pMemberFunction) { @@ -338,7 +338,7 @@ void OUndoReportSectionAction::implReRemove( ) } ORptUndoPropertyAction::ORptUndoPropertyAction(SdrModel& rNewMod, const PropertyChangeEvent& evt) - :OCommentUndoAction(rNewMod,0) + :OCommentUndoAction(rNewMod,nullptr) ,m_xObj(evt.Source, UNO_QUERY) ,m_aPropertyName(evt.PropertyName) ,m_aNewValue(evt.NewValue) @@ -381,7 +381,7 @@ void ORptUndoPropertyAction::setProperty(bool _bOld) OUString ORptUndoPropertyAction::GetComment() const { - OUString aStr( ModuleRes(RID_STR_UNDO_PROPERTY) ); + OUString aStr( RptResId(RID_STR_UNDO_PROPERTY) ); return aStr.replaceFirst("#", m_aPropertyName); } diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index ed3caaaba4a8..38c03995ec8d 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -20,13 +20,12 @@ #include "UndoEnv.hxx" #include "formatnormalizer.hxx" #include "conditionupdater.hxx" -#include "corestrings.hrc" +#include "strings.hxx" #include "rptui_slotid.hrc" #include "RptDef.hxx" -#include "ModuleHelper.hxx" #include "RptObject.hxx" #include "RptPage.hxx" -#include "RptResId.hrc" +#include "strings.hrc" #include "RptModel.hxx" #include <com/sun/star/container/XChild.hpp> diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index 5a5696861bb9..b2887720d4cd 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/report/XShape.hpp> #include <com/sun/star/report/XFixedLine.hpp> #include <com/sun/star/table/BorderLine2.hpp> -#include "xmlstrings.hrc" +#include "strings.hxx" #include "xmlTable.hxx" #include "xmlFormattedField.hxx" #include "xmlImage.hxx" diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index f010f246c351..a563799502c2 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -30,7 +30,7 @@ #include <comphelper/namecontainer.hxx> #include <comphelper/genericpropertyset.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include "xmlstrings.hrc" +#include "strings.hxx" #define PROPERTY_ID_WIDTH 1 #define PROPERTY_ID_HEIGHT 2 diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index cc9b689d1dde..788a0a3a09be 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -24,7 +24,7 @@ #include <xmloff/nmspmap.hxx> #include "xmlEnums.hxx" #include "xmlHelper.hxx" -#include "xmlstrings.hrc" +#include "strings.hxx" #include "xmlStyleImport.hxx" #include <ucbhelper/content.hxx> #include <comphelper/namecontainer.hxx> diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index d44a982b8b33..767f1733c942 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx @@ -24,7 +24,7 @@ #include "xmlEnums.hxx" #include "xmlControlProperty.hxx" #include "xmlComponent.hxx" -#include "xmlstrings.hrc" +#include "strings.hxx" namespace rptxml { diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index f37e32667841..7a66a583f019 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -31,7 +31,7 @@ #include <xmloff/txtprmap.hxx> #include <xmloff/numehelp.hxx> #include "xmlHelper.hxx" -#include "xmlstrings.hrc" +#include "strings.hxx" #include "xmlPropertyHandler.hxx" #include <sax/tools/converter.hxx> #include <com/sun/star/awt/ImagePosition.hpp> diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 21a8fc1a6306..d8ce3fa9cd2e 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -24,7 +24,7 @@ #include "xmlEnums.hxx" #include "xmlReportElement.hxx" #include "xmlCell.hxx" -#include "xmlstrings.hrc" +#include "strings.hxx" #include <com/sun/star/report/XFormattedField.hpp> #include <com/sun/star/report/XFixedText.hpp> #include <com/sun/star/text/ControlCharacter.hpp> diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index 323d47e897d8..0e66bb46e689 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -27,7 +27,7 @@ #include <comphelper/genericpropertyset.hxx> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include "xmlstrings.hrc" +#include "strings.hxx" #include "xmlStyleImport.hxx" namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index 586296daf52d..76c7c00f18ae 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -23,7 +23,7 @@ #include <xmloff/nmspmap.hxx> #include "xmlHelper.hxx" #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "strings.hxx" namespace rptxml { diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index d3e0095f4731..6582a4543444 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/awt/ImagePosition.hpp> #include <com/sun/star/awt/ImageScaleMode.hpp> #include <xmloff/prstylei.hxx> -#include "xmlstrings.hrc" +#include "strings.hxx" #include "xmlEnums.hxx" #include <xmloff/contextid.hxx> #include <xmloff/txtprmap.hxx> diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx index fbf2ab633345..1f9862a01ab2 100644 --- a/reportdesign/source/filter/xml/xmlRow.cxx +++ b/reportdesign/source/filter/xml/xmlRow.cxx @@ -28,7 +28,7 @@ #include <comphelper/namecontainer.hxx> #include <comphelper/genericpropertyset.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include "xmlstrings.hrc" +#include "strings.hxx" namespace rptxml { diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index c8e714237f0a..f69b5e3edffa 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -29,7 +29,7 @@ #include "xmlStyleImport.hxx" #include <connectivity/dbtools.hxx> #include <com/sun/star/report/ReportPrintOption.hpp> -#include "xmlstrings.hrc" +#include "strings.hxx" #include "xmlTable.hxx" diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index c36fdfc33077..5ff337bcaf4f 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -29,7 +29,7 @@ #include <com/sun/star/report/ForceNewPage.hpp> #include "xmlCondPrtExpr.hxx" #include "xmlStyleImport.hxx" -#include "xmlstrings.hrc" +#include "strings.hxx" #include <connectivity/dbtools.hxx> #include <com/sun/star/report/XShape.hpp> #include <com/sun/star/report/XFixedLine.hpp> diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index f691cf7bbbac..7925036608fa 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -57,7 +57,7 @@ #include <svtools/sfxecode.hxx> #include "xmlEnums.hxx" #include "xmlStyleImport.hxx" -#include "xmlstrings.hrc" +#include "strings.hxx" #include "xmlPropertyHandler.hxx" #include <xmloff/txtprmap.hxx> #include "ReportDefinition.hxx" diff --git a/reportdesign/source/inc/corestrings.hrc b/reportdesign/source/inc/corestrings.hrc deleted file mode 100644 index 2d5505b2afea..000000000000 --- a/reportdesign/source/inc/corestrings.hrc +++ /dev/null @@ -1,30 +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 . - */ -#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC -#define REPORTDESIGN_SHARED_CORESTRINGS_HRC - -#include <rtl/ustring.hxx> - -#define STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.hrc" -#undef STRINGCONSTANTS_INCLUDED_INDIRECT - -#endif // REPORTDESIGN_SHARED_CORESTRINGS_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/inc/stringconstants.hrc b/reportdesign/source/inc/stringconstants.hrc deleted file mode 100644 index 1cfe717f8092..000000000000 --- a/reportdesign/source/inc/stringconstants.hrc +++ /dev/null @@ -1,257 +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 . - */ - -#ifndef INCLUDED_REPORTDESIGN_SOURCE_INC_STRINGCONSTANTS_HRC -#define INCLUDED_REPORTDESIGN_SOURCE_INC_STRINGCONSTANTS_HRC - -#ifndef STRINGCONSTANTS_INCLUDED_INDIRECT -#error "don't include this file directly! use dbastrings.hrc or dbustrings.hrc instead!" -#endif - -//= service names - -#define SERVICE_FIXEDTEXT "com.sun.star.report.FixedText" -#define SERVICE_FORMATTEDFIELD "com.sun.star.report.FormattedField" -#define SERVICE_IMAGECONTROL "com.sun.star.report.ImageControl" -#define SERVICE_FORMATCONDITION "com.sun.star.report.FormatCondition" -#define SERVICE_FUNCTION "com.sun.star.report.Function" -#define SERVICE_REPORTDEFINITION "com.sun.star.report.ReportDefinition" -#define SERVICE_SHAPE "com.sun.star.report.Shape" -#define SERVICE_FIXEDLINE "com.sun.star.report.FixedLine" -#define SERVICE_SECTION "com.sun.star.report.Section" -#define SERVICE_GROUP "com.sun.star.report.Group" - -//= property names - -#define PROPERTY_VISIBLE "Visible" -#define PROPERTY_NAME "Name" -#define PROPERTY_HEIGHT "Height" -#define PROPERTY_BACKCOLOR "BackColor" -#define PROPERTY_BACKTRANSPARENT "BackTransparent" -#define PROPERTY_CONTROLBACKGROUND "ControlBackground" -#define PROPERTY_CONTROLBACKGROUNDTRANSPARENT "ControlBackgroundTransparent" -#define PROPERTY_FORCENEWPAGE "ForceNewPage" -#define PROPERTY_NEWROWORCOL "NewRowOrCol" -#define PROPERTY_KEEPTOGETHER "KeepTogether" -#define PROPERTY_CANGROW "CanGrow" -#define PROPERTY_CANSHRINK "CanShrink" -#define PROPERTY_REPEATSECTION "RepeatSection" -#define PROPERTY_GROUP "Group" -#define PROPERTY_REPORTDEFINITION "ReportDefinition" - -#define PROPERTY_GROUPINTERVAL "GroupInterval" -#define PROPERTY_EXPRESSION "Expression" -#define PROPERTY_GROUPON "GroupOn" -#define PROPERTY_SORTASCENDING "SortAscending" - -#define PROPERTY_MASTERFIELDS "MasterFields" -#define PROPERTY_DETAILFIELDS "DetailFields" -#define PROPERTY_CAPTION "Caption" -#define PROPERTY_COMMAND "Command" -#define PROPERTY_BACKGRAPHICLOCATION "BackGraphicLocation" -#define PROPERTY_ORIENTATION "Orientation" -#define PROPERTY_PAPERSIZE "Size" -#define PROPERTY_GROUPKEEPTOGETHER "GroupKeepTogether" -#define PROPERTY_PAGEHEADEROPTION "PageHeaderOption" -#define PROPERTY_PAGEFOOTEROPTION "PageFooterOption" -#define PROPERTY_COMMANDTYPE "CommandType" -#define PROPERTY_REPORTHEADERON "ReportHeaderOn" -#define PROPERTY_REPORTFOOTERON "ReportFooterOn" -#define PROPERTY_PAGEHEADERON "PageHeaderOn" -#define PROPERTY_PAGEFOOTERON "PageFooterOn" -#define PROPERTY_HEADERON "HeaderOn" -#define PROPERTY_FOOTERON "FooterOn" -#define PROPERTY_WIDTH "Width" -#define PROPERTY_POSITIONX "PositionX" -#define PROPERTY_POSITIONY "PositionY" -#define PROPERTY_DATAFIELD "DataField" -#define PROPERTY_PARAADJUST "ParaAdjust" -#define PROPERTY_FONTDESCRIPTOR "FontDescriptor" -#define PROPERTY_FONTDESCRIPTORASIAN "FontDescriptorAsian" -#define PROPERTY_FONTDESCRIPTORCOMPLEX "FontDescriptorComplex" -#define PROPERTY_CONTROLTEXTEMPHASISMARK "ControlTextEmphasis" -#define PROPERTY_CHARRELIEF "CharRelief" -#define PROPERTY_CHARCOLOR "CharColor" -#define PROPERTY_VERTICALALIGN "VerticalAlign" -#define PROPERTY_IMAGEPOSITION "ImagePosition" -#define PROPERTY_IMAGEURL "ImageURL" -#define PROPERTY_CHARUNDERLINECOLOR "CharUnderlineColor" -#define PROPERTY_LABEL "Label" -#define PROPERTY_EFFECTIVEDEFAULT "EffectiveDefault" -#define PROPERTY_EFFECTIVEMAX "EffectiveMax" -#define PROPERTY_EFFECTIVEMIN "EffectiveMin" -#define PROPERTY_FORMATKEY "FormatKey" -#define PROPERTY_MAXTEXTLEN "MaxTextLen" -#define PROPERTY_LISTSOURCE "ListSource" -#define PROPERTY_FORMATSSUPPLIER "FormatsSupplier" -#define PROPERTY_CONTROLBORDER "ControlBorder" -#define PROPERTY_CONTROLBORDERCOLOR "ControlBorderColor" -#define PROPERTY_BORDER "Border" -#define PROPERTY_BORDERCOLOR "BorderColor" -#define PROPERTY_DEFAULTCONTROL "DefaultControl" - -#define PROPERTY_LEFTMARGIN "LeftMargin" -#define PROPERTY_RIGHTMARGIN "RightMargin" -#define PROPERTY_TOPMARGIN "TopMargin" -#define PROPERTY_BOTTOMMARGIN "BottomMargin" - -#define PROPERTY_PRINTREPEATEDVALUES "PrintRepeatedValues" -#define PROPERTY_CONDITIONALPRINTEXPRESSION "ConditionalPrintExpression" -#define PROPERTY_STARTNEWCOLUMN "StartNewColumn" -#define PROPERTY_RESETPAGENUMBER "ResetPageNumber" -#define PROPERTY_PRINTWHENGROUPCHANGE "PrintWhenGroupChange" -#define PROPERTY_STATE "State" -#define PROPERTY_TIME_STATE "TimeState" -#define PROPERTY_DATE_STATE "DateState" -#define PROPERTY_TRISTATE "TriState" -#define PROPERTY_LISTSOURCETYPE "ListSourceType" -#define PROPERTY_FONTCHARWIDTH "FontCharWidth" -#define PROPERTY_FONTCHARSET "CharFontCharSet" -#define PROPERTY_FONTFAMILY "CharFontFamily" -#define PROPERTY_CHARFONTHEIGHT "CharHeight" -#define PROPERTY_FONTHEIGHT "FontHeight" -#define PROPERTY_FONTKERNING "FontKerning" -#define PROPERTY_FONT "FontDescriptor" -#define PROPERTY_FONTNAME "FontName" -#define PROPERTY_FONTORIENTATION "CharRotation" -#define PROPERTY_FONTPITCH "CharFontPitch" -#define PROPERTY_FONTSLANT "FontSlant" -#define PROPERTY_CHARSTRIKEOUT "CharStrikeout" -#define PROPERTY_FONTSTRIKEOUT "FontStrikeout" -#define PROPERTY_FONTSTYLENAME "CharFontStyleName" -#define PROPERTY_FONTUNDERLINE "CharUnderline" -#define PROPERTY_FONTWEIGHT "CharWeight" -#define PROPERTY_FONTWIDTH "FontWidth" -#define PROPERTY_FONTWORDLINEMODE "FontWordLineMode" -#define PROPERTY_FONTTYPE "FontType" - -#define PROPERTY_ENABLED "Enabled" - -#define PROPERTY_CHAREMPHASIS "CharEmphasis" -#define PROPERTY_CHARFONTNAME "CharFontName" -#define PROPERTY_CHARFONTSTYLENAME "CharFontStyleName" -#define PROPERTY_CHARFONTFAMILY "CharFontFamily" -#define PROPERTY_CHARFONTCHARSET "CharFontCharSet" -#define PROPERTY_CHARFONTPITCH "CharFontPitch" -#define PROPERTY_CHARHEIGHT "CharHeight" -#define PROPERTY_CHARUNDERLINE "CharUnderline" -#define PROPERTY_CHARWEIGHT "CharWeight" -#define PROPERTY_CHARPOSTURE "CharPosture" -#define PROPERTY_CHARWORDMODE "CharWordMode" -#define PROPERTY_CHARROTATION "CharRotation" -#define PROPERTY_CHARSCALEWIDTH "CharScaleWidth" - -// Asian -#define PROPERTY_CHAREMPHASISASIAN "CharEmphasisAsian" -#define PROPERTY_CHARFONTNAMEASIAN "CharFontNameAsian" -#define PROPERTY_CHARFONTSTYLENAMEASIAN "CharFontStyleNameAsian" -#define PROPERTY_CHARFONTFAMILYASIAN "CharFontFamilyAsian" -#define PROPERTY_CHARFONTCHARSETASIAN "CharFontCharSetAsian" -#define PROPERTY_CHARFONTPITCHASIAN "CharFontPitchAsian" -#define PROPERTY_CHARHEIGHTASIAN "CharHeightAsian" -#define PROPERTY_CHARUNDERLINEASIAN "CharUnderlineAsian" -#define PROPERTY_CHARWEIGHTASIAN "CharWeightAsian" -#define PROPERTY_CHARPOSTUREASIAN "CharPostureAsian" -#define PROPERTY_CHARWORDMODEASIAN "CharWordModeAsian" -#define PROPERTY_CHARROTATIONASIAN "CharRotationAsian" -#define PROPERTY_CHARSCALEWIDTHASIAN "CharScaleWidthAsian" -#define PROPERTY_CHARLOCALEASIAN "CharLocaleAsian" - -// Complex -#define PROPERTY_CHAREMPHASISCOMPLEX "CharEmphasisComplex" -#define PROPERTY_CHARFONTNAMECOMPLEX "CharFontNameComplex" -#define PROPERTY_CHARFONTSTYLENAMECOMPLEX "CharFontStyleNameComplex" -#define PROPERTY_CHARFONTFAMILYCOMPLEX "CharFontFamilyComplex" -#define PROPERTY_CHARFONTCHARSETCOMPLEX "CharFontCharSetComplex" -#define PROPERTY_CHARFONTPITCHCOMPLEX "CharFontPitchComplex" -#define PROPERTY_CHARHEIGHTCOMPLEX "CharHeightComplex" -#define PROPERTY_CHARUNDERLINECOMPLEX "CharUnderlineComplex" -#define PROPERTY_CHARWEIGHTCOMPLEX "CharWeightComplex" -#define PROPERTY_CHARPOSTURECOMPLEX "CharPostureComplex" -#define PROPERTY_CHARWORDMODECOMPLEX "CharWordModeComplex" -#define PROPERTY_CHARROTATIONCOMPLEX "CharRotationComplex" -#define PROPERTY_CHARSCALEWIDTHCOMPLEX "CharScaleWidthComplex" -#define PROPERTY_CHARLOCALECOMPLEX "CharLocaleComplex" - -#define PROPERTY_STATUSINDICATOR "StatusIndicator" -#define PROPERTY_SECTION "Section" -#define PROPERTY_FILTER "Filter" -#define PROPERTY_ESCAPEPROCESSING "EscapeProcessing" - -#define PROPERTY_MULTILINE "MultiLine" -#define PROPERTY_ACTIVECONNECTION "ActiveConnection" -#define PROPERTY_DATASOURCENAME "DataSourceName" -#define PROPERTY_FORMULA "Formula" -#define PROPERTY_INITIALFORMULA "InitialFormula" -#define PROPERTY_PREEVALUATED "PreEvaluated" -#define PROPERTY_DEEPTRAVERSING "DeepTraversing" -#define PROPERTY_MIMETYPE "MimeType" -#define PROPERTY_BACKGROUNDCOLOR "BackgroundColor" -#define PROPERTY_TEXT "Text" -#define PROPERTY_TEXTCOLOR "TextColor" -#define PROPERTY_TEXTLINECOLOR "TextLineColor" -#define PROPERTY_FONTRELIEF "FontRelief" -#define PROPERTY_FONTEMPHASISMARK "FontEmphasisMark" -#define PROPERTY_ZORDER "ZOrder" -#define PROPERTY_OPAQUE "Opaque" -#define PROPERTY_TRANSFORMATION "Transformation" -#define PROPERTY_CUSTOMSHAPEENGINE "CustomShapeEngine" -#define PROPERTY_CUSTOMSHAPEDATA "CustomShapeData" -#define PROPERTY_CUSTOMSHAPEGEOMETRY "CustomShapeGeometry" - -#define PROPERTY_NUMBERINGTYPE "NumberingType" -#define PROPERTY_PAGESTYLELAYOUT "PageStyleLayout" -#define PROPERTY_ISLANDSCAPE "IsLandscape" -#define PROPERTY_ALIGN "Align" -#define PROPERTY_TYPE "Type" - -#define PROPERTY_PRESERVEIRI "PreserveIRI" -#define PROPERTY_SCALEMODE "ScaleMode" - -#define PROPERTY_LINESTYLE "LineStyle" -#define PROPERTY_LINEDASH "LineDash" -#define PROPERTY_LINECOLOR "LineColor" -#define PROPERTY_LINETRANSPARENCE "LineTransparence" -#define PROPERTY_LINEWIDTH "LineWidth" - -#define PROPERTY_CHARFLASH "CharFlash" -#define PROPERTY_CHARESCAPEMENTHEIGHT "CharEscapementHeight" -#define PROPERTY_CHARLOCALE "CharLocale" -#define PROPERTY_CHARESCAPEMENT "CharEscapement" -#define PROPERTY_CHARCASEMAP "CharCaseMap" -#define PROPERTY_CHARCOMBINEISON "CharCombineIsOn" -#define PROPERTY_CHARCOMBINEPREFIX "CharCombinePrefix" -#define PROPERTY_CHARCOMBINESUFFIX "CharCombineSuffix" -#define PROPERTY_CHARHIDDEN "CharHidden" -#define PROPERTY_CHARSHADOWED "CharShadowed" -#define PROPERTY_CHARCONTOURED "CharContoured" -#define PROPERTY_CHARAUTOKERNING "CharAutoKerning" -#define PROPERTY_CHARKERNING "CharKerning" -#define PROPERTY_HYPERLINKURL "HyperLinkURL" -#define PROPERTY_HYPERLINKTARGET "HyperLinkTarget" -#define PROPERTY_HYPERLINKNAME "HyperLinkName" -#define PROPERTY_VISITEDCHARSTYLENAME "VisitedCharStyleName" -#define PROPERTY_UNVISITEDCHARSTYLENAME "UnvisitedCharStyleName" -#define PROPERTY_ORDER "Order" -#define PROPERTY_APPLYFILTER "ApplyFilter" -#define PROPERTY_MAXROWS "MaxRows" - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/inc/uistrings.hrc b/reportdesign/source/inc/uistrings.hrc deleted file mode 100644 index 4aaca430f215..000000000000 --- a/reportdesign/source/inc/uistrings.hrc +++ /dev/null @@ -1,57 +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 . - */ -#ifndef REPORTDESIGN_SHARED_UISTRINGS_HRC -#define REPORTDESIGN_SHARED_UISTRINGS_HRC - -#include <rtl/ustring.hxx> - -#define STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.hrc" -#undef STRINGCONSTANTS_INCLUDED_INDIRECT - -#define PROPERTY_REPORTNAME "ReportName" -#define CFG_REPORTDESIGNER "SunReportBuilder" -#define DBREPORTHEADER "ReportHeader" -#define DBREPORTFOOTER "ReportFooter" -#define DBPAGEHEADER "PageHeader" -#define DBPAGEFOOTER "PageFooter" -#define DBGROUPHEADER "GroupHeader" -#define DBGROUPFOOTER "GroupFooter" -#define DBDETAIL "Detail" -#define REPORTCONTROLFORMAT "ReportControlFormat" -#define CURRENT_WINDOW "CurrentWindow" -#define PROPERTY_FONTCOLOR "FontColor" -#define PROPERTY_EMPTY_IS_NULL "ConvertEmptyToNull" -#define PROPERTY_FILTERPROPOSAL "UseFilterValueProposal" -#define PROPERTY_POSITION "Position" -#define PROPERTY_FORMATKEYDATE "FormatKeyDate" -#define PROPERTY_FORMATKEYTIME "FormatKeyTime" -#define DBOVERLAPPEDCONTROL "OverlappedControl" -#define PROPERTY_FORMULALIST "FormulaList" -#define PROPERTY_SCOPE "Scope" -#define PROPERTY_CHARTTYPE "ChartType" -#define PROPERTY_PREVIEW_COUNT "RowLimit" -#define PROPERTY_TITLE "Title" -#define PROPERTY_AREA "Area" -#define PROPERTY_FILLCOLOR "FillColor" -#define DBTEXTBOXBOUNDCONTENT "TextBoxBoundContent" - -#endif // REPORTDESIGN_SHARED_UISTRINGS_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/inc/xmlstrings.hrc b/reportdesign/source/inc/xmlstrings.hrc deleted file mode 100644 index ab0082a40dc1..000000000000 --- a/reportdesign/source/inc/xmlstrings.hrc +++ /dev/null @@ -1,42 +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 . - */ -#ifndef REPORTDESIGN_SHARED_XMLSTRINGS_HRC -#define REPORTDESIGN_SHARED_XMLSTRINGS_HRC - -#include <rtl/ustring.hxx> - -#define STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.hrc" -#undef STRINGCONSTANTS_INCLUDED_INDIRECT - -//= XML - -#define SERVICE_SETTINGSIMPORTER "com.sun.star.comp.Report.XMLOasisSettingsImporter" -#define SERVICE_STYLESIMPORTER "com.sun.star.comp.Report.XMLOasisStylesImporter" -#define SERVICE_CONTENTIMPORTER "com.sun.star.comp.Report.XMLOasisContentImporter" -#define SERVICE_IMPORTFILTER "com.sun.star.document.ImportFilter" -#define SERVICE_METAIMPORTER "com.sun.star.comp.Report.XMLOasisMetaImporter" -#define PROPERTY_BORDERLEFT "BorderLeft" -#define PROPERTY_BORDERRIGHT "BorderRight" -#define PROPERTY_BORDERTOP "BorderTop" -#define PROPERTY_BORDERBOTTOM "BorderBottom" - -#endif // REPORTDESIGN_SHARED_XMLSTRINGS_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 4d89af8070e7..2092c538a2ee 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -33,10 +33,10 @@ #include "rptui_slotid.hrc" #include <connectivity/dbtools.hxx> +#include "core_resource.hxx" #include "helpids.hrc" -#include "RptResId.hrc" -#include "ModuleHelper.hxx" -#include "uistrings.hrc" +#include "strings.hrc" +#include "strings.hxx" #include "ColumnInfo.hxx" #include <comphelper/property.hxx> @@ -320,7 +320,7 @@ void OAddFieldWindow::Update() m_aActions->EnableItem(m_aActions->GetItemId(j),false); } - OUString aTitle(ModuleRes(RID_STR_FIELDSELECTION)); + OUString aTitle(RptResId(RID_STR_FIELDSELECTION)); SetText(aTitle); if ( m_xRowSet.is() ) { diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 0a3b665085f5..3ac4e1581c24 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -19,10 +19,10 @@ #include "CondFormat.hxx" -#include "uistrings.hrc" -#include "RptResId.hrc" +#include "strings.hxx" +#include "strings.hrc" #include "rptui_slotid.hrc" -#include "ModuleHelper.hxx" +#include "core_resource.hxx" #include "helpids.hrc" #include "UITools.hxx" #include "ReportController.hxx" @@ -434,7 +434,7 @@ namespace rptui short nRet = ModalDialog::Execute(); if ( nRet == RET_OK ) { - const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CONDITIONAL_FORMATTING ) ); + const OUString sUndoAction( RptResId( RID_STR_UNDO_CONDITIONAL_FORMATTING ) ); const UndoContext aUndoContext( m_rController.getUndoManager(), sUndoAction ); try { diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src deleted file mode 100644 index ecf70cae59fd..000000000000 --- a/reportdesign/source/ui/dlg/CondFormat.src +++ /dev/null @@ -1,28 +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 "helpids.hrc" -#include "rptui_slotid.hrc" - -String STR_NUMBERED_CONDITION -{ - Text [ en-US ] = "Condition $number$"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index f93326f6eaec..fcec991d2348 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -20,9 +20,9 @@ #include "Condition.hxx" #include "UITools.hxx" #include "CondFormat.hxx" -#include "RptResId.hrc" +#include "core_resource.hxx" +#include "strings.hrc" #include "ReportController.hxx" -#include "ModuleHelper.hxx" #include "ColorChanger.hxx" #include "helpids.hrc" #include "reportformula.hxx" @@ -445,7 +445,7 @@ void Condition::fillFormatCondition(const uno::Reference< report::XFormatConditi void Condition::setConditionIndex( size_t _nCondIndex, size_t _nCondCount ) { m_nCondIndex = _nCondIndex; - OUString sHeader( ModuleRes( STR_NUMBERED_CONDITION ) ); + OUString sHeader( RptResId( STR_NUMBERED_CONDITION ) ); sHeader = sHeader.replaceFirst( "$number$", OUString::number( _nCondIndex + 1) ); m_pHeader->SetText( sHeader ); diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 8c72bb98375b..7e5639e6cd34 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -18,16 +18,15 @@ */ #include "DateTime.hxx" #include <com/sun/star/beans/XPropertySet.hpp> -#include "RptResId.hrc" +#include "strings.hrc" #include "rptui_slotid.hrc" -#include "ModuleHelper.hxx" #include "helpids.hrc" #include <vcl/msgbox.hxx> #include <connectivity/dbconversion.hxx> #include <unotools/syslocale.hxx> #include "UITools.hxx" #include "RptDef.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "ReportController.hxx" #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/NumberFormat.hpp> diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 50bd4d4c31b8..5bd6b8b632a9 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -26,14 +26,14 @@ #include <com/sun/star/report/GroupOn.hpp> #include <com/sun/star/sdbc/DataType.hpp> -#include "RptResId.hrc" +#include "strings.hrc" #include "rptui_slotid.hrc" -#include "ModuleHelper.hxx" +#include "core_resource.hxx" #include "helpids.hrc" #include "GroupExchange.hxx" #include "UITools.hxx" #include "UndoActions.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "ReportController.hxx" #include "ColumnInfo.hxx" @@ -318,7 +318,7 @@ void OFieldExpressionControl::moveGroups(const uno::Sequence<uno::Any>& _aGroups m_bIgnoreEvent = true; { sal_Int32 nRow = _nRow; - const OUString sUndoAction(ModuleRes(RID_STR_UNDO_MOVE_GROUP)); + const OUString sUndoAction(RptResId(RID_STR_UNDO_MOVE_GROUP)); const UndoContext aUndoContext( m_pParent->m_pController->getUndoManager(), sUndoAction ); uno::Reference< report::XGroups> xGroups = m_pParent->getGroups(); @@ -379,7 +379,7 @@ void OFieldExpressionControl::lateInit() SetFont(aFont); InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(OUString('0')) * 4)/*, sal_True */); - InsertDataColumn( FIELD_EXPRESSION, OUString(ModuleRes(STR_RPT_EXPRESSION)), 100); + InsertDataColumn( FIELD_EXPRESSION, RptResId(STR_RPT_EXPRESSION), 100); m_pComboCell = VclPtr<ComboBoxControl>::Create( &GetDataWindow() ); m_pComboCell->SetSelectHdl(LINK(this,OFieldExpressionControl,CBChangeHdl)); @@ -430,7 +430,7 @@ bool OFieldExpressionControl::SaveModified() if ( m_aGroupPositions[nRow] == NO_GROUP ) { bAppend = true; - OUString sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP)); + OUString sUndoAction(RptResId(RID_STR_UNDO_APPEND_GROUP)); m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, OUString(), 0, ViewShellId(-1) ); xGroup = m_pParent->getGroups()->createGroup(); xGroup->setHeaderOn(true); @@ -756,7 +756,7 @@ void OFieldExpressionControl::DeleteRows() if ( bFirstTime ) { bFirstTime = false; - OUString sUndoAction(ModuleRes(RID_STR_UNDO_REMOVE_SELECTION)); + OUString sUndoAction(RptResId(RID_STR_UNDO_REMOVE_SELECTION)); m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, OUString(), 0, ViewShellId(-1) ); } @@ -972,10 +972,18 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusGot, Control&, rControl, void ) { if ( m_pFieldExpression && m_pFieldExpression->getExpressionControl() ) { - Control* pControls[] = { m_pFieldExpression->getExpressionControl(), m_pHeaderLst, m_pFooterLst, m_pGroupOnLst, m_pGroupIntervalEd, m_pKeepTogetherLst, m_pOrderLst}; + const std::pair<Control*, const char*> pControls[] = { + { m_pFieldExpression->getExpressionControl(), STR_RPT_HELP_FIELD }, + { m_pHeaderLst, STR_RPT_HELP_HEADER }, + { m_pFooterLst, STR_RPT_HELP_FOOTER }, + { m_pGroupOnLst, STR_RPT_HELP_GROUPON }, + { m_pGroupIntervalEd, STR_RPT_HELP_INTERVAL }, + { m_pKeepTogetherLst, STR_RPT_HELP_KEEP }, + { m_pOrderLst, STR_RPT_HELP_SORT } + }; for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i) { - if ( &rControl == pControls[i] ) + if (&rControl == pControls[i].first) { ListBox* pListBox = dynamic_cast< ListBox* >( &rControl ); if ( pListBox ) @@ -984,7 +992,7 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusGot, Control&, rControl, void ) if ( pNumericField ) pNumericField->SaveValue(); //shows the text given by the id in the multiline edit - m_pHelpWindow->SetText(OUString(ModuleRes(static_cast<sal_uInt16>(i+STR_RPT_HELP_FIELD)))); + m_pHelpWindow->SetText(RptResId(pControls[i].second)); break; } } @@ -1106,23 +1114,23 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x case sdbc::DataType::LONGVARCHAR: case sdbc::DataType::VARCHAR: case sdbc::DataType::CHAR: - m_pGroupOnLst->InsertEntry(OUString(ModuleRes(STR_RPT_PREFIXCHARS))); + m_pGroupOnLst->InsertEntry(RptResId(STR_RPT_PREFIXCHARS)); m_pGroupOnLst->SetEntryData(1,reinterpret_cast<void*>(report::GroupOn::PREFIX_CHARACTERS)); break; case sdbc::DataType::DATE: case sdbc::DataType::TIME: case sdbc::DataType::TIMESTAMP: { - const sal_uInt16 nIds[] = { STR_RPT_YEAR, STR_RPT_QUARTER,STR_RPT_MONTH,STR_RPT_WEEK,STR_RPT_DAY,STR_RPT_HOUR,STR_RPT_MINUTE }; - for (sal_uInt16 i = 0; i < SAL_N_ELEMENTS(nIds); ++i) + const char* aIds[] = { STR_RPT_YEAR, STR_RPT_QUARTER,STR_RPT_MONTH,STR_RPT_WEEK,STR_RPT_DAY,STR_RPT_HOUR,STR_RPT_MINUTE }; + for (sal_uInt16 i = 0; i < SAL_N_ELEMENTS(aIds); ++i) { - m_pGroupOnLst->InsertEntry(OUString(ModuleRes(nIds[i]))); + m_pGroupOnLst->InsertEntry(RptResId(aIds[i])); m_pGroupOnLst->SetEntryData(i+1,reinterpret_cast<void*>(i+2)); } } break; default: - m_pGroupOnLst->InsertEntry(OUString(ModuleRes(STR_RPT_INTERVAL))); + m_pGroupOnLst->InsertEntry(RptResId(STR_RPT_INTERVAL)); m_pGroupOnLst->SetEntryData(1,reinterpret_cast<void*>(report::GroupOn::INTERVAL)); break; } diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src deleted file mode 100644 index 9ae6ebda573a..000000000000 --- a/reportdesign/source/ui/dlg/GroupsSorting.src +++ /dev/null @@ -1,108 +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 "helpids.hrc" -#include <svx/svxids.hrc> - -String STR_RPT_EXPRESSION -{ - Text [ en-US ] = "Field/Expression" ; -}; - -String STR_RPT_PREFIXCHARS -{ - Text [ en-US ] = "Prefix Characters" ; -}; - -String STR_RPT_YEAR -{ - Text [ en-US ] = "Year" ; -}; - -String STR_RPT_QUARTER -{ - Text [ en-US ] = "Quarter" ; -}; - -String STR_RPT_MONTH -{ - Text [ en-US ] = "Month" ; -}; - -String STR_RPT_WEEK -{ - Text [ en-US ] = "Week" ; -}; - -String STR_RPT_DAY -{ - Text [ en-US ] = "Day" ; -}; - -String STR_RPT_HOUR -{ - Text [ en-US ] = "Hour" ; -}; - -String STR_RPT_MINUTE -{ - Text [ en-US ] = "Minute" ; -}; - -String STR_RPT_INTERVAL -{ - Text [ en-US ] = "Interval" ; -}; - -String STR_RPT_HELP_FIELD -{ - Text [ en-US ] = "Select a field or type an expression to sort or group on." ; -}; - -String STR_RPT_HELP_HEADER -{ - Text [ en-US ] = "Display a header for this group?" ; -}; - -String STR_RPT_HELP_FOOTER -{ - Text [ en-US ] = "Display a footer for this group?" ; -}; - -String STR_RPT_HELP_GROUPON -{ - Text [ en-US ] = "Select the value or range of values that starts a new group." ; -}; - -String STR_RPT_HELP_INTERVAL -{ - Text [ en-US ] = "Interval or number of characters to group on." ; -}; - -String STR_RPT_HELP_KEEP -{ - Text [ en-US ] = "Keep group together on one page?" ; -}; - -String STR_RPT_HELP_SORT -{ - Text [ en-US ] = "Select ascending or descending sort order. Ascending means from A to Z or 0 to 9" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 4d1b2d745925..cdefb2f4bd25 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -19,7 +19,7 @@ #include "Navigator.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "bitmaps.hlst" #include "ReportController.hxx" #include "UITools.hxx" @@ -33,7 +33,7 @@ #include <com/sun/star/report/XImageControl.hpp> #include <com/sun/star/report/XShape.hpp> #include "helpids.hrc" -#include "RptResId.hrc" +#include "strings.hrc" #include "rptui_slotid.hrc" #include <comphelper/propmultiplex.hxx> #include <comphelper/containermultiplexer.hxx> @@ -44,7 +44,7 @@ #include <svtools/treelistentry.hxx> #include <svl/solar.hrc> #include "ReportVisitor.hxx" -#include "ModuleHelper.hxx" +#include "core_resource.hxx" #include <rtl/ref.hxx> #include <memory> @@ -552,7 +552,7 @@ void NavigatorTree::traverseSection(const uno::Reference< report::XSection>& _xS void NavigatorTree::traverseFunctions(const uno::Reference< report::XFunctions>& _xFunctions,SvTreeListEntry* _pParent) { - SvTreeListEntry* pFunctions = insertEntry(OUString(ModuleRes(RID_STR_FUNCTIONS)), _pParent, RID_SVXBMP_RPT_NEW_FUNCTION, TREELIST_APPEND, new UserData(this,_xFunctions)); + SvTreeListEntry* pFunctions = insertEntry(RptResId(RID_STR_FUNCTIONS), _pParent, RID_SVXBMP_RPT_NEW_FUNCTION, TREELIST_APPEND, new UserData(this,_xFunctions)); const sal_Int32 nCount = _xFunctions->getCount(); for (sal_Int32 i = 0; i< nCount; ++i) { @@ -622,7 +622,7 @@ void NavigatorTree::traversePageFooter(const uno::Reference< report::XSection>& void NavigatorTree::traverseGroups(const uno::Reference< report::XGroups>& _xGroups) { SvTreeListEntry* pReport = find(_xGroups->getReportDefinition()); - insertEntry(OUString(ModuleRes(RID_STR_GROUPS)), pReport, RID_SVXBMP_SORTINGANDGROUPING, TREELIST_APPEND, new UserData(this,_xGroups)); + insertEntry(RptResId(RID_STR_GROUPS), pReport, RID_SVXBMP_SORTINGANDGROUPING, TREELIST_APPEND, new UserData(this,_xGroups)); } void NavigatorTree::traverseGroup(const uno::Reference< report::XGroup>& _xGroup) diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src deleted file mode 100644 index c0caf74d1dad..000000000000 --- a/reportdesign/source/ui/dlg/Navigator.src +++ /dev/null @@ -1,35 +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 "helpids.hrc" -#include "rptui_slotid.hrc" -#include <svx/svxids.hrc> -#include <svl/solar.hrc> - -String RID_STR_FUNCTIONS -{ - Text [ en-US ] = "Functions" ; -}; - -String RID_STR_GROUPS -{ - Text [ en-US ] = "Groups" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index cbe3fe9a7ef6..184b8040e390 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -18,16 +18,15 @@ */ #include "PageNumber.hxx" #include <com/sun/star/beans/XPropertySet.hpp> -#include "RptResId.hrc" +#include "strings.hrc" #include "rptui_slotid.hrc" -#include "ModuleHelper.hxx" #include "RptDef.hxx" #include "helpids.hrc" #include <vcl/msgbox.hxx> #include <vcl/settings.hxx> #include "UITools.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "ReportController.hxx" #include <comphelper/propertysequence.hxx> #include <algorithm> diff --git a/reportdesign/source/ui/dlg/PageNumber.src b/reportdesign/source/ui/dlg/PageNumber.src deleted file mode 100644 index be120f608e77..000000000000 --- a/reportdesign/source/ui/dlg/PageNumber.src +++ /dev/null @@ -1,34 +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 "helpids.hrc" -#include <svx/svxids.hrc> - -String STR_RPT_PN_PAGE -{ - Text [ en-US ] = "\"Page \" & #PAGENUMBER#" ; - Text [ x-comment ] = "The space after the word is no error. #PAGENUMBER# is a replacement and & must not be translated as well as \""; -}; -String STR_RPT_PN_PAGE_OF -{ - Text [ en-US ] = " & \" of \" & #PAGECOUNT#" ; - Text [ x-comment ] = "The space before and after the word is no error. #PAGECOUNT# is a replacement and & must not be translated as well as \""; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index 2651ef18bd59..5bb8c376f1c5 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -23,8 +23,7 @@ #include <svx/svxdlg.hxx> #include <editeng/svxenum.hxx> #include "dlgpage.hxx" -#include "ModuleHelper.hxx" -#include "RptResId.hrc" +#include "strings.hrc" #include <svl/intitem.hxx> #include <svl/cjkoptions.hxx> #include <svl/aeitem.hxx> diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx index 6b6aea5ee854..6150a14c4924 100644 --- a/reportdesign/source/ui/inc/ColorListener.hxx +++ b/reportdesign/source/ui/inc/ColorListener.hxx @@ -22,7 +22,6 @@ #include <vcl/window.hxx> #include <svtools/colorcfg.hxx> #include <svtools/extcolorcfg.hxx> -#include "ModuleHelper.hxx" #include <tools/link.hxx> namespace rptui @@ -32,7 +31,6 @@ namespace rptui OColorListener(const OColorListener&) = delete; void operator =(const OColorListener&) = delete; protected: - OModuleClient m_aModuleClient; Link<OColorListener&,void> m_aCollapsedLink; svtools::ColorConfig m_aColorConfig; svtools::ExtendedColorConfig m_aExtendedColorConfig; diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx index 9f1daeacc9f2..0118fe54eac1 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_CONDFORMAT_HXX #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_CONDFORMAT_HXX -#include "ModuleHelper.hxx" - #include <com/sun/star/report/XReportControlModel.hpp> #include <vcl/dialog.hxx> @@ -69,7 +67,6 @@ namespace rptui { typedef ::std::vector< VclPtr<Condition> > Conditions; - OModuleClient m_aModuleClient; VclPtr<vcl::Window> m_pConditionPlayground; Conditions m_aConditions; VclPtr<VclScrolledWindow> m_pScrollWindow; diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx index ff2bd78f92ec..58e1270a974e 100644 --- a/reportdesign/source/ui/inc/GeometryHandler.hxx +++ b/reportdesign/source/ui/inc/GeometryHandler.hxx @@ -90,12 +90,12 @@ namespace rptui */ sal_uInt32 impl_getDataFieldType_throw(const OUString& _sDataField = OUString()) const; - css::uno::Any getConstantValue(bool bToControlValue,sal_uInt16 nResId,const css::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName ); + css::uno::Any getConstantValue(bool bToControlValue,const char** pResId,const css::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName ); css::beans::Property getProperty(const OUString & PropertyName); static void implCreateListLikeControl( const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ,css::inspection::LineDescriptor & out_Descriptor - ,sal_uInt16 _nResId + ,const char** pResId ,bool _bReadOnlyControl ,bool _bTrueIfListBoxFalseIfComboBox ); diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx index 29f6e28f4c33..43550c9f3929 100644 --- a/reportdesign/source/ui/inc/Navigator.hxx +++ b/reportdesign/source/ui/inc/Navigator.hxx @@ -20,7 +20,6 @@ #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_NAVIGATOR_HXX #include <vcl/floatwin.hxx> -#include "ModuleHelper.hxx" #include <memory> namespace rptui { @@ -28,7 +27,6 @@ namespace rptui class ONavigatorImpl; class ONavigator : public FloatingWindow { - OModuleClient m_aModuleClient; ::std::unique_ptr<ONavigatorImpl> m_pImpl; ONavigator(const ONavigator&) = delete; void operator =(const ONavigator&) = delete; diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index 499372f6a5df..55f952147e6b 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -20,7 +20,6 @@ #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCONTROLLER_HXX #include "DesignView.hxx" -#include "ModuleHelper.hxx" #include "ReportControllerObserver.hxx" #include "RptDef.hxx" @@ -83,7 +82,6 @@ namespace rptui ,public ::comphelper::OPropertyArrayUsageHelper < OReportController_BASE > { private: - OModuleClient m_aModuleClient; ::comphelper::OInterfaceContainerHelper2 m_aSelectionListeners; css::uno::Sequence< css::beans::PropertyValue> @@ -201,20 +199,20 @@ namespace rptui ,sal_Int32 _nGroupPos ,bool _bShow); - void executeMethodWithUndo(sal_uInt16 _nUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun); - void alignControlsWithUndo(sal_uInt16 _nUndoStrId, ControlModification _nControlModification, bool _bAlignAtSection = false); + void executeMethodWithUndo(const char* pUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun); + void alignControlsWithUndo(const char* pUndoStrId, ControlModification _nControlModification, bool _bAlignAtSection = false); css::uno::Reference< css::frame::XFrame > getXFrame(); /** shrink a section - @param _nUndoStrId the string id of the string which is shown in undo menu + @param pUndoStrId the string id of the string which is shown in undo menu @param _nShrinkId ID of what you would like to shrink. */ static void shrinkSectionBottom(const css::uno::Reference< css::report::XSection >& _xSection); static void shrinkSectionTop(const css::uno::Reference< css::report::XSection >& _xSection); public: - void shrinkSection(sal_uInt16 _nUndoStrId, const css::uno::Reference< css::report::XSection >& _xSection, sal_Int32 _nShrinkId); + void shrinkSection(const char* pUndoStrId, const css::uno::Reference< css::report::XSection >& _xSection, sal_Int32 _nShrinkId); /** opens the file open dialog to allow the user to select a image which will be * bound to a newly created image button. @@ -299,7 +297,7 @@ namespace rptui /** set the property at all selected controls. @return <TRUE/> when the selection is not empty */ - bool impl_setPropertyAtControls_throw(const sal_uInt16 _nUndoResId + bool impl_setPropertyAtControls_throw(const char* pUndoResId ,const OUString& _sProperty ,const css::uno::Any& _aValue ,const css::uno::Sequence< css::beans::PropertyValue >& _aArgs); diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx index 50374e4dcb97..e9f03e722470 100644 --- a/reportdesign/source/ui/inc/RptUndo.hxx +++ b/reportdesign/source/ui/inc/RptUndo.hxx @@ -54,7 +54,7 @@ namespace rptui OSectionUndo( OReportModel& rMod ,sal_uInt16 _nSlot ,Action _eAction - ,sal_uInt16 nCommentID); + ,const char* pCommentID); virtual ~OSectionUndo() override; virtual void Undo() override; @@ -106,7 +106,7 @@ namespace rptui ,OGroupHelper> _pMemberFunction ,const css::uno::Reference< css::report::XGroup >& _xGroup ,Action _eAction - ,sal_uInt16 nCommentID); + ,const char* pCommentID); virtual OUString GetComment() const override; }; @@ -125,7 +125,7 @@ namespace rptui void implReRemove( ); public: OGroupUndo(OReportModel& rMod - ,sal_uInt16 nCommentID + ,const char* pCommentID ,Action _eAction ,const css::uno::Reference< css::report::XGroup>& _xGroup ,const css::uno::Reference< css::report::XReportDefinition >& _xReportDefinition); diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx index fefc2d7d5ac2..cafca76a2551 100644 --- a/reportdesign/source/ui/inc/SectionWindow.hxx +++ b/reportdesign/source/ui/inc/SectionWindow.hxx @@ -66,7 +66,7 @@ namespace rptui * \param _pIsSectionOn * @return sal_True when title was set otherwise FALSE */ - bool setGroupSectionTitle(const css::uno::Reference< css::report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OGroupHelper> _pGetSection, const ::std::mem_fun_t<bool, OGroupHelper>& _pIsSectionOn); + bool setGroupSectionTitle(const css::uno::Reference< css::report::XGroup>& _xGroup,const char* pResId,::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OGroupHelper> _pGetSection, const ::std::mem_fun_t<bool, OGroupHelper>& _pIsSectionOn); /** set the title of the (report/page) header or footer * @@ -76,7 +76,7 @@ namespace rptui * \param _pIsSectionOn * @return sal_True when title was set otherwise FALSE */ - bool setReportSectionTitle(const css::uno::Reference< css::report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t<bool, OReportHelper>& _pIsSectionOn); + bool setReportSectionTitle(const css::uno::Reference< css::report::XReportDefinition>& _xReport,const char* pResId,::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t<bool, OReportHelper>& _pIsSectionOn); void ImplInitSettings(); DECL_LINK(Collapsed, OColorListener&, void); diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index c9e0e6a3e989..812a4bc0c9f0 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -19,11 +19,10 @@ #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_METADATA_HXX #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_METADATA_HXX -#include "ModuleHelper.hxx" - #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/inspection/XPropertyHandler.hpp> #include <o3tl/typed_flags_set.hxx> +#include <vector> //= UI flags (for all browseable properties) enum class PropUIFlags { @@ -47,7 +46,6 @@ namespace rptui //= OPropertyInfoService class OPropertyInfoService - :public OModuleClient { OPropertyInfoService(const OPropertyInfoService&) = delete; void operator =(const OPropertyInfoService&) = delete; diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx index e205d41e19b4..6d4c6351704a 100644 --- a/reportdesign/source/ui/inc/propbrw.hxx +++ b/reportdesign/source/ui/inc/propbrw.hxx @@ -29,7 +29,6 @@ #include <svl/lstner.hxx> #include <vcl/dockwin.hxx> #include <svx/svdmark.hxx> -#include "ModuleHelper.hxx" namespace rptui { @@ -44,7 +43,6 @@ class OObjectBase; class PropBrw : public DockingWindow , public SfxListener, public SfxBroadcaster { private: - OModuleClient m_aModuleClient; css::uno::Reference< css::uno::XComponentContext > m_xInspectorContext; css::uno::Reference< css::uno::XComponentContext > 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[] = { /* diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index bbd66c5c84ba..5064d6451b63 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -20,7 +20,7 @@ #include <svl/hint.hxx> #include <vcl/settings.hxx> -#include "uistrings.hrc" +#include "strings.hxx" namespace rptui diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 09325299e7aa..dec9f097b337 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -18,7 +18,7 @@ */ #include "RptUndo.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "rptui_slotid.hrc" #include "UITools.hxx" #include "UndoEnv.hxx" @@ -113,8 +113,8 @@ namespace OSectionUndo::OSectionUndo(OReportModel& _rMod ,sal_uInt16 _nSlot ,Action _eAction - ,sal_uInt16 nCommentID) -: OCommentUndoAction(_rMod,nCommentID) + ,const char* pCommentID) +: OCommentUndoAction(_rMod,pCommentID) ,m_eAction(_eAction) ,m_nSlot(_nSlot) ,m_bInserted(false) @@ -220,7 +220,7 @@ OReportSectionUndo::OReportSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot ,OReportHelper> _pMemberFunction ,const uno::Reference< report::XReportDefinition >& _xReport ,Action _eAction) -: OSectionUndo(_rMod,_nSlot,_eAction,0) +: OSectionUndo(_rMod,_nSlot,_eAction,nullptr) ,m_aReportHelper(_xReport) ,m_pMemberFunction(_pMemberFunction) { @@ -257,8 +257,8 @@ OGroupSectionUndo::OGroupSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot ,OGroupHelper> _pMemberFunction ,const uno::Reference< report::XGroup >& _xGroup ,Action _eAction - ,sal_uInt16 nCommentID) -: OSectionUndo(_rMod,_nSlot,_eAction,nCommentID) + ,const char* pCommentID) +: OSectionUndo(_rMod,_nSlot,_eAction,pCommentID) ,m_aGroupHelper(_xGroup) ,m_pMemberFunction(_pMemberFunction) { @@ -323,11 +323,11 @@ void OGroupSectionUndo::implReRemove( ) OGroupUndo::OGroupUndo(OReportModel& _rMod - ,sal_uInt16 nCommentID + ,const char* pCommentID ,Action _eAction ,const uno::Reference< report::XGroup>& _xGroup ,const uno::Reference< report::XReportDefinition >& _xReportDefinition) -: OCommentUndoAction(_rMod,nCommentID) +: OCommentUndoAction(_rMod,pCommentID) ,m_xGroup(_xGroup) ,m_xReportDefinition(_xReportDefinition) ,m_eAction(_eAction) diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 443e23ca2c1f..9d7a3eed25ad 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -100,11 +100,11 @@ #include "dlgpage.hxx" #include <vcl/msgbox.hxx> #include "rptui_slotid.hrc" -#include "uistrings.hrc" +#include "strings.hxx" +#include "core_resource.hxx" #include "RptObject.hxx" -#include "ModuleHelper.hxx" #include "RptDef.hxx" -#include "RptResId.hrc" +#include "strings.hrc" #include "ReportDefinition.hxx" #include "RptModel.hxx" @@ -163,14 +163,14 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32 OSL_ENSURE(_xGroup.is(),"Group is NULL -> GPF"); if ( _xGroup->getHeaderOn() && _xGroup->getHeader()->getName().isEmpty() ) { - OUString sName = ModuleRes(RID_STR_GROUPHEADER); + OUString sName = RptResId(RID_STR_GROUPHEADER); sName += OUString::number(_nPos); _xGroup->getHeader()->setName(sName); } if ( _xGroup->getFooterOn() && _xGroup->getFooter()->getName().isEmpty() ) { - OUString sName = ModuleRes(RID_STR_GROUPFOOTER); + OUString sName = RptResId(RID_STR_GROUPFOOTER); sName += OUString::number(_nPos); _xGroup->getFooter()->setName(sName); } diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index fccb41abb983..83233bb7e67f 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -37,7 +37,7 @@ #include "ScrollHelper.hxx" #include "Navigator.hxx" #include "SectionWindow.hxx" -#include "RptResId.hrc" +#include "strings.hrc" #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index de398d2aa1ab..51b1f3cb9f05 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -28,7 +28,7 @@ #include <ViewsWindow.hxx> #include <ReportSection.hxx> #include <ReportController.hxx> -#include <uistrings.hrc> +#include <strings.hxx> #include <reportformula.hxx> #include <toolkit/helper/property.hxx> diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index 54b7fbfc80f0..db79387e4701 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -29,7 +29,7 @@ #include <ViewsWindow.hxx> #include <ReportSection.hxx> #include <ReportController.hxx> -#include <uistrings.hrc> +#include <strings.hxx> #include <reportformula.hxx> #include <toolkit/helper/property.hxx> diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index d23550f9de16..2e0a68235562 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -112,17 +112,17 @@ #include <svx/zoom_def.hxx> #include <svx/dialogs.hrc> +#include "core_resource.hxx" #include "DesignView.hxx" -#include "ModuleHelper.hxx" #include "RptObject.hxx" #include "RptUndo.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "RptDef.hxx" #include "ReportSection.hxx" #include "SectionView.hxx" #include "UndoActions.hxx" #include "dlgpage.hxx" -#include "RptResId.hrc" +#include "strings.hrc" #include <svl/itempool.hxx> #include <svl/itemset.hxx> @@ -407,7 +407,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const case SID_REPORTHEADERFOOTER: { aReturn.bEnabled = isEditable(); - OUString sText = ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getReportHeaderOn()) ? RID_STR_REPORTHEADERFOOTER_DELETE : RID_STR_REPORTHEADERFOOTER_INSERT); + OUString sText = RptResId((m_xReportDefinition.is() && m_xReportDefinition->getReportHeaderOn()) ? RID_STR_REPORTHEADERFOOTER_DELETE : RID_STR_REPORTHEADERFOOTER_INSERT); aReturn.sTitle = sText; } break; @@ -416,7 +416,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const case SID_PAGEHEADERFOOTER: { aReturn.bEnabled = isEditable(); - OUString sText = ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT); + OUString sText = RptResId((m_xReportDefinition.is() && m_xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT); aReturn.sTitle = sText; } break; @@ -569,7 +569,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const aReturn.bEnabled = !pSectionWindow->getReportSection().isUiActive(); } { - OUString sText = ModuleRes(RID_STR_DELETE); + OUString sText = RptResId(RID_STR_DELETE); aReturn.sTitle = sText; } break; @@ -1153,7 +1153,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > { uno::Reference< report::XFunctions> xFunctions(xFunction->getParent(),uno::UNO_QUERY_THROW); sal_Int32 nIndex = getPositionInIndexAccess(xFunctions.get(),xFunction); - const OUString sUndoAction = ModuleRes(RID_STR_UNDO_REMOVE_FUNCTION); + const OUString sUndoAction = RptResId(RID_STR_UNDO_REMOVE_FUNCTION); UndoContext aUndoContext( getUndoManager(), sUndoAction ); xFunctions->removeByIndex(nIndex); select(uno::makeAny(xFunctions->getParent())); @@ -1436,7 +1436,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > ::std::vector< uno::Reference< uno::XInterface > > aControlsFormats; lcl_getReportControlFormat( aArgs, getDesignView(), xWindow, aControlsFormats ); - const OUString sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEFONT)); + const OUString sUndoAction(RptResId(RID_STR_UNDO_CHANGEFONT)); UndoContext aUndoContext( getUndoManager(), sUndoAction ); ::std::vector< uno::Reference< uno::XInterface > >::const_iterator aIter = aControlsFormats.begin(); @@ -1513,7 +1513,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > if ( !aControlsFormats.empty() ) { - const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CHANGEFONT ) ); + const OUString sUndoAction( RptResId( RID_STR_UNDO_CHANGEFONT ) ); UndoContext aUndoContext( getUndoManager(), sUndoAction ); ::std::vector< uno::Reference< uno::XInterface > >::const_iterator aIter = aControlsFormats.begin(); @@ -2450,7 +2450,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ else { uno::Reference< beans::XPropertySet> xProp(getUsedStyle(m_xReportDefinition),uno::UNO_QUERY_THROW); - const OUString sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEPAGE)); + const OUString sUndoAction(RptResId(RID_STR_UNDO_CHANGEPAGE)); UndoContext aUndoContext( getUndoManager(), sUndoAction ); const SfxPoolItem* pItem = nullptr; if ( SfxItemState::SET == pSet->GetItemState( RPTUI_ID_SIZE,true,&pItem)) @@ -2575,17 +2575,17 @@ void OReportController::Notify(SfxBroadcaster & /* _rBc */, SfxHint const & _rHi } } -void OReportController::executeMethodWithUndo(sal_uInt16 _nUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun) +void OReportController::executeMethodWithUndo(const char* pUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun) { - const OUString sUndoAction = ModuleRes(_nUndoStrId); + const OUString sUndoAction = RptResId(pUndoStrId); UndoContext aUndoContext( getUndoManager(), sUndoAction ); _pMemfun( getDesignView() ); InvalidateFeature( SID_UNDO ); } -void OReportController::alignControlsWithUndo(sal_uInt16 _nUndoStrId, ControlModification _nControlModification, bool _bAlignAtSection) +void OReportController::alignControlsWithUndo(const char* pUndoStrId, ControlModification _nControlModification, bool _bAlignAtSection) { - const OUString sUndoAction = ModuleRes(_nUndoStrId); + const OUString sUndoAction = RptResId(pUndoStrId); UndoContext aUndoContext( getUndoManager(), sUndoAction ); getDesignView()->alignMarkedObjects(_nControlModification,_bAlignAtSection); InvalidateFeature( SID_UNDO ); @@ -2659,11 +2659,11 @@ void OReportController::shrinkSectionTop(const uno::Reference<report::XSection>& _xSection->setHeight(nNewSectionHeight); } -void OReportController::shrinkSection(sal_uInt16 _nUndoStrId, const uno::Reference<report::XSection>& _xSection, sal_Int32 _nSid) +void OReportController::shrinkSection(const char* pUndoStrId, const uno::Reference<report::XSection>& _xSection, sal_Int32 _nSid) { if ( _xSection.is() ) { - const OUString sUndoAction = ModuleRes(_nUndoStrId); + const OUString sUndoAction = RptResId(pUndoStrId); UndoContext aUndoContext( getUndoManager(), sUndoAction ); if (_nSid == SID_SECTION_SHRINK) @@ -2835,7 +2835,7 @@ uno::Reference<frame::XModel> OReportController::executeReport() uno::Reference<frame::XModel> xModel; if ( m_xReportDefinition.is() ) { - sal_uInt16 nErrorId = RID_ERR_NO_COMMAND; + const char* pErrorId = RID_ERR_NO_COMMAND; bool bEnabled = !m_xReportDefinition->getCommand().isEmpty(); if ( bEnabled ) { @@ -2848,20 +2848,20 @@ uno::Reference<frame::XModel> OReportController::executeReport() bEnabled = pPage->GetObjCount() != 0; } if ( !bEnabled ) - nErrorId = RID_ERR_NO_OBJECTS; + pErrorId = RID_ERR_NO_OBJECTS; } dbtools::SQLExceptionInfo aInfo; if ( !bEnabled ) { sdb::SQLContext aFirstMessage; - OUString sInfo = ModuleRes( nErrorId ); + OUString sInfo = RptResId( pErrorId ); aFirstMessage.Message = sInfo; aInfo = aFirstMessage; if ( isEditable() ) { sal_uInt16 nCommand = 0; - if ( nErrorId == RID_ERR_NO_COMMAND ) + if (!strcmp(pErrorId, RID_ERR_NO_COMMAND)) { if ( !m_bShowProperties ) executeUnChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< beans::PropertyValue>()); @@ -2904,7 +2904,7 @@ uno::Reference<frame::XModel> OReportController::executeReport() // our first message says: we caught an exception sdb::SQLContext aFirstMessage; - OUString sInfo(ModuleRes(RID_STR_CAUGHT_FOREIGN_EXCEPTION)); + OUString sInfo(RptResId(RID_STR_CAUGHT_FOREIGN_EXCEPTION)); sInfo = sInfo.replaceAll("$type$", aCaughtException.getValueTypeName()); aFirstMessage.Message = sInfo; @@ -2930,7 +2930,7 @@ uno::Reference<frame::XModel> OReportController::executeReport() } if (aInfo.isValid()) { - const OUString suSQLContext = ModuleRes( RID_STR_COULD_NOT_CREATE_REPORT ); + const OUString suSQLContext = RptResId( RID_STR_COULD_NOT_CREATE_REPORT ); aInfo.prepend(suSQLContext); } m_bInGeneratePreview = false; @@ -2986,7 +2986,7 @@ uno::Reference< sdbc::XRowSet > const & OReportController::getRowSet() void OReportController::insertGraphic() { - const OUString sTitle(ModuleRes(RID_STR_IMPORT_GRAPHIC)); + const OUString sTitle(RptResId(RID_STR_IMPORT_GRAPHIC)); // build some arguments for the upcoming dialog try { @@ -3082,7 +3082,7 @@ void SAL_CALL OReportController::removeSelectionChangeListener( const Reference< void OReportController::createNewFunction(const uno::Any& _aValue) { uno::Reference< container::XIndexContainer> xFunctions(_aValue,uno::UNO_QUERY_THROW); - const OUString sNewName = ModuleRes(RID_STR_FUNCTION); + const OUString sNewName = RptResId(RID_STR_FUNCTION); uno::Reference< report::XFunction> xFunction(report::Function::create(m_xContext)); xFunction->setName(sNewName); // the call below will also create an undo action -> listener @@ -3217,7 +3217,7 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs) { getDesignView()->unmarkAllObjects(); - const OUString sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL)); + const OUString sUndoAction(RptResId(RID_STR_UNDO_INSERT_CONTROL)); UndoContext aUndoContext( getUndoManager(), sUndoAction ); SequenceAsHashMap aMap(_aArgs); @@ -3245,7 +3245,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs { getDesignView()->unmarkAllObjects(); - const OUString sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL)); + const OUString sUndoAction(RptResId(RID_STR_UNDO_INSERT_CONTROL)); UndoContext aUndoContext( getUndoManager(), sUndoAction ); if ( !m_xReportDefinition->getPageHeaderOn() ) @@ -3257,12 +3257,12 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs SequenceAsHashMap aMap(_aArgs); bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE, false); - OUString sFunction( ModuleRes(STR_RPT_PN_PAGE) ); + OUString sFunction( RptResId(STR_RPT_PN_PAGE) ); sFunction = sFunction.replaceFirst("#PAGENUMBER#", "PageNumber()"); if ( bStateOfPage ) { - sFunction += ModuleRes(STR_RPT_PN_PAGE_OF); + sFunction += RptResId(STR_RPT_PN_PAGE_OF); sFunction = sFunction.replaceFirst("#PAGECOUNT#", "PageCount()"); } @@ -3288,7 +3288,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) } uno::Reference<report::XSection> xCurrentSection = getDesignView()->getCurrentSection(); - UndoContext aUndoContext( getUndoManager(), OUString( ModuleRes( RID_STR_UNDO_INSERT_CONTROL ) ) ); + UndoContext aUndoContext(getUndoManager(), RptResId(RID_STR_UNDO_INSERT_CONTROL)); try { @@ -3742,7 +3742,7 @@ void OReportController::switchReportSection(const sal_Int16 _nId) std::unique_ptr< UndoContext > pUndoContext; if ( SID_REPORTHEADERFOOTER == _nId ) { - const OUString sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER)); + const OUString sUndoAction(RptResId(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER)); pUndoContext.reset( new UndoContext( getUndoManager(), sUndoAction ) ); addUndoAction(new OReportSectionUndo(*(m_aReportModel),SID_REPORTHEADER_WITHOUT_UNDO @@ -3789,7 +3789,7 @@ void OReportController::switchPageSection(const sal_Int16 _nId) std::unique_ptr< UndoContext > pUndoContext; if ( SID_PAGEHEADERFOOTER == _nId ) { - const OUString sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER)); + const OUString sUndoAction(RptResId(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER)); pUndoContext.reset( new UndoContext( getUndoManager(), sUndoAction ) ); addUndoAction(new OReportSectionUndo(*m_aReportModel @@ -4127,14 +4127,14 @@ bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const uno::R return bRet; } -bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndoResId,const OUString& _sProperty,const uno::Any& _aValue,const Sequence< PropertyValue >& _aArgs) +bool OReportController::impl_setPropertyAtControls_throw(const char* pUndoResId,const OUString& _sProperty,const uno::Any& _aValue,const Sequence< PropertyValue >& _aArgs) { ::std::vector< uno::Reference< uno::XInterface > > aSelection; uno::Reference< awt::XWindow> xWindow; lcl_getReportControlFormat( _aArgs, getDesignView(), xWindow, aSelection ); ::std::vector< uno::Reference< uno::XInterface > >::const_iterator aIter = aSelection.begin(); - const OUString sUndoAction = ModuleRes( _nUndoResId ); + const OUString sUndoAction = RptResId( pUndoResId ); UndoContext aUndoContext( getUndoManager(), sUndoAction ); for(; aIter != aSelection.end();++aIter) diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 544dfb203638..7363f3eaaf9d 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -20,7 +20,7 @@ #include "ReportSection.hxx" #include "ReportWindow.hxx" #include "DesignView.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "RptObject.hxx" #include "RptModel.hxx" #include "SectionView.hxx" @@ -50,7 +50,7 @@ #include "RptDef.hxx" #include "SectionWindow.hxx" #include "helpids.hrc" -#include "RptResId.hrc" +#include "strings.hrc" #include "dlgedclip.hxx" #include "UndoActions.hxx" #include "rptui_slotid.hrc" diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 8ac0e90fa598..6513c2cba02c 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -32,7 +32,7 @@ #include "RptDef.hxx" #include "dlgedfunc.hxx" #include "RptModel.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "RptPage.hxx" #include "ReportController.hxx" #include "EndMarker.hxx" diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index d94fe0deb51d..b179abc92811 100644 --- a/reportdesign/source/ui/report/SectionView.cxx +++ b/reportdesign/source/ui/report/SectionView.cxx @@ -26,7 +26,7 @@ #include <vcl/scrbar.hxx> #include "ReportSection.hxx" #include "ReportWindow.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 6e4a3fa386e6..ebcc09695dbb 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -24,9 +24,10 @@ #include "RptDef.hxx" #include "ReportSection.hxx" #include "DesignView.hxx" -#include "uistrings.hrc" +#include "strings.hxx" +#include "core_resource.hxx" #include "helpids.hrc" -#include "RptResId.hrc" +#include "strings.hrc" #include "StartMarker.hxx" #include "EndMarker.hxx" #include "ViewsWindow.hxx" @@ -149,7 +150,7 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) } else { - OUString sTitle = ModuleRes(RID_STR_DETAIL); + OUString sTitle = RptResId(RID_STR_DETAIL); m_aStartMarker->setTitle(sTitle); m_aStartMarker->Invalidate(InvalidateFlags::Children); } @@ -165,20 +166,20 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) } } -bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t<uno::Reference<report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t<bool,OReportHelper>& _pIsSectionOn) +bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReportDefinition>& _xReport,const char* pResId,::std::mem_fun_t<uno::Reference<report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t<bool,OReportHelper>& _pIsSectionOn) { OReportHelper aReportHelper(_xReport); const bool bRet = _pIsSectionOn(&aReportHelper) && _pGetSection(&aReportHelper) == m_aReportSection->getSection(); if ( bRet ) { - OUString sTitle = ModuleRes(_nResId); + OUString sTitle = RptResId(pResId); m_aStartMarker->setTitle(sTitle); m_aStartMarker->Invalidate(InvalidateFlags::Children); } return bRet; } -bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> _pGetSection, const ::std::mem_fun_t<bool,OGroupHelper>& _pIsSectionOn) +bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& _xGroup,const char* pResId,::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> _pGetSection, const ::std::mem_fun_t<bool,OGroupHelper>& _pIsSectionOn) { OGroupHelper aGroupHelper(_xGroup); const bool bRet = _pIsSectionOn(&aGroupHelper) && _pGetSection(&aGroupHelper) == m_aReportSection->getSection() ; @@ -191,8 +192,7 @@ bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& sExpression = sLabel; } - ModuleRes aRes(_nResId); - OUString sTitle(aRes); + OUString sTitle(RptResId(pResId)); sTitle = sTitle.replaceFirst("#", sExpression); m_aStartMarker->setTitle( sTitle ); m_aStartMarker->Invalidate(InvalidateFlags::Children); @@ -317,7 +317,7 @@ void OSectionWindow::zoom(const Fraction& _aZoom) IMPL_LINK_NOARG( OSectionWindow, StartSplitHdl, Splitter*, void) { - const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CHANGE_SIZE ) ); + const OUString sUndoAction( RptResId( RID_STR_UNDO_CHANGE_SIZE ) ); getViewsWindow()->getView()->getReportView()->getController().getUndoManager().EnterListAction( sUndoAction, OUString(), 0, ViewShellId(-1) ); } diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 5e070d8076f7..ac3c7b5a6221 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -19,9 +19,8 @@ #include "StartMarker.hxx" #include <vcl/image.hxx> #include <vcl/svapp.hxx> -#include "RptResId.hrc" +#include "strings.hrc" #include "bitmaps.hlst" -#include "ModuleHelper.hxx" #include "ColorChanger.hxx" #include "ReportDefines.hxx" #include "SectionWindow.hxx" diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index a8c1f9d021ee..b97a72d1efa2 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -26,21 +26,20 @@ #include "ReportController.hxx" #include "UITools.hxx" #include "RptDef.hxx" -#include "RptResId.hrc" +#include "strings.hrc" #include "SectionView.hxx" #include "ReportSection.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "rptui_slotid.hrc" #include "dlgedclip.hxx" #include "ColorChanger.hxx" #include "RptObject.hxx" -#include "ModuleHelper.hxx" #include "EndMarker.hxx" #include <svx/svdpagv.hxx> #include <svx/unoshape.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> - +#include "core_resource.hxx" #include "helpids.hrc" #include <svx/svdundo.hxx> #include <toolkit/helper/convert.hxx> @@ -1234,7 +1233,7 @@ void OViewsWindow::EndDragObj_removeInvisibleObjects() void OViewsWindow::EndDragObj(bool _bControlKeyPressed, const OSectionView* _pSection, const Point& _aPnt) { - const OUString sUndoAction = ModuleRes(RID_STR_UNDO_CHANGEPOSITION); + const OUString sUndoAction = RptResId(RID_STR_UNDO_CHANGEPOSITION); const UndoContext aUndoContext( getView()->getReportView()->getController().getUndoManager(), sUndoAction ); Point aNewPos = _aPnt; diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index 0bc995800283..bc4e87011c39 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "dlgedfac.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "RptObject.hxx" #include <RptDef.hxx> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 62b8fe3fef35..a57d3eec9dc9 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -48,7 +48,7 @@ #include "ScrollHelper.hxx" #include "UITools.hxx" -#include <uistrings.hrc> +#include <strings.hxx> #include "UndoEnv.hxx" #include <RptModel.hxx> #include <comphelper/propertysequence.hxx> diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 5e7316b7dcd3..7c0ffd2b9149 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -21,7 +21,7 @@ #include "RptObject.hxx" #include "ReportController.hxx" #include <cppuhelper/component_context.hxx> -#include <RptResId.hrc> +#include <strings.hrc> #include "rptui_slotid.hrc" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> @@ -47,9 +47,10 @@ #include <comphelper/types.hxx> #include <comphelper/sequence.hxx> #include <comphelper/processfactory.hxx> +#include "core_resource.hxx" #include "SectionView.hxx" #include "ReportSection.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "DesignView.hxx" #include "ViewsWindow.hxx" #include "UITools.hxx" @@ -332,52 +333,52 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac OUString aName; if ( !_aObjects.getLength() ) { - aName = ModuleRes(RID_STR_BRWTITLE_NO_PROPERTIES); + aName = RptResId(RID_STR_BRWTITLE_NO_PROPERTIES); } else if ( _aObjects.getLength() == 1 ) // single selection { - aName = ModuleRes(RID_STR_BRWTITLE_PROPERTIES); + aName = RptResId(RID_STR_BRWTITLE_PROPERTIES); uno::Reference< container::XNameContainer > xNameCont(_aObjects[0],uno::UNO_QUERY); Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName("ReportComponent"), UNO_QUERY ); if ( xServiceInfo.is() ) { - sal_uInt16 nResId = 0; + const char* pResId = nullptr; if ( xServiceInfo->supportsService( SERVICE_FIXEDTEXT ) ) { - nResId = RID_STR_PROPTITLE_FIXEDTEXT; + pResId = RID_STR_PROPTITLE_FIXEDTEXT; } else if ( xServiceInfo->supportsService( SERVICE_IMAGECONTROL ) ) { - nResId = RID_STR_PROPTITLE_IMAGECONTROL; + pResId = RID_STR_PROPTITLE_IMAGECONTROL; } else if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD ) ) { - nResId = RID_STR_PROPTITLE_FORMATTED; + pResId = RID_STR_PROPTITLE_FORMATTED; } else if ( xServiceInfo->supportsService( SERVICE_SHAPE ) ) { - nResId = RID_STR_PROPTITLE_SHAPE; + pResId = RID_STR_PROPTITLE_SHAPE; } else if ( xServiceInfo->supportsService( SERVICE_REPORTDEFINITION ) ) { - nResId = RID_STR_PROPTITLE_REPORT; + pResId = RID_STR_PROPTITLE_REPORT; } else if ( xServiceInfo->supportsService( SERVICE_SECTION ) ) { - nResId = RID_STR_PROPTITLE_SECTION; + pResId = RID_STR_PROPTITLE_SECTION; } else if ( xServiceInfo->supportsService( SERVICE_FUNCTION ) ) { - nResId = RID_STR_PROPTITLE_FUNCTION; + pResId = RID_STR_PROPTITLE_FUNCTION; } else if ( xServiceInfo->supportsService( SERVICE_GROUP ) ) { - nResId = RID_STR_PROPTITLE_GROUP; + pResId = RID_STR_PROPTITLE_GROUP; } else if ( xServiceInfo->supportsService( SERVICE_FIXEDLINE ) ) { - nResId = RID_STR_PROPTITLE_FIXEDLINE; + pResId = RID_STR_PROPTITLE_FIXEDLINE; } else { @@ -386,16 +387,16 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac return aName; } - if (nResId) + if (pResId) { - aName += ModuleRes(nResId); + aName += RptResId(pResId); } } } else // multiselection { - aName = ModuleRes(RID_STR_BRWTITLE_PROPERTIES); - aName += ModuleRes(RID_STR_BRWTITLE_MULTISELECT); + aName = RptResId(RID_STR_BRWTITLE_PROPERTIES); + aName += RptResId(RID_STR_BRWTITLE_MULTISELECT); } return aName; diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src deleted file mode 100644 index 55472688ab79..000000000000 --- a/reportdesign/source/ui/report/report.src +++ /dev/null @@ -1,284 +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> -#include "helpids.hrc" - -// Property Browser Headline ---------------------------------------------------------------- - -String RID_STR_BRWTITLE_PROPERTIES -{ - Text [ en-US ] = "Properties: "; -}; -String RID_STR_BRWTITLE_NO_PROPERTIES -{ - Text [ en-US ] = "No Control marked"; -}; -String RID_STR_BRWTITLE_MULTISELECT -{ - Text [ en-US ] = "Multiselection"; -}; - -String RID_STR_PROPTITLE_IMAGECONTROL -{ - Text [ en-US ] = "Image Control" ; -}; -String RID_STR_PROPTITLE_FIXEDTEXT -{ - Text [ en-US ] = "Label field" ; -}; -String RID_STR_PROPTITLE_FIXEDLINE -{ - Text [ en-US ] = "Line" ; -}; -String RID_STR_PROPTITLE_FORMATTED -{ - Text [ en-US ] = "Formatted Field"; -}; -String RID_STR_PROPTITLE_SHAPE -{ - Text [ en-US ] = "Shape"; -}; -String RID_STR_PROPTITLE_REPORT -{ - Text [ en-US ] = "Report"; -}; -String RID_STR_PROPTITLE_SECTION -{ - Text [ en-US ] = "Section"; -}; -String RID_STR_PROPTITLE_FUNCTION -{ - Text [ en-US ] = "Function"; -}; -String RID_STR_PROPTITLE_GROUP -{ - Text [ en-US ] = "Group"; -}; - -String RID_STR_UNDO_CHANGEPOSITION -{ - Text [ en-US ] = "Change Object"; -}; -String RID_STR_UNDO_MOVE_GROUP -{ - Text [ en-US ] = "Move Group(s)"; -}; -String RID_STR_UNDO_CONDITIONAL_FORMATTING -{ - Text [ en-US ] = "Conditional Formatting"; -}; -String RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER -{ - Text [ en-US ] = "Remove report header / report footer"; -}; - -String RID_STR_UNDO_ADD_REPORTHEADERFOOTER -{ - Text [ en-US ] = "Add report header / report footer"; -}; - -String RID_STR_UNDO_PROPERTY -{ - Text [ en-US ] = "Change property '#'"; - Text [ x-comment ] = "The # character is used for replacing"; -}; - -String RID_STR_UNDO_ADD_GROUP_HEADER -{ - Text [ en-US ] = "Add group header "; -}; - -String RID_STR_UNDO_REMOVE_GROUP_HEADER -{ - Text [ en-US ] = "Remove group header "; -}; - -String RID_STR_UNDO_ADD_GROUP_FOOTER -{ - Text [ en-US ] = "Add group footer "; -}; - -String RID_STR_UNDO_REMOVE_GROUP_FOOTER -{ - Text [ en-US ] = "Remove group footer "; -}; -String RID_STR_UNDO_ADDFUNCTION -{ - Text [ en-US ] = "Add function"; -}; - -String STR_RPT_LABEL -{ - Text [ en-US ] = "~Report name" ; -}; - -String RID_STR_UNDO_REMOVE_GROUP -{ - Text [ en-US ] = "Delete Group" ; -}; - -String RID_STR_UNDO_APPEND_GROUP -{ - Text [ en-US ] = "Add Group" ; -}; - -String RID_STR_UNDO_REMOVE_SELECTION -{ - Text [ en-US ] = "Delete Selection" ; -}; -String RID_STR_UNDO_REMOVE_FUNCTION -{ - Text [ en-US ] = "Delete Function" ; -}; - -String RID_STR_UNDO_CHANGE_SIZE -{ - Text [ en-US ] = "Change Size" ; -}; - -String RID_STR_UNDO_PASTE -{ - Text [ en-US ] = "Paste" ; -}; - -String RID_STR_UNDO_INSERT_CONTROL -{ - Text [ en-US ] = "Insert Control" ; -}; - -String RID_STR_UNDO_DELETE_CONTROL -{ - Text [ en-US ] = "Delete Control" ; -}; - -String RID_STR_GROUPHEADER -{ - Text [ en-US ] = "GroupHeader"; - Text [ x-comment ] = "Please try to avoid spaces in the name. It is used as a programmatic one."; -}; -String RID_STR_GROUPFOOTER -{ - Text [ en-US ] = "GroupFooter"; - Text [ x-comment ] = "Please try to avoid spaces in the name. It is used as a programmatic one."; -}; - -String RID_STR_FIELDSELECTION -{ - Text [ en-US ] = "Add field:"; -}; - -String RID_STR_FILTER -{ - Text [ en-US ] = "Filter" ; -}; - -String RID_STR_UNDO_ALIGNMENT -{ - Text [ en-US ] = "Change Alignment" ; -}; -String RID_STR_HEADER -{ - Text [ en-US ] = "# Header" ; - Text[ x-comment ] = "# will be replaced with a name."; -}; -String RID_STR_FOOTER -{ - Text [ en-US ] = "# Footer" ; - Text[ x-comment ] = "# will be replaced with a name."; -}; -String RID_STR_IMPORT_GRAPHIC -{ - Text [ en-US ] = "Insert graphics" ; -}; -String RID_STR_DELETE -{ - Text [ en-US ] = "Delete" ; -}; -String RID_STR_FUNCTION -{ - Text [ en-US ] = "Function" ; -}; - -String RID_STR_COULD_NOT_CREATE_REPORT -{ - Text [ en-US ] = "An error occurred while creating the report." ; -}; -String RID_STR_CAUGHT_FOREIGN_EXCEPTION -{ - Text [ en-US ] = "An exception of type $type$ was caught." ; -}; -String RID_STR_UNDO_CHANGEFONT -{ - Text [ en-US ] = "Change font"; -}; -String RID_STR_UNDO_CHANGEPAGE -{ - Text [ en-US ] = "Change page attributes"; -}; -String RID_STR_PAGEHEADERFOOTER_INSERT -{ - Text [ en-US ] = "Insert Page Header/Footer"; -}; -String RID_STR_PAGEHEADERFOOTER_DELETE -{ - Text [ en-US ] = "Delete Page Header/Footer"; -}; -String RID_STR_REPORTHEADERFOOTER_INSERT -{ - Text [ en-US ] = "Insert Report Header/Footer"; -}; -String RID_STR_REPORTHEADERFOOTER_DELETE -{ - Text [ en-US ] = "Delete Report Header/Footer"; -}; -String RID_ERR_NO_COMMAND -{ - Text [ en-US ] = "The report can not be executed unless it is bound to content."; -}; -String RID_ERR_NO_OBJECTS -{ - Text [ en-US ] = "The report can not be executed unless at least one object has been inserted."; -}; -String RID_STR_UNDO_SHRINK -{ - Text [ en-US ] = "Shrink Section"; -}; -String RID_STR_DETAIL -{ - Text [ en-US ] = "Detail"; -}; -String RID_STR_PAGE_HEADER -{ - Text [ en-US ] = "Page Header"; -}; -String RID_STR_PAGE_FOOTER -{ - Text [ en-US ] = "Page Footer"; -}; -String RID_STR_REPORT_HEADER -{ - Text [ en-US ] = "Report Header"; -}; -String RID_STR_REPORT_FOOTER -{ - Text [ en-US ] = "Report Footer"; -}; -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |