summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AllLangHelp_sdatabase.mk2
-rw-r--r--AllLangHelp_shared.mk2
-rw-r--r--source/text/sdatabase/migrate_macros.xhp (renamed from source/text/shared/explorer/database/migrate_macros.xhp)4
-rw-r--r--source/text/sdatabase/password.xhp (renamed from source/text/shared/explorer/database/password.xhp)13
-rw-r--r--source/text/shared/00/00000001.xhp4
5 files changed, 12 insertions, 13 deletions
diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index a83735de4b..736b1abb48 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -73,6 +73,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
helpcontent2/source/text/sdatabase/menuinsert \
helpcontent2/source/text/sdatabase/menutools \
helpcontent2/source/text/sdatabase/menuview \
+ helpcontent2/source/text/sdatabase/migrate_macros \
+ helpcontent2/source/text/sdatabase/password \
helpcontent2/source/text/sdatabase/tablewizard00 \
helpcontent2/source/text/sdatabase/tablewizard01 \
helpcontent2/source/text/sdatabase/tablewizard02 \
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 2642366a70..6e19148d10 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -870,8 +870,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
))
$(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
- helpcontent2/source/text/shared/explorer/database/migrate_macros \
- helpcontent2/source/text/shared/explorer/database/password \
helpcontent2/source/text/shared/explorer/database/querywizard00 \
helpcontent2/source/text/shared/explorer/database/querywizard01 \
helpcontent2/source/text/shared/explorer/database/querywizard02 \
diff --git a/source/text/shared/explorer/database/migrate_macros.xhp b/source/text/sdatabase/migrate_macros.xhp
index 736498f3fe..0db2c00144 100644
--- a/source/text/shared/explorer/database/migrate_macros.xhp
+++ b/source/text/sdatabase/migrate_macros.xhp
@@ -23,7 +23,7 @@
<meta>
<topic id="textsharedexplorerdatabasemigrate_macrosxml" indexer="include">
<title xml-lang="en-US" id="tit">Migrate Macros</title>
- <filename>/text/shared/explorer/database/migrate_macros.xhp</filename>
+ <filename>/text/sdatabase/migrate_macros.xhp</filename>
</topic>
</meta>
<body>
@@ -37,7 +37,7 @@
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/summarypage/SummaryPage" id="bm_id0224200911450174" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/migratepage/MigratePage" id="bm_id0224200911450175" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/backuppage/BackupPage" id="bm_id022420091141366" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id0112200902353472" role="heading" level="1"><link href="text/shared/explorer/database/migrate_macros.xhp">Migrate Macros</link></paragraph>
+<h1 id="hd_id0112200902353472"><link href="text/sdatabase/migrate_macros.xhp">Migrate Macros</link></h1>
<bookmark xml-lang="en-US" branch="hid/.uno:DBMigrateScripts" id="bm_id0224200911384751" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0112200902353466" role="paragraph"><ahelp hid=".">The Database Document Macro Migration Wizard moves existing macros from sub-documents of an old Base file into the new Base file's macro storage area.</ahelp></paragraph>
</section>
diff --git a/source/text/shared/explorer/database/password.xhp b/source/text/sdatabase/password.xhp
index e51fdde2cc..770fe6b7e1 100644
--- a/source/text/shared/explorer/database/password.xhp
+++ b/source/text/sdatabase/password.xhp
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,27 +16,26 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
<helpdocument version="1.0">
<meta>
<topic id="textsharedexplorerdatabasepasswordxhp" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">User Name and Password Required</title>
-<filename>/text/shared/explorer/database/password.xhp</filename>
+<filename>/text/sdatabase/password.xhp</filename>
</topic>
<history>
<created date="2005-01-19T15:18:43">Password dialog</created>
</history>
</meta>
<body>
-<paragraph role="heading" id="par_idN10541" xml-lang="en-US" level="1">User Name and Password Required</paragraph>
+<h1 id="par_idN10541">User Name and Password Required</h1>
<bookmark xml-lang="en-US" branch="hid/svtools:Edit:DLG_LOGIN:ED_LOGIN_USERNAME" id="bm_id1444135" localize="false"/>
-<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="2">User name</paragraph>
+<h2 id="par_idN1054D">User name</h2>
<paragraph role="paragraph" id="par_idN10551" xml-lang="en-US"><ahelp hid=".">Enter the user name to connect to the data source.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svtools:Edit:DLG_LOGIN:ED_LOGIN_PASSWORD" id="bm_id7426984" localize="false"/>
-<paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="2">Password</paragraph>
+<h2 id="par_idN10568">Password</h2>
<paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US"><ahelp hid=".">Enter the password to connect to the data source.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_LOGIN:CB_LOGIN_SAVEPASSWORD" id="bm_id9922788" localize="false"/>
-<paragraph role="heading" id="par_idN10583" xml-lang="en-US" level="2">Remember password till end of session</paragraph>
+<h2 id="par_idN10583">Remember password till end of session</h2>
<paragraph role="paragraph" id="par_idN10587" xml-lang="en-US"><ahelp hid=".">Select to use the same user name and password without further dialog, when you connect again to the same data source in the current %PRODUCTNAME session.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/00/00000001.xhp b/source/text/shared/00/00000001.xhp
index 7f397d6d78..c98becce12 100644
--- a/source/text/shared/00/00000001.xhp
+++ b/source/text/shared/00/00000001.xhp
@@ -39,12 +39,14 @@
<h2 id="hd_id3147617">Cancel</h2>
<paragraph xml-lang="en-US" id="par_id3155913" role="paragraph"><ahelp hid=".">Clicking <emph>Cancel</emph> closes a dialog without saving any changes made.</ahelp></paragraph>
</section>
+
<section id="finish">
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDFINISH" id="bm_id3211157" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_CREATE" id="bm_id189519" localize="false"/>
<h2 id="hd_id2341685">Finish</h2>
<paragraph xml-lang="en-US" id="par_id6909390" role="paragraph"><ahelp hid=".">Applies all changes and closes the wizard.</ahelp></paragraph>
</section>
+
<section id="toolbars">
<h2 id="hd_id3147477">Toolbars</h2>
<paragraph xml-lang="en-US" id="par_id3149783" role="paragraph">By clicking the arrow next to some icons you open a toolbar. To move a toolbar, drag the title bar. As soon as you release the mouse button, the toolbar remains at the new position. Drag the title bar to another position, or drag to an edge of the window, where the toolbar will dock. Close a toolbar by clicking the <emph>Close Window</emph> icon. Make the toolbar visible again by choosing <emph>View - Toolbars - (toolbar name)</emph>.</paragraph>
@@ -201,7 +203,7 @@
<h3 id="par_id3145069">Reset</h3>
<paragraph xml-lang="en-US" id="par_id3145169" role="paragraph"><ahelp hid="cui/ui/autocorrectdialog/reset">Resets modified values back to the tab page previous values.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/autocorrectdialog/cancel" id="bm_id4539935" localize="false"/>
-<section id="cancel">
+<section id="cancel_autocorr">
<h3 id="par_id3145070">Cancel</h3>
<paragraph xml-lang="en-US" id="par_id3145269" role="paragraph"><ahelp hid="cui/ui/autocorrectdialog/cancel">Closes dialog and discards all changes.</ahelp></paragraph>
</section>