summaryrefslogtreecommitdiff
path: root/reportdesign/source
diff options
context:
space:
mode:
Diffstat (limited to 'reportdesign/source')
-rw-r--r--reportdesign/source/core/resource/core_resource.cxx3
-rw-r--r--reportdesign/source/core/sdr/ReportUndoFactory.cxx2
-rw-r--r--reportdesign/source/core/sdr/UndoActions.cxx10
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.cxx4
-rw-r--r--reportdesign/source/ui/inc/GeometryHandler.hxx5
-rw-r--r--reportdesign/source/ui/inc/ReportController.hxx8
-rw-r--r--reportdesign/source/ui/inc/RptUndo.hxx6
-rw-r--r--reportdesign/source/ui/inc/SectionWindow.hxx4
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx2
-rw-r--r--reportdesign/source/ui/inspection/DefaultInspection.cxx2
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx16
-rw-r--r--reportdesign/source/ui/misc/RptUndo.cxx8
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx12
-rw-r--r--reportdesign/source/ui/report/SectionWindow.cxx4
-rw-r--r--reportdesign/source/ui/report/propbrw.cxx2
15 files changed, 44 insertions, 44 deletions
diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx
index a81ab5e34fae..e11d536dc132 100644
--- a/reportdesign/source/core/resource/core_resource.cxx
+++ b/reportdesign/source/core/resource/core_resource.cxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <core_resource.hxx>
-#include <unotools/resmgr.hxx>
-OUString RptResId(std::string_view aId) { return Translate::get(aId, Translate::Create("rpt")); }
+OUString RptResId(TranslateId aId) { return Translate::get(aId, Translate::Create("rpt")); }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
index c926c874407e..1c36d836b2e2 100644
--- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx
+++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
@@ -25,7 +25,7 @@ namespace rptui
{
using namespace ::com::sun::star;
-static std::unique_ptr<SdrUndoAction> lcl_createUndo(SdrObject& rObject, Action _eAction, const char* pCommentId)
+static std::unique_ptr<SdrUndoAction> lcl_createUndo(SdrObject& rObject, Action _eAction, TranslateId pCommentId)
{
OObjectBase* pObj = dynamic_cast<OObjectBase*>(&rObject);
if ( !pObj )
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index 8616ee612d4d..21332691bfb7 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -68,7 +68,7 @@ namespace rptui
}
-OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,const char* pCommentID)
+OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod, TranslateId pCommentID)
:SdrUndoAction(_rMod)
{
m_pController = static_cast< OReportModel& >( _rMod ).getController();
@@ -91,7 +91,7 @@ OUndoContainerAction::OUndoContainerAction(SdrModel& _rMod
,Action _eAction
,const uno::Reference< container::XIndexContainer >& rContainer
,const Reference< XInterface > & xElem
- ,const char* pCommentId)
+ ,TranslateId pCommentId)
:OCommentUndoAction(_rMod, pCommentId)
,m_xElement(xElem)
,m_xContainer(rContainer)
@@ -233,7 +233,7 @@ OUndoGroupSectionAction::OUndoGroupSectionAction(
SdrModel& _rMod, Action _eAction,
::std::function<uno::Reference<report::XSection>(OGroupHelper*)> _pMemberFunction,
const uno::Reference<report::XGroup>& _xGroup, const Reference<XInterface>& xElem,
- const char* pCommentId)
+ TranslateId pCommentId)
: OUndoContainerAction(_rMod, _eAction, nullptr, xElem, pCommentId)
, m_aGroupHelper(_xGroup)
, m_pMemberFunction(std::move(_pMemberFunction))
@@ -277,7 +277,7 @@ OUndoReportSectionAction::OUndoReportSectionAction(
SdrModel& _rMod, Action _eAction,
::std::function<uno::Reference<report::XSection>(OReportHelper*)> _pMemberFunction,
const uno::Reference<report::XReportDefinition>& _xReport, const Reference<XInterface>& xElem,
- const char* pCommentId)
+ TranslateId pCommentId)
: OUndoContainerAction(_rMod, _eAction, nullptr, xElem, pCommentId)
, m_aReportHelper(_xReport)
, m_pMemberFunction(std::move(_pMemberFunction))
@@ -323,7 +323,7 @@ void OUndoReportSectionAction::implReRemove( )
}
ORptUndoPropertyAction::ORptUndoPropertyAction(SdrModel& rNewMod, const PropertyChangeEvent& evt)
- :OCommentUndoAction(rNewMod,nullptr)
+ :OCommentUndoAction(rNewMod,{})
,m_xObj(evt.Source, UNO_QUERY)
,m_aPropertyName(evt.PropertyName)
,m_aNewValue(evt.NewValue)
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 6ac7f357d90e..0957c3039e39 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -938,7 +938,7 @@ IMPL_LINK_NOARG(OGroupsSortingDialog, OnControlFocusGot, LinkParamNone*, void )
IMPL_LINK(OGroupsSortingDialog, OnWidgetFocusGot, weld::Widget&, rControl, void )
{
- const std::pair<weld::Widget*, const char*> pControls[] = {
+ const std::pair<weld::Widget*, TranslateId> pControls[] = {
{ m_xHeaderLst.get(), STR_RPT_HELP_HEADER },
{ m_xFooterLst.get(), STR_RPT_HELP_FOOTER },
{ m_xGroupOnLst.get(), STR_RPT_HELP_GROUPON },
@@ -1081,7 +1081,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x
case sdbc::DataType::TIME:
case sdbc::DataType::TIMESTAMP:
{
- const char* aIds[] = { STR_RPT_YEAR, STR_RPT_QUARTER,STR_RPT_MONTH,STR_RPT_WEEK,STR_RPT_DAY,STR_RPT_HOUR,STR_RPT_MINUTE };
+ const TranslateId aIds[] = { STR_RPT_YEAR, STR_RPT_QUARTER,STR_RPT_MONTH,STR_RPT_WEEK,STR_RPT_DAY,STR_RPT_HOUR,STR_RPT_MINUTE };
for (size_t i = 0; i < SAL_N_ELEMENTS(aIds); ++i)
{
m_xGroupOnLst->append(OUString::number(i+2), RptResId(aIds[i]));
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index e5852694600d..79fb54433238 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -33,6 +33,7 @@
#include <com/sun/star/report/XFunctionsSupplier.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/sdbc/XRowSet.hpp>
+#include <unotools/resmgr.hxx>
#include <map>
#include <memory>
#include <string_view>
@@ -92,12 +93,12 @@ namespace rptui
*/
sal_uInt32 impl_getDataFieldType_throw(const OUString& _sDataField = OUString()) const;
- css::uno::Any getConstantValue(bool bToControlValue,const char** pResId,const css::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName );
+ css::uno::Any getConstantValue(bool bToControlValue,const TranslateId* 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
- ,const char** pResId
+ ,const TranslateId* pResId
,bool _bReadOnlyControl
,bool _bTrueIfListBoxFalseIfComboBox
);
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 80685623f126..92ab4f3fe712 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -194,8 +194,8 @@ namespace rptui
,sal_Int32 _nGroupPos
,bool _bShow);
- void executeMethodWithUndo(const char* pUndoStrId,const ::std::function<void(ODesignView *)>& _pMemfun);
- void alignControlsWithUndo(const char* pUndoStrId, ControlModification _nControlModification, bool _bAlignAtSection = false);
+ void executeMethodWithUndo(TranslateId pUndoStrId,const ::std::function<void(ODesignView *)>& _pMemfun);
+ void alignControlsWithUndo(TranslateId pUndoStrId, ControlModification _nControlModification, bool _bAlignAtSection = false);
css::uno::Reference< css::frame::XFrame > getXFrame();
@@ -207,7 +207,7 @@ namespace rptui
static void shrinkSectionTop(const css::uno::Reference< css::report::XSection >& _xSection);
public:
- void shrinkSection(const char* pUndoStrId, const css::uno::Reference< css::report::XSection >& _xSection, sal_Int32 _nShrinkId);
+ void shrinkSection(TranslateId pUndoStrId, const css::uno::Reference< css::report::XSection >& _xSection, sal_Int32 _nShrinkId);
/** opens the file open dialog to allow the user to select an image which will be
* bound to a newly created image button.
@@ -292,7 +292,7 @@ namespace rptui
/** set the property at all selected controls.
@return <TRUE/> when the selection is not empty
*/
- bool impl_setPropertyAtControls_throw(const char* pUndoResId
+ bool impl_setPropertyAtControls_throw(TranslateId 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 9f0b6c1aa24b..cef45a59d996 100644
--- a/reportdesign/source/ui/inc/RptUndo.hxx
+++ b/reportdesign/source/ui/inc/RptUndo.hxx
@@ -55,7 +55,7 @@ namespace rptui
OSectionUndo( OReportModel& rMod
,sal_uInt16 _nSlot
,Action _eAction
- ,const char* pCommentID);
+ ,TranslateId pCommentID);
virtual ~OSectionUndo() override;
virtual void Undo() override;
@@ -103,7 +103,7 @@ namespace rptui
,::std::function<css::uno::Reference< css::report::XSection >(OGroupHelper *)> _pMemberFunction
,const css::uno::Reference< css::report::XGroup >& _xGroup
,Action _eAction
- ,const char* pCommentID);
+ ,TranslateId pCommentID);
virtual OUString GetComment() const override;
};
@@ -122,7 +122,7 @@ namespace rptui
void implReRemove( );
public:
OGroupUndo(OReportModel& rMod
- ,const char* pCommentID
+ ,TranslateId 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 a202b0a19315..1e727c2e5f71 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -62,7 +62,7 @@ namespace rptui
* @return sal_True when title was set otherwise FALSE
*/
bool setGroupSectionTitle(
- const css::uno::Reference<css::report::XGroup>& _xGroup, const char* pResId,
+ const css::uno::Reference<css::report::XGroup>& _xGroup, TranslateId pResId,
const ::std::function<css::uno::Reference<css::report::XSection>(OGroupHelper*)>&
_pGetSection,
const ::std::function<bool(OGroupHelper*)>& _pIsSectionOn);
@@ -76,7 +76,7 @@ namespace rptui
* @return sal_True when title was set otherwise FALSE
*/
bool setReportSectionTitle(
- const css::uno::Reference<css::report::XReportDefinition>& _xReport, const char* pResId,
+ const css::uno::Reference<css::report::XReportDefinition>& _xReport, TranslateId pResId,
const ::std::function<css::uno::Reference<css::report::XSection>(OReportHelper*)>&
_pGetSection,
const ::std::function<bool(OReportHelper*)>& _pIsSectionOn);
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index d9665d6883dc..f4c8abd97497 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -468,7 +468,7 @@ bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutex
{"ParentWindow", m_xContext->getValueByName("DialogParentWindow")},
{"Detail", uno::Any(m_xDataProvider)},
{"Master", uno::Any(m_xReportComponent->getSection()->getReportDefinition())},
- {"Explanation", uno::Any(RptResId(RID_STR_EXPLANATION))},
+ {"Explanation", uno::Any(RptResId(TranslateId(nullptr, RID_STR_EXPLANATION)))},
{"DetailLabel", uno::Any(RptResId(RID_STR_DETAILLABEL))},
{"MasterLabel", uno::Any(RptResId(RID_STR_MASTERLABEL))},
}));
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index 4ac4dd3bbc2a..80269f433346 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -160,7 +160,7 @@ namespace rptui
const struct
{
const char* programmaticName;
- const char* uiNameResId;
+ TranslateId uiNameResId;
OString helpId;
} aCategories[] = {
{ "General", RID_STR_PROPPAGE_DEFAULT, HID_RPT_PROPDLG_TAB_GENERAL },
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 280e9060e67f..68aa4cabfe37 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -634,13 +634,13 @@ beans::PropertyState SAL_CALL GeometryHandler::getPropertyState(const OUString &
void GeometryHandler::implCreateListLikeControl(
const uno::Reference< inspection::XPropertyControlFactory >& _rxControlFactory
,inspection::LineDescriptor & out_Descriptor
- ,const char** pResId
+ ,const TranslateId* pResId
,bool _bReadOnlyControl
,bool _bTrueIfListBoxFalseIfComboBox
)
{
std::vector<OUString> aList;
- for (const char** pItem = pResId; *pItem; ++pItem)
+ for (const TranslateId* pItem = pResId; *pItem; ++pItem)
aList.push_back(RptResId(*pItem));
implCreateListLikeControl(_rxControlFactory, out_Descriptor, aList, _bReadOnlyControl, _bTrueIfListBoxFalseIfComboBox);
}
@@ -724,7 +724,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
case PROPERTY_ID_BACKTRANSPARENT:
case PROPERTY_ID_CONTROLBACKGROUNDTRANSPARENT:
{
- const char** pResId = RID_STR_BOOL;
+ const TranslateId* pResId = RID_STR_BOOL;
if ( PROPERTY_ID_KEEPTOGETHER == nId && uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is())
pResId = RID_STR_KEEPTOGETHER_CONST;
implCreateListLikeControl(_xControlFactory,aOut,pResId,false,true);
@@ -892,10 +892,10 @@ beans::Property GeometryHandler::getProperty(const OUString & PropertyName)
return beans::Property();
return *pFind;
}
-uno::Any GeometryHandler::getConstantValue(bool _bToControlValue,const char** pResId,const uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName )
+uno::Any GeometryHandler::getConstantValue(bool _bToControlValue,const TranslateId* pResId,const uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName )
{
std::vector<OUString> aList;
- for (const char** pItem = pResId; *pItem; ++pItem)
+ for (const TranslateId* pItem = pResId; *pItem; ++pItem)
aList.push_back(RptResId(*pItem));
uno::Sequence< OUString > aSeq(aList.size());
for (size_t i = 0; i < aList.size(); ++i)
@@ -1037,7 +1037,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
sal_uInt32 nFound(RESARRAY_INDEX_NOTFOUND);
sal_uInt32 i = 0;
- for (const char** pItem = RID_STR_TYPE_CONST; *pItem; ++pItem)
+ for (const TranslateId* pItem = RID_STR_TYPE_CONST; *pItem; ++pItem)
{
if (sValue == RptResId(*pItem))
{
@@ -1060,7 +1060,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
sal_uInt32 nFound(RESARRAY_INDEX_NOTFOUND);
sal_uInt32 i = 0;
- for (const char** pItem = RID_STR_VERTICAL_ALIGN_CONST; *pItem; ++pItem)
+ for (const TranslateId* pItem = RID_STR_VERTICAL_ALIGN_CONST; *pItem; ++pItem)
{
if (sValue == RptResId(*pItem))
{
@@ -1080,7 +1080,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
sal_uInt32 nFound(RESARRAY_INDEX_NOTFOUND);
sal_uInt32 i = 0;
- for (const char** pItem = RID_STR_PARAADJUST_CONST; *pItem; ++pItem)
+ for (const TranslateId* pItem = RID_STR_PARAADJUST_CONST; *pItem; ++pItem)
{
if (sValue == RptResId(*pItem))
{
diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx
index c2a07a4d0f92..29d3945bedc3 100644
--- a/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/reportdesign/source/ui/misc/RptUndo.cxx
@@ -113,7 +113,7 @@ namespace
OSectionUndo::OSectionUndo(OReportModel& _rMod
,sal_uInt16 _nSlot
,Action _eAction
- ,const char* pCommentID)
+ ,TranslateId pCommentID)
: OCommentUndoAction(_rMod,pCommentID)
,m_eAction(_eAction)
,m_nSlot(_nSlot)
@@ -214,7 +214,7 @@ OReportSectionUndo::OReportSectionUndo(
OReportModel& _rMod, sal_uInt16 _nSlot,
::std::function<uno::Reference<report::XSection>(OReportHelper*)> _pMemberFunction,
const uno::Reference<report::XReportDefinition>& _xReport, Action _eAction)
- : OSectionUndo(_rMod, _nSlot, _eAction, nullptr)
+ : OSectionUndo(_rMod, _nSlot, _eAction, {})
, m_aReportHelper(_xReport)
, m_pMemberFunction(std::move(_pMemberFunction))
{
@@ -248,7 +248,7 @@ void OReportSectionUndo::implReRemove( )
OGroupSectionUndo::OGroupSectionUndo(
OReportModel& _rMod, sal_uInt16 _nSlot,
::std::function<uno::Reference<report::XSection>(OGroupHelper*)> _pMemberFunction,
- const uno::Reference<report::XGroup>& _xGroup, Action _eAction, const char* pCommentID)
+ const uno::Reference<report::XGroup>& _xGroup, Action _eAction, TranslateId pCommentID)
: OSectionUndo(_rMod, _nSlot, _eAction, pCommentID)
, m_aGroupHelper(_xGroup)
, m_pMemberFunction(std::move(_pMemberFunction))
@@ -314,7 +314,7 @@ void OGroupSectionUndo::implReRemove( )
OGroupUndo::OGroupUndo(OReportModel& _rMod
- ,const char* pCommentID
+ ,TranslateId pCommentID
,Action _eAction
,const uno::Reference< report::XGroup>& _xGroup
,const uno::Reference< report::XReportDefinition >& _xReportDefinition)
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index dbc992f33c61..04d331aae68e 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2581,7 +2581,7 @@ void OReportController::Notify(SfxBroadcaster & /* _rBc */, SfxHint const & _rHi
});
}
-void OReportController::executeMethodWithUndo(const char* pUndoStrId,const ::std::function<void(ODesignView *)>& _pMemfun)
+void OReportController::executeMethodWithUndo(TranslateId pUndoStrId,const ::std::function<void(ODesignView *)>& _pMemfun)
{
const OUString sUndoAction = RptResId(pUndoStrId);
UndoContext aUndoContext( getUndoManager(), sUndoAction );
@@ -2589,7 +2589,7 @@ void OReportController::executeMethodWithUndo(const char* pUndoStrId,const ::std
InvalidateFeature( SID_UNDO );
}
-void OReportController::alignControlsWithUndo(const char* pUndoStrId, ControlModification _nControlModification, bool _bAlignAtSection)
+void OReportController::alignControlsWithUndo(TranslateId pUndoStrId, ControlModification _nControlModification, bool _bAlignAtSection)
{
const OUString sUndoAction = RptResId(pUndoStrId);
UndoContext aUndoContext( getUndoManager(), sUndoAction );
@@ -2665,7 +2665,7 @@ void OReportController::shrinkSectionTop(const uno::Reference<report::XSection>&
_xSection->setHeight(nNewSectionHeight);
}
-void OReportController::shrinkSection(const char* pUndoStrId, const uno::Reference<report::XSection>& _xSection, sal_Int32 _nSid)
+void OReportController::shrinkSection(TranslateId pUndoStrId, const uno::Reference<report::XSection>& _xSection, sal_Int32 _nSid)
{
if ( _xSection.is() )
{
@@ -2838,7 +2838,7 @@ uno::Reference<frame::XModel> OReportController::executeReport()
uno::Reference<frame::XModel> xModel;
if ( m_xReportDefinition.is() )
{
- const char* pErrorId = RID_ERR_NO_COMMAND;
+ TranslateId pErrorId = RID_ERR_NO_COMMAND;
bool bEnabled = !m_xReportDefinition->getCommand().isEmpty();
if ( bEnabled )
{
@@ -2864,7 +2864,7 @@ uno::Reference<frame::XModel> OReportController::executeReport()
if ( isEditable() )
{
sal_uInt16 nCommand = 0;
- if (!strcmp(pErrorId, RID_ERR_NO_COMMAND))
+ if (pErrorId != RID_ERR_NO_COMMAND)
{
if ( !m_bShowProperties )
executeUnChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< beans::PropertyValue>());
@@ -4151,7 +4151,7 @@ bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const uno::R
return bRet;
}
-bool OReportController::impl_setPropertyAtControls_throw(const char* pUndoResId,const OUString& _sProperty,const uno::Any& _aValue,const Sequence< PropertyValue >& _aArgs)
+bool OReportController::impl_setPropertyAtControls_throw(TranslateId pUndoResId,const OUString& _sProperty,const uno::Any& _aValue,const Sequence< PropertyValue >& _aArgs)
{
::std::vector< uno::Reference< uno::XInterface > > aSelection;
uno::Reference< awt::XWindow> xWindow;
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 660971395694..60d5235f84bb 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -163,7 +163,7 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
}
bool OSectionWindow::setReportSectionTitle(
- const uno::Reference<report::XReportDefinition>& _xReport, const char* pResId,
+ const uno::Reference<report::XReportDefinition>& _xReport, TranslateId pResId,
const ::std::function<uno::Reference<report::XSection>(OReportHelper*)>& _pGetSection,
const ::std::function<bool(OReportHelper*)>& _pIsSectionOn)
{
@@ -179,7 +179,7 @@ bool OSectionWindow::setReportSectionTitle(
}
bool OSectionWindow::setGroupSectionTitle(
- const uno::Reference<report::XGroup>& _xGroup, const char* pResId,
+ const uno::Reference<report::XGroup>& _xGroup, TranslateId pResId,
const ::std::function<uno::Reference<report::XSection>(OGroupHelper*)>& _pGetSection,
const ::std::function<bool(OGroupHelper*)>& _pIsSectionOn)
{
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index afdbe742705a..672350ad230e 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -327,7 +327,7 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac
Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName("ReportComponent"), UNO_QUERY );
if ( xServiceInfo.is() )
{
- const char* pResId;
+ TranslateId pResId;
if ( xServiceInfo->supportsService( SERVICE_FIXEDTEXT ) )
{
pResId = RID_STR_PROPTITLE_FIXEDTEXT;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 08:28:27 +0000