summaryrefslogtreecommitdiff
path: root/reportdesign/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'reportdesign/source/ui')
-rw-r--r--reportdesign/source/ui/dlg/DateTime.src4
-rw-r--r--reportdesign/source/ui/dlg/Formula.cxx4
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.src6
-rw-r--r--reportdesign/source/ui/dlg/Navigator.src5
-rw-r--r--reportdesign/source/ui/dlg/PageNumber.src6
-rw-r--r--reportdesign/source/ui/inc/FunctionHelper.hxx2
-rw-r--r--reportdesign/source/ui/inc/metadata.hxx4
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx4
-rw-r--r--reportdesign/source/ui/inspection/DefaultInspection.cxx11
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx10
-rw-r--r--reportdesign/source/ui/inspection/metadata.cxx14
-rw-r--r--reportdesign/source/ui/misc/FunctionHelper.cxx4
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx4
-rw-r--r--reportdesign/source/ui/report/report.src24
14 files changed, 49 insertions, 53 deletions
diff --git a/reportdesign/source/ui/dlg/DateTime.src b/reportdesign/source/ui/dlg/DateTime.src
index 0e30747fb78c..09e557007ab4 100644
--- a/reportdesign/source/ui/dlg/DateTime.src
+++ b/reportdesign/source/ui/dlg/DateTime.src
@@ -47,6 +47,7 @@ ModalDialog RID_DATETIME_DLG
CheckBox CB_DATE
{
+ HelpID = "reportdesign:CheckBox:RID_DATETIME_DLG:CB_DATE";
Pos = MAP_APPFONT ( UNRELATED_CONTROLS , RELATED_CONTROLS /* + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT */) ;
Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ;
Check = TRUE;
@@ -62,6 +63,7 @@ ModalDialog RID_DATETIME_DLG
ListBox LB_DATE_TYPE
{
+ HelpID = "reportdesign:ListBox:RID_DATETIME_DLG:LB_DATE_TYPE";
Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH, RELATED_CONTROLS + UNRELATED_CONTROLS + CHECKBOX_HEIGHT) ;
Size = MAP_APPFONT( PAGE_WIDTH - 3*UNRELATED_CONTROLS - BUTTON_WIDTH, 60 );
Border = TRUE;
@@ -78,6 +80,7 @@ ModalDialog RID_DATETIME_DLG
};
CheckBox CB_TIME
{
+ HelpID = "reportdesign:CheckBox:RID_DATETIME_DLG:CB_TIME";
Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 3*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ;
Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ;
Check = TRUE;
@@ -93,6 +96,7 @@ ModalDialog RID_DATETIME_DLG
ListBox LB_TIME_TYPE
{
+ HelpID = "reportdesign:ListBox:RID_DATETIME_DLG:LB_TIME_TYPE";
Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH, RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ;
Size = MAP_APPFONT( PAGE_WIDTH - 3*UNRELATED_CONTROLS - BUTTON_WIDTH, 60 );
Border = TRUE;
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index c54380cb7d2a..682ec6b17438 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -99,7 +99,7 @@ FormulaDialog::~FormulaDialog()
{
if ( m_pAddField )
{
- SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( HID_RPT_FIELD_SEL_WIN ) );
+ SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) );
aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)).GetBuffer() ) );
::std::auto_ptr<Window> aTemp2(m_pAddField);
@@ -209,7 +209,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton)
{
m_pAddField = new OAddFieldWindow(this,m_xRowSet);
m_pAddField->SetCreateHdl(LINK( this, FormulaDialog, OnClickHdl ) );
- SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( HID_RPT_FIELD_SEL_WIN ) );
+ SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) );
if ( aDlgOpt.Exists() )
{
m_pAddField->SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) );
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src
index 2c73fff07de4..186fb771ad46 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.src
+++ b/reportdesign/source/ui/dlg/GroupsSorting.src
@@ -166,6 +166,7 @@ FloatingWindow RID_GROUPS_SORTING
};
ListBox LST_ORDER
{
+ HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_ORDER";
Border = TRUE;
Pos = MAP_APPFONT(2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 4*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + FIXEDTEXT_HEIGHT - 1 );
Size = MAP_APPFONT( LISTBOX_WIDTH, 60 );
@@ -190,6 +191,7 @@ FloatingWindow RID_GROUPS_SORTING
};
ListBox LST_HEADERLST
{
+ HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_HEADERLST";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 5*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 2*FIXEDTEXT_HEIGHT -1);
@@ -213,6 +215,7 @@ FloatingWindow RID_GROUPS_SORTING
};
ListBox LST_FOOTERLST
{
+ HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_FOOTERLST";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 6*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 3*FIXEDTEXT_HEIGHT -1);
@@ -236,6 +239,7 @@ FloatingWindow RID_GROUPS_SORTING
};
ListBox LST_GROUPONLST
{
+ HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_GROUPONLST";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 7*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 4*FIXEDTEXT_HEIGHT -1);
@@ -257,6 +261,7 @@ FloatingWindow RID_GROUPS_SORTING
};
NumericField ED_GROUPINTERVALLST
{
+ HelpID = "reportdesign:NumericField:RID_GROUPS_SORTING:ED_GROUPINTERVALLST";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT(2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH , 8*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 5*FIXEDTEXT_HEIGHT -1);
@@ -273,6 +278,7 @@ FloatingWindow RID_GROUPS_SORTING
};
ListBox LST_KEEPTOGETHERLST
{
+ HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_KEEPTOGETHERLST";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT(2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH , 9*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 6*FIXEDTEXT_HEIGHT -1);
diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src
index 496bae3b0ab7..b9e639dfe646 100644
--- a/reportdesign/source/ui/dlg/Navigator.src
+++ b/reportdesign/source/ui/dlg/Navigator.src
@@ -110,7 +110,6 @@ Menu RID_MENU_NAVIGATOR
MenuItem
{
Identifier = SID_SORTINGANDGROUPING;
- HelpId = SID_SORTINGANDGROUPING ;
Command = ".uno:DbSortingAndGrouping";
Text [ en-US ] = "Sorting and Grouping...";
};
@@ -121,7 +120,6 @@ Menu RID_MENU_NAVIGATOR
MenuItem
{
Identifier = SID_PAGEHEADERFOOTER;
- HelpId = SID_PAGEHEADERFOOTER ;
Command = ".uno:PageHeaderFooter";
Checkable = TRUE;
Text [ en-US ] = "Page Header/Footer...";
@@ -129,7 +127,6 @@ Menu RID_MENU_NAVIGATOR
MenuItem
{
Identifier = SID_REPORTHEADERFOOTER;
- HelpId = SID_REPORTHEADERFOOTER ;
Command = ".uno:ReportHeaderFooter";
Checkable = TRUE;
Text [ en-US ] = "Report Header/Footer...";
@@ -141,7 +138,6 @@ Menu RID_MENU_NAVIGATOR
MenuItem
{
Identifier = SID_RPT_NEW_FUNCTION;
- HelpId = SID_RPT_NEW_FUNCTION;
Command = ".uno:NewFunction";
Text [ en-US ] = "New Function";
};
@@ -152,7 +148,6 @@ Menu RID_MENU_NAVIGATOR
MenuItem
{
Identifier = SID_SHOW_PROPERTYBROWSER;
- HelpId = SID_SHOW_PROPERTYBROWSER ;
Command = ".uno:FormProperties";
Text [ en-US ] = "Properties...";
};
diff --git a/reportdesign/source/ui/dlg/PageNumber.src b/reportdesign/source/ui/dlg/PageNumber.src
index 31c5bdb4026c..c5c760e1755d 100644
--- a/reportdesign/source/ui/dlg/PageNumber.src
+++ b/reportdesign/source/ui/dlg/PageNumber.src
@@ -54,6 +54,7 @@ ModalDialog RID_PAGENUMBERS
RadioButton RB_PAGE_N
{
+ HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_N";
Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT) ;
Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;
Group = TRUE;
@@ -62,6 +63,7 @@ ModalDialog RID_PAGENUMBERS
};
RadioButton RB_PAGE_N_OF_M
{
+ HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_N_OF_M";
Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 3*RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT) ;
Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;
Text [ en-US ] = "Page N of M";
@@ -76,6 +78,7 @@ ModalDialog RID_PAGENUMBERS
RadioButton RB_PAGE_TOPPAGE
{
+ HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_TOPPAGE";
Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 4*RELATED_CONTROLS + UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT) ;
Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;
Group = TRUE;
@@ -84,6 +87,7 @@ ModalDialog RID_PAGENUMBERS
};
RadioButton RB_PAGE_BOTTOMPAGE
{
+ HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_BOTTOMPAGE";
Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 5*RELATED_CONTROLS + UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT) ;
Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;
Text [ en-US ] = "Bottom of Page (Footer)";
@@ -104,6 +108,7 @@ ModalDialog RID_PAGENUMBERS
};
ListBox LST_ALIGNMENT
{
+ HelpID = "reportdesign:ListBox:RID_PAGENUMBERS:LST_ALIGNMENT";
Border = TRUE;
Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH , 6*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT -1);
Size = MAP_APPFONT( LISTBOX_WIDTH, 60 );
@@ -121,6 +126,7 @@ ModalDialog RID_PAGENUMBERS
};
CheckBox CB_SHOWNUMBERONFIRSTPAGE
{
+ HelpID = "reportdesign:CheckBox:RID_PAGENUMBERS:CB_SHOWNUMBERONFIRSTPAGE";
Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 6*RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 8*FIXEDTEXT_HEIGHT) ;
Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;
Check = TRUE;
diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx
index 48da4e0eb180..e2a43c163808 100644
--- a/reportdesign/source/ui/inc/FunctionHelper.hxx
+++ b/reportdesign/source/ui/inc/FunctionHelper.hxx
@@ -81,7 +81,7 @@ public:
virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const ;
virtual void initArgumentInfo() const;
virtual ::rtl::OUString getSignature() const ;
- virtual long getHelpId() const ;
+ virtual rtl::OString getHelpId() const ;
virtual sal_uInt32 getParameterCount() const ;
virtual ::rtl::OUString getParameterName(sal_uInt32 _nPos) const ;
virtual ::rtl::OUString getParameterDescription(sal_uInt32 _nPos) const ;
diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx
index 5ab2f53467ba..3cc2a20cc465 100644
--- a/reportdesign/source/ui/inc/metadata.hxx
+++ b/reportdesign/source/ui/inc/metadata.hxx
@@ -60,7 +60,7 @@ namespace rptui
// IPropertyInfoService
sal_Int32 getPropertyId(const String& _rName) const;
String getPropertyTranslation(sal_Int32 _nId) const;
- sal_Int32 getPropertyHelpId(sal_Int32 _nId) const;
+ rtl::OString getPropertyHelpId(sal_Int32 _nId) const;
sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const;
static void getExcludeProperties(::std::vector< com::sun::star::beans::Property >& _rExcludeProperties,const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler);
@@ -83,7 +83,7 @@ namespace rptui
class HelpIdUrl
{
public:
- static ::rtl::OUString getHelpURL( sal_uInt32 _nHelpId );
+ static ::rtl::OUString getHelpURL( const rtl::OString& _sHelpId );
};
//========================================================================
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index d62a9443d490..8ac5053ff39f 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -285,7 +285,7 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co
switch(nId)
{
case PROPERTY_ID_CHARTTYPE:
- aOut.PrimaryButtonId = UID_RPT_PROP_CHARTTYPE_DLG;
+ aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_CHARTTYPE_DLG);
aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::TextField , sal_True);
aOut.HasPrimaryButton = sal_True;
break;
@@ -295,7 +295,7 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co
case PROPERTY_ID_MASTERFIELDS:
case PROPERTY_ID_DETAILFIELDS:
aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::StringListField , sal_False);
- aOut.PrimaryButtonId = UID_RPT_PROP_DLG_LINKFIELDS;
+ aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_DLG_LINKFIELDS);
aOut.HasPrimaryButton = sal_True;
break;
default:
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index 929225751437..48d8c74e0c01 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -41,17 +41,20 @@
#include <rtl/ustrbuf.hxx>
#include <tools/debug.hxx>
#include "metadata.hxx"
+#include <tools/urlobj.hxx>
//........................................................................
namespace rptui
{
//........................................................................
//------------------------------------------------------------------------
- ::rtl::OUString HelpIdUrl::getHelpURL( sal_uInt32 _nHelpId )
+ ::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId )
{
::rtl::OUStringBuffer aBuffer;
- aBuffer.appendAscii( "HID:" );
- aBuffer.append( (sal_Int32)_nHelpId );
+ ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 );
+ DBG_ASSERT( INetURLObject( aTmp ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" );
+ aBuffer.appendAscii( INET_HID_SCHEME );
+ aBuffer.append( aTmp.getStr() );
return aBuffer.makeStringAndClear();
}
@@ -235,7 +238,7 @@ namespace rptui
{
const sal_Char* programmaticName;
USHORT uiNameResId;
- sal_uInt32 helpId;
+ rtl::OString helpId;
} aCategories[] = {
{ "General", RID_STR_PROPPAGE_DEFAULT, HID_RPT_PROPDLG_TAB_GENERAL },
{ "Data", RID_STR_PROPPAGE_DATA, HID_RPT_PROPDLG_TAB_DATA },
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index cc4a4d709941..084bd77f8d5b 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -777,12 +777,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
break;
case PROPERTY_ID_INITIALFORMULA:
case PROPERTY_ID_FORMULA:
- aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA;
+ aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA);
aOut.HasPrimaryButton = sal_True;
aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False);
break;
case PROPERTY_ID_CONDITIONALPRINTEXPRESSION:
- aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA;
+ aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA);
aOut.HasPrimaryButton = sal_True;
aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False);
break;
@@ -797,7 +797,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
if ( m_nDataFieldType == DATA_OR_FORMULA )
{
- aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA;
+ aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA);
aOut.HasPrimaryButton = sal_True;
}
@@ -824,12 +824,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::ColorListBox, sal_False );
break;
case PROPERTY_ID_FONT:
- aOut.PrimaryButtonId = UID_RPT_RPT_PROP_DLG_FONT_TYPE;
+ aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_FONT_TYPE);
aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True );
aOut.HasPrimaryButton = sal_True;
break;
case PROPERTY_ID_AREA:
- aOut.PrimaryButtonId = UID_RPT_RPT_PROP_DLG_AREA;
+ aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_AREA);
aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True );
aOut.HasPrimaryButton = sal_True;
break;
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index 4cd952e05e1f..2c98d134196e 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -58,7 +58,7 @@ namespace rptui
{
String sName;
String sTranslation;
- sal_uInt32 nHelpId;
+ rtl::OString sHelpId;
sal_Int32 nId;
sal_uInt16 nPos;
sal_uInt32 nUIFlags;
@@ -68,16 +68,16 @@ namespace rptui
sal_Int32 _nId,
const String& aTranslation,
sal_uInt16 nPosId,
- sal_uInt32 nHelpId,
+ const rtl::OString& _sHelpId,
sal_uInt32 _nUIFlags);
};
//------------------------------------------------------------------------
OPropertyInfoImpl::OPropertyInfoImpl(const ::rtl::OUString& _rName, sal_Int32 _nId,
- const String& aString, sal_uInt16 nP, sal_uInt32 nHid, sal_uInt32 _nUIFlags)
+ const String& aString, sal_uInt16 nP, const rtl::OString& sHid, sal_uInt32 _nUIFlags)
:sName(_rName)
,sTranslation(aString)
- ,nHelpId(nHid)
+ ,sHelpId(sHid)
,nId(_nId)
,nPos(nP)
,nUIFlags(_nUIFlags)
@@ -200,10 +200,10 @@ namespace rptui
}
//------------------------------------------------------------------------
- sal_Int32 OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const
+ rtl::OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const
{
const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
- return (pInfo) ? pInfo->nHelpId : 0;
+ return (pInfo) ? pInfo->sHelpId : rtl::OString();
}
//------------------------------------------------------------------------
@@ -219,7 +219,7 @@ namespace rptui
// intialisierung
if(!s_pPropertyInfos)
getPropertyInfo();
- OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, 0, 0);
+ OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, "", 0);
const OPropertyInfoImpl* pPropInfo = ::std::lower_bound(
s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch, PropertyInfoLessByName() );
diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx
index 4e15218c2af8..791251e0424a 100644
--- a/reportdesign/source/ui/misc/FunctionHelper.cxx
+++ b/reportdesign/source/ui/misc/FunctionHelper.cxx
@@ -221,9 +221,9 @@ void FunctionDescription::initArgumentInfo() const
return m_xFunctionDescription->getSignature();
}
// -----------------------------------------------------------------------------
-long FunctionDescription::getHelpId() const
+rtl::OString FunctionDescription::getHelpId() const
{
- return 0;
+ return rtl::OString();
}
// -----------------------------------------------------------------------------
sal_uInt32 FunctionDescription::getParameterCount() const
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 37a67f99eb63..339e136c2fec 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -203,7 +203,7 @@ ODesignView::~ODesignView()
}
if ( m_pAddField )
{
- SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( UID_RPT_RPT_APP_VIEW ) );
+ SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( UID_RPT_RPT_APP_VIEW ) );
aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL).GetBuffer() ) );
notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
::std::auto_ptr<Window> aTemp2(m_pAddField);
@@ -600,7 +600,7 @@ void ODesignView::toggleAddField()
uno::Reference < beans::XPropertySet > xSet(rReportController.getRowSet(),uno::UNO_QUERY);
m_pAddField = new OAddFieldWindow(this,xSet);
m_pAddField->SetCreateHdl(LINK( &rReportController, OReportController, OnCreateHdl ) );
- SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( UID_RPT_RPT_APP_VIEW ) );
+ SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( UID_RPT_RPT_APP_VIEW ) );
if ( aDlgOpt.Exists() )
m_pAddField->SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) );
m_pAddField->Update();
diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src
index 4a84f7bd034d..95d1629d13ac 100644
--- a/reportdesign/source/ui/report/report.src
+++ b/reportdesign/source/ui/report/report.src
@@ -32,7 +32,7 @@
#ifndef _SBASLTID_HRC
#include <svx/svxids.hrc>
#endif
-
+#include "helpids.hrc"
// Dialog Controls ---------------------------------------------------------------
@@ -298,7 +298,6 @@ Menu RID_MENU_REPORT
MenuItem
{
Identifier = SID_SORTINGANDGROUPING;
- HelpId = SID_SORTINGANDGROUPING ;
Command = ".uno:DbSortingAndGrouping";
Text [ en-US ] = "Sorting and Grouping...";
};
@@ -309,14 +308,12 @@ Menu RID_MENU_REPORT
MenuItem
{
Identifier = SID_ATTR_CHAR_COLOR_BACKGROUND;
- HelpId = SID_ATTR_CHAR_COLOR_BACKGROUND ;
Command = ".uno:DBBackgroundColor";
Text [ en-US ] = "Background Color...";
};
MenuItem
{
Identifier = SID_RULER;
- HelpId = SID_RULER ;
Command = ".uno:ShowRuler";
Checkable = TRUE;
Text [ en-US ] = "Ruler...";
@@ -324,7 +321,6 @@ Menu RID_MENU_REPORT
MenuItem
{
Identifier = SID_GRID_VISIBLE;
- HelpId = SID_GRID_VISIBLE ;
Command = ".uno:GridVisible";
Checkable = TRUE;
Text [ en-US ] = "Grid...";
@@ -336,14 +332,12 @@ Menu RID_MENU_REPORT
MenuItem
{
Identifier = SID_PAGEHEADERFOOTER;
- HelpId = SID_PAGEHEADERFOOTER ;
Command = ".uno:PageHeaderFooter";
Checkable = TRUE;
};
MenuItem
{
Identifier = SID_REPORTHEADERFOOTER;
- HelpId = SID_REPORTHEADERFOOTER ;
Command = ".uno:ReportHeaderFooter";
Checkable = TRUE;
};
@@ -354,7 +348,6 @@ Menu RID_MENU_REPORT
MenuItem
{
Identifier = SID_ARRANGEMENU ;
- HelpID = SID_ARRANGEMENU ;
Command = ".uno:ArrangeMenu" ;
Text [ en-US ] = "~Arrange" ;
SubMenu = Menu
@@ -368,13 +361,13 @@ Menu RID_MENU_REPORT
MenuItem
{
Identifier = SID_FRAME_UP ;
- HelpID = SID_FRAME_UP ;
+ HelpId = ".uno:ObjectForwardOne";
Text [ en-US ] = "Bring ~Forward" ;
};
MenuItem
{
Identifier = SID_FRAME_DOWN ;
- HelpID = SID_FRAME_DOWN ;
+ HelpId = ".uno:ObjectBackOne";
Text [ en-US ] = "Send Back~ward" ;
};
MenuItem
@@ -443,7 +436,6 @@ Menu RID_MENU_REPORT
{
Identifier = SID_OBJECT_RESIZING ;
Command = ".uno:ObjectResize" ;
- HelpID = SID_OBJECT_RESIZING ;
Text [ en-US ] = "~Object Resizing" ;
Text [ x-comment ] = " ";
SubMenu = Menu
@@ -454,7 +446,6 @@ Menu RID_MENU_REPORT
{
Identifier = SID_OBJECT_SMALLESTWIDTH ;
Command = ".uno:SmallestWidth" ;
- HelpID = SID_OBJECT_SMALLESTWIDTH ;
Text [ en-US ] = "~Fit to smallest width" ;
Text [ x-comment ] = " ";
};
@@ -462,7 +453,6 @@ Menu RID_MENU_REPORT
{
Identifier = SID_OBJECT_GREATESTWIDTH ;
Command = ".uno:GreatestWidth" ;
- HelpID = SID_OBJECT_GREATESTWIDTH ;
Text [ en-US ] = "~Fit to greatest width" ;
Text [ x-comment ] = " ";
};
@@ -474,7 +464,6 @@ Menu RID_MENU_REPORT
{
Identifier = SID_OBJECT_SMALLESTHEIGHT ;
Command = ".uno:SmallestHeight" ;
- HelpID = SID_OBJECT_SMALLESTHEIGHT ;
Text [ en-US ] = "~Fit to smallest height" ;
Text [ x-comment ] = " ";
};
@@ -482,7 +471,6 @@ Menu RID_MENU_REPORT
{
Identifier = SID_OBJECT_GREATESTHEIGHT ;
Command = ".uno:GreatestHeight" ;
- HelpID = SID_OBJECT_GREATESTHEIGHT ;
Text [ en-US ] = "~Fit to greatest height" ;
Text [ x-comment ] = " ";
};
@@ -498,7 +486,6 @@ Menu RID_MENU_REPORT
{
Identifier = SID_SECTION_SHRINK_MENU ;
Command = ".uno:SectionShrinkMenu" ;
- HelpID = SID_SECTION_SHRINK_MENU ;
Text [ en-US ] = "Section" ;
Text [ x-comment ] = " ";
SubMenu = Menu
@@ -509,7 +496,6 @@ Menu RID_MENU_REPORT
{
Identifier = SID_SECTION_SHRINK ;
Command = ".uno:SectionShrink" ;
- HelpID = SID_SECTION_SHRINK ;
Text [ en-US ] = "Shrink" ;
Text [ x-comment ] = " ";
};
@@ -517,7 +503,6 @@ Menu RID_MENU_REPORT
{
Identifier = SID_SECTION_SHRINK_TOP ;
Command = ".uno:SectionShrinkTop" ;
- HelpID = SID_SECTION_SHRINK_TOP ;
Text [ en-US ] = "Shrink from top" ;
Text [ x-comment ] = " ";
};
@@ -525,7 +510,6 @@ Menu RID_MENU_REPORT
{
Identifier = SID_SECTION_SHRINK_BOTTOM ;
Command = ".uno:SectionShrinkBottom" ;
- HelpID = SID_SECTION_SHRINK_BOTTOM ;
Text [ en-US ] = "Shrink from bottom" ;
Text [ x-comment ] = " ";
};
@@ -539,7 +523,6 @@ Menu RID_MENU_REPORT
MenuItem
{
Identifier = SID_DISTRIBUTION;
- HelpId = SID_DISTRIBUTION ;
Command = ".uno:Distribution";
Text [ en-US ] = "Distribution..." ;
};
@@ -550,7 +533,6 @@ Menu RID_MENU_REPORT
MenuItem
{
Identifier = SID_SHOW_PROPERTYBROWSER;
- HelpId = SID_SHOW_PROPERTYBROWSER ;
Command = ".uno:FormProperties";
Text [ en-US ] = "Properties...";
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 19:32:37 +0000