summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/app
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/app')
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx15
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.hxx2
-rw-r--r--dbaccess/source/ui/app/app.src19
3 files changed, 9 insertions, 27 deletions
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index afad4e3a2d7c..2a5eb22549b8 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -753,23 +753,24 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
{
OSL_ENSURE(E_TABLE != _eType,"E_TABLE isn't allowed.");
- USHORT nHelpId = 0, nImageId = 0, nImageIdH = 0;
+ USHORT nImageId = 0, nImageIdH = 0;
+ rtl::OString sHelpId;
ImageProvider aImageProvider;
Image aFolderImage, aFolderImageHC;
switch( _eType )
{
case E_FORM:
- nHelpId = HID_APP_FORM_TREE;
+ sHelpId = HID_APP_FORM_TREE;
aFolderImage = aImageProvider.getFolderImage( DatabaseObject::FORM, false );
aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::FORM, true );
break;
case E_REPORT:
- nHelpId = HID_APP_REPORT_TREE;
+ sHelpId = HID_APP_REPORT_TREE;
aFolderImage = aImageProvider.getFolderImage( DatabaseObject::REPORT, false );
aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::REPORT, true );
break;
case E_QUERY:
- nHelpId = HID_APP_QUERY_TREE;
+ sHelpId = HID_APP_QUERY_TREE;
aFolderImage = aImageProvider.getFolderImage( DatabaseObject::QUERY, false );
aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::QUERY, true );
break;
@@ -780,7 +781,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
if ( !m_pLists[_eType] )
{
- m_pLists[_eType] = createSimpleTree( nHelpId, aFolderImage, aFolderImageHC );
+ m_pLists[_eType] = createSimpleTree( sHelpId, aFolderImage, aFolderImageHC );
}
if ( m_pLists[_eType] )
@@ -878,10 +879,10 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine
}
}
// -----------------------------------------------------------------------------
-DBTreeListBox* OAppDetailPageHelper::createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC )
+DBTreeListBox* OAppDetailPageHelper::createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage, const Image& _rImageHC )
{
DBTreeListBox* pTreeView = new DBTreeListBox(this,getBorderWin().getView()->getORB(),WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP);
- pTreeView->SetHelpId(_nHelpId);
+ pTreeView->SetHelpId( _sHelpId );
return createTree( pTreeView, _rImage, _rImageHC );
}
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 5ade6b687949..9f3cadc56a44 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -190,7 +190,7 @@ namespace dbaui
@return
The new tree.
*/
- DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC );
+ DBTreeListBox* createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage, const Image& _rImageHC );
DECL_LINK( OnEntryDoubleClick, SvTreeListBox* );
DECL_LINK( OnEntrySelChange, void* );
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index 2dec9005f847..4af2bdb70521 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -111,14 +111,12 @@ Menu RID_MENU_APP_NEW
MenuItem
{
Identifier = SID_APP_NEW_FORM;
- HelpId = SID_APP_NEW_FORM;
Command = ".uno:DBNewForm";
Text [ en-US ] = "Form..." ;
};
MenuItem
{
Identifier = SID_APP_NEW_REPORT;
- HelpId = SID_APP_NEW_REPORT;
Command = ".uno:DBNewReport";
Text [ en-US ] = "Report..." ;
};
@@ -154,7 +152,6 @@ Menu RID_MENU_APP_NEW
MenuItem
{
Identifier = SID_DB_NEW_VIEW_SQL;
- HelpId = SID_DB_NEW_VIEW_SQL;
Command = ".uno:DBNewViewSQL";
Text [ en-US ] = "View (Simple)..." ;
};
@@ -177,7 +174,6 @@ Menu RID_MENU_APP_EDIT
MenuItem
{
Identifier = SID_DB_APP_PASTE_SPECIAL;
- HelpID = SID_DB_APP_PASTE_SPECIAL ;
Text[ en-US ] = "Paste Special...";
Command = ".uno:PasteSpecial";
};
@@ -188,42 +184,36 @@ Menu RID_MENU_APP_EDIT
MenuItem
{
Identifier = SID_DB_APP_DELETE;
- HelpID = SID_DB_APP_DELETE ;
Text[ en-US ] = "Delete";
Command = ".uno:DBDelete";
};
MenuItem
{
Identifier = SID_DB_APP_RENAME;
- HelpID = SID_DB_APP_RENAME ;
Text[ en-US ] = "Rename";
Command = ".uno:DBRename";
};
MenuItem
{
Identifier = SID_DB_APP_EDIT;
- HelpID = SID_DB_APP_EDIT ;
Text[ en-US ] = "Edit";
Command = ".uno:DBEdit";
};
MenuItem
{
Identifier = SID_DB_APP_EDIT_SQL_VIEW;
- HelpID = SID_DB_APP_EDIT_SQL_VIEW ;
Text [ en-US ] = "Edit in SQL View...";
Command = ".uno:DBEditSqlView";
};
MenuItem
{
Identifier = SID_DB_APP_OPEN;
- HelpID = SID_DB_APP_OPEN ;
Text[ en-US ] = "Open";
Command = ".uno:DBOpen";
};
MenuItem
{
Identifier = SID_DB_APP_CONVERTTOVIEW;
- HelpID = SID_DB_APP_CONVERTTOVIEW ;
Text[ en-US ] = "Create as View";
Command = ".uno:DBConvertToView";
};
@@ -236,14 +226,12 @@ Menu RID_MENU_APP_EDIT
MenuItem
{
Identifier = SID_APP_NEW_REPORT_PRE_SEL;
- HelpId = SID_APP_NEW_REPORT_PRE_SEL;
Command = ".uno:DBNewReportWithPreSelection";
Text [ en-US ] = "Report..." ;
};
MenuItem
{
Identifier = SID_REPORT_CREATE_REPWIZ_PRE_SEL ;
- HelpID = HID_DOCUMENT_CREATE_REPWIZ ;
Text[ en-US ] = "Report Wizard...";
Command = ".uno:DBNewReportAutoPilotWithPreSelection";
@@ -255,7 +243,6 @@ Menu RID_MENU_APP_EDIT
MenuItem
{
Identifier = SID_SELECTALL;
- HelpID = SID_SELECTALL ;
Text[ en-US ] = "Select All";
Command = ".uno:SelectAll";
};
@@ -274,21 +261,18 @@ Menu RID_MENU_APP_EDIT
MenuItem
{
Identifier = SID_DB_APP_DSPROPS;
- HelpID = SID_DB_APP_DSPROPS ;
Text[ en-US ] = "Properties";
Command = ".uno:DBDSProperties";
};
MenuItem
{
Identifier = SID_DB_APP_DSCONNECTION_TYPE;
- HelpID = SID_DB_APP_DSCONNECTION_TYPE ;
Text[ en-US ] = "Connection Type";
Command = ".uno:DBDSConnectionType";
};
MenuItem
{
Identifier = SID_DB_APP_DSADVANCED_SETTINGS;
- HelpID = SID_DB_APP_DSADVANCED_SETTINGS ;
Text[ en-US ] = "Advanced Settings";
Command = ".uno:DBDSAdvancedSettings";
};
@@ -394,7 +378,6 @@ Menu RID_MENU_APP_PREVIEW
MenuItem
{
Identifier = SID_DB_APP_DISABLE_PREVIEW;
- HelpId = SID_DB_APP_DISABLE_PREVIEW;
Text[ en-US ] = "None";
Command = ".uno:DBDisablePreview";
Checkable = TRUE;
@@ -404,7 +387,6 @@ Menu RID_MENU_APP_PREVIEW
MenuItem
{
Identifier = SID_DB_APP_VIEW_DOCINFO_PREVIEW;
- HelpId = SID_DB_APP_VIEW_DOCINFO_PREVIEW;
Text[ en-US ] = "Document Information";
Command = ".uno:DBShowDocInfoPreview";
Checkable = TRUE;
@@ -414,7 +396,6 @@ Menu RID_MENU_APP_PREVIEW
MenuItem
{
Identifier = SID_DB_APP_VIEW_DOC_PREVIEW;
- HelpId = SID_DB_APP_VIEW_DOC_PREVIEW;
Text[ en-US ] = "Document";
Command = ".uno:DBShowDocPreview";
Checkable = TRUE;
generated by cgit (git 2.34.1) at 2024-06-03 01:32:34 +0000