diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-06-12 18:19:30 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-06-12 18:19:30 +0000 |
| commit | 4dd442010398f4d280ebaa1de3d066185da00daf (patch) | |
| tree | 21c432407105663703a62af771d16039cde3ae80 /helpcontent2/source/text/shared/explorer/database | |
| parent | CWS-TOOLING: integrate CWS chart37 (diff) | |
| download | help-4dd442010398f4d280ebaa1de3d066185da00daf.tar.gz help-4dd442010398f4d280ebaa1de3d066185da00daf.zip | |
CWS-TOOLING: integrate CWS hcshared21
2009-05-13 09:49:59 +0200 ufi r271841 : CWS-TOOLING: rebase CWS hcshared21 to trunk@271427 (milestone: DEV300:m47)
2009-04-16 11:01:43 +0200 ufi r270873 : again
2009-03-17 10:19:50 +0100 ufi r269575 : before builds
2009-02-13 16:03:59 +0100 ufi r267726 : CWS-TOOLING: rebase CWS hcshared21 to trunk@267171 (milestone: DEV300:m41)
2009-02-10 10:30:11 +0100 ufi r267539 : vor neuem rebase Versuch
2009-02-03 15:55:58 +0100 ufi r267334 : before rebase
2009-01-06 10:38:41 +0100 ufi r265901 : i97718
Diffstat (limited to 'helpcontent2/source/text/shared/explorer/database')
3 files changed, 125 insertions, 43 deletions
diff --git a/helpcontent2/source/text/shared/explorer/database/02010101.xhp b/helpcontent2/source/text/shared/explorer/database/02010101.xhp index 35352548a5..bc2a0c1f3c 100755 --- a/helpcontent2/source/text/shared/explorer/database/02010101.xhp +++ b/helpcontent2/source/text/shared/explorer/database/02010101.xhp @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> - - - +<helpdocument version="1.0"> + <!-- - *********************************************************************** +*********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -11,8 +10,8 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: 02010101.xhp,v $ - * $Revision: 1.15 $ + * $RCSfile: soffice2xmlhelp.xsl,v $ + * $Revision: 1.10 $ * * This file is part of OpenOffice.org. * @@ -33,41 +32,52 @@ * ************************************************************************ --> - - - <helpdocument version="1.0"> + + <meta> -<topic id="textsharedexplorerdatabase02010101xml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Relations</title> -<filename>/text/shared/explorer/database/02010101.xhp</filename> -</topic> -</meta> -<body> + <topic id="textsharedexplorerdatabase02010101xml" indexer="include" status="PUBLISH"> + <title xml-lang="en-US" id="tit">Join Properties</title> + <filename>/text/shared/explorer/database/02010101.xhp</filename> + </topic> + </meta> + <body> <bookmark xml-lang="en-US" branch="index" id="bm_id3154015"><bookmark_value>links;relational databases (Base)</bookmark_value> -<bookmark_value>inner joins (Base)</bookmark_value> -<bookmark_value>joins in databases (Base)</bookmark_value> -<bookmark_value>left joins (Base)</bookmark_value> -<bookmark_value>right joins (Base)</bookmark_value> -<bookmark_value>full joins (Base)</bookmark_value> -</bookmark><comment>mw deleted "join properties" and changed "link properties..." to "links;"</comment><paragraph role="heading" id="hd_id3154015" xml-lang="en-US" level="1" l10n="U" oldref="1">Relations</paragraph> -<paragraph role="paragraph" id="par_id3151205" xml-lang="en-US" l10n="U" oldref="2">If you double-click a connection between two linked fields in the query design, or if you choose <emph>Insert - New Relation</emph>, the <emph>Relations</emph> dialog appears. These properties will be used in all queries created in the future.</paragraph> -<section id="howtoget"> - <embed href="text/shared/00/00000450.xhp#Joins"/> -</section> + <bookmark_value>inner joins (Base)</bookmark_value> + <bookmark_value>joins in databases (Base)</bookmark_value> + <bookmark_value>left joins (Base)</bookmark_value> + <bookmark_value>right joins (Base)</bookmark_value> + <bookmark_value>full joins (Base)</bookmark_value> +</bookmark><comment>mw deleted "join properties" and changed "link properties..." to "links;"</comment> +<paragraph xml-lang="en-US" id="hd_id3154015" role="heading" level="1" l10n="CHG" + oldref="1">Join Properties</paragraph> + <paragraph xml-lang="en-US" id="par_id3151205" role="paragraph" l10n="U" oldref="2">If you double-click a connection between two linked fields in the query design, or if you choose <emph>Insert - New Relation</emph>, the <emph>Join Properties</emph> dialog appears. These properties will be used in all queries created in the future.</paragraph> + <section id="howtoget"> + <embed href="text/shared/00/00000450.xhp#Joins"/> + </section> <bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_LEFT_TABLE" id="bm_id3150749" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_RIGHT_TABLE" id="bm_id3150752" localize="false"/><paragraph role="heading" id="hd_id3155066" xml-lang="en-US" level="2" l10n="U" oldref="17">Tables involved</paragraph> -<paragraph role="paragraph" id="par_id3153924" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_DLG_QRY_RIGHT_TABLE">Specifies two different tables that you want to join.</ahelp></paragraph><comment>UFI: removed a help id</comment><paragraph role="heading" id="hd_id3155766" xml-lang="en-US" level="2" l10n="U" oldref="15">Fields involved</paragraph> -<paragraph role="paragraph" id="par_id3148994" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid=".">Specifies two data fields that will be joined by a relation.</ahelp></paragraph> -<paragraph role="heading" id="hd_id3159267" xml-lang="en-US" level="2" l10n="U" oldref="3">Options</paragraph> -<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_JOINTYPE" id="bm_id3147321" localize="false"/><paragraph role="heading" id="hd_id3147340" xml-lang="en-US" level="3" l10n="U" oldref="13">Type</paragraph> -<paragraph role="paragraph" id="par_id3152482" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="HID_DLG_QRY_JOINTYPE">Specifies the link type of the selected link.</ahelp> Some databases support only a subset of the possible types.</paragraph> -<paragraph role="heading" id="hd_id3155334" xml-lang="en-US" level="3" l10n="U" oldref="5">Inner Join</paragraph> -<paragraph role="paragraph" id="par_id3155936" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the internal join, the results table contains only the records for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link is created by a corresponding WHERE clause.</paragraph> -<paragraph role="heading" id="hd_id3156372" xml-lang="en-US" level="3" l10n="U" oldref="7">Left Join</paragraph> -<paragraph role="paragraph" id="par_id3166450" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the left join, the results table contains all fields of the left table and only those fields of the right table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the LEFT OUTER JOIN command.</paragraph> -<paragraph role="heading" id="hd_id3155607" xml-lang="en-US" level="3" l10n="U" oldref="9">Right Join</paragraph> -<paragraph role="paragraph" id="par_id3150647" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the right join, the results table contains all fields of the right table and only those fields of the left table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the RIGHT OUTER JOIN command.</paragraph> -<paragraph role="heading" id="hd_id3158215" xml-lang="en-US" level="3" l10n="U" oldref="11">Full Join</paragraph> -<paragraph role="paragraph" id="par_id3163665" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_DLG_QRY_JOINTYPE">For a full join, the results table contains all fields of the left and right tables.</ahelp> In the SQL of $[officename] this type of link corresponds to the FULL OUTER JOIN command.</paragraph> -</body> -</helpdocument> +<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_RIGHT_TABLE" id="bm_id3150752" localize="false"/> +<paragraph xml-lang="en-US" id="hd_id3155066" role="heading" level="2" l10n="U" + oldref="17">Tables involved</paragraph> + <paragraph xml-lang="en-US" id="par_id3153924" role="paragraph" l10n="U" oldref="16"><ahelp hid="HID_DLG_QRY_RIGHT_TABLE">Specifies two different tables that you want to join.</ahelp></paragraph> + <paragraph xml-lang="en-US" id="hd_id3155766" role="heading" level="2" l10n="U" + oldref="15">Fields involved</paragraph> + <paragraph xml-lang="en-US" id="par_id3148994" role="paragraph" l10n="CHG" oldref="14"><ahelp hid=".">Specifies two data fields that will be joined by a relation.</ahelp></paragraph> + <paragraph xml-lang="en-US" id="hd_id3159267" role="heading" level="2" l10n="U" oldref="3">Options</paragraph> +<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_JOINTYPE" id="bm_id3147321" localize="false"/> +<paragraph xml-lang="en-US" id="hd_id3147340" role="heading" level="3" l10n="U" + oldref="13">Type</paragraph> + <paragraph xml-lang="en-US" id="par_id3152482" role="paragraph" l10n="CHG" oldref="4"><ahelp hid="HID_DLG_QRY_JOINTYPE">Specifies the link type of the selected link.</ahelp> Some databases support only a subset of the possible types.</paragraph> + <paragraph xml-lang="en-US" id="hd_id3155334" role="heading" level="3" l10n="U" oldref="5">Inner Join</paragraph> + <paragraph xml-lang="en-US" id="par_id3155936" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the internal join, the results table contains only the records for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link is created by a corresponding WHERE clause.</paragraph> + <paragraph xml-lang="en-US" id="hd_id3156372" role="heading" level="3" l10n="U" oldref="7">Left Join</paragraph> + <paragraph xml-lang="en-US" id="par_id3166450" role="paragraph" l10n="U" oldref="8"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the left join, the results table contains all fields of the left table and only those fields of the right table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the LEFT OUTER JOIN command.</paragraph> + <paragraph xml-lang="en-US" id="hd_id3155607" role="heading" level="3" l10n="U" oldref="9">Right Join</paragraph> + <paragraph xml-lang="en-US" id="par_id3150647" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the right join, the results table contains all fields of the right table and only those fields of the left table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the RIGHT OUTER JOIN command.</paragraph> + <paragraph xml-lang="en-US" id="hd_id3158215" role="heading" level="3" l10n="U" + oldref="11">Full Join</paragraph> + <paragraph xml-lang="en-US" id="par_id3163665" role="paragraph" l10n="U" oldref="12"><ahelp hid="HID_DLG_QRY_JOINTYPE">For a full join, the results table contains all fields of the left and right tables.</ahelp> In the SQL of $[officename] this type of link corresponds to the FULL OUTER JOIN command.</paragraph> +<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_JOIN_CONTROL" id="bm_id0305200912022930" localize="false"/> +<paragraph xml-lang="en-US" id="hd_id0305200912031976" role="heading" level="3" l10n="NEW">Natural</paragraph> + <paragraph xml-lang="en-US" id="par_id0305200912031977" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts the keyword NATURAL into the SQL statement that defines the relation. The relation joins all columns that have the same column name in both tables. The resulting joined table contains only one column for each pair of equally named columns.</ahelp></paragraph> + </body> +</helpdocument>
\ No newline at end of file diff --git a/helpcontent2/source/text/shared/explorer/database/makefile.mk b/helpcontent2/source/text/shared/explorer/database/makefile.mk index 3492dd4323..f2d85e7594 100644 --- a/helpcontent2/source/text/shared/explorer/database/makefile.mk +++ b/helpcontent2/source/text/shared/explorer/database/makefile.mk @@ -6,9 +6,9 @@ # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ +# $RCSfile: makefile.template,v $ # -# $Revision: 1.13.4.4 $ +# $Revision: 1.5 $ # # This file is part of OpenOffice.org. # @@ -112,6 +112,7 @@ XHPFILES = \ menuinsert.xhp \ menutools.xhp \ menuview.xhp \ + migrate_macros.xhp \ password.xhp \ querywizard00.xhp \ querywizard01.xhp \ diff --git a/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp b/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp new file mode 100755 index 0000000000..b90fc54ea4 --- /dev/null +++ b/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<helpdocument version="1.0"> + +<!-- +*********************************************************************** + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: soffice2xmlhelp.xsl,v $ + * $Revision: 1.10 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************ + --> + + +<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> + </topic> + </meta> + <body> + <section id="migrate_macros"> +<bookmark xml-lang="en-US" branch="index" id="bm_id6009095"><bookmark_value>wizards;macros (Base)</bookmark_value> + <bookmark_value>Macro Wizard (Base)</bookmark_value> + <bookmark_value>macros;attaching new (Base)</bookmark_value> + <bookmark_value>migrating macros (Base)</bookmark_value> +</bookmark><comment>MW added 2 index entries</comment> +<paragraph xml-lang="en-US" id="hd_id0112200902353472" role="heading" level="1" l10n="NEW"><link href="text/shared/explorer/database/migrate_macros.xhp">Migrate Macros</link></paragraph> +<bookmark xml-lang="en-US" branch="hid/.uno:DBMigrateScripts" id="bm_id0224200911384751" localize="false"/> +<paragraph xml-lang="en-US" id="par_id0112200902353466" role="paragraph" l10n="NEW"><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> +<bookmark xml-lang="en-US" branch="hid/dbaccess_PushButton_TP_SAVE_DBDOC_AS_PB_BROWSE_SAVE_AS_LOCATION" id="bm_id022420091141368" localize="false"/> +<paragraph xml-lang="en-US" id="par_id0224200911454780" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose a location and file name to save the new database file. By default, the new file gets the same name as the old file, while the old file gets renamed with the string "backup" in the name.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/dbaccess_MultiLineEdit_TP_SUMMARY_ED_CHANGES" id="bm_id0224200911450172" localize="false"/> +<paragraph xml-lang="en-US" id="par_id022420091145472" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The list shows all changes that were applied to the database file.</ahelp></paragraph> + <paragraph xml-lang="en-US" id="par_id0112200902353542" role="paragraph" l10n="NEW">Previously, macros have been allowed to reside only in the text sub-documents of forms and reports. Starting with OpenOffice.org 3.1 or StarOffice 9.1, macros can also be stored in the Base file itself. This means that macros in Base files can be called now from any of its sub-components: forms, reports, table design, query design, relation design, table data view.</paragraph> + <paragraph xml-lang="en-US" id="par_id0112200903075865" role="paragraph" l10n="NEW">However, it is technically not possible to store macros both in a Base file and in its sub-documents at the same time. So, if you want to attach some new macros to the Base file, while retaining any existing old macros that were stored in the sub-documents, you must move the existing old macros up to the Base file's macro storage area. </paragraph> + <paragraph xml-lang="en-US" id="par_id0112200903075830" role="paragraph" l10n="NEW">The Database Document Macro Migration Wizard can move the macros up into the Base file's storage area. You can then examine the macros and edit them as needed. </paragraph> + <paragraph xml-lang="en-US" id="par_id0112200903075951" role="paragraph" l10n="NEW">For example, it is possible that macros from the sub-documents had the same module names and macro names. After you moved the macros into one common macro storage area, you must edit the macros to make the names unique. The wizard cannot do this.</paragraph> + <paragraph xml-lang="en-US" id="par_id0112200903075915" role="paragraph" l10n="NEW">The wizard can backup the Base file to another folder of your choice. The wizard changes the original Base file. The backup remains unchanged.</paragraph> + <embed href="text/shared/00/00000001.xhp#zurueckautopi"/> + <embed href="text/shared/00/00000001.xhp#weiterautopi"/> + <embed href="text/shared/00/00000001.xhp#finish"/> + <embed href="text/shared/00/00000001.xhp#abbrechen"/> + <section id="relatedtopics"> + <paragraph xml-lang="en-US" id="par_id0112200902353554" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Macros_in_Database_Documents">An in depth explanation by the developers (Wiki).</link></paragraph> + </section> + </body> +</helpdocument>
\ No newline at end of file |