diff options
| -rw-r--r-- | desktop/UI_deployment.mk | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/inc/helpid.hrc | 5 | ||||
| -rw-r--r-- | desktop/uiconfig/ui/extensionmanager.ui (renamed from desktop/uiconfig/ui/ExtensionManager.ui) | 0 | ||||
| -rw-r--r-- | desktop/util/hidother.src | 5 | ||||
| m--------- | helpcontent2 | 0 |
6 files changed, 2 insertions, 12 deletions
diff --git a/desktop/UI_deployment.mk b/desktop/UI_deployment.mk index c06e91fe29b7..4aeb42c73d35 100644 --- a/desktop/UI_deployment.mk +++ b/desktop/UI_deployment.mk @@ -10,7 +10,7 @@ $(eval $(call gb_UI_UI,desktop)) $(eval $(call gb_UI_add_uifiles,desktop,\ - desktop/uiconfig/ui/ExtensionManager \ + desktop/uiconfig/ui/extensionmanager \ )) # vim: set noet sw=4 ts=4: diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 25e7c7607380..e5d284d1d5d0 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -701,7 +701,7 @@ void DialogHelper::PostUserEvent( const Link& rLink, void* pCaller ) // ExtMgrDialog //------------------------------------------------------------------------------ ExtMgrDialog::ExtMgrDialog(Window *pParent, TheExtensionManager *pManager) - : ModelessDialog(pParent, "ExtensionManagerDialog", "desktop/ui/ExtensionManager.ui") + : ModelessDialog(pParent, "ExtensionManagerDialog", "desktop/ui/extensionmanager.ui") , DialogHelper(pManager->getContext(), (Dialog*) this) , m_sAddPackages(getResourceString(RID_STR_ADD_PACKAGES)) , m_bHasProgress(false) diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc index 768c57334388..11a91029a379 100644 --- a/desktop/source/inc/helpid.hrc +++ b/desktop/source/inc/helpid.hrc @@ -19,11 +19,6 @@ #ifndef INCLUDED_DESKTOP_HELPID_HRC #define INCLUDED_DESKTOP_HELPID_HRC -#define HID_PACKAGE_MANAGER_TREELISTBOX "DESKTOP_HID_PACKAGE_MANAGER_TREELISTBOX" -#define HID_PACKAGE_MANAGER_PROGRESS "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS" -#define HID_PACKAGE_MANAGER_PROGRESS_CANCEL "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS_CANCEL" -#define HID_PACKAGE_MANAGER_MENU_ITEM "DESKTOP_HID_PACKAGE_MANAGER_MENU_ITEM" - #define HID_FIRSTSTART_PREV "DESKTOP_HID_FIRSTSTART_PREV" #define HID_FIRSTSTART_NEXT "DESKTOP_HID_FIRSTSTART_NEXT" #define HID_FIRSTSTART_CANCEL "DESKTOP_HID_FIRSTSTART_CANCEL" diff --git a/desktop/uiconfig/ui/ExtensionManager.ui b/desktop/uiconfig/ui/extensionmanager.ui index fc336970779a..fc336970779a 100644 --- a/desktop/uiconfig/ui/ExtensionManager.ui +++ b/desktop/uiconfig/ui/extensionmanager.ui diff --git a/desktop/util/hidother.src b/desktop/util/hidother.src index f2607b08789a..0885f9a75901 100644 --- a/desktop/util/hidother.src +++ b/desktop/util/hidother.src @@ -18,11 +18,6 @@ #include "../source/inc/helpid.hrc" -hidspecial HID_PACKAGE_MANAGER_MENU_ITEM { HelpID = HID_PACKAGE_MANAGER_MENU_ITEM; }; -hidspecial HID_PACKAGE_MANAGER_TREELISTBOX { HelpID = HID_PACKAGE_MANAGER_TREELISTBOX; }; -hidspecial HID_PACKAGE_MANAGER_PROGRESS { HelpID = HID_PACKAGE_MANAGER_PROGRESS; }; -hidspecial HID_PACKAGE_MANAGER_PROGRESS_CANCEL { HelpID = HID_PACKAGE_MANAGER_PROGRESS_CANCEL; }; - hidspecial HID_PACKAGE_MANAGER_UPD_REQ { HelpID = HID_PACKAGE_MANAGER_UPD_REQ; }; hidspecial HID_FIRSTSTART_PREV { HelpId = HID_FIRSTSTART_PREV;}; diff --git a/helpcontent2 b/helpcontent2 -Subproject fa665d0f817d7446b290a16434411d6af0ad6f9 +Subproject 3a14e891235b0c8eb7f8572a2ed9ea318153662 |