From b3b1bc6c92bfaf1242f73500340e4096b58118e1 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 14 Jun 2011 16:53:26 +0200 Subject: [PATCH 01/16] Version 3.4.1.1, tag libreoffice-3.4.1.1 (3.4.1-rc1) From aaaa1e5d89f088cb9335a5baef9a3b6e2ae5c3b1 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 16 Jun 2011 02:05:26 +0200 Subject: [PATCH 02/16] remove some noise #i112319# cleanup / check on WITH_LANG from l10ntooling20 cws (only change in that cws) --- helpcontent2/helpers/update_tree.pl | 30 +++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl index 27b1a1dbbf..8dc7bf4e98 100644 --- a/helpcontent2/helpers/update_tree.pl +++ b/helpcontent2/helpers/update_tree.pl @@ -68,15 +68,12 @@ if ( ! defined $prj ) { { $source_dir = $ENV{TRYSDF}; } - else + elsif( defined $ENV{LOCALIZESDF} && $ENV{LOCALIZESDF} ne "" ) { $source_dir = $ENV{LOCALIZESDF}; } $source_dir =~ s/\/auxiliary\/localize.sdf$// ; } - #else {die "ERROR: The env variables TRYSDF LOCALIZATION_FOUND LOCALIZESDF not found ... something is wrong!\n";} - - $treestrings = "$source_dir/text/shared/tree_strings.xhp"; } else { $tree_src = "$prj\/source\/auxiliary"; @@ -89,13 +86,11 @@ if ( ! defined $prj ) { { $source_dir = $ENV{TRYSDF}; } - else + elsif ( defined $ENV{LOCALIZESDF} && $ENV{LOCALIZESDF} ne "" ) { $source_dir = $ENV{LOCALIZESDF}; } $source_dir =~ s/\/auxiliary\/localize.sdf$// ; - #else {die "ERROR: The env variables TRYSDF LOCALIZATION_FOUND LOCALIZESDF not found ... something is wrong!\n";} - } # Get the English tree files as master @@ -107,15 +102,22 @@ if ( ! defined $prj ) { # Update localizations from sdf #------------------------------- -@langs = split /\s+/, $with_lang; -&read_loc; -print "################\nUpdating the treefiles for @langs \n"; -for $l(@langs) { - if ($l ne "en-US") { - &do_lang($l); +if( defined $with_lang && $with_lang ne "" ) +{ + @langs = split /\s+/, $with_lang; + &read_loc; + print "################\nUpdating the treefiles for @langs \n"; + for $l(@langs) + { + if ($l ne "en-US") { + &do_lang($l); + } } } - +else +{ + print "\nNo WITH_LANG set, skipping l10n\n"; +} #------------------------------- # $t1 = new Benchmark; From 307a100d85b4f2f5c9bf83f8753aab4f95651f0f Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Thu, 16 Jun 2011 10:59:10 +0200 Subject: [PATCH 03/16] remove Telnet option from Insert Hyperlink dialog --- helpcontent2/helpers/help_hid.lst | 1 - helpcontent2/source/text/shared/02/09070100.xhp | 2 -- 2 files changed, 3 deletions(-) diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst index d9c1db7b7e..5e9224e6b4 100644 --- a/helpcontent2/helpers/help_hid.lst +++ b/helpcontent2/helpers/help_hid.lst @@ -9212,7 +9212,6 @@ svx_RadioButton_RID_SVXPAGE_GRFCROP_RB_SIZECONST,704610839, svx_RadioButton_RID_SVXPAGE_GRFCROP_RB_ZOOMCONST,704610840, svx_RadioButton_RID_SVXPAGE_HYPERLINK_INTERNET_RB_LINKTYP_FTP,704446979, svx_RadioButton_RID_SVXPAGE_HYPERLINK_INTERNET_RB_LINKTYP_INTERNET,704446978, -svx_RadioButton_RID_SVXPAGE_HYPERLINK_INTERNET_RB_LINKTYP_TELNET,704446980, svx_RadioButton_RID_SVXPAGE_HYPERLINK_MAIL_RB_LINKTYP_MAIL,704463362, svx_RadioButton_RID_SVXPAGE_HYPERLINK_MAIL_RB_LINKTYP_NEWS,704463363, svx_RadioButton_RID_SVXPAGE_HYPERLINK_NEWDOCUMENT_RB_EDITLATER,704496131, diff --git a/helpcontent2/source/text/shared/02/09070100.xhp b/helpcontent2/source/text/shared/02/09070100.xhp index 9230de8559..872257159f 100644 --- a/helpcontent2/source/text/shared/02/09070100.xhp +++ b/helpcontent2/source/text/shared/02/09070100.xhp @@ -53,8 +53,6 @@ Creates an http hyperlink. FTP Creates an FTP hyperlink. -Telnet -Creates a Telnet hyperlink. Target Enter a URL for the file that you want to open when you click the hyperlink. If you do not specify a target frame, the file opens in the current document or frame.see i48946 WWW Browser From 0f629e66c00b56f4cae158bf161e55f67ec53bdf Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Thu, 16 Jun 2011 17:22:39 +0200 Subject: [PATCH 04/16] remove Target in document button from Internet page --- helpcontent2/source/text/shared/02/09070100.xhp | 2 -- 1 file changed, 2 deletions(-) diff --git a/helpcontent2/source/text/shared/02/09070100.xhp b/helpcontent2/source/text/shared/02/09070100.xhp index 872257159f..b8e473de71 100644 --- a/helpcontent2/source/text/shared/02/09070100.xhp +++ b/helpcontent2/source/text/shared/02/09070100.xhp @@ -57,8 +57,6 @@ Enter a URL for the file that you want to open when you click the hyperlink. If you do not specify a target frame, the file opens in the current document or frame.see i48946 WWW Browser Opens a web browser, into which you can load the desired URL. You can then copy and paste the URL into the Target field. -Target in document -Opens the Target in Document dialog. There you can select the destination within a document and add it to the target URL with the Insert button. Specifies the position in the target document where you wish to jump to. Inserts the target in the Target field of the Hyperlink dialog. Once the hyperlink has been completely entered, click on Close to set the link and leave the dialog. From 5048d1643217584306ec5b4b9c1fedaea12f1f88 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Thu, 16 Jun 2011 17:35:18 +0200 Subject: [PATCH 05/16] remove the help of the removed Internet Search options page --- .../source/text/shared/optionen/01020200.xhp | 111 ------------------ .../source/text/shared/optionen/01030000.xhp | 1 - .../source/text/shared/optionen/makefile.mk | 1 - helpcontent2/util/sbasic/makefile.mk | 1 - helpcontent2/util/scalc/makefile.mk | 1 - helpcontent2/util/schart/makefile.mk | 1 - helpcontent2/util/sdatabase/makefile.mk | 1 - helpcontent2/util/sdraw/makefile.mk | 1 - helpcontent2/util/simpress/makefile.mk | 1 - helpcontent2/util/smath/makefile.mk | 1 - helpcontent2/util/swriter/makefile.mk | 1 - 11 files changed, 121 deletions(-) delete mode 100644 helpcontent2/source/text/shared/optionen/01020200.xhp diff --git a/helpcontent2/source/text/shared/optionen/01020200.xhp b/helpcontent2/source/text/shared/optionen/01020200.xhp deleted file mode 100644 index a6c81059cb..0000000000 --- a/helpcontent2/source/text/shared/optionen/01020200.xhp +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - -Search -/text/shared/optionen/01020200.xhp - - -Sun Microsystems, Inc. -converted from old format - fpe - - - -
-search engines; selecting - - -Search -Use this tab page to define the settings for searching in the Internet. -
-
- -
-Search in -Specifies the search engine and its corresponding configuration. - -Search engines -Displays the available search engines. Select a search engine to display its configuration in the adjacent text and option boxes. - -Name -Displays the name of the selected search engine. This is the name that will be shown in the sub-menu of the Search icon on the Hyperlink bar. - - - -Type -Sets the advanced search preferences (and, or, exact) as well as the way the results are defined and displayed. -The links And, Or and Exactly are available. - -Prefix -This text box displays the URL and the first part of the query command for a search machine. A URL can also be typed directly. - -Suffix -The search terms are passed between the prefix and the suffix.The suffix provides the command sequence, sent at the end of a search. - -Separator -If you type more than one word while running a search, these words will be separated by the character specified here. Most search engines require the "+" character. -To determine which prefixes, separators and suffixes to use when defining a new search engine: - - -Activate the search engine and perform a search with at least two words. - - -Copy the URL from your browser's URL field and paste it into a blank document. - - -Change the conditions for the search in the search engine, if it offers you the choice. - - -Again, copy the contents of the URL field. - - -Compare the URLs with the sample URLs in the fields of this dialog and make a note of the prefixes, suffixes and separators used. - - - -Case match -Determines the case match for running a search. The list contains the following entries: None, Upper and Lower. The search terms entered are converted according to your selection. -Search engines handle queries differently according to the way they are constructed. For example, some are case sensitive and some are not. Because of this, it is best to select None as the case match option. - -New -Use this button to include a new search engine.New deletes all important entries of the entry mask such as "Name" and "Suffix". Enter the new search engine together with all of the necessary details. As soon as you accept your entries with Add, the new search engine will appear in the search engine list under Search in. Close the dialog with the OK button. - -Add -Click this button to add a new configuration to the list. - -Modify -Click this button to apply the modifications made to an existing configuration. - -Delete -Click this button to delete the selected search engine from the list. There will be no security response. - - diff --git a/helpcontent2/source/text/shared/optionen/01030000.xhp b/helpcontent2/source/text/shared/optionen/01030000.xhp index 79d344000a..83c35e0c0b 100644 --- a/helpcontent2/source/text/shared/optionen/01030000.xhp +++ b/helpcontent2/source/text/shared/optionen/01030000.xhp @@ -45,7 +45,6 @@ - diff --git a/helpcontent2/source/text/shared/optionen/makefile.mk b/helpcontent2/source/text/shared/optionen/makefile.mk index c685eb4a7b..1ae8f58da0 100644 --- a/helpcontent2/source/text/shared/optionen/makefile.mk +++ b/helpcontent2/source/text/shared/optionen/makefile.mk @@ -64,7 +64,6 @@ XHPFILES = \ 01014000.xhp \ 01020000.xhp \ 01020100.xhp \ - 01020200.xhp \ 01020300.xhp \ 01020400.xhp \ 01030000.xhp \ diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk index 51f9898516..7708374f64 100644 --- a/helpcontent2/util/sbasic/makefile.mk +++ b/helpcontent2/util/sbasic/makefile.mk @@ -1179,7 +1179,6 @@ LINKLINKFILES= \ text$/shared$/optionen$/01014000.xhp \ text$/shared$/optionen$/01020000.xhp \ text$/shared$/optionen$/01020100.xhp \ - text$/shared$/optionen$/01020200.xhp \ text$/shared$/optionen$/01020300.xhp \ text$/shared$/optionen$/01020400.xhp \ text$/shared$/optionen$/01030000.xhp \ diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk index aeaddc4c24..e36e94a3a3 100644 --- a/helpcontent2/util/scalc/makefile.mk +++ b/helpcontent2/util/scalc/makefile.mk @@ -1192,7 +1192,6 @@ LINKLINKFILES= \ text$/shared$/optionen$/01014000.xhp \ text$/shared$/optionen$/01020000.xhp \ text$/shared$/optionen$/01020100.xhp \ - text$/shared$/optionen$/01020200.xhp \ text$/shared$/optionen$/01020300.xhp \ text$/shared$/optionen$/01020400.xhp \ text$/shared$/optionen$/01030000.xhp \ diff --git a/helpcontent2/util/schart/makefile.mk b/helpcontent2/util/schart/makefile.mk index 955d107095..1d8f34575d 100644 --- a/helpcontent2/util/schart/makefile.mk +++ b/helpcontent2/util/schart/makefile.mk @@ -880,7 +880,6 @@ LINKLINKFILES= \ text$/shared$/optionen$/01014000.xhp \ text$/shared$/optionen$/01020000.xhp \ text$/shared$/optionen$/01020100.xhp \ - text$/shared$/optionen$/01020200.xhp \ text$/shared$/optionen$/01020300.xhp \ text$/shared$/optionen$/01020400.xhp \ text$/shared$/optionen$/01030000.xhp \ diff --git a/helpcontent2/util/sdatabase/makefile.mk b/helpcontent2/util/sdatabase/makefile.mk index f42fc5bd75..93526c3129 100644 --- a/helpcontent2/util/sdatabase/makefile.mk +++ b/helpcontent2/util/sdatabase/makefile.mk @@ -878,7 +878,6 @@ LINKLINKFILES= \ text$/shared$/optionen$/01014000.xhp \ text$/shared$/optionen$/01020000.xhp \ text$/shared$/optionen$/01020100.xhp \ - text$/shared$/optionen$/01020200.xhp \ text$/shared$/optionen$/01020300.xhp \ text$/shared$/optionen$/01020400.xhp \ text$/shared$/optionen$/01030000.xhp \ diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk index 75541ffa2d..1add060489 100644 --- a/helpcontent2/util/sdraw/makefile.mk +++ b/helpcontent2/util/sdraw/makefile.mk @@ -1113,7 +1113,6 @@ LINKLINKFILES= \ text$/shared$/optionen$/01014000.xhp \ text$/shared$/optionen$/01020000.xhp \ text$/shared$/optionen$/01020100.xhp \ - text$/shared$/optionen$/01020200.xhp \ text$/shared$/optionen$/01020300.xhp \ text$/shared$/optionen$/01020400.xhp \ text$/shared$/optionen$/01030000.xhp \ diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk index 16aea33e47..8ea57b43f0 100644 --- a/helpcontent2/util/simpress/makefile.mk +++ b/helpcontent2/util/simpress/makefile.mk @@ -1115,7 +1115,6 @@ LINKLINKFILES= \ text$/shared$/optionen$/01014000.xhp \ text$/shared$/optionen$/01020000.xhp \ text$/shared$/optionen$/01020100.xhp \ - text$/shared$/optionen$/01020200.xhp \ text$/shared$/optionen$/01020300.xhp \ text$/shared$/optionen$/01020400.xhp \ text$/shared$/optionen$/01030000.xhp \ diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk index 3059b11159..a7040b6692 100644 --- a/helpcontent2/util/smath/makefile.mk +++ b/helpcontent2/util/smath/makefile.mk @@ -958,7 +958,6 @@ LINKLINKFILES= \ text$/shared$/optionen$/01014000.xhp \ text$/shared$/optionen$/01020000.xhp \ text$/shared$/optionen$/01020100.xhp \ - text$/shared$/optionen$/01020200.xhp \ text$/shared$/optionen$/01020300.xhp \ text$/shared$/optionen$/01020400.xhp \ text$/shared$/optionen$/01030000.xhp \ diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk index 1ed17d2bbb..074d542383 100644 --- a/helpcontent2/util/swriter/makefile.mk +++ b/helpcontent2/util/swriter/makefile.mk @@ -1270,7 +1270,6 @@ LINKLINKFILES= \ text$/shared$/optionen$/01014000.xhp \ text$/shared$/optionen$/01020000.xhp \ text$/shared$/optionen$/01020100.xhp \ - text$/shared$/optionen$/01020200.xhp \ text$/shared$/optionen$/01020300.xhp \ text$/shared$/optionen$/01020400.xhp \ text$/shared$/optionen$/01030000.xhp \ From cf330b6e18030da5fb0d60c8bc9f9aa6f2bb824e Mon Sep 17 00:00:00 2001 From: Korrawit Pruegsanusak Date: Thu, 23 Jun 2011 22:15:16 +0700 Subject: [PATCH 06/16] Update the operation of delete and backspace key fdo#31652 The operation of these two buttons are interchanged, so help needs update. Released under LGPLv3+/MPL --- helpcontent2/source/text/scalc/01/02150000.xhp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helpcontent2/source/text/scalc/01/02150000.xhp b/helpcontent2/source/text/scalc/01/02150000.xhp index 38d70ba0a6..6f1bc4e4fa 100644 --- a/helpcontent2/source/text/scalc/01/02150000.xhp +++ b/helpcontent2/source/text/scalc/01/02150000.xhp @@ -52,8 +52,8 @@
-This dialog is also called by pressing Del after the cell cursor has been activated on the sheet. -Pressing Backspace deletes content without calling the dialog or changing formats. +This dialog is also called by pressing Backspace after the cell cursor has been activated on the sheet. +Pressing Delete deletes content without calling the dialog or changing formats. Use Cut on the Standard bar to delete contents and formats without the dialog. Selection This area lists the options for deleting contents. From 6cac6f828f6de0cab327878d0725a99ad9a83654 Mon Sep 17 00:00:00 2001 From: Regina Henschel Date: Thu, 23 Jun 2011 18:33:53 +0300 Subject: [PATCH 07/16] Adapt texts to new B-spline implementation --- .../text/schart/01/smooth_line_properties.xhp | 14 +++++++------- helpcontent2/source/text/schart/01/type_xy.xhp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/helpcontent2/source/text/schart/01/smooth_line_properties.xhp b/helpcontent2/source/text/schart/01/smooth_line_properties.xhp index 463c4a5ffa..0551b43829 100644 --- a/helpcontent2/source/text/schart/01/smooth_line_properties.xhp +++ b/helpcontent2/source/text/schart/01/smooth_line_properties.xhp @@ -55,22 +55,22 @@ Select Cubic Spline or B-Spline. -These are mathematical models that influence the display of the curves. The cubic spline line passes through all points, while the B-spline line connects the first and last point and passes by the intermediate points. +These are mathematical models that influence the display of the curves. The curves are created by joining together segments of polynomials. Optionally set the resolution. A higher value leads to a smoother line. -For B-spline lines optionally set the data points order. +For B-spline lines optionally set the degree of the polynomials. -1088553477 cubic spline + -Apply a cubic spline model.1088553478 b-spline +Apply a cubic spline model. -Apply a B-spline model.1088559618 resolution +Apply a B-spline model. -Set the resolution.1088559617 data points order +Set the resolution. -Set the data points order. +Set the degree of the polynomials. diff --git a/helpcontent2/source/text/schart/01/type_xy.xhp b/helpcontent2/source/text/schart/01/type_xy.xhp index 967eecc780..a3199ebfe7 100644 --- a/helpcontent2/source/text/schart/01/type_xy.xhp +++ b/helpcontent2/source/text/schart/01/type_xy.xhp @@ -94,7 +94,7 @@ Cubic Spline interpolates your data points with polynomials of degree 3. The transitions between the polynomial pieces are smooth, having the same slope and curvature. The Resolution determines how many line segments are calculated to draw a piece of polynomial between two data points. You can see the intermediate points if you click any data point. -B-Spline uses the data points as control points to form a B-spline curve. Those curves are built piecewise from polynomials. The Data points order sets the degree k of these polynomials. Besides the first and last point the curve doesn't go through the data points but lays inside the convex hull of each k+1 adjacent data points. Having Resolution r and n+1 data points, r times n uniform line segments are used to draw the whole curve.Regina: watch issue 72218, which would bring a change to UI +B-Spline uses a parametric, interpolating B-spline curve. Those curves are built piecewise from polynomials. The Degree of polynomials sets the degree of these polynomials.
From 121a83753a55cf4ecf7209b55464efcf645f9464 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 27 Jun 2011 12:32:00 +0200 Subject: [PATCH 08/16] fix broken image paths in help fdo#37509 --- helpcontent2/source/text/sbasic/shared/02/11040000.xhp | 2 +- helpcontent2/source/text/scalc/guide/scenario.xhp | 2 +- helpcontent2/source/text/shared/main0213.xhp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helpcontent2/source/text/sbasic/shared/02/11040000.xhp b/helpcontent2/source/text/sbasic/shared/02/11040000.xhp index 4955c1a9a7..54bf40de04 100644 --- a/helpcontent2/source/text/sbasic/shared/02/11040000.xhp +++ b/helpcontent2/source/text/sbasic/shared/02/11040000.xhp @@ -55,7 +55,7 @@ -Icon +Icon diff --git a/helpcontent2/source/text/scalc/guide/scenario.xhp b/helpcontent2/source/text/scalc/guide/scenario.xhp index fe889eef44..1fc9e30174 100644 --- a/helpcontent2/source/text/scalc/guide/scenario.xhp +++ b/helpcontent2/source/text/scalc/guide/scenario.xhp @@ -68,7 +68,7 @@ Click the Scenarios icon -Scenarios icon +Scenarios icon in the Navigator. diff --git a/helpcontent2/source/text/shared/main0213.xhp b/helpcontent2/source/text/shared/main0213.xhp index f279ab8322..3218e25960 100644 --- a/helpcontent2/source/text/shared/main0213.xhp +++ b/helpcontent2/source/text/shared/main0213.xhp @@ -69,7 +69,7 @@ -Icon +Icon @@ -117,7 +117,7 @@ -Icon +Icon From ac114c54e5aa5c487070efe88dc3334503a81c95 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 27 Jun 2011 14:48:56 +0200 Subject: [PATCH 09/16] fix two more broken image paths in help --- helpcontent2/source/text/scalc/01/02110000.xhp | 2 +- helpcontent2/source/text/scalc/02/06040000.xhp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helpcontent2/source/text/scalc/01/02110000.xhp b/helpcontent2/source/text/scalc/01/02110000.xhp index e2e84bc15e..502a41198a 100644 --- a/helpcontent2/source/text/scalc/01/02110000.xhp +++ b/helpcontent2/source/text/scalc/01/02110000.xhp @@ -147,7 +147,7 @@ -Icon +Icon diff --git a/helpcontent2/source/text/scalc/02/06040000.xhp b/helpcontent2/source/text/scalc/02/06040000.xhp index a6b4cd96b0..661f064bce 100644 --- a/helpcontent2/source/text/scalc/02/06040000.xhp +++ b/helpcontent2/source/text/scalc/02/06040000.xhp @@ -50,7 +50,7 @@ -Icon +Icon From 5a6bf68cdeac23f873fa58246c42d426d3b552ff Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 27 Jun 2011 14:52:07 +0200 Subject: [PATCH 10/16] fix broken image path in help --- helpcontent2/source/text/scalc/02/06040000.xhp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpcontent2/source/text/scalc/02/06040000.xhp b/helpcontent2/source/text/scalc/02/06040000.xhp index 661f064bce..25a9e0dc09 100644 --- a/helpcontent2/source/text/scalc/02/06040000.xhp +++ b/helpcontent2/source/text/scalc/02/06040000.xhp @@ -50,7 +50,7 @@ -Icon +Icon From 6048d273d50a21b8e67565005fd420c33d4499a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Schnabel?= Date: Sun, 3 Jul 2011 22:18:11 +0200 Subject: [PATCH 11/16] help for fdo#30800: help for changed grid line option Changed help and tool tip strings for the new grid line option (using tri-state drop-down instead of checkbox) --- helpcontent2/source/text/scalc/guide/table_view.xhp | 3 +-- helpcontent2/source/text/shared/optionen/01060100.xhp | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/helpcontent2/source/text/scalc/guide/table_view.xhp b/helpcontent2/source/text/scalc/guide/table_view.xhp index 8413a2640f..1af9c74733 100644 --- a/helpcontent2/source/text/scalc/guide/table_view.xhp +++ b/helpcontent2/source/text/scalc/guide/table_view.xhp @@ -59,8 +59,7 @@ To hide grid lines: -Under the menu item %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Calc -, go to the View tab page. Unmark Grid lines. Confirm with OK. +Under the menu item %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Calc, go to the View tab page. Choose to hide Grid lines from the drop-down. Confirm with OK.
diff --git a/helpcontent2/source/text/shared/optionen/01060100.xhp b/helpcontent2/source/text/shared/optionen/01060100.xhp index 7c5b936e56..7976bb48bf 100644 --- a/helpcontent2/source/text/shared/optionen/01060100.xhp +++ b/helpcontent2/source/text/shared/optionen/01060100.xhp @@ -76,11 +76,10 @@ Visual aids Specifies which lines are displayed. - + Grid lines - Specifies whether to display grid lines between the cells.For printing, choose Format - Page - Sheet and mark the Grid check box. - + Specifies when grid lines will be displayed. Default is to display grid lines only on cells that do not have a background color. You can choose to also display grid lines on cells with background color, or to hide them. For printing, choose Format - Page - Sheet and mark the Grid check box. Color Specifies a color for the grid lines in the current document. To see the grid line color that was saved with the document, go to %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - Appearance, under Scheme find the entry Spreadsheet - Grid lines and set the color to "Automatic". From aa369cb77f8f8365c15bb28a9845c36e85293823 Mon Sep 17 00:00:00 2001 From: Matus Kukan Date: Sat, 2 Jul 2011 15:14:00 +0200 Subject: [PATCH 12/16] Remove online registration related code --- helpcontent2/helpers/help_hid.lst | 2 -- helpcontent2/helpers/longnames_commands.csv | 2 -- helpcontent2/helpers/uno-commands.csv | 1 - helpcontent2/helpers/uno_hid.lst | 2 -- helpcontent2/helpers/unocmds.txt | 1 - 5 files changed, 8 deletions(-) diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst index 5e9224e6b4..ffb9de2925 100644 --- a/helpcontent2/helpers/help_hid.lst +++ b/helpcontent2/helpers/help_hid.lst @@ -5620,8 +5620,6 @@ SID_OLE_ACTIVATE,26607,.uno:ActivateOLE SID_OLE_DEACTIVATE,26608,.uno:Deactivate SID_OLE_OBJECT,26606,.uno:OleObject SID_OLE_SELECT,26621,.uno:SelectOLE -SID_ONLINE_REGISTRATION,6537,.uno:OnlineRegistrationDlg -SID_ONLINE_REGISTRATION_DLG,6540,.uno:StartRegistrationDialog SID_OPENDLG_CONDFRMT,26159,.uno:ConditionalFormatDialog SID_OPENDLG_CONSOLIDATE,26150,.uno:DataConsolidate SID_OPENDLG_EDIT_PRINTAREA,26605,.uno:EditPrintArea diff --git a/helpcontent2/helpers/longnames_commands.csv b/helpcontent2/helpers/longnames_commands.csv index 3ba7bfd355..92a9e84e9f 100644 --- a/helpcontent2/helpers/longnames_commands.csv +++ b/helpcontent2/helpers/longnames_commands.csv @@ -1444,8 +1444,6 @@ SID_OLE_ACTIVATE,.uno:ActivateOLE SID_OLE_DEACTIVATE,.uno:Deactivate SID_OLE_OBJECT,.uno:OleObject SID_OLE_SELECT,.uno:SelectOLE -SID_ONLINE_REGISTRATION,.uno:OnlineRegistrationDlg -SID_ONLINE_REGISTRATION_DLG,.uno:StartRegistrationDialog SID_OPENDLG_CHART,.uno:StarChartDialog SID_OPENDLG_CONDFRMT,.uno:ConditionalFormatDialog SID_OPENDLG_CONSOLIDATE,.uno:DataConsolidate diff --git a/helpcontent2/helpers/uno-commands.csv b/helpcontent2/helpers/uno-commands.csv index 7ce92427e8..5baf4c294f 100644 --- a/helpcontent2/helpers/uno-commands.csv +++ b/helpcontent2/helpers/uno-commands.csv @@ -1199,7 +1199,6 @@ .uno:ObjectPosition .uno:Objects3DToolbox .uno:OnlineAutoFormat -.uno:OnlineRegistrationDlg .uno:Open .uno:OpenHyperlinkOnCursor .uno:OpenReadOnly diff --git a/helpcontent2/helpers/uno_hid.lst b/helpcontent2/helpers/uno_hid.lst index 81ca33632d..06cb093447 100644 --- a/helpcontent2/helpers/uno_hid.lst +++ b/helpcontent2/helpers/uno_hid.lst @@ -1439,8 +1439,6 @@ SID_OLE_ACTIVATE,26607,.uno:ActivateOLE SID_OLE_DEACTIVATE,26608,.uno:Deactivate SID_OLE_OBJECT,26606,.uno:OleObject SID_OLE_SELECT,26621,.uno:SelectOLE -SID_ONLINE_REGISTRATION,6537,.uno:OnlineRegistrationDlg -SID_ONLINE_REGISTRATION_DLG,6540,.uno:StartRegistrationDialog SID_OPENDLG_CHART,26155,.uno:StarChartDialog SID_OPENDLG_CONDFRMT,26159,.uno:ConditionalFormatDialog SID_OPENDLG_CONSOLIDATE,26150,.uno:DataConsolidate diff --git a/helpcontent2/helpers/unocmds.txt b/helpcontent2/helpers/unocmds.txt index e6a0a375d6..014f2ca9ca 100644 --- a/helpcontent2/helpers/unocmds.txt +++ b/helpcontent2/helpers/unocmds.txt @@ -729,7 +729,6 @@ .uno:ObjectPosition;shared/01/05250000.xhp .uno:Objects3DToolbox;simpress/02/10090000.xhp .uno:OnlineAutoFormat;swriter/01/05150100.xhp -.uno:OnlineRegistrationDlg;shared/01/08060100.xhp .uno:Open;shared/01/01020000.xhp .uno:OpenHyperlinkOnCursor;shared/02/09070000.xhp .uno:OpenReadOnly;shared/02/01171000.xhp From 791e6a841bf80a4c3843f093c392211c82118d9c Mon Sep 17 00:00:00 2001 From: Timo Richter Date: Thu, 14 Jul 2011 18:34:07 +0200 Subject: [PATCH 13/16] Wiki to native help converter My files contain a list of its dependencies in their heads. HHC/install_hhc.sh should be run first. convert.py converts test2.xml into several formats to test/ --- helpcontent2/wiki-to-help/HHC/htmlhelp.reg | 12 + helpcontent2/wiki-to-help/HHC/install_hhc.sh | 60 +++ helpcontent2/wiki-to-help/convert.py | 124 ++++++ helpcontent2/wiki-to-help/test2.xml | 381 +++++++++++++++++++ 4 files changed, 577 insertions(+) create mode 100644 helpcontent2/wiki-to-help/HHC/htmlhelp.reg create mode 100755 helpcontent2/wiki-to-help/HHC/install_hhc.sh create mode 100755 helpcontent2/wiki-to-help/convert.py create mode 100644 helpcontent2/wiki-to-help/test2.xml diff --git a/helpcontent2/wiki-to-help/HHC/htmlhelp.reg b/helpcontent2/wiki-to-help/HHC/htmlhelp.reg new file mode 100644 index 0000000000..e38e0ef828 --- /dev/null +++ b/helpcontent2/wiki-to-help/HHC/htmlhelp.reg @@ -0,0 +1,12 @@ +REGEDIT4 + +[HKEY_CURRENT_USER\Software\Wine] +"Version"="win2k" + +[HKEY_CURRENT_USER\Software\Wine\AppDefaults\hhc.exe\DllOverrides] +"itircl"="native" +"itss"="native" + +[HKEY_CURRENT_USER\Software\Wine\AppDefaults\hhw.exe\DllOverrides] +"itircl"="native" +"itss"="native" diff --git a/helpcontent2/wiki-to-help/HHC/install_hhc.sh b/helpcontent2/wiki-to-help/HHC/install_hhc.sh new file mode 100755 index 0000000000..ba93c78c26 --- /dev/null +++ b/helpcontent2/wiki-to-help/HHC/install_hhc.sh @@ -0,0 +1,60 @@ +#!/bin/bash -e +# -e Exit immediately if a command exits with a non-zero status. + +# This installs Microsofts HHC (HTML Help Compiler) +# Copyright 2011 Timo Richter and others. +# Licensed under GNU GPLv3 +# Depends on: wine, wget, cabextract +# +# Usage of HHC: wine c:\\htmlhelp\\hhc.exe c:\\test\\htmlhelp.hhp +# +# Changes: Set installation directory to c:\htmlhelp +# Copy also itcc.dll, this is neccessary +# No execution of htmlhelp.exe installer needed +# Abortion of install if anything fails, e.g. the download of HHC. +# + +echo "Please wait" + +cd "$(dirname "$0")" # cd to path of this script + + +WINEPREFIX=${WINEPREFIX:=$HOME/.wine} +test -d "$WINEPREFIX" || wineprefixcreate 2>> /dev/null +HHDIR="${WINEPREFIX}/dosdevices/c:/htmlhelp" +mkdir "$HHDIR" + +# Setup the registry +# Set Wine's Windows version to Windows 2000 (or above), and add an override to use the native itss.dll, both via winecfg. +wine regedit htmlhelp.reg + +cd "$HHDIR" + +# Install HTML Help Workshop +wget -O htmlhelp.exe 'http://go.microsoft.com/fwlink/?LinkId=14188' +cabextract -F hhc.exe htmlhelp.exe +cabextract -F HHA.dll htmlhelp.exe + +# Install ITSS.DLL +cabextract -F hhupd.exe htmlhelp.exe +cabextract -F itircl.dll hhupd.exe +cabextract -F itss.dll hhupd.exe +cabextract -F itcc.dll htmlhelp.exe +cp -a itircl.dll "$WINEPREFIX/drive_c/windows/system32/" +cp -a itcc.dll "$WINEPREFIX/drive_c/windows/system32/" +cp -a itss.dll "$WINEPREFIX/drive_c/windows/system32/" +wine regsvr32 'C:\WINDOWS\SYSTEM32\itcc.dll' +wine regsvr32 'C:\WINDOWS\SYSTEM32\itircl.dll' +wine regsvr32 'C:\WINDOWS\SYSTEM32\itss.dll' + +# Install MFC40.DLL +wget -N http://activex.microsoft.com/controls/vc/mfc40.cab +cabextract -F mfc40.exe mfc40.cab +cabextract -F mfc40.dll mfc40.exe +cp -a mfc40.dll "$WINEPREFIX/drive_c/windows/system32/" + +echo +echo Done. + +exit 0 + diff --git a/helpcontent2/wiki-to-help/convert.py b/helpcontent2/wiki-to-help/convert.py new file mode 100755 index 0000000000..0298391364 --- /dev/null +++ b/helpcontent2/wiki-to-help/convert.py @@ -0,0 +1,124 @@ +#!/usr/bin/env python +""" +Convert an XML-Dump to platformspecific help files. +Copyright 2011 Timo Richter +Licensed under GNU GPLv3 + +This program depends on: +mwlib +python +python-lxml +xsltproc +Microsoft HHC: http://go.microsoft.com/fwlink/?LinkId=14188 + + +""" + +import xml.dom.minidom as minidom +import subprocess, tempfile, os, shutil + +class Wine(object): + #driveletter="j:" #final + + def __init__(self,workingDir,driveletter): + """ Setup the wine environment. Granting access so that wine is able to output files to @workingDir. + @workingDir will be accessable via @driveletter + E.g. Wine("/tmp/dir","j:") """ + homedir = os.path.expanduser('~') + wineprefix=os.path.join(homedir,".wine") + drive=os.path.join(wineprefix,"dosdevices",driveletter) + if os.path.lexists(drive): + self.driveBak = drive+".bak" + shutil.move(drive,self.driveBak) + os.symlink(workingDir,drive) + self.drive = drive + #self.driveBak = driveBak + + def ex(self,*cmd): + """ execute something with wine """ + cmd = [elem for elem in cmd] + cmd = ["/usr/bin/wine"]+cmd + r= (subprocess.Popen(cmd).wait()) + return r + + def __call__(self,*cmd): + return self.ex(*cmd) + + def __del__(self): + os.remove(self.drive) + if hasattr(self,'driveBak'): + shutil.move(self.driveBak,self.drive) + + + + +class Main(object): + workingDir = "./test" # final + mwpath='/usr/local/bin/' # final + style='/usr/share/xml/docbook/stylesheet/docbook-xsl/htmlhelp/htmlhelp.xsl' # final + + tmp=None + + def ex(self,*cmd): + """ + Execute a program + @cmd Command, args + @return boolean True if succeed + """ + cmd = [elem for elem in cmd] + print cmd + return (subprocess.Popen(cmd).wait() == 0) + + def __init__(self): + self.tmp = tempfile.mkdtemp() + + self.workingDir = os.path.abspath(self.workingDir) + self.style = os.path.abspath(self.style) + + self.wine = Wine(self.tmp,"j:") + self.convert("test2.xml",self.workingDir) + + def convert(self,source,dest): + """ + Create the converted files. + @source XML-Dump-file + @dest Directory for output + """ + tmp = self.tmp + try: + os.mkdir(dest) + except OSError: + pass + + names = self.getArtNames(source) + self.ex(self.mwpath+"mw-buildcdb","--input",source,"--output",tmp) \ + and self.ex( + self.mwpath+"mw-render","--config=%s/wikiconf.txt"%(tmp), + "-w","docbook","-o",tmp+"/docbook.xml",*names) \ + and (shutil.copy(tmp+'/docbook.xml',dest) or True) \ + and self.ex("/usr/bin/xsltproc","--nonet","--novalid","-o",tmp+'/',self.style,tmp+'/docbook.xml') \ + and (self.wine("c:\\htmlhelp\\hhc.exe","j:\\htmlhelp.hhp") or True) \ + and (shutil.copy(tmp+'/htmlhelp.chm',dest) or True) + + def __del__(self): + shutil.rmtree(self.tmp) # remove temp files + pass + + def getArtNames(self,filename): + """ + Get Article Names + Reads all title tags from an xml file and returns a list of all titles. + @filename XML-file + @return List of Strings + """ + dom=minidom.parse(filename) + elements=dom.getElementsByTagName("title") + names=[] + for element in elements: + name=element.childNodes[0].data + names.append(name) + return names + +if __name__ == '__main__': + Main() + diff --git a/helpcontent2/wiki-to-help/test2.xml b/helpcontent2/wiki-to-help/test2.xml new file mode 100644 index 0000000000..ad0af7df8b --- /dev/null +++ b/helpcontent2/wiki-to-help/test2.xml @@ -0,0 +1,381 @@ + + + LibreOffice Help + http://gimli/Main_Page + MediaWiki 1.16.0 + first-letter + + Media + Special + + Talk + User + User talk + LibreOffice Help + LibreOffice Help talk + File + File talk + MediaWiki + MediaWiki talk + Template + Template talk + Help + Help talk + Category + Category talk + + + + Main Page + 1 + + 120128 + 2011-02-17T21:54:02Z + + Kendy + 2 + + Added Basic help. + {{OrigLang|Welcome to {{ProductName}} Help!}} +Thank you for using the [http://www.documentfoundation.org/download/ {{ProductName}}] application help. Press F1 whenever you need help using the {{ProductName}} software, and you will be redirected to this site. Alternatively, you can install an off-line version of the help in your native language. + +If you only want to browse the help, please use the following entry points for easier navigation: + +* [[Writer/Welcome_to_the_Writer_Help|{{ProductName}} Writer]] (text processing) +* [[Calc/Welcome_to_the_Calc_Help|{{ProductName}} Calc]] (spreadsheets) +* [[Impress/Welcome_to_the_Impress_Help|{{ProductName}} Impress]] (presentations) +* [[Draw/Welcome_to_the_Draw_Help|{{ProductName}} Draw]] (drawing) +* [[Common/Database_1|{{ProductName}} Base]] (database processing) +* [[Math/Welcome_to_the_Math_Help|{{ProductName}} Math]] (formula editing) +* [[Basic/Basic_Help|{{ProductName}} Basic]] (programming using the Basic language) + +== How to Participate == + +At the moment, we are still fine-tuning the tools converting the off-line help to the on-line form. Later, you will be able to participate, and improve the help pages. The plans are described in [http://wiki.documentfoundation.org/Development/Wikihelp The Document Foundation wiki]. + +Consult the [http://meta.wikimedia.org/wiki/Help:Contents User's Guide] for information on using the wiki software. + + + + Swriter/.uno:GraphicFilterSolarize + 2 + + + 43159 + 2010-12-17T15:23:21Z + + WikiSysop + 1 + + Redirected page to [[Common/Graphic Filter Bar#bm id3154910]] + #REDIRECT [[Common/Graphic_Filter_Bar#bm_id3154910]] + + + + Swriter/59886 + 3 + + + 43160 + 2010-12-17T15:23:21Z + + WikiSysop + 1 + + Redirected page to [[Common/Presentation Wizard Page 1#bm id3155136]] + #REDIRECT [[Common/Presentation_Wizard_Page_1#bm_id3155136]] + + + + Swriter/704807947 + 4 + + + 43161 + 2010-12-17T15:23:22Z + + WikiSysop + 1 + + Redirected page to [[Common/Accessibility#bm id3153881]] + #REDIRECT [[Common/Accessibility#bm_id3153881]] + + + + Swriter/.uno:SelectTable + 5 + + + 43162 + 2010-12-17T15:23:22Z + + WikiSysop + 1 + + Redirected page to [[Writer/Table#bm id3954588]] + #REDIRECT [[Writer/Table#bm_id3954588]] + + + + Swriter/859636226 + 6 + + + 43163 + 2010-12-17T15:23:23Z + + WikiSysop + 1 + + Redirected page to [[Common/Address Data Source#bm id611896]] + #REDIRECT [[Common/Address_Data_Source#bm_id611896]] + + + + Swriter/546685977 + 7 + + + 43164 + 2010-12-17T15:23:24Z + + WikiSysop + 1 + + Redirected page to [[Common/General 2#bm id3145750]] + #REDIRECT [[Common/General_2#bm_id3145750]] + + + + Swriter/1417988121 + 8 + + + 43165 + 2010-12-17T15:23:24Z + + WikiSysop + 1 + + Redirected page to [[Writer/Caption#bm id7607959]] + #REDIRECT [[Writer/Caption#bm_id7607959]] + + + + Swriter/34666 + 9 + + + 43166 + 2010-12-17T15:23:25Z + + WikiSysop + 1 + + Redirected page to [[Common/Euro Converter Wizard#bm id3152960]] + #REDIRECT [[Common/Euro_Converter_Wizard#bm_id3152960]] + + + + Swriter/54892 + 10 + + + 43167 + 2010-12-17T15:23:25Z + + WikiSysop + 1 + + Redirected page to [[Writer/Define Bibliography Entry#bm id3149689]] + #REDIRECT [[Writer/Define_Bibliography_Entry#bm_id3149689]] + + + + Common/Size/da + 87185 + + 131455 + 2011-03-01T17:57:01Z + + WikiSysop + 1 + + Created page with "{{Lang|Størrelse}} <div id="bm_id3153391"></div> Sæt skriftstørrelsen for den markerede tekst. Åbn genvejsmenu - vælg '''Størrelse'''" + {{Lang|Størrelse}} +<div id="bm_id3153391"></div> +Sæt skriftstørrelsen for den markerede tekst. + +Åbn genvejsmenu - vælg '''Størrelse''' + + + + Common/Size/zh-TW + 87186 + + 131456 + 2011-03-01T17:57:02Z + + WikiSysop + 1 + + Created page with "{{Lang|大小}} <div id="bm_id3153391"></div> 設定所選文字的字型大小。 右鍵功能表'''「大小」'''" + {{Lang|大小}} +<div id="bm_id3153391"></div> +設定所選文字的字型大小。 + +右鍵功能表'''「大小」''' + + + + Common/Size/zh-CN + 87187 + + 131457 + 2011-03-01T17:57:03Z + + WikiSysop + 1 + + Created page with "{{Lang|大小}} <div id="bm_id3153391"></div> 设置选定文字的字体大小。 打开上下文菜单 - 选择'''大小'''" + {{Lang|大小}} +<div id="bm_id3153391"></div> +设置选定文字的字体大小。 + +打开上下文菜单 - 选择'''大小''' + + + + Common/Size/ko + 87188 + + 131458 + 2011-03-01T17:57:04Z + + WikiSysop + 1 + + Created page with "{{Lang|크기}} <div id="bm_id3153391"></div> 선택한 텍스트의 글꼴 크기를 설정합니다. '''크기''' 콘텍스트 메뉴" + {{Lang|크기}} +<div id="bm_id3153391"></div> +선택한 텍스트의 글꼴 크기를 설정합니다. + +'''크기''' 콘텍스트 메뉴 + + + + Common/Creating a New Database/sv + 87189 + + 131459 + 2011-03-01T17:57:05Z + + WikiSysop + 1 + + Created page with "{{Lang|Skapa en ny databas}} <div id="bm_id6911526"></div> <!-- mw deleted "creating;" -->#Välj '''Arkiv - Nytt - Databas'''.<br/><br/>Då öppnas [[Common/Database_Wizard/sv|Da..." + {{Lang|Skapa en ny databas}} +<div id="bm_id6911526"></div> +<!-- mw deleted "creating;" -->#Välj '''Arkiv - Nytt - Databas'''.<br/><br/>Då öppnas [[Common/Database_Wizard/sv|Databasguiden]] där du skapar en ny databasfil.<br/> +#I Databasguiden väljer du typ av databas och du kan välja att öppna Tabellguiden som nästa guide.<br/><br/>I [[Common/Table_Wizard/sv|Tabellguiden]] får du hjälp med att infoga en tabell i den nya databasfilen.<br/> + +{{RelatedTopics|[[Common/Database_1/sv|Använda databaser i {{ProductName}} Base]] + +[[Common/Database_Overview/sv|Databasöversikt]] + +}} + + + + Common/Creating a New Database/da + 87190 + + 131460 + 2011-03-01T17:57:06Z + + WikiSysop + 1 + + Created page with "{{Lang|Oprette en ny Database}} <div id="bm_id6911526"></div> <!-- mw deleted "creating;" -->#Vælg '''Filer - Ny(t) - Database'''.<br/><br/>Dette åbner [[Common/Database_Wizard..." + {{Lang|Oprette en ny Database}} +<div id="bm_id6911526"></div> +<!-- mw deleted "creating;" -->#Vælg '''Filer - Ny(t) - Database'''.<br/><br/>Dette åbner [[Common/Database_Wizard/da|Databaseguiden]], hvor du kan oprette en ny databasefil.<br/> +#I Databaseguiden vælges typen af database og vælg indstillingen for at åbne Tabelguiden som den næste guide.<br/><br/>[[Common/Table_Wizard/da|Tabelguiden]] hjælper dig med at tilføje en tabel til den nye databasefil.<br/> + +{{RelatedTopics|[[Common/Database_1/da|Brug af databaser i {{ProductName}} Base]] + +[[Common/Database_Overview/da|Databaseoversigt]] + +}} + + + + Common/Creating a New Database/zh-TW + 87191 + + 131461 + 2011-03-01T17:57:07Z + + WikiSysop + 1 + + Created page with "{{Lang|建立新的資料庫}} <div id="bm_id6911526"></div> <!-- mw deleted "creating;" -->#選擇 '''[檔案] - [開啟新檔] - [資料庫]'''。<br/><br/>這會開啟[[Common..." + {{Lang|建立新的資料庫}} +<div id="bm_id6911526"></div> +<!-- mw deleted "creating;" -->#選擇 '''[檔案] - [開啟新檔] - [資料庫]'''。<br/><br/>這會開啟[[Common/Database_Wizard/zh-TW|資料庫精靈]]，您可在其中建立新的資料庫檔案。<br/> +#在「資料庫精靈」中，選取資料庫類型，然後選取要開啟「表格精靈」作為下一個精靈的選項。<br/><br/>[[Common/Table_Wizard/zh-TW|表格精靈]]可協助您在新的資料庫檔案中增加表格。<br/> + +{{RelatedTopics|[[Common/Database_1/zh-TW|在 {{ProductName}} Base 中使用資料庫]] + +[[Common/Database_Overview/zh-TW|資料庫簡介]] + +}} + + + + Common/Creating a New Database/zh-CN + 87192 + + 131462 + 2011-03-01T17:57:08Z + + WikiSysop + 1 + + Created page with "{{Lang|创建新数据库}} <div id="bm_id6911526"></div> <!-- mw deleted "creating;" -->#选择'''文件 - 新建 - 数据库'''。<br/><br/>这样可打开[[Common/Database_Wiz..." + {{Lang|创建新数据库}} +<div id="bm_id6911526"></div> +<!-- mw deleted "creating;" -->#选择'''文件 - 新建 - 数据库'''。<br/><br/>这样可打开[[Common/Database_Wizard/zh-CN|数据库向导]]，利用该向导可创建新的数据库文件。<br/> +#在“数据库向导”中，选择数据库类型，然后选择此选项打开作为下一向导的“表格向导”。<br/><br/>[[Common/Table_Wizard/zh-CN|表格向导]]可帮助您在新数据库文件中添加表格。<br/> + +{{RelatedTopics|[[Common/Database_1/zh-CN|在 {{ProductName}} Base 中使用数据库]] + +[[Common/Database_Overview/zh-CN|数据源摘要]] + +}} + + + + Common/Creating a New Database/ko + 87193 + + 131463 + 2011-03-01T17:57:09Z + + WikiSysop + 1 + + Created page with "{{Lang|새 데이터베이스 만들기}} <div id="bm_id6911526"></div> <!-- mw deleted "creating;" -->#'''파일 - 새로 만들기 - 데이터베이스'''를 선택합니다.<b..." + {{Lang|새 데이터베이스 만들기}} +<div id="bm_id6911526"></div> +<!-- mw deleted "creating;" -->#'''파일 - 새로 만들기 - 데이터베이스'''를 선택합니다.<br/><br/>새 데이터베이스 파일을 만들 수 있는 [[Common/Database_Wizard/ko|데이터베이스 마법사]]가 열립니다.<br/> +#데이터베이스 마법사에서 데이터베이스 유형을 선택한 다음 테이블 마법사를 다음 마법사로 여는 옵션을 선택합니다.<br/><br/>[[Common/Table_Wizard/ko|테이블 마법사]]를 사용하면 새 데이터베이스 파일에 테이블을 추가할 수 있습니다.<br/> + +{{RelatedTopics|[[Common/Database_1/ko|{{ProductName}} Base에서 데이터베이스 사용]] + +[[Common/Database_Overview/ko|데이터베이스 개요]] + +}} + + + From 3aabd79dd9dd86d125fa73052bcf3de642767b88 Mon Sep 17 00:00:00 2001 From: Timo Richter Date: Thu, 14 Jul 2011 19:09:20 +0200 Subject: [PATCH 14/16] Usage of wine depends on platform Mwlib is being run internally to make it faster --- helpcontent2/wiki-to-help/README | 27 ++++++++++ helpcontent2/wiki-to-help/convert.py | 79 ++++++++++++---------------- helpcontent2/wiki-to-help/hhc.py | 64 ++++++++++++++++++++++ helpcontent2/wiki-to-help/mw.py | 26 +++++++++ 4 files changed, 151 insertions(+), 45 deletions(-) create mode 100644 helpcontent2/wiki-to-help/README create mode 100644 helpcontent2/wiki-to-help/hhc.py create mode 100644 helpcontent2/wiki-to-help/mw.py diff --git a/helpcontent2/wiki-to-help/README b/helpcontent2/wiki-to-help/README new file mode 100644 index 0000000000..cf95023977 --- /dev/null +++ b/helpcontent2/wiki-to-help/README @@ -0,0 +1,27 @@ +Conversion of an XML-Dump to platformspecific help files +---------------------------------------------------- +1 INSTALLATION + +The following programs are requiered: + - mwlib + - python + - python-lxml + - xsltproc + +1.1 On GNU and UNIX + + - Install wine + - Execute HHC/install_hhc.sh + +1.2 On Windows + + - Install HHC from http://go.microsoft.com/fwlink/?LinkId=14188 + +2 USAGE + +3 LICENSE + +The following applies to all files if not stated differently + + - Licensed under GNU GPLv3 + - Copyright 2011 Timo Richter diff --git a/helpcontent2/wiki-to-help/convert.py b/helpcontent2/wiki-to-help/convert.py index 0298391364..89cdac428e 100755 --- a/helpcontent2/wiki-to-help/convert.py +++ b/helpcontent2/wiki-to-help/convert.py @@ -17,45 +17,15 @@ Microsoft HHC: http://go.microsoft.com/fwlink/?LinkId=14188 import xml.dom.minidom as minidom import subprocess, tempfile, os, shutil -class Wine(object): - #driveletter="j:" #final - - def __init__(self,workingDir,driveletter): - """ Setup the wine environment. Granting access so that wine is able to output files to @workingDir. - @workingDir will be accessable via @driveletter - E.g. Wine("/tmp/dir","j:") """ - homedir = os.path.expanduser('~') - wineprefix=os.path.join(homedir,".wine") - drive=os.path.join(wineprefix,"dosdevices",driveletter) - if os.path.lexists(drive): - self.driveBak = drive+".bak" - shutil.move(drive,self.driveBak) - os.symlink(workingDir,drive) - self.drive = drive - #self.driveBak = driveBak - - def ex(self,*cmd): - """ execute something with wine """ - cmd = [elem for elem in cmd] - cmd = ["/usr/bin/wine"]+cmd - r= (subprocess.Popen(cmd).wait()) - return r - - def __call__(self,*cmd): - return self.ex(*cmd) - - def __del__(self): - os.remove(self.drive) - if hasattr(self,'driveBak'): - shutil.move(self.driveBak,self.drive) - - +from hhc import HHC +from mw import MW +scriptpath=os.path.dirname(os.path.realpath(__file__) ) class Main(object): workingDir = "./test" # final - mwpath='/usr/local/bin/' # final - style='/usr/share/xml/docbook/stylesheet/docbook-xsl/htmlhelp/htmlhelp.xsl' # final + #mwpath='/usr/local/bin/' # final + style=os.path.join(scriptpath,'xsl/htmlhelp/htmlhelp.xsl') # final tmp=None @@ -75,30 +45,49 @@ class Main(object): self.workingDir = os.path.abspath(self.workingDir) self.style = os.path.abspath(self.style) - self.wine = Wine(self.tmp,"j:") + self.hhc = HHC() self.convert("test2.xml",self.workingDir) - def convert(self,source,dest): + def convert(self,source,dest,startpage=None): """ Create the converted files. @source XML-Dump-file @dest Directory for output + @startpage Path to an html file """ tmp = self.tmp try: os.mkdir(dest) except OSError: pass - names = self.getArtNames(source) - self.ex(self.mwpath+"mw-buildcdb","--input",source,"--output",tmp) \ - and self.ex( - self.mwpath+"mw-render","--config=%s/wikiconf.txt"%(tmp), - "-w","docbook","-o",tmp+"/docbook.xml",*names) \ - and (shutil.copy(tmp+'/docbook.xml',dest) or True) \ + MW.buildcdb(source,tmp) + MW.render("--config=%s/wikiconf.txt"%(tmp), + "-w","docbook","-o",tmp+"/docbook.xml",*names) + + #and mwlib.apps.render + #self.ex(self.mwpath+"mw-buildcdb","--input",source,"--output",tmp) and \ + #self.ex( + # self.mwpath+"mw-render","--config=%s/wikiconf.txt"%(tmp), + # "-w","docbook","-o",tmp+"/docbook.xml",*names) \ + (shutil.copy(tmp+'/docbook.xml',dest) or True) \ and self.ex("/usr/bin/xsltproc","--nonet","--novalid","-o",tmp+'/',self.style,tmp+'/docbook.xml') \ - and (self.wine("c:\\htmlhelp\\hhc.exe","j:\\htmlhelp.hhp") or True) \ - and (shutil.copy(tmp+'/htmlhelp.chm',dest) or True) + and self.setStartpage(startpage) \ + and (self.hhc(tmp) or True) \ + and (shutil.copy(os.path.join(tmp,'htmlhelp.chm'),dest) or True) + + def setStartpage(self,startpage): + """ + Private. + Copies @startpage to our tmp dir so that it will be used as the start page. + @return False if @startpage doesnt exist, otherwise True. + """ + if startpage is None: return True + filename="index.html" + if not os.path.exist(startpage): return False + os.remove(os.path.join(self.tmp,filename)) + shutil.copy(startpage, os.path.join(self.tmp,filename)) + return True def __del__(self): shutil.rmtree(self.tmp) # remove temp files diff --git a/helpcontent2/wiki-to-help/hhc.py b/helpcontent2/wiki-to-help/hhc.py new file mode 100644 index 0000000000..d2d8302604 --- /dev/null +++ b/helpcontent2/wiki-to-help/hhc.py @@ -0,0 +1,64 @@ +import platform, os, subprocess + +class HHC(object): + """ Class for execution of Html Help Compiler """ + hhcexe="c:\\htmlhelp\\hhc.exe" + + def __init__(self): + pass + + def exWindows(self,source): + """ Private. Compile @source calling HHC natively under Windows """ + cmd=[self.hhcexe,os.path.join(source,"htmlhelp.hhp")] + r = (subprocess.Popen(cmd).wait()) + return r + + def exWine(self,source): + """ Private. Compile @source calling HHC via Wine """ + #dirname = os.path.dirname(source) + wine = Wine(source,"j:") + r = wine(self.hhcexe,"j:\\htmlhelp.hhp") + del wine + return r + + def __call__(self,source): + """ + Converts @source with HHC + @source path to input directory that contains htmlhelp.hhp + """ + windows=(platform.system()=="Windows") + if windows is False: + self.exWine(source) + else: + self.exWindows(source) + +class Wine(object): + # TODO: this should be a singleton + def __init__(self,workingDir,driveletter): + """ Setup the wine environment. Granting access so that wine is able to output files to @workingDir. + @workingDir will be accessable via @driveletter + E.g. Wine("/tmp/dir","j:") """ + homedir = os.path.expanduser('~') + wineprefix=os.path.join(homedir,".wine") + drive=os.path.join(wineprefix,"dosdevices",driveletter) + if os.path.lexists(drive): + self.driveBak = drive+".bak" + shutil.move(drive,self.driveBak) + os.symlink(workingDir,drive) + self.drive = drive + #self.driveBak = driveBak + + def ex(self,*cmd): + """ execute something with wine """ + cmd = [elem for elem in cmd] + cmd = ["/usr/bin/wine"]+cmd + r= (subprocess.Popen(cmd).wait()) + return r + + def __call__(self,*cmd): + return self.ex(*cmd) + + def __del__(self): + os.remove(self.drive) + if hasattr(self,'driveBak'): + shutil.move(self.driveBak,self.drive) diff --git a/helpcontent2/wiki-to-help/mw.py b/helpcontent2/wiki-to-help/mw.py new file mode 100644 index 0000000000..d2709cc6bc --- /dev/null +++ b/helpcontent2/wiki-to-help/mw.py @@ -0,0 +1,26 @@ +import mwlib.cdbwiki, mwlib.apps.render, mwlib.apps +import sys + +class MW(object): + """ This is the proxy class for mwlib """ + + @staticmethod + def _setArgs(function,args): + """ Set sys.argv for @function """ + bak = sys.argv + args=("nothing",)+args + dec=[x.encode() for x in args] + sys.argv=dec + r=function() + sys.argv=bak + return r + + @staticmethod + def buildcdb(source,dest): + args=("--input",source,"--output",dest) + return MW._setArgs(mwlib.apps.buildcdb,args) + #mwlib.cdbwiki.BuildWiki(*args) + + @staticmethod + def render(*args): + return MW._setArgs(mwlib.apps.render.Main(),args) From e7ae095f63da637a292e05e68f1201af01acc54d Mon Sep 17 00:00:00 2001 From: Timo Richter Date: Fri, 15 Jul 2011 15:04:08 +0200 Subject: [PATCH 15/16] modified: helpcontent2/wiki-to-help/README --- helpcontent2/wiki-to-help/README | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/helpcontent2/wiki-to-help/README b/helpcontent2/wiki-to-help/README index cf95023977..f2dae3a133 100644 --- a/helpcontent2/wiki-to-help/README +++ b/helpcontent2/wiki-to-help/README @@ -1,8 +1,10 @@ + Conversion of an XML-Dump to platformspecific help files ----------------------------------------------------- +-------------------------------------------------------- + 1 INSTALLATION -The following programs are requiered: +The following programs are required: - mwlib - python - python-lxml From 4de147c19f472e588726ec5573899dfa10f9bd26 Mon Sep 17 00:00:00 2001 From: Timo Richter Date: Tue, 19 Jul 2011 22:08:21 +0200 Subject: [PATCH 16/16] License change --- helpcontent2/wiki-to-help/README | 2 +- helpcontent2/wiki-to-help/convert.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/helpcontent2/wiki-to-help/README b/helpcontent2/wiki-to-help/README index f2dae3a133..5dcfc95865 100644 --- a/helpcontent2/wiki-to-help/README +++ b/helpcontent2/wiki-to-help/README @@ -25,5 +25,5 @@ The following programs are required: The following applies to all files if not stated differently - - Licensed under GNU GPLv3 + - Licensed under GNU LGPLv3 / MPL - Copyright 2011 Timo Richter diff --git a/helpcontent2/wiki-to-help/convert.py b/helpcontent2/wiki-to-help/convert.py index 89cdac428e..a86b4b60d8 100755 --- a/helpcontent2/wiki-to-help/convert.py +++ b/helpcontent2/wiki-to-help/convert.py @@ -2,7 +2,6 @@ """ Convert an XML-Dump to platformspecific help files. Copyright 2011 Timo Richter -Licensed under GNU GPLv3 This program depends on: mwlib