diff options
22 files changed, 61 insertions, 36 deletions
diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk index d267369c9e..d438789b8f 100644 --- a/AllLangHelp_sdatabase.mk +++ b/AllLangHelp_sdatabase.mk @@ -9,8 +9,14 @@ $(eval $(call gb_AllLangHelp_AllLangHelp,sdatabase)) +$(eval $(call gb_AllLangHelp_set_treefile,sdatabase,helpcontent2/source/auxiliary/sdatabase)) + $(eval $(call gb_AllLangHelp_use_linked_modules,sdatabase,\ shared \ )) +$(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\ + helpcontent2/source/text/sdatabase/main \ +)) + # vim: set noet sw=4 ts=4: diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index 61b965b911..938734ebb0 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -904,7 +904,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet \ helpcontent2/source/text/shared/explorer/database/dabawiz02text \ helpcontent2/source/text/shared/explorer/database/dabawiz03auth \ - helpcontent2/source/text/shared/explorer/database/main \ helpcontent2/source/text/shared/explorer/database/menubar \ helpcontent2/source/text/shared/explorer/database/menuedit \ helpcontent2/source/text/shared/explorer/database/menufile \ diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk index ba0f731021..dab539f065 100644 --- a/CustomTarget_html.mk +++ b/CustomTarget_html.mk @@ -10,9 +10,9 @@ $(eval $(call gb_CustomTarget_CustomTarget,helpcontent2/help3xsl)) # HACK!! -html_TREE_MODULES := sbasic scalc schart shared simpress smath swriter sdraw -html_TEXT_MODULES := $(html_TREE_MODULES) sdatabase -html_BMARK_MODULES := swriter:WRITER scalc:CALC simpress:IMPRESS sdraw:DRAW shared/explorer/database:BASE smath:MATH schart:CHART sbasic:BASIC shared:SHARED +html_TREE_MODULES := swriter scalc simpress sdraw sdatabase smath schart sbasic shared +html_TEXT_MODULES := $(html_TREE_MODULES) +html_BMARK_MODULES := swriter:WRITER scalc:CALC simpress:IMPRESS sdraw:DRAW sdatabase:BASE smath:MATH schart:CHART sbasic:BASIC shared:SHARED $(eval $(call gb_CustomTarget_register_targets,helpcontent2/help3xsl,\ hid2file.js \ diff --git a/help3xsl/help2.js b/help3xsl/help2.js index 9eb35c003c..382627d83d 100644 --- a/help3xsl/help2.js +++ b/help3xsl/help2.js @@ -188,7 +188,7 @@ function setupModules(lang) { '<a href="' + lang + '/text/scalc/main0000.html?DbPAR=CALC"><div class="calc-icon"></div>Calc</a>' + '<a href="' + lang + '/text/simpress/main0000.html?DbPAR=IMPRESS"><div class="impress-icon"></div>Impress</a>' + '<a href="' + lang + '/text/sdraw/main0000.html?DbPAR=DRAW"><div class="draw-icon"></div>Draw</a>' + - '<a href="' + lang + '/text/shared/explorer/database/main.html?DbPAR=BASE"><div class="base-icon"></div>Base</a>' + + '<a href="' + lang + '/text/sdatabase/main.html?DbPAR=BASE"><div class="base-icon"></div>Base</a>' + '<a href="' + lang + '/text/smath/main0000.html?DbPAR=MATH"><div class="math-icon"></div>Math</a>' + '<a href="' + lang + '/text/schart/main0000.html?DbPAR=CHART"><div class="chart-icon"></div>Chart</a>' + '<a href="' + lang + '/text/sbasic/shared/main0601.html?DbPAR=BASIC"><div class="basic-icon"></div>Basic</a>'; diff --git a/help3xsl/index2.html b/help3xsl/index2.html index ce16c3083e..b42007dd5e 100644 --- a/help3xsl/index2.html +++ b/help3xsl/index2.html @@ -36,7 +36,7 @@ case "simpress": {defaultFile='text/simpress/main0000.html';module="IMPRESS";break;} case "sdraw": {defaultFile='text/sdraw/main0000.html';module="DRAW";break;} case "smath": {defaultFile='text/smath/main0000.html';module="MATH";break;} - case "sdatabase": {defaultFile='text/shared/explorer/database/main.html';module="BASE";break;} + case "sdatabase": {defaultFile='text/sdatabase/main.html';module="BASE";break;} case "sbasic": {defaultFile='text/sbasic/shared/main0601.html';module="BASIC";break;} default: {defaultFile='text/shared/05/new_help.html';module="WRITER";break;} } diff --git a/source/auxiliary/sdatabase.tree b/source/auxiliary/sdatabase.tree new file mode 100644 index 0000000000..52ed2ed4a1 --- /dev/null +++ b/source/auxiliary/sdatabase.tree @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . +--> +<tree_view version="24-Aug-2004"> + <help_section application="sbase" id="09" title="Database Functionality (Base)"> + <node id="0901" title="General Information"> + <topic id="sdatabase/text/sdatabase/main.xhp">%PRODUCTNAME Database</topic> + <topic id="shared/text/shared/guide/database_main.xhp">Database Overview</topic> + <topic id="shared/text/shared/guide/data_new.xhp">Creating a New Database</topic> + <topic id="shared/text/shared/guide/data_tables.xhp">Working with Tables</topic> + <topic id="shared/text/shared/guide/data_queries.xhp">Working with Queries</topic> + <topic id="shared/text/shared/guide/data_forms.xhp">Working with Forms</topic> + <topic id="shared/text/shared/guide/data_reports.xhp">Creating Reports </topic> + <topic id="shared/text/shared/guide/data_register.xhp">Registering and Deleting a Database </topic> + <topic id="shared/text/shared/guide/data_im_export.xhp">Importing and Exporting Data in Base </topic> + <topic id="shared/text/shared/guide/data_enter_sql.xhp">Executing SQL Commands</topic> + </node> + </help_section> +</tree_view> diff --git a/source/auxiliary/shared.tree b/source/auxiliary/shared.tree index 82926407fa..831b1d9b28 100644 --- a/source/auxiliary/shared.tree +++ b/source/auxiliary/shared.tree @@ -201,18 +201,4 @@ <topic id="shared/text/shared/guide/numbering_stop.xhp">Turning off Bullets and Numbering for Individual Paragraphs</topic> </node> </help_section> - <help_section application="swriter" id="09" title="Database Functionality (Base)"> - <node id="0901" title="General Information"> -<topic id="shared/text/shared/explorer/database/main.xhp">%PRODUCTNAME Database</topic> -<topic id="shared/text/shared/guide/database_main.xhp">Database Overview</topic> -<topic id="shared/text/shared/guide/data_new.xhp">Creating a New Database</topic> -<topic id="shared/text/shared/guide/data_tables.xhp">Working with Tables</topic> -<topic id="shared/text/shared/guide/data_queries.xhp">Working with Queries</topic> -<topic id="shared/text/shared/guide/data_forms.xhp">Working with Forms</topic> -<topic id="shared/text/shared/guide/data_reports.xhp">Creating Reports </topic> -<topic id="shared/text/shared/guide/data_register.xhp">Registering and Deleting a Database </topic> -<topic id="shared/text/shared/guide/data_im_export.xhp">Importing and Exporting Data in Base </topic> -<topic id="shared/text/shared/guide/data_enter_sql.xhp">Executing SQL Commands</topic> - </node> - </help_section> </tree_view> diff --git a/source/text/shared/explorer/database/main.xhp b/source/text/sdatabase/main.xhp index 6127ae2500..bd68a21a07 100644 --- a/source/text/shared/explorer/database/main.xhp +++ b/source/text/sdatabase/main.xhp @@ -25,7 +25,7 @@ <meta> <topic id="textsharedexplorerdatabasemainxml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">%PRODUCTNAME Database</title> -<filename>/text/shared/explorer/database/main.xhp</filename> +<filename>/text/sdatabase/main.xhp</filename> </topic> </meta> <body> @@ -33,7 +33,7 @@ <bookmark xml-lang="en-US" branch="index" id="bm_id8622089"><bookmark_value>databases;main page (Base)</bookmark_value> <bookmark_value>$[officename] Base data sources</bookmark_value> <bookmark_value>data sources;$[officename] Base</bookmark_value> -</bookmark><comment>mw changed "Base,..."</comment><paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="1"><variable id="base"><link href="text/shared/explorer/database/main.xhp">Using Databases in %PRODUCTNAME Base</link> +</bookmark><comment>mw changed "Base,..."</comment><paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="1"><variable id="base"><link href="text/sdatabase/main.xhp">Using Databases in %PRODUCTNAME Base</link> </variable></paragraph> <paragraph role="paragraph" id="par_idN107BD" xml-lang="en-US">In %PRODUCTNAME Base, you can access data that is stored in a wide variety of database file formats. %PRODUCTNAME Base natively supports some flat file database formats, such as the dBASE format. You can also use %PRODUCTNAME Base to connect to external relational databases, such as databases from MySQL or Oracle.</paragraph> </section> diff --git a/source/text/shared/explorer/database/dabadoc.xhp b/source/text/shared/explorer/database/dabadoc.xhp index 1f00605106..d3d785f4a0 100644 --- a/source/text/shared/explorer/database/dabadoc.xhp +++ b/source/text/shared/explorer/database/dabadoc.xhp @@ -32,7 +32,7 @@ <paragraph xml-lang="en-US" id="par_idN10554" role="paragraph"><ahelp hid=".">The database file window organizes the tables, views, queries, and reports of a database in %PRODUCTNAME.</ahelp></paragraph> </section> <section id="relatedtopics"> - <paragraph xml-lang="en-US" id="par_idN105B7" role="paragraph"><link href="text/shared/explorer/database/main.xhp">Working with databases in %PRODUCTNAME</link></paragraph> + <paragraph xml-lang="en-US" id="par_idN105B7" role="paragraph"><link href="text/sdatabase/main.xhp">Working with databases in %PRODUCTNAME</link></paragraph> </section> </body> </helpdocument>
\ No newline at end of file diff --git a/source/text/shared/guide/data_forms.xhp b/source/text/shared/guide/data_forms.xhp index 3c8e161207..2170179944 100644 --- a/source/text/shared/guide/data_forms.xhp +++ b/source/text/shared/guide/data_forms.xhp @@ -64,7 +64,7 @@ <paragraph role="paragraph" id="par_idN1065F" xml-lang="en-US">A new text document opens. Use the <link href="text/shared/02/01170000.xhp">Form Controls</link> to insert form controls.</paragraph> <paragraph role="note" id="par_idN10670" xml-lang="en-US">Click the <emph>Forms</emph> icon to access all forms that were created from within the current database window. In addition, you can use the <emph>Form Controls</emph> icons to add database form controls to any Writer or Calc document, but these documents will not be listed in the database window. </paragraph> <section id="relatedtopics"> -<embed href="text/shared/explorer/database/main.xhp#base"/> +<embed href="text/sdatabase/main.xhp#base"/> <embed href="text/shared/guide/database_main.xhp#database_main"/> </section> </body> diff --git a/source/text/shared/guide/data_im_export.xhp b/source/text/shared/guide/data_im_export.xhp index 8286ce489a..d0435ebf3e 100644 --- a/source/text/shared/guide/data_im_export.xhp +++ b/source/text/shared/guide/data_im_export.xhp @@ -89,7 +89,7 @@ <paragraph role="tip" id="par_id2584002" xml-lang="en-US">On Windows systems, you can also use drag-and-drop instead of Copy and Paste. Also, for registered databases, you can open the datasource browser (press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Shift + F4 keys) instead of opening the Base window.</paragraph> <section id="relatedtopics"> <paragraph role="paragraph" id="par_id5871761" xml-lang="en-US" localize="false"> - <embedvar href="text/shared/explorer/database/main.xhp#base"/> + <embedvar href="text/sdatabase/main.xhp#base"/> </paragraph> <paragraph role="paragraph" id="par_id6531266" xml-lang="en-US" localize="false"> <embedvar href="text/shared/guide/database_main.xhp#database_main"/> diff --git a/source/text/shared/guide/data_new.xhp b/source/text/shared/guide/data_new.xhp index d3953f2c4f..f5128a9ef8 100644 --- a/source/text/shared/guide/data_new.xhp +++ b/source/text/shared/guide/data_new.xhp @@ -47,7 +47,7 @@ </list> <section id="relatedtopics"> <paragraph role="paragraph" id="par_idN105FC" xml-lang="en-US" localize="false"> - <embedvar href="text/shared/explorer/database/main.xhp#base"/> + <embedvar href="text/sdatabase/main.xhp#base"/> </paragraph> <paragraph role="paragraph" id="par_idN10604" xml-lang="en-US" localize="false"> <embedvar href="text/shared/guide/database_main.xhp#database_main"/> diff --git a/source/text/shared/guide/data_queries.xhp b/source/text/shared/guide/data_queries.xhp index b2639670ff..96fd55860e 100644 --- a/source/text/shared/guide/data_queries.xhp +++ b/source/text/shared/guide/data_queries.xhp @@ -68,7 +68,7 @@ <paragraph role="paragraph" id="par_idN1065F" xml-lang="en-US">You see the <link href="text/shared/explorer/database/02010100.xhp">Query Design window</link>.</paragraph> <section id="relatedtopics"> <paragraph role="paragraph" id="par_idN1067B" xml-lang="en-US" localize="false"> - <embedvar href="text/shared/explorer/database/main.xhp#base"/> + <embedvar href="text/sdatabase/main.xhp#base"/> </paragraph> <paragraph role="paragraph" id="par_idN10683" xml-lang="en-US" localize="false"> <embedvar href="text/shared/guide/database_main.xhp#database_main"/> diff --git a/source/text/shared/guide/data_register.xhp b/source/text/shared/guide/data_register.xhp index e46852973e..62f72b4aac 100644 --- a/source/text/shared/guide/data_register.xhp +++ b/source/text/shared/guide/data_register.xhp @@ -56,7 +56,7 @@ </list> <section id="relatedtopics"> <paragraph role="paragraph" id="par_idN105F3" xml-lang="en-US" localize="false"> - <embedvar href="text/shared/explorer/database/main.xhp#base"/> + <embedvar href="text/sdatabase/main.xhp#base"/> </paragraph> <paragraph role="paragraph" id="par_idN105FB" xml-lang="en-US" localize="false"> <embedvar href="text/shared/guide/database_main.xhp#database_main"/> diff --git a/source/text/shared/guide/data_reports.xhp b/source/text/shared/guide/data_reports.xhp index 33c1b18bd9..992c6725b6 100644 --- a/source/text/shared/guide/data_reports.xhp +++ b/source/text/shared/guide/data_reports.xhp @@ -135,7 +135,7 @@ </list> <section id="relatedtopics"> <embed href="text/shared/guide/data_report.xhp#data_report"/> -<embed href="text/shared/explorer/database/main.xhp#base"/> +<embed href="text/sdatabase/main.xhp#base"/> <embed href="text/shared/guide/database_main.xhp#database_main"/> </section> </body> diff --git a/source/text/shared/guide/data_tables.xhp b/source/text/shared/guide/data_tables.xhp index 61c634b983..d69af41a4d 100644 --- a/source/text/shared/guide/data_tables.xhp +++ b/source/text/shared/guide/data_tables.xhp @@ -79,7 +79,7 @@ <paragraph role="paragraph" id="par_idN10795" xml-lang="en-US">You see the View Design window, which is almost the same as the <link href="text/shared/explorer/database/02010100.xhp">Query Design window</link>.</paragraph> <section id="relatedtopics"> <paragraph role="paragraph" id="par_idN1067B" xml-lang="en-US" localize="false"> - <embedvar href="text/shared/explorer/database/main.xhp#base"/> + <embedvar href="text/sdatabase/main.xhp#base"/> </paragraph> <paragraph role="paragraph" id="par_idN10683" xml-lang="en-US" localize="false"> <embedvar href="text/shared/guide/database_main.xhp#database_main"/> diff --git a/source/text/shared/guide/data_view.xhp b/source/text/shared/guide/data_view.xhp index 3749dab3d9..64d6532eca 100644 --- a/source/text/shared/guide/data_view.xhp +++ b/source/text/shared/guide/data_view.xhp @@ -50,7 +50,7 @@ </list> <section id="relatedtopics"> <paragraph role="paragraph" id="par_idN10606" xml-lang="en-US" localize="false"> - <embedvar href="text/shared/explorer/database/main.xhp#base"/> + <embedvar href="text/sdatabase/main.xhp#base"/> </paragraph> <paragraph role="paragraph" id="par_idN1060E" xml-lang="en-US" localize="false"> <embedvar href="text/shared/guide/database_main.xhp#database_main"/> diff --git a/source/text/shared/guide/database_main.xhp b/source/text/shared/guide/database_main.xhp index 8add70b9ab..3fd3fdbd8c 100644 --- a/source/text/shared/guide/database_main.xhp +++ b/source/text/shared/guide/database_main.xhp @@ -38,7 +38,7 @@ <paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" localize="false"/> <paragraph role="heading" id="hd_id3148474" xml-lang="en-US" level="1"><variable id="database_main"><link href="text/shared/guide/database_main.xhp" name="Data Source Overview">Database Overview</link> </variable><comment>remove this file when all links are resolved</comment></paragraph> -<paragraph role="paragraph" id="par_idN105F1" xml-lang="en-US"><link href="text/shared/explorer/database/main.xhp">Working with databases in %PRODUCTNAME</link></paragraph> +<paragraph role="paragraph" id="par_idN105F1" xml-lang="en-US"><link href="text/sdatabase/main.xhp">Working with databases in %PRODUCTNAME</link></paragraph> <paragraph role="heading" id="hd_id3153821" xml-lang="en-US" level="2">Data Source View</paragraph> <paragraph role="paragraph" id="par_id3149415" xml-lang="en-US">Choose <emph>View - Data Sources</emph> or press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Shift + F4 keys to call the data source view from a text document or spreadsheet.</paragraph> <paragraph role="paragraph" id="par_id3147531" xml-lang="en-US">On the left you can see the <link href="text/shared/02/12000000.xhp" name="Data source explorer">Data source explorer</link>. If you select a table or query there, you see the contents of this table or query on the right. At the top margin is the <link href="text/shared/main0212.xhp" name="Database bar">Table Data bar</link>.</paragraph> diff --git a/source/text/shared/guide/main.xhp b/source/text/shared/guide/main.xhp index 084ea41233..4b8c5de515 100644 --- a/source/text/shared/guide/main.xhp +++ b/source/text/shared/guide/main.xhp @@ -113,7 +113,7 @@ <embed href="text/shared/guide/insert_specialchar.xhp#insert_specialchar"/> <paragraph id="hd_id3152576" role="heading" level="2" xml-lang="en-US">Data Sources</paragraph> -<paragraph id="par_idN10826" role="paragraph" xml-lang="en-US"><link href="text/shared/explorer/database/main.xhp">Working with databases in %PRODUCTNAME</link></paragraph> +<paragraph id="par_idN10826" role="paragraph" xml-lang="en-US"><link href="text/sdatabase/main.xhp">Working with databases in %PRODUCTNAME</link></paragraph> <paragraph id="par_idN10841" role="paragraph" xml-lang="en-US"><link href="text/shared/explorer/database/tablewizard00.xhp">Table Wizard</link></paragraph> <paragraph id="par_idN1085B" role="paragraph" xml-lang="en-US"><link href="text/shared/explorer/database/querywizard00.xhp">Query Wizard</link></paragraph> <paragraph id="par_idN10875" role="paragraph" xml-lang="en-US"><link href="text/shared/autopi/01090000.xhp">Forms Wizard</link></paragraph> diff --git a/source/text/shared/guide/startcenter.xhp b/source/text/shared/guide/startcenter.xhp index 5225e5fbbc..35a35909ae 100644 --- a/source/text/shared/guide/startcenter.xhp +++ b/source/text/shared/guide/startcenter.xhp @@ -82,7 +82,7 @@ </listitem> <listitem> <paragraph xml-lang="en-US" id="par_id0820200803105089" role="paragraph"> - <emph>Base Database</emph> opens %PRODUCTNAME <link href="text/shared/explorer/database/main.xhp">Base</link></paragraph> + <emph>Base Database</emph> opens %PRODUCTNAME <link href="text/sdatabase/main.xhp">Base</link></paragraph> </listitem> </list> diff --git a/source/text/simpress/main0000.xhp b/source/text/simpress/main0000.xhp index 6d87987d5b..fa069665ec 100644 --- a/source/text/simpress/main0000.xhp +++ b/source/text/simpress/main0000.xhp @@ -38,7 +38,7 @@ <embed href="text/simpress/guide/main.xhp#main"/> <embed href="text/simpress/main0503.xhp#main0503"/> <embed href="text/schart/main0000.xhp#chart_main"/> -<embed href="text/shared/explorer/database/main.xhp#base"/> +<embed href="text/sdatabase/main.xhp#base"/> <paragraph role="heading" id="hd_id3149880" xml-lang="en-US" level="3">$[officename] Impress Menus, Toolbars, and Keys</paragraph> <embed href="text/simpress/main0100.xhp#main0100"/> <embed href="text/simpress/main0200.xhp#main0200"/> diff --git a/source/text/swriter/main0000.xhp b/source/text/swriter/main0000.xhp index 457a0048b3..8e271d35d1 100644 --- a/source/text/swriter/main0000.xhp +++ b/source/text/swriter/main0000.xhp @@ -38,7 +38,7 @@ <embed href="text/swriter/main0503.xhp#main0503"/> <embed href="text/swriter/guide/main.xhp#main"/> <embed href="text/schart/main0000.xhp#chart_main"/> -<embed href="text/shared/explorer/database/main.xhp#base"/> +<embed href="text/sdatabase/main.xhp#base"/> <paragraph role="heading" id="hd_id3149131" xml-lang="en-US" level="3">Menus, Toolbars, and Keys</paragraph> <embed href="text/swriter/main0100.xhp#main0100"/> <embed href="text/swriter/main0200.xhp#main0200"/> |