(openoffice) branch AOO42X updated: Maintenance cleanup
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new a22b373ecf Maintenance cleanup a22b373ecf is described below commit a22b373ecfd94a96960f079d94f4f2224cf97178 Author: mseidel AuthorDate: Thu Jun 6 16:32:42 2024 +0200 Maintenance cleanup (cherry picked from commit 6f71c8ba79c522bf18f1ed1034c8f4aa9dab228d) --- main/sw/source/ui/utlui/gloslst.src | 68 --- main/sw/source/ui/utlui/unotools.src | 89 main/sw/source/ui/utlui/utlui.src| 57 +++ main/sw/source/ui/utlui/zoomctrl.cxx | 22 - 4 files changed, 80 insertions(+), 156 deletions(-) diff --git a/main/sw/source/ui/utlui/gloslst.src b/main/sw/source/ui/utlui/gloslst.src index ca3f4741d8..16602e2c6b 100644 --- a/main/sw/source/ui/utlui/gloslst.src +++ b/main/sw/source/ui/utlui/gloslst.src @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,20 +7,18 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - #include "globals.hrc" #include "utlui.hrc" #include "helpid.h" @@ -31,75 +29,45 @@ ModalDialog DLG_GLOSSARY_DECIDE_DLG HelpID = HID_DLG_GLOSS_DECIDE ; OutputSize = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT ( 161 , 67 ) ; + Size = MAP_APPFONT ( 161, 67 ) ; Text [ en-US ] = "Select AutoText:" ; Moveable = TRUE ; -FixedLine FL_GLOSS + FixedLine FL_GLOSS { - Pos = MAP_APPFONT ( 6 , 3 ) ; -Size = MAP_APPFONT ( 93 , 8 ) ; + Pos = MAP_APPFONT ( 6, 3 ) ; + Size = MAP_APPFONT ( 93, 8 ) ; Text [ en-US ] = "AutoText - Group" ; }; OKButton PB_OK { - Pos = MAP_APPFONT ( 105 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 105, 6 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; TabStop = TRUE ; Group = TRUE ; DefButton = TRUE ; }; CancelButton PB_CANCEL { - Pos = MAP_APPFONT ( 105 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 105, 23 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; TabStop = TRUE ; Group = TRUE ; }; HelpButton PB_HELP { - Pos = MAP_APPFONT ( 105 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 105, 43 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; TabStop = TRUE ; Group = TRUE ; }; ListBox LB_LIST { - HelpID = "sw:ListBox:DLG_GLOSSARY_DECIDE_DLG:LB_LIST"; - Pos = MAP_APPFONT ( 12 , 15 ) ; - Size = MAP_APPFONT ( 81 , 40 ) ; + HelpID = "sw:ListBox:DLG_GLOSSARY_DECIDE_DLG:LB_LIST" ; + Pos = MAP_APPFONT ( 12, 15 ) ; + Size = MAP_APPFONT ( 81, 40 ) ; TabStop = TRUE ; Border = TRUE ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +// ** EOF diff --git a/main/sw/source/ui/utlui/unotools.src b/main/sw/source/ui/utlui/unotools.src index 79e5af667b..37396e4e1b 100644 --- a/main/sw/source/ui/utlui/unotools.src +++ b/main/sw/source/ui/utlui/unotools.src @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,19 +7,18 @@ * 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
(openoffice) branch trunk updated: Maintenance cleanup
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 6f71c8ba79 Maintenance cleanup 6f71c8ba79 is described below commit 6f71c8ba79c522bf18f1ed1034c8f4aa9dab228d Author: mseidel AuthorDate: Thu Jun 6 16:32:42 2024 +0200 Maintenance cleanup --- main/sw/source/ui/utlui/gloslst.src | 68 --- main/sw/source/ui/utlui/unotools.src | 89 main/sw/source/ui/utlui/utlui.src| 57 +++ main/sw/source/ui/utlui/zoomctrl.cxx | 22 - 4 files changed, 80 insertions(+), 156 deletions(-) diff --git a/main/sw/source/ui/utlui/gloslst.src b/main/sw/source/ui/utlui/gloslst.src index ca3f4741d8..16602e2c6b 100644 --- a/main/sw/source/ui/utlui/gloslst.src +++ b/main/sw/source/ui/utlui/gloslst.src @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,20 +7,18 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - #include "globals.hrc" #include "utlui.hrc" #include "helpid.h" @@ -31,75 +29,45 @@ ModalDialog DLG_GLOSSARY_DECIDE_DLG HelpID = HID_DLG_GLOSS_DECIDE ; OutputSize = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT ( 161 , 67 ) ; + Size = MAP_APPFONT ( 161, 67 ) ; Text [ en-US ] = "Select AutoText:" ; Moveable = TRUE ; -FixedLine FL_GLOSS + FixedLine FL_GLOSS { - Pos = MAP_APPFONT ( 6 , 3 ) ; -Size = MAP_APPFONT ( 93 , 8 ) ; + Pos = MAP_APPFONT ( 6, 3 ) ; + Size = MAP_APPFONT ( 93, 8 ) ; Text [ en-US ] = "AutoText - Group" ; }; OKButton PB_OK { - Pos = MAP_APPFONT ( 105 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 105, 6 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; TabStop = TRUE ; Group = TRUE ; DefButton = TRUE ; }; CancelButton PB_CANCEL { - Pos = MAP_APPFONT ( 105 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 105, 23 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; TabStop = TRUE ; Group = TRUE ; }; HelpButton PB_HELP { - Pos = MAP_APPFONT ( 105 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 105, 43 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; TabStop = TRUE ; Group = TRUE ; }; ListBox LB_LIST { - HelpID = "sw:ListBox:DLG_GLOSSARY_DECIDE_DLG:LB_LIST"; - Pos = MAP_APPFONT ( 12 , 15 ) ; - Size = MAP_APPFONT ( 81 , 40 ) ; + HelpID = "sw:ListBox:DLG_GLOSSARY_DECIDE_DLG:LB_LIST" ; + Pos = MAP_APPFONT ( 12, 15 ) ; + Size = MAP_APPFONT ( 81, 40 ) ; TabStop = TRUE ; Border = TRUE ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +// ** EOF diff --git a/main/sw/source/ui/utlui/unotools.src b/main/sw/source/ui/utlui/unotools.src index 79e5af667b..37396e4e1b 100644 --- a/main/sw/source/ui/utlui/unotools.src +++ b/main/sw/source/ui/utlui/unotools.src @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,19 +7,18 @@ * 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 -
(openoffice) branch Pilot-Pirx-patch-1 updated (74741f260a -> ffa8d6d074)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a change to branch Pilot-Pirx-patch-1 in repository https://gitbox.apache.org/repos/asf/openoffice.git from 74741f260a Merge branch 'trunk' into Pilot-Pirx-patch-1 add f34f5b56d0 Fix spelling (#215) add 1d5ec71305 Update icons add cba28f4f85 Update icon (buttonminus.png) new ffa8d6d074 Merge branch 'trunk' into Pilot-Pirx-patch-1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: main/default_images/extensions/res/buttonminus.png | Bin 457 -> 206 bytes .../extensions/res/buttonminus_hc.png | Bin 122 -> 127 bytes .../filter/misc/FinalizedMandatoryTest.java| 42 ++--- .../classic/classic_images.tar.gz | Bin 1364891 -> 1364926 bytes 4 files changed, 21 insertions(+), 21 deletions(-)
(openoffice) 01/01: Merge branch 'trunk' into Pilot-Pirx-patch-1
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-patch-1 in repository https://gitbox.apache.org/repos/asf/openoffice.git commit ffa8d6d0744a40c1ddc806a113df85a6f8a81d8d Merge: 74741f260a cba28f4f85 Author: mseidel AuthorDate: Wed Jun 5 20:49:58 2024 +0200 Merge branch 'trunk' into Pilot-Pirx-patch-1 main/default_images/extensions/res/buttonminus.png | Bin 457 -> 206 bytes .../extensions/res/buttonminus_hc.png | Bin 122 -> 127 bytes .../filter/misc/FinalizedMandatoryTest.java| 42 ++--- .../classic/classic_images.tar.gz | Bin 1364891 -> 1364926 bytes 4 files changed, 21 insertions(+), 21 deletions(-)
(openoffice) branch Pilot-Pirx-wizard updated (627562ce12 -> 954bd891b1)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a change to branch Pilot-Pirx-wizard in repository https://gitbox.apache.org/repos/asf/openoffice.git from 627562ce12 Merge branch 'trunk' into Pilot-Pirx-wizard add d1f3eb887e Updated English dictionary add 6fd66686f1 Maintenance cleanup add 6b7c93d1f1 Maintenance cleanup add 3215e17bb4 Maintenance cleanup add 3009d07ac2 Cleaned up resource files add 07df5c7113 Fix spelling in code comments (#211) add ce18a1693b Fix spelling in code comments (#212) add 8735c04741 misc: fix spelling (#213) add c622e83ad3 Minor cleanup add 0080c5f63e small cleanup (Tango icon set was removed long ago) add f4c755a4bd Update 0402.xhp add 0cb24ebdae Remove unused helpmenu.png add 6e9ebb6bba Remove unused helpmenu.png (HiContrast) add ad9e0707f7 Use correct Math icons in Industrial icon set add 1dbb066d0b Small maintenance cleanup add 76447f04cc Remove HelpMenu from customization dialog add a7d8910e9b Updated English dictionary add f34f5b56d0 Fix spelling (#215) add 1d5ec71305 Update icons add cba28f4f85 Update icon (buttonminus.png) new 954bd891b1 Merge branch 'trunk' into Pilot-Pirx-wizard The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: main/cui/source/dialogs/dlgname.cxx| 90 +++--- main/cui/source/dialogs/dlgname.hrc| 12 +- main/cui/source/dialogs/zoom.cxx | 356 ++--- main/cui/source/dialogs/zoom.hrc | 48 +-- main/cui/source/options/doclinkdialog.src | 78 ++--- main/cui/source/options/fontsubs.src | 24 +- main/cui/source/options/optsave.src| 63 ++-- main/default_images/extensions/res/buttonminus.png | Bin 457 -> 206 bytes .../extensions/res/buttonminus_hc.png | Bin 122 -> 127 bytes .../res/commandimagelist/lc_helpmenu.png | Bin 1623 -> 0 bytes .../res/commandimagelist/lch_helpmenu.png | Bin 208 -> 0 bytes .../res/commandimagelist/sc_helpmenu.png | Bin 802 -> 0 bytes .../res/commandimagelist/sch_helpmenu.png | Bin 167 -> 0 bytes .../primitive2d/controlprimitive2d.hxx | 4 +- main/editeng/source/misc/unolingu.cxx | 2 +- main/embeddedobj/source/msole/olepersist.cxx | 46 +-- main/extensions.lst| 2 +- .../filter/misc/FinalizedMandatoryTest.java| 42 +-- main/forms/source/xforms/submission/replace.cxx| 2 +- .../source/xforms/submission/submission_get.cxx| 6 +- .../source/xforms/submission/submission_post.cxx | 2 +- main/framework/test/typecfg/cfgview.cxx| 2 +- .../source/text/shared/00/0402.xhp | 2 +- main/linguistic/source/misc.cxx| 2 +- .../classic/classic_images.tar.gz | Bin 1355547 -> 1364926 bytes .../industrial/res/commandimagelist/lc_adjust.png | Bin 905 -> 572 bytes .../industrial/res/commandimagelist/lc_draw.png| Bin 882 -> 870 bytes .../res/commandimagelist/lc_helpmenu.png | Bin 652 -> 0 bytes .../res/commandimagelist/lc_symbolcatalogue.png| Bin 558 -> 300 bytes .../industrial/res/commandimagelist/sc_adjust.png | Bin 711 -> 291 bytes .../industrial/res/commandimagelist/sc_draw.png| Bin 763 -> 253 bytes .../res/commandimagelist/sc_helpmenu.png | Bin 275 -> 0 bytes .../res/commandimagelist/sc_symbolcatalogue.png| Bin 424 -> 124 bytes main/packimages/Makefile | 8 +- main/packimages/Module_packimages.mk | 11 +- main/packimages/Package_packimages.mk | 11 +- main/psprint_config/configuration/psprint.conf | 2 +- .../main/java/ifc/frame/_XNotifyingDispatch.java | 2 +- main/sal/rtl/source/unload.cxx | 2 +- main/scp2/source/ooo/file_ooo.scp | 2 +- main/scp2/source/ooo/module_hidden_ooo.scp | 3 +- main/sd/source/ui/inc/OutlineView.hxx | 2 +- main/sfx2/sdi/sfx.sdi | 295 + main/shell/qa/zip/testimpl/testzipimpl.cxx | 18 +- main/shell/qa/zip/testimpl/testzipimpl.hxx | 13 +- main/shell/qa/zip/ziptest.cxx | 2 - main/sot/source/sdstor/stgdir.hxx | 2 +- main/sw/source/core/text/redlnitr.cxx | 127 .../sun/star/wizards/agenda/AgendaTemplate.java| 52 +-- .../com/sun/star/wizards/web/ImageListDialog.java | 6 +- .../xmerge/source/palmtests/qa/lib/converterlib.pm | 2 +- main/xmloff/sourc
(openoffice) 01/01: Merge branch 'trunk' into Pilot-Pirx-wizard
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-wizard in repository https://gitbox.apache.org/repos/asf/openoffice.git commit 954bd891b1f7f8b4d37cdb393de3f3ece845a140 Merge: 627562ce12 cba28f4f85 Author: mseidel AuthorDate: Wed Jun 5 20:48:59 2024 +0200 Merge branch 'trunk' into Pilot-Pirx-wizard main/cui/source/dialogs/dlgname.cxx| 90 +++--- main/cui/source/dialogs/dlgname.hrc| 12 +- main/cui/source/dialogs/zoom.cxx | 356 ++--- main/cui/source/dialogs/zoom.hrc | 48 +-- main/cui/source/options/doclinkdialog.src | 78 ++--- main/cui/source/options/fontsubs.src | 24 +- main/cui/source/options/optsave.src| 63 ++-- main/default_images/extensions/res/buttonminus.png | Bin 457 -> 206 bytes .../extensions/res/buttonminus_hc.png | Bin 122 -> 127 bytes .../res/commandimagelist/lc_helpmenu.png | Bin 1623 -> 0 bytes .../res/commandimagelist/lch_helpmenu.png | Bin 208 -> 0 bytes .../res/commandimagelist/sc_helpmenu.png | Bin 802 -> 0 bytes .../res/commandimagelist/sch_helpmenu.png | Bin 167 -> 0 bytes .../primitive2d/controlprimitive2d.hxx | 4 +- main/editeng/source/misc/unolingu.cxx | 2 +- main/embeddedobj/source/msole/olepersist.cxx | 46 +-- main/extensions.lst| 2 +- .../filter/misc/FinalizedMandatoryTest.java| 42 +-- main/forms/source/xforms/submission/replace.cxx| 2 +- .../source/xforms/submission/submission_get.cxx| 6 +- .../source/xforms/submission/submission_post.cxx | 2 +- main/framework/test/typecfg/cfgview.cxx| 2 +- .../source/text/shared/00/0402.xhp | 2 +- main/linguistic/source/misc.cxx| 2 +- .../classic/classic_images.tar.gz | Bin 1355547 -> 1364926 bytes .../industrial/res/commandimagelist/lc_adjust.png | Bin 905 -> 572 bytes .../industrial/res/commandimagelist/lc_draw.png| Bin 882 -> 870 bytes .../res/commandimagelist/lc_helpmenu.png | Bin 652 -> 0 bytes .../res/commandimagelist/lc_symbolcatalogue.png| Bin 558 -> 300 bytes .../industrial/res/commandimagelist/sc_adjust.png | Bin 711 -> 291 bytes .../industrial/res/commandimagelist/sc_draw.png| Bin 763 -> 253 bytes .../res/commandimagelist/sc_helpmenu.png | Bin 275 -> 0 bytes .../res/commandimagelist/sc_symbolcatalogue.png| Bin 424 -> 124 bytes main/packimages/Makefile | 8 +- main/packimages/Module_packimages.mk | 11 +- main/packimages/Package_packimages.mk | 11 +- main/psprint_config/configuration/psprint.conf | 2 +- .../main/java/ifc/frame/_XNotifyingDispatch.java | 2 +- main/sal/rtl/source/unload.cxx | 2 +- main/scp2/source/ooo/file_ooo.scp | 2 +- main/scp2/source/ooo/module_hidden_ooo.scp | 3 +- main/sd/source/ui/inc/OutlineView.hxx | 2 +- main/sfx2/sdi/sfx.sdi | 295 + main/shell/qa/zip/testimpl/testzipimpl.cxx | 18 +- main/shell/qa/zip/testimpl/testzipimpl.hxx | 13 +- main/shell/qa/zip/ziptest.cxx | 2 - main/sot/source/sdstor/stgdir.hxx | 2 +- main/sw/source/core/text/redlnitr.cxx | 127 .../sun/star/wizards/agenda/AgendaTemplate.java| 52 +-- .../com/sun/star/wizards/web/ImageListDialog.java | 6 +- .../xmerge/source/palmtests/qa/lib/converterlib.pm | 2 +- main/xmloff/source/text/txtparai.cxx | 2 +- 52 files changed, 657 insertions(+), 688 deletions(-)
(openoffice) branch AOO41X updated: Update icon (buttonminus.png)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new bad22231ae Update icon (buttonminus.png) bad22231ae is described below commit bad22231ae6ca230b5376e4ea87cd462e8ba43a0 Author: mseidel AuthorDate: Tue Jun 4 23:44:29 2024 +0200 Update icon (buttonminus.png) --- .../classic/classic_images.tar.gz | Bin 1727810 -> 1727802 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/main/ooo_custom_images/classic/classic_images.tar.gz b/main/ooo_custom_images/classic/classic_images.tar.gz index 0b8870ba76..25fe67dc0b 100644 Binary files a/main/ooo_custom_images/classic/classic_images.tar.gz and b/main/ooo_custom_images/classic/classic_images.tar.gz differ
(openoffice) branch AOO42X updated: Update icon (buttonminus.png)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new d991e0af3d Update icon (buttonminus.png) d991e0af3d is described below commit d991e0af3db621fed6b4cf018e2b99cd6273d634 Author: mseidel AuthorDate: Tue Jun 4 23:40:14 2024 +0200 Update icon (buttonminus.png) (cherry picked from commit cba28f4f85957ac51bc6864902215659efd712f3) --- .../classic/classic_images.tar.gz | Bin 1364891 -> 1364926 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/main/ooo_custom_images/classic/classic_images.tar.gz b/main/ooo_custom_images/classic/classic_images.tar.gz index 6cb6be6c66..1f1aff00e4 100644 Binary files a/main/ooo_custom_images/classic/classic_images.tar.gz and b/main/ooo_custom_images/classic/classic_images.tar.gz differ
(openoffice) branch trunk updated: Update icon (buttonminus.png)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new cba28f4f85 Update icon (buttonminus.png) cba28f4f85 is described below commit cba28f4f85957ac51bc6864902215659efd712f3 Author: mseidel AuthorDate: Tue Jun 4 23:40:14 2024 +0200 Update icon (buttonminus.png) --- .../classic/classic_images.tar.gz | Bin 1364891 -> 1364926 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/main/ooo_custom_images/classic/classic_images.tar.gz b/main/ooo_custom_images/classic/classic_images.tar.gz index 6cb6be6c66..1f1aff00e4 100644 Binary files a/main/ooo_custom_images/classic/classic_images.tar.gz and b/main/ooo_custom_images/classic/classic_images.tar.gz differ
(openoffice) branch Pilot-Pirx-iconset updated (9e02cffec6 -> 9105c1b8bc)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a change to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git from 9e02cffec6 Merge branch 'trunk' into Pilot-Pirx-iconset add a7d8910e9b Updated English dictionary add f34f5b56d0 Fix spelling (#215) add 1d5ec71305 Update icons new 9105c1b8bc Merge branch 'trunk' into Pilot-Pirx-iconset The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: main/default_images/extensions/res/buttonminus.png | Bin 457 -> 206 bytes .../extensions/res/buttonminus_hc.png | Bin 122 -> 127 bytes main/extensions.lst| 2 +- .../filter/misc/FinalizedMandatoryTest.java| 42 ++--- 4 files changed, 22 insertions(+), 22 deletions(-)
(openoffice) 01/01: Merge branch 'trunk' into Pilot-Pirx-iconset
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git commit 9105c1b8bc5a956a5a95563aad565e0a84a5b7d3 Merge: 9e02cffec6 1d5ec71305 Author: mseidel AuthorDate: Tue Jun 4 14:48:42 2024 +0200 Merge branch 'trunk' into Pilot-Pirx-iconset main/default_images/extensions/res/buttonminus.png | Bin 457 -> 206 bytes .../extensions/res/buttonminus_hc.png | Bin 122 -> 127 bytes main/extensions.lst| 2 +- .../filter/misc/FinalizedMandatoryTest.java| 42 ++--- 4 files changed, 22 insertions(+), 22 deletions(-)
(openoffice) branch AOO41X updated: Update icons
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new 37aab46c31 Update icons 37aab46c31 is described below commit 37aab46c315596eeba81e581381d6f37c22cfeb7 Author: mseidel AuthorDate: Tue Jun 4 13:51:11 2024 +0200 Update icons (cherry picked from commit 1d5ec713059c62a3dddaccd2c779c9a00d3edeec) --- main/default_images/extensions/res/buttonminus.png| Bin 457 -> 206 bytes main/default_images/extensions/res/buttonminus_hc.png | Bin 122 -> 127 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/extensions/res/buttonminus.png b/main/default_images/extensions/res/buttonminus.png index ce27c585ab..e2dd78a75e 100644 Binary files a/main/default_images/extensions/res/buttonminus.png and b/main/default_images/extensions/res/buttonminus.png differ diff --git a/main/default_images/extensions/res/buttonminus_hc.png b/main/default_images/extensions/res/buttonminus_hc.png index f8594bb214..e8802393d4 100644 Binary files a/main/default_images/extensions/res/buttonminus_hc.png and b/main/default_images/extensions/res/buttonminus_hc.png differ
(openoffice) branch AOO42X updated: Update icons
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new cb9a6f2c60 Update icons cb9a6f2c60 is described below commit cb9a6f2c606afb553c2cd376b927c0905217c38a Author: mseidel AuthorDate: Tue Jun 4 13:51:11 2024 +0200 Update icons (cherry picked from commit 1d5ec713059c62a3dddaccd2c779c9a00d3edeec) --- main/default_images/extensions/res/buttonminus.png| Bin 457 -> 206 bytes main/default_images/extensions/res/buttonminus_hc.png | Bin 122 -> 127 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/extensions/res/buttonminus.png b/main/default_images/extensions/res/buttonminus.png index ce27c585ab..e2dd78a75e 100644 Binary files a/main/default_images/extensions/res/buttonminus.png and b/main/default_images/extensions/res/buttonminus.png differ diff --git a/main/default_images/extensions/res/buttonminus_hc.png b/main/default_images/extensions/res/buttonminus_hc.png index f8594bb214..e8802393d4 100644 Binary files a/main/default_images/extensions/res/buttonminus_hc.png and b/main/default_images/extensions/res/buttonminus_hc.png differ
(openoffice) branch trunk updated: Update icons
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 1d5ec71305 Update icons 1d5ec71305 is described below commit 1d5ec713059c62a3dddaccd2c779c9a00d3edeec Author: mseidel AuthorDate: Tue Jun 4 13:51:11 2024 +0200 Update icons --- main/default_images/extensions/res/buttonminus.png| Bin 457 -> 206 bytes main/default_images/extensions/res/buttonminus_hc.png | Bin 122 -> 127 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/extensions/res/buttonminus.png b/main/default_images/extensions/res/buttonminus.png index ce27c585ab..e2dd78a75e 100644 Binary files a/main/default_images/extensions/res/buttonminus.png and b/main/default_images/extensions/res/buttonminus.png differ diff --git a/main/default_images/extensions/res/buttonminus_hc.png b/main/default_images/extensions/res/buttonminus_hc.png index f8594bb214..e8802393d4 100644 Binary files a/main/default_images/extensions/res/buttonminus_hc.png and b/main/default_images/extensions/res/buttonminus_hc.png differ
(openoffice) branch AOO42X updated: Fix spelling (#215)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 82f4a08e62 Fix spelling (#215) 82f4a08e62 is described below commit 82f4a08e62b6e6565639bc5de683d244f0bcec8a Author: John Bampton AuthorDate: Sun Jun 2 21:59:30 2024 +1000 Fix spelling (#215) Thanks! (cherry picked from commit f34f5b56d06948156f53a6580f67e89351d9aafc) --- .../filter/misc/FinalizedMandatoryTest.java| 42 +++--- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/main/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java b/main/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java index be542047af..fdb4fa8929 100644 --- a/main/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java +++ b/main/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java @@ -52,7 +52,7 @@ import static org.junit.Assert.*; * the services com.sun.star.document.FilterFactory and * com.sun.star.document.TypeDetection. * - * Each of theses services represent a container of PropertyValue[]. + * Each of these services represent a container of PropertyValue[]. * The PropertyValue[] contains among others the properties called * Finalized and Mandatory. If the property * Finalized is set to true, a filter can be removed @@ -67,9 +67,9 @@ import static org.junit.Assert.*; * will be changed and the service will be flushed. The test checks for expected exceptions: * If the property Finalized equals * true the tests check if an Exception must be thrown. - * The next step of the test is the removal of the filter was removed, than the service + * The next step of the test is the removal of the filter was removed, then the service * will be flushed. The test checks for expected exceptions: If the property - * Madantory equals true, an Exception must + * Mandatory equals true, an Exception must * be thrown. * This test results false state if there is no filter available with: * Finalized=true @@ -107,7 +107,7 @@ public class FinalizedMandatoryTest /** * Creates an instance for the given serviceName * @param serviceName the name of the service which should be created - * @throws Exception was thrown if creataion failes + * @throws Exception was thrown if creation fails * @return XInterface of service */ private XInterface getTestObject(String serviceName) throws Exception @@ -115,7 +115,7 @@ public class FinalizedMandatoryTest Object oInterface = xMSF.createInstance(serviceName); -assertNotNull("Service wan't created", oInterface); +assertNotNull("Service wasn't created", oInterface); //if (oInterface == null) { //failed("Service wasn't created") ; //throw new Exception("could not create service '"+serviceName+"'"); @@ -143,7 +143,7 @@ public class FinalizedMandatoryTest /** * test the given service serviceName. - * For every filter a new instace was created and the tests started. + * For every filter a new instance was created and the tests started. * @param serviceName the name of the service to test */ private void checkReadonlySupport(String serviceName) @@ -232,8 +232,8 @@ public class FinalizedMandatoryTest fail("could not replace filter properties ('" + filterName + "')"); } -// 1b.) try to wirte the changed filter to the configuration. -// This must result in a exception if the filter is finalized. +// 1b.) try to write the changed filter to the configuration. +// This must result in an exception if the filter is finalized. boolean flushError = false; try { @@ -242,9 +242,9 @@ public class FinalizedMandatoryTest catch (WrappedTargetRuntimeException e) { flushError = true; -assertTrue("Unexpected exception wihle flushing changed filter '" + filterName + "'", isFinalized); +assertTrue("Unexpected exception while flushing changed filter '" + filterName + "'", isFinalized); } -assertTrue("Expected exception was not thorwn while flushing changed filter '" + filterName + "' Finalized:" + isFinalized, +assertTrue("Expected exception was not thrown while flushing changed filter '" + filterName + "' Finalized:" + isFinalized, !(flushError ^ isFinalized)); @@ -258,8 +258,8 @@ public class FinalizedMandatoryTest {
(openoffice) branch trunk updated: Fix spelling (#215)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new f34f5b56d0 Fix spelling (#215) f34f5b56d0 is described below commit f34f5b56d06948156f53a6580f67e89351d9aafc Author: John Bampton AuthorDate: Sun Jun 2 21:59:30 2024 +1000 Fix spelling (#215) Thanks! --- .../filter/misc/FinalizedMandatoryTest.java| 42 +++--- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/main/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java b/main/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java index be542047af..fdb4fa8929 100644 --- a/main/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java +++ b/main/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java @@ -52,7 +52,7 @@ import static org.junit.Assert.*; * the services com.sun.star.document.FilterFactory and * com.sun.star.document.TypeDetection. * - * Each of theses services represent a container of PropertyValue[]. + * Each of these services represent a container of PropertyValue[]. * The PropertyValue[] contains among others the properties called * Finalized and Mandatory. If the property * Finalized is set to true, a filter can be removed @@ -67,9 +67,9 @@ import static org.junit.Assert.*; * will be changed and the service will be flushed. The test checks for expected exceptions: * If the property Finalized equals * true the tests check if an Exception must be thrown. - * The next step of the test is the removal of the filter was removed, than the service + * The next step of the test is the removal of the filter was removed, then the service * will be flushed. The test checks for expected exceptions: If the property - * Madantory equals true, an Exception must + * Mandatory equals true, an Exception must * be thrown. * This test results false state if there is no filter available with: * Finalized=true @@ -107,7 +107,7 @@ public class FinalizedMandatoryTest /** * Creates an instance for the given serviceName * @param serviceName the name of the service which should be created - * @throws Exception was thrown if creataion failes + * @throws Exception was thrown if creation fails * @return XInterface of service */ private XInterface getTestObject(String serviceName) throws Exception @@ -115,7 +115,7 @@ public class FinalizedMandatoryTest Object oInterface = xMSF.createInstance(serviceName); -assertNotNull("Service wan't created", oInterface); +assertNotNull("Service wasn't created", oInterface); //if (oInterface == null) { //failed("Service wasn't created") ; //throw new Exception("could not create service '"+serviceName+"'"); @@ -143,7 +143,7 @@ public class FinalizedMandatoryTest /** * test the given service serviceName. - * For every filter a new instace was created and the tests started. + * For every filter a new instance was created and the tests started. * @param serviceName the name of the service to test */ private void checkReadonlySupport(String serviceName) @@ -232,8 +232,8 @@ public class FinalizedMandatoryTest fail("could not replace filter properties ('" + filterName + "')"); } -// 1b.) try to wirte the changed filter to the configuration. -// This must result in a exception if the filter is finalized. +// 1b.) try to write the changed filter to the configuration. +// This must result in an exception if the filter is finalized. boolean flushError = false; try { @@ -242,9 +242,9 @@ public class FinalizedMandatoryTest catch (WrappedTargetRuntimeException e) { flushError = true; -assertTrue("Unexpected exception wihle flushing changed filter '" + filterName + "'", isFinalized); +assertTrue("Unexpected exception while flushing changed filter '" + filterName + "'", isFinalized); } -assertTrue("Expected exception was not thorwn while flushing changed filter '" + filterName + "' Finalized:" + isFinalized, +assertTrue("Expected exception was not thrown while flushing changed filter '" + filterName + "' Finalized:" + isFinalized, !(flushError ^ isFinalized)); @@ -258,8 +258,8 @@ public class FinalizedMandatoryTest { fail("could not remove filter from container ('" + filterName + "')&q
(openoffice) 01/01: Merge branch 'trunk' into Pilot-Pirx-patch-1
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-patch-1 in repository https://gitbox.apache.org/repos/asf/openoffice.git commit 74741f260a00d49e25a9ecf0c73a26417a1bc90b Merge: 2bd4cdeaa3 a7d8910e9b Author: mseidel AuthorDate: Sun Jun 2 13:26:45 2024 +0200 Merge branch 'trunk' into Pilot-Pirx-patch-1 main/cui/source/dialogs/dlgname.cxx| 90 +++--- main/cui/source/dialogs/dlgname.hrc| 12 +- main/cui/source/dialogs/zoom.cxx | 356 ++--- main/cui/source/dialogs/zoom.hrc | 48 +-- main/cui/source/options/doclinkdialog.src | 78 ++--- main/cui/source/options/fontsubs.src | 24 +- main/cui/source/options/optsave.src| 63 ++-- .../res/commandimagelist/lc_helpmenu.png | Bin 1623 -> 0 bytes .../res/commandimagelist/lch_helpmenu.png | Bin 208 -> 0 bytes .../res/commandimagelist/sc_helpmenu.png | Bin 802 -> 0 bytes .../res/commandimagelist/sch_helpmenu.png | Bin 167 -> 0 bytes .../primitive2d/controlprimitive2d.hxx | 4 +- main/editeng/source/misc/unolingu.cxx | 2 +- main/embeddedobj/source/msole/olepersist.cxx | 46 +-- main/extensions.lst| 2 +- main/forms/source/xforms/submission/replace.cxx| 2 +- .../source/xforms/submission/submission_get.cxx| 6 +- .../source/xforms/submission/submission_post.cxx | 2 +- main/framework/test/typecfg/cfgview.cxx| 2 +- .../source/text/shared/00/0402.xhp | 2 +- main/linguistic/source/misc.cxx| 2 +- .../classic/classic_images.tar.gz | Bin 1355547 -> 1364891 bytes .../industrial/res/commandimagelist/lc_adjust.png | Bin 905 -> 572 bytes .../industrial/res/commandimagelist/lc_draw.png| Bin 882 -> 870 bytes .../res/commandimagelist/lc_helpmenu.png | Bin 652 -> 0 bytes .../res/commandimagelist/lc_symbolcatalogue.png| Bin 558 -> 300 bytes .../industrial/res/commandimagelist/sc_adjust.png | Bin 711 -> 291 bytes .../industrial/res/commandimagelist/sc_draw.png| Bin 763 -> 253 bytes .../res/commandimagelist/sc_helpmenu.png | Bin 275 -> 0 bytes .../res/commandimagelist/sc_symbolcatalogue.png| Bin 424 -> 124 bytes main/packimages/Makefile | 8 +- main/packimages/Module_packimages.mk | 11 +- main/packimages/Package_packimages.mk | 11 +- main/psprint_config/configuration/psprint.conf | 2 +- .../main/java/ifc/frame/_XNotifyingDispatch.java | 2 +- main/sal/rtl/source/unload.cxx | 2 +- main/scp2/source/ooo/file_ooo.scp | 2 +- main/scp2/source/ooo/module_hidden_ooo.scp | 3 +- main/sd/source/ui/inc/OutlineView.hxx | 2 +- main/sfx2/sdi/sfx.sdi | 295 + main/sot/source/sdstor/stgdir.hxx | 2 +- .../sun/star/wizards/agenda/AgendaTemplate.java| 52 +-- .../com/sun/star/wizards/web/ImageListDialog.java | 6 +- .../xmerge/source/palmtests/qa/lib/converterlib.pm | 2 +- main/xmloff/source/text/txtparai.cxx | 2 +- 45 files changed, 559 insertions(+), 584 deletions(-)
(openoffice) branch Pilot-Pirx-patch-1 updated (2bd4cdeaa3 -> 74741f260a)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a change to branch Pilot-Pirx-patch-1 in repository https://gitbox.apache.org/repos/asf/openoffice.git from 2bd4cdeaa3 Merge branch 'trunk' into Pilot-Pirx-patch-1 add 3215e17bb4 Maintenance cleanup add 3009d07ac2 Cleaned up resource files add 07df5c7113 Fix spelling in code comments (#211) add ce18a1693b Fix spelling in code comments (#212) add 8735c04741 misc: fix spelling (#213) add c622e83ad3 Minor cleanup add 0080c5f63e small cleanup (Tango icon set was removed long ago) add f4c755a4bd Update 0402.xhp add 0cb24ebdae Remove unused helpmenu.png add 6e9ebb6bba Remove unused helpmenu.png (HiContrast) add ad9e0707f7 Use correct Math icons in Industrial icon set add 1dbb066d0b Small maintenance cleanup add 76447f04cc Remove HelpMenu from customization dialog add a7d8910e9b Updated English dictionary new 74741f260a Merge branch 'trunk' into Pilot-Pirx-patch-1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: main/cui/source/dialogs/dlgname.cxx| 90 +++--- main/cui/source/dialogs/dlgname.hrc| 12 +- main/cui/source/dialogs/zoom.cxx | 356 ++--- main/cui/source/dialogs/zoom.hrc | 48 +-- main/cui/source/options/doclinkdialog.src | 78 ++--- main/cui/source/options/fontsubs.src | 24 +- main/cui/source/options/optsave.src| 63 ++-- .../res/commandimagelist/lc_helpmenu.png | Bin 1623 -> 0 bytes .../res/commandimagelist/lch_helpmenu.png | Bin 208 -> 0 bytes .../res/commandimagelist/sc_helpmenu.png | Bin 802 -> 0 bytes .../res/commandimagelist/sch_helpmenu.png | Bin 167 -> 0 bytes .../primitive2d/controlprimitive2d.hxx | 4 +- main/editeng/source/misc/unolingu.cxx | 2 +- main/embeddedobj/source/msole/olepersist.cxx | 46 +-- main/extensions.lst| 2 +- main/forms/source/xforms/submission/replace.cxx| 2 +- .../source/xforms/submission/submission_get.cxx| 6 +- .../source/xforms/submission/submission_post.cxx | 2 +- main/framework/test/typecfg/cfgview.cxx| 2 +- .../source/text/shared/00/0402.xhp | 2 +- main/linguistic/source/misc.cxx| 2 +- .../classic/classic_images.tar.gz | Bin 1355547 -> 1364891 bytes .../industrial/res/commandimagelist/lc_adjust.png | Bin 905 -> 572 bytes .../industrial/res/commandimagelist/lc_draw.png| Bin 882 -> 870 bytes .../res/commandimagelist/lc_helpmenu.png | Bin 652 -> 0 bytes .../res/commandimagelist/lc_symbolcatalogue.png| Bin 558 -> 300 bytes .../industrial/res/commandimagelist/sc_adjust.png | Bin 711 -> 291 bytes .../industrial/res/commandimagelist/sc_draw.png| Bin 763 -> 253 bytes .../res/commandimagelist/sc_helpmenu.png | Bin 275 -> 0 bytes .../res/commandimagelist/sc_symbolcatalogue.png| Bin 424 -> 124 bytes main/packimages/Makefile | 8 +- main/packimages/Module_packimages.mk | 11 +- main/packimages/Package_packimages.mk | 11 +- main/psprint_config/configuration/psprint.conf | 2 +- .../main/java/ifc/frame/_XNotifyingDispatch.java | 2 +- main/sal/rtl/source/unload.cxx | 2 +- main/scp2/source/ooo/file_ooo.scp | 2 +- main/scp2/source/ooo/module_hidden_ooo.scp | 3 +- main/sd/source/ui/inc/OutlineView.hxx | 2 +- main/sfx2/sdi/sfx.sdi | 295 + main/sot/source/sdstor/stgdir.hxx | 2 +- .../sun/star/wizards/agenda/AgendaTemplate.java| 52 +-- .../com/sun/star/wizards/web/ImageListDialog.java | 6 +- .../xmerge/source/palmtests/qa/lib/converterlib.pm | 2 +- main/xmloff/source/text/txtparai.cxx | 2 +- 45 files changed, 559 insertions(+), 584 deletions(-) delete mode 100644 main/default_images/res/commandimagelist/lc_helpmenu.png delete mode 100644 main/default_images/res/commandimagelist/lch_helpmenu.png delete mode 100644 main/default_images/res/commandimagelist/sc_helpmenu.png delete mode 100644 main/default_images/res/commandimagelist/sch_helpmenu.png delete mode 100644 main/ooo_custom_images/industrial/res/commandimagelist/lc_helpmenu.png delete mode 100644 main/ooo_custom_images/industrial/res/commandimagelist/sc_helpmenu.png
(openoffice) branch AOO41X updated: Updated English dictionary
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new f369601bd7 Updated English dictionary f369601bd7 is described below commit f369601bd71bcc40ad01f81d672342da3e15be56 Author: mseidel AuthorDate: Sun Jun 2 13:23:46 2024 +0200 Updated English dictionary --- main/extensions.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/extensions.lst b/main/extensions.lst index d296c27ba9..5e34823d1f 100644 --- a/main/extensions.lst +++ b/main/extensions.lst @@ -39,7 +39,7 @@ # English dictionary [ language=en.* || language=de || language=it ] -60871c958bbca8a67d1ce1c142805cdf https://sourceforge.net/projects/aoo-extensions/files/17102/102/dict-en-20240501_aoo.oxt/download "dict-en.oxt" +b6bdaca58830037d177dc9f0512145f0 https://sourceforge.net/projects/aoo-extensions/files/17102/103/dict-en-20240601_aoo.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ]
(openoffice) branch AOO42X updated: Updated English dictionary
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new bcaef009a6 Updated English dictionary bcaef009a6 is described below commit bcaef009a6b99c95d4d12b68a3b4d3b4a561fcea Author: mseidel AuthorDate: Sun Jun 2 13:20:39 2024 +0200 Updated English dictionary (cherry picked from commit a7d8910e9bcf454119ec119145a1f45e1bd58d7e) --- main/extensions.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/extensions.lst b/main/extensions.lst index a0de45d02d..07dcfe95df 100644 --- a/main/extensions.lst +++ b/main/extensions.lst @@ -72,7 +72,7 @@ # English (en_AU, en_CA, en_GB, en_US, en_ZA) dictionary [ language=en.* || language=de || language=it ] - 60871c958bbca8a67d1ce1c142805cdf https://sourceforge.net/projects/aoo-extensions/files/17102/102/dict-en-20240501_aoo.oxt/download "dict-en.oxt" + b6bdaca58830037d177dc9f0512145f0 https://sourceforge.net/projects/aoo-extensions/files/17102/103/dict-en-20240601_aoo.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ]
(openoffice) branch trunk updated: Updated English dictionary
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new a7d8910e9b Updated English dictionary a7d8910e9b is described below commit a7d8910e9bcf454119ec119145a1f45e1bd58d7e Author: mseidel AuthorDate: Sun Jun 2 13:20:39 2024 +0200 Updated English dictionary --- main/extensions.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/extensions.lst b/main/extensions.lst index a0de45d02d..07dcfe95df 100644 --- a/main/extensions.lst +++ b/main/extensions.lst @@ -72,7 +72,7 @@ # English (en_AU, en_CA, en_GB, en_US, en_ZA) dictionary [ language=en.* || language=de || language=it ] - 60871c958bbca8a67d1ce1c142805cdf https://sourceforge.net/projects/aoo-extensions/files/17102/102/dict-en-20240501_aoo.oxt/download "dict-en.oxt" + b6bdaca58830037d177dc9f0512145f0 https://sourceforge.net/projects/aoo-extensions/files/17102/103/dict-en-20240601_aoo.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ]
(openoffice) 01/01: Merge branch 'trunk' into Pilot-Pirx-iconset
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git commit 9e02cffec63d47a0928ca44205d3cb817dcc6b5d Merge: 24ff2f5488 76447f04cc Author: mseidel AuthorDate: Sat Jun 1 22:25:10 2024 +0200 Merge branch 'trunk' into Pilot-Pirx-iconset main/sfx2/sdi/sfx.sdi | 295 +- 1 file changed, 146 insertions(+), 149 deletions(-)
(openoffice) branch Pilot-Pirx-iconset updated (24ff2f5488 -> 9e02cffec6)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a change to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git from 24ff2f5488 Merge branch 'trunk' into Pilot-Pirx-iconset add 76447f04cc Remove HelpMenu from customization dialog new 9e02cffec6 Merge branch 'trunk' into Pilot-Pirx-iconset The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: main/sfx2/sdi/sfx.sdi | 295 +- 1 file changed, 146 insertions(+), 149 deletions(-)
(openoffice) branch AOO41X updated: Remove HelpMenu from customization dialog
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new 0b4b6fc780 Remove HelpMenu from customization dialog 0b4b6fc780 is described below commit 0b4b6fc78023c52e37b1e9597cec155e173c8d5c Author: mseidel AuthorDate: Sat Jun 1 21:14:00 2024 +0200 Remove HelpMenu from customization dialog (cherry picked from commit 76447f04cce8ec63054985714b34ce894ddd422e) --- main/sfx2/sdi/sfx.sdi | 295 +- 1 file changed, 146 insertions(+), 149 deletions(-) diff --git a/main/sfx2/sdi/sfx.sdi b/main/sfx2/sdi/sfx.sdi index cd6bf0eef7..77ac3065b6 100644 --- a/main/sfx2/sdi/sfx.sdi +++ b/main/sfx2/sdi/sfx.sdi @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,27 +7,25 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - //-- SfxBoolItem _SwitchViewShell0 SID_VIEWSHELL0 [ /* flags: */ AutoUpdate = FALSE, -Cachable = Cachable, + Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, HasDialog = FALSE, @@ -925,7 +923,7 @@ SfxVoidItem ClearHistory SID_CLEARHISTORY [ /* flags: */ AutoUpdate = FALSE, -Cachable = Cachable, + Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, HasDialog = FALSE, @@ -1818,7 +1816,7 @@ SfxVoidItem FormatMenu SID_FORMATMENU /* config: */ AccelConfig = FALSE, -MenuConfig = FALSE, + MenuConfig = FALSE, StatusBarConfig = FALSE, ToolBoxConfig = FALSE, GroupId = GID_EDIT; @@ -2710,7 +2708,7 @@ SfxVoidItem HelpMenu SID_HELPMENU /* config: */ AccelConfig = FALSE, - MenuConfig = TRUE, + MenuConfig = FALSE, StatusBarConfig = FALSE, ToolBoxConfig = FALSE, GroupId = GID_APPLICATION; @@ -2950,11 +2948,11 @@ SfxBoolItem InsertHyperlink SID_HYPERLINK_INSERT //-- SfxVoidItem InsertObjectFloatingFrame SID_INSERT_FLOATINGFRAME ( -SfxStringItem Name FN_PARAM_1, -SfxStringItem URL FN_PARAM_2, -SvxSizeItem MarginFN_PARAM_3, -SfxByteItem ScrollingMode FN_PARAM_4, -SfxBoolItem IsBorder FN_PARAM_5 + SfxStringItem Name FN_PARAM_1, + SfxStringItem URL FN_PARAM_2, + SvxSizeItem Margin FN_PARAM_3, + SfxByteItem ScrollingMode FN_PARAM_4, + SfxBoolItem IsBorderFN_PARAM_5 ) [ /* flags: */ @@ -4264,25 +4262,25 @@ SfxObjectItem WebHtml SID_WEBHTML SfxObjectItem OpenHyperlink SID_OPENHYPERLINK (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem OpenFlags SID_OPTIONS,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION,SfxStringItem Referer SID_REFERER) [ -/* flags: */ -AutoUpdate = FALSE, -Cachable = Cachable, -FastCall = FALSE, -HasCoreId = FALSE, -HasDialog = TRUE, -ReadOnlyDoc = TRUE, -Toggle = FALSE, -Container = TRUE, -RecordAbsolute = FALSE, -RecordPerSet; -Asynchron; + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = TRUE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; -/* config: */ -AccelConfig = FALSE, -MenuConfig = FALSE, -StatusBarConfig = FALSE, -ToolBoxConfig = FALSE, -GroupId = GID_APPLICATION; + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + Group
(openoffice) branch AOO42X updated: Remove HelpMenu from customization dialog
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 6521cac3ac Remove HelpMenu from customization dialog 6521cac3ac is described below commit 6521cac3ac04f042fcab08d363326db01f6eaf52 Author: mseidel AuthorDate: Sat Jun 1 21:14:00 2024 +0200 Remove HelpMenu from customization dialog (cherry picked from commit 76447f04cce8ec63054985714b34ce894ddd422e) --- main/sfx2/sdi/sfx.sdi | 295 +- 1 file changed, 146 insertions(+), 149 deletions(-) diff --git a/main/sfx2/sdi/sfx.sdi b/main/sfx2/sdi/sfx.sdi index cd6bf0eef7..77ac3065b6 100644 --- a/main/sfx2/sdi/sfx.sdi +++ b/main/sfx2/sdi/sfx.sdi @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,27 +7,25 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - //-- SfxBoolItem _SwitchViewShell0 SID_VIEWSHELL0 [ /* flags: */ AutoUpdate = FALSE, -Cachable = Cachable, + Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, HasDialog = FALSE, @@ -925,7 +923,7 @@ SfxVoidItem ClearHistory SID_CLEARHISTORY [ /* flags: */ AutoUpdate = FALSE, -Cachable = Cachable, + Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, HasDialog = FALSE, @@ -1818,7 +1816,7 @@ SfxVoidItem FormatMenu SID_FORMATMENU /* config: */ AccelConfig = FALSE, -MenuConfig = FALSE, + MenuConfig = FALSE, StatusBarConfig = FALSE, ToolBoxConfig = FALSE, GroupId = GID_EDIT; @@ -2710,7 +2708,7 @@ SfxVoidItem HelpMenu SID_HELPMENU /* config: */ AccelConfig = FALSE, - MenuConfig = TRUE, + MenuConfig = FALSE, StatusBarConfig = FALSE, ToolBoxConfig = FALSE, GroupId = GID_APPLICATION; @@ -2950,11 +2948,11 @@ SfxBoolItem InsertHyperlink SID_HYPERLINK_INSERT //-- SfxVoidItem InsertObjectFloatingFrame SID_INSERT_FLOATINGFRAME ( -SfxStringItem Name FN_PARAM_1, -SfxStringItem URL FN_PARAM_2, -SvxSizeItem MarginFN_PARAM_3, -SfxByteItem ScrollingMode FN_PARAM_4, -SfxBoolItem IsBorder FN_PARAM_5 + SfxStringItem Name FN_PARAM_1, + SfxStringItem URL FN_PARAM_2, + SvxSizeItem Margin FN_PARAM_3, + SfxByteItem ScrollingMode FN_PARAM_4, + SfxBoolItem IsBorderFN_PARAM_5 ) [ /* flags: */ @@ -4264,25 +4262,25 @@ SfxObjectItem WebHtml SID_WEBHTML SfxObjectItem OpenHyperlink SID_OPENHYPERLINK (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem OpenFlags SID_OPTIONS,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION,SfxStringItem Referer SID_REFERER) [ -/* flags: */ -AutoUpdate = FALSE, -Cachable = Cachable, -FastCall = FALSE, -HasCoreId = FALSE, -HasDialog = TRUE, -ReadOnlyDoc = TRUE, -Toggle = FALSE, -Container = TRUE, -RecordAbsolute = FALSE, -RecordPerSet; -Asynchron; + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = TRUE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; -/* config: */ -AccelConfig = FALSE, -MenuConfig = FALSE, -StatusBarConfig = FALSE, -ToolBoxConfig = FALSE, -GroupId = GID_APPLICATION; + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + Group
(openoffice) branch trunk updated: Remove HelpMenu from customization dialog
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 76447f04cc Remove HelpMenu from customization dialog 76447f04cc is described below commit 76447f04cce8ec63054985714b34ce894ddd422e Author: mseidel AuthorDate: Sat Jun 1 21:14:00 2024 +0200 Remove HelpMenu from customization dialog --- main/sfx2/sdi/sfx.sdi | 295 +- 1 file changed, 146 insertions(+), 149 deletions(-) diff --git a/main/sfx2/sdi/sfx.sdi b/main/sfx2/sdi/sfx.sdi index cd6bf0eef7..77ac3065b6 100644 --- a/main/sfx2/sdi/sfx.sdi +++ b/main/sfx2/sdi/sfx.sdi @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,27 +7,25 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - //-- SfxBoolItem _SwitchViewShell0 SID_VIEWSHELL0 [ /* flags: */ AutoUpdate = FALSE, -Cachable = Cachable, + Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, HasDialog = FALSE, @@ -925,7 +923,7 @@ SfxVoidItem ClearHistory SID_CLEARHISTORY [ /* flags: */ AutoUpdate = FALSE, -Cachable = Cachable, + Cachable = Cachable, FastCall = FALSE, HasCoreId = FALSE, HasDialog = FALSE, @@ -1818,7 +1816,7 @@ SfxVoidItem FormatMenu SID_FORMATMENU /* config: */ AccelConfig = FALSE, -MenuConfig = FALSE, + MenuConfig = FALSE, StatusBarConfig = FALSE, ToolBoxConfig = FALSE, GroupId = GID_EDIT; @@ -2710,7 +2708,7 @@ SfxVoidItem HelpMenu SID_HELPMENU /* config: */ AccelConfig = FALSE, - MenuConfig = TRUE, + MenuConfig = FALSE, StatusBarConfig = FALSE, ToolBoxConfig = FALSE, GroupId = GID_APPLICATION; @@ -2950,11 +2948,11 @@ SfxBoolItem InsertHyperlink SID_HYPERLINK_INSERT //-- SfxVoidItem InsertObjectFloatingFrame SID_INSERT_FLOATINGFRAME ( -SfxStringItem Name FN_PARAM_1, -SfxStringItem URL FN_PARAM_2, -SvxSizeItem MarginFN_PARAM_3, -SfxByteItem ScrollingMode FN_PARAM_4, -SfxBoolItem IsBorder FN_PARAM_5 + SfxStringItem Name FN_PARAM_1, + SfxStringItem URL FN_PARAM_2, + SvxSizeItem Margin FN_PARAM_3, + SfxByteItem ScrollingMode FN_PARAM_4, + SfxBoolItem IsBorderFN_PARAM_5 ) [ /* flags: */ @@ -4264,25 +4262,25 @@ SfxObjectItem WebHtml SID_WEBHTML SfxObjectItem OpenHyperlink SID_OPENHYPERLINK (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem OpenFlags SID_OPTIONS,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION,SfxStringItem Referer SID_REFERER) [ -/* flags: */ -AutoUpdate = FALSE, -Cachable = Cachable, -FastCall = FALSE, -HasCoreId = FALSE, -HasDialog = TRUE, -ReadOnlyDoc = TRUE, -Toggle = FALSE, -Container = TRUE, -RecordAbsolute = FALSE, -RecordPerSet; -Asynchron; + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = TRUE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; -/* config: */ -AccelConfig = FALSE, -MenuConfig = FALSE, -StatusBarConfig = FALSE, -ToolBoxConfig = FALSE, -GroupId = GID_APPLICATION; + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_APPLICATION; ] //-- @@ -4504,7 +4502,7
(openoffice) branch AOO41X updated: Remove unused helpmenu.png
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new c9d10e5002 Remove unused helpmenu.png c9d10e5002 is described below commit c9d10e500284e960188136c698865e7ca047d4b9 Author: mseidel AuthorDate: Sat Jun 1 17:06:58 2024 +0200 Remove unused helpmenu.png --- .../res/commandimagelist/lc_helpmenu.png | Bin 1623 -> 0 bytes .../res/commandimagelist/lch_helpmenu.png | Bin 208 -> 0 bytes .../res/commandimagelist/sc_helpmenu.png | Bin 802 -> 0 bytes .../res/commandimagelist/sch_helpmenu.png | Bin 167 -> 0 bytes .../classic/classic_images.tar.gz | Bin 1728067 -> 1727810 bytes .../res/commandimagelist/lc_helpmenu.png | Bin 652 -> 0 bytes .../res/commandimagelist/sc_helpmenu.png | Bin 275 -> 0 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/res/commandimagelist/lc_helpmenu.png b/main/default_images/res/commandimagelist/lc_helpmenu.png deleted file mode 100644 index 1e2a36797b..00 Binary files a/main/default_images/res/commandimagelist/lc_helpmenu.png and /dev/null differ diff --git a/main/default_images/res/commandimagelist/lch_helpmenu.png b/main/default_images/res/commandimagelist/lch_helpmenu.png deleted file mode 100644 index b1b4409ccc..00 Binary files a/main/default_images/res/commandimagelist/lch_helpmenu.png and /dev/null differ diff --git a/main/default_images/res/commandimagelist/sc_helpmenu.png b/main/default_images/res/commandimagelist/sc_helpmenu.png deleted file mode 100644 index 001180acdd..00 Binary files a/main/default_images/res/commandimagelist/sc_helpmenu.png and /dev/null differ diff --git a/main/default_images/res/commandimagelist/sch_helpmenu.png b/main/default_images/res/commandimagelist/sch_helpmenu.png deleted file mode 100644 index fd5ce17dac..00 Binary files a/main/default_images/res/commandimagelist/sch_helpmenu.png and /dev/null differ diff --git a/main/ooo_custom_images/classic/classic_images.tar.gz b/main/ooo_custom_images/classic/classic_images.tar.gz index acd9194542..0b8870ba76 100644 Binary files a/main/ooo_custom_images/classic/classic_images.tar.gz and b/main/ooo_custom_images/classic/classic_images.tar.gz differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/lc_helpmenu.png b/main/ooo_custom_images/industrial/res/commandimagelist/lc_helpmenu.png deleted file mode 100644 index 9837208748..00 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/lc_helpmenu.png and /dev/null differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/sc_helpmenu.png b/main/ooo_custom_images/industrial/res/commandimagelist/sc_helpmenu.png deleted file mode 100644 index 5a5a2ba3e9..00 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/sc_helpmenu.png and /dev/null differ
(openoffice) branch AOO41X updated: Corrected strings in various SDF
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new b431bcd69a Corrected strings in various SDF b431bcd69a is described below commit b431bcd69afbe3e8e560beda475063201cbcf898 Author: mseidel AuthorDate: Sat Jun 1 16:58:47 2024 +0200 Corrected strings in various SDF --- extras/l10n/source/ast/localize.sdf | 2 +- extras/l10n/source/bg/localize.sdf| 2 +- extras/l10n/source/ca-XR/localize.sdf | 2 +- extras/l10n/source/ca-XV/localize.sdf | 2 +- extras/l10n/source/ca/localize.sdf| 2 +- extras/l10n/source/cs/localize.sdf| 2 +- extras/l10n/source/da/localize.sdf| 2 +- extras/l10n/source/el/localize.sdf| 2 +- extras/l10n/source/en-GB/localize.sdf | 2 +- extras/l10n/source/eu/localize.sdf| 2 +- extras/l10n/source/fi/localize.sdf| 2 +- extras/l10n/source/gd/localize.sdf| 2 +- extras/l10n/source/gl/localize.sdf| 2 +- extras/l10n/source/he/localize.sdf| 2 +- extras/l10n/source/hi/localize.sdf| 2 +- extras/l10n/source/hu/localize.sdf| 2 +- extras/l10n/source/ja/localize.sdf| 2 +- extras/l10n/source/km/localize.sdf| 2 +- extras/l10n/source/ko/localize.sdf| 2 +- extras/l10n/source/lt/localize.sdf| 2 +- extras/l10n/source/nb/localize.sdf| 2 +- extras/l10n/source/pt-BR/localize.sdf | 2 +- extras/l10n/source/ru/localize.sdf| 2 +- extras/l10n/source/sk/localize.sdf| 2 +- extras/l10n/source/sl/localize.sdf| 2 +- extras/l10n/source/sr/localize.sdf| 2 +- extras/l10n/source/sv/localize.sdf| 2 +- extras/l10n/source/ta/localize.sdf| 2 +- extras/l10n/source/th/localize.sdf| 2 +- extras/l10n/source/tr/localize.sdf| 2 +- extras/l10n/source/vi/localize.sdf| 2 +- extras/l10n/source/zh-CN/localize.sdf | 2 +- extras/l10n/source/zh-TW/localize.sdf | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/extras/l10n/source/ast/localize.sdf b/extras/l10n/source/ast/localize.sdf index 31667213fd..7bf9b35e4d 100644 --- a/extras/l10n/source/ast/localize.sdf +++ b/extras/l10n/source/ast/localize.sdf @@ -50069,7 +50069,7 @@ helpcontent2source\text\shared\00\0402.xhp 0 helppar_id3154365 8 0 ast \ helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3149765 9 0 ast Choose \Edit - Cut\ 20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3144762 565 0 ast \\Command\\Ctrl\\+X 20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3148744 10 0 ast On the \Standard\ Bar, click 20130618 17:22:18 -helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3145173 0 ast \\Icon\\ 20130618 17:22:18 +helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3145173 0 ast \\Icon\\ 20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3154153 11 0 ast Cut 20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3150742 12 0 ast Choose \Edit - Copy\ 20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3148923 566 0 ast \\Command\\Ctrl\\+C 20130618 17:22:18 diff --git a/extras/l10n/source/bg/localize.sdf b/extras/l10n/source/bg/localize.sdf index 2a81520c92..1c59ecbfc5 100644 --- a/extras/l10n/source/bg/localize.sdf +++ b/extras/l10n/source/bg/localize.sdf @@ -50071,7 +50071,7 @@ helpcontent2source\text\shared\00\0402.xhp 0 helppar_id3154365 8 0 bg \< helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3149765 9 0 bg Изберете \Редактиране - Изрязване\ 20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3144762 565 0 bg \\Command\\Ctrl\\+X 20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3148744 10 0 bg В лентата \Стандартни\ щракнете върху20130618 17:22:18 -helpcontent2 source\text\shared\00\0402.xhp
(openoffice) 01/01: Merge branch 'trunk' into Pilot-Pirx-iconset
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git commit 24ff2f5488c8217cab9a8e99da486dd7e15d Merge: 5cfc63abc6 1dbb066d0b Author: mseidel AuthorDate: Thu May 30 23:50:35 2024 +0200 Merge branch 'trunk' into Pilot-Pirx-iconset main/cui/source/dialogs/zoom.cxx | 356 +++ main/cui/source/dialogs/zoom.hrc | 48 +++--- 2 files changed, 201 insertions(+), 203 deletions(-)
(openoffice) branch Pilot-Pirx-iconset updated (5cfc63abc6 -> 24ff2f5488)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a change to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git from 5cfc63abc6 Add additional icons add 1dbb066d0b Small maintenance cleanup new 24ff2f5488 Merge branch 'trunk' into Pilot-Pirx-iconset The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: main/cui/source/dialogs/zoom.cxx | 356 +++ main/cui/source/dialogs/zoom.hrc | 48 +++--- 2 files changed, 201 insertions(+), 203 deletions(-)
(openoffice) branch AOO42X updated: Small maintenance cleanup
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 103e116f57 Small maintenance cleanup 103e116f57 is described below commit 103e116f579c8ed653c9e66fda14aba80b8f45e9 Author: mseidel AuthorDate: Thu May 30 23:06:01 2024 +0200 Small maintenance cleanup (cherry picked from commit 1dbb066d0bc4af5666a35236f7f416596143a5d3) --- main/cui/source/dialogs/zoom.cxx | 356 +++ main/cui/source/dialogs/zoom.hrc | 48 +++--- 2 files changed, 201 insertions(+), 203 deletions(-) diff --git a/main/cui/source/dialogs/zoom.cxx b/main/cui/source/dialogs/zoom.cxx index ef323ee19d..984149c600 100644 --- a/main/cui/source/dialogs/zoom.cxx +++ b/main/cui/source/dialogs/zoom.cxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,20 +7,18 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" @@ -60,9 +58,9 @@ sal_uInt16 SvxZoomDialog::GetFactor() const { -if ( a100Btn.IsChecked() ) + if ( a100Btn.IsChecked() ) return 100; -if ( aUserBtn.IsChecked() ) + if ( aUserBtn.IsChecked() ) return (sal_uInt16)aUserEdit.GetValue(); else return SPECIAL_FACTOR; @@ -76,12 +74,12 @@ void SvxZoomDialog::SetFactor( sal_uInt16 nNewFactor, sal_uInt16 nBtnId ) if ( !nBtnId ) { -if ( nNewFactor == 100 ) + if ( nNewFactor == 100 ) { a100Btn.Check(); a100Btn.GrabFocus(); } -else + else { aUserBtn.Check(); aUserEdit.Enable(); @@ -117,20 +115,20 @@ void SvxZoomDialog::HideButton( sal_uInt16 nBtnId ) { switch ( nBtnId ) { - case ZOOMBTN_OPTIMAL: // Optimal-Button + case ZOOMBTN_OPTIMAL: // Optimal button aOptimalBtn.Hide(); break; - case ZOOMBTN_PAGEWIDTH: // Seitenbreite-Button + case ZOOMBTN_PAGEWIDTH: // Page Width button aPageWidthBtn.Hide(); break; - case ZOOMBTN_WHOLEPAGE: // Ganze Seite-Button + case ZOOMBTN_WHOLEPAGE: // Entire Page button aWholePageBtn.Hide(); break; default: - DBG_ERROR( "Falsche Button-Nummer!!!" ); + DBG_ERROR( "Wrong button number!" ); } } @@ -139,9 +137,9 @@ void SvxZoomDialog::HideButton( sal_uInt16 nBtnId ) void SvxZoomDialog::SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) { DBG_ASSERT( nMin < nMax, "invalid limits" ); -aUserEdit.SetMin( nMin ); + aUserEdit.SetMin( nMin ); aUserEdit.SetFirst( nMin ); -aUserEdit.SetMax( nMax ); + aUserEdit.SetMax( nMax ); aUserEdit.SetLast( nMax ); } @@ -151,56 +149,56 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_ZOOM ) ), -aZoomFl ( this, CUI_RES( FL_ZOOM ) ), -aOptimalBtn ( this, CUI_RES( BTN_OPTIMAL ) ), -aWholePageBtn ( this, CUI_RES( BTN_WHOLE_PAGE ) ), -aPageWidthBtn ( this, CUI_RES( BTN_PAGE_WIDTH ) ), -a100Btn ( this, CUI_RES( BTN_100 ) ), -aUserBtn( this, CUI_RES( BTN_USER ) ), - aUserEdit ( this, CUI_RES( ED_USER ) ), - -aViewLayoutFl ( this, CUI_RES( FL_VIEWLAYOUT ) ), -aAutomaticBtn ( this, CUI_RES( BTN_AUTOMATIC ) ), -aSingleBtn ( this, CUI_RES( BTN_SINGLE ) ), -aColumnsBtn ( this, CUI_RES( BTN_COLUMNS ) ), -aColumnsEdit( this, CUI_RES( ED_COLUMNS ) ), -aBookModeChk( this, CUI_R
(openoffice) branch trunk updated: Small maintenance cleanup
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 1dbb066d0b Small maintenance cleanup 1dbb066d0b is described below commit 1dbb066d0bc4af5666a35236f7f416596143a5d3 Author: mseidel AuthorDate: Thu May 30 23:06:01 2024 +0200 Small maintenance cleanup --- main/cui/source/dialogs/zoom.cxx | 356 +++ main/cui/source/dialogs/zoom.hrc | 48 +++--- 2 files changed, 201 insertions(+), 203 deletions(-) diff --git a/main/cui/source/dialogs/zoom.cxx b/main/cui/source/dialogs/zoom.cxx index ef323ee19d..984149c600 100644 --- a/main/cui/source/dialogs/zoom.cxx +++ b/main/cui/source/dialogs/zoom.cxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,20 +7,18 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" @@ -60,9 +58,9 @@ sal_uInt16 SvxZoomDialog::GetFactor() const { -if ( a100Btn.IsChecked() ) + if ( a100Btn.IsChecked() ) return 100; -if ( aUserBtn.IsChecked() ) + if ( aUserBtn.IsChecked() ) return (sal_uInt16)aUserEdit.GetValue(); else return SPECIAL_FACTOR; @@ -76,12 +74,12 @@ void SvxZoomDialog::SetFactor( sal_uInt16 nNewFactor, sal_uInt16 nBtnId ) if ( !nBtnId ) { -if ( nNewFactor == 100 ) + if ( nNewFactor == 100 ) { a100Btn.Check(); a100Btn.GrabFocus(); } -else + else { aUserBtn.Check(); aUserEdit.Enable(); @@ -117,20 +115,20 @@ void SvxZoomDialog::HideButton( sal_uInt16 nBtnId ) { switch ( nBtnId ) { - case ZOOMBTN_OPTIMAL: // Optimal-Button + case ZOOMBTN_OPTIMAL: // Optimal button aOptimalBtn.Hide(); break; - case ZOOMBTN_PAGEWIDTH: // Seitenbreite-Button + case ZOOMBTN_PAGEWIDTH: // Page Width button aPageWidthBtn.Hide(); break; - case ZOOMBTN_WHOLEPAGE: // Ganze Seite-Button + case ZOOMBTN_WHOLEPAGE: // Entire Page button aWholePageBtn.Hide(); break; default: - DBG_ERROR( "Falsche Button-Nummer!!!" ); + DBG_ERROR( "Wrong button number!" ); } } @@ -139,9 +137,9 @@ void SvxZoomDialog::HideButton( sal_uInt16 nBtnId ) void SvxZoomDialog::SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) { DBG_ASSERT( nMin < nMax, "invalid limits" ); -aUserEdit.SetMin( nMin ); + aUserEdit.SetMin( nMin ); aUserEdit.SetFirst( nMin ); -aUserEdit.SetMax( nMax ); + aUserEdit.SetMax( nMax ); aUserEdit.SetLast( nMax ); } @@ -151,56 +149,56 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_ZOOM ) ), -aZoomFl ( this, CUI_RES( FL_ZOOM ) ), -aOptimalBtn ( this, CUI_RES( BTN_OPTIMAL ) ), -aWholePageBtn ( this, CUI_RES( BTN_WHOLE_PAGE ) ), -aPageWidthBtn ( this, CUI_RES( BTN_PAGE_WIDTH ) ), -a100Btn ( this, CUI_RES( BTN_100 ) ), -aUserBtn( this, CUI_RES( BTN_USER ) ), - aUserEdit ( this, CUI_RES( ED_USER ) ), - -aViewLayoutFl ( this, CUI_RES( FL_VIEWLAYOUT ) ), -aAutomaticBtn ( this, CUI_RES( BTN_AUTOMATIC ) ), -aSingleBtn ( this, CUI_RES( BTN_SINGLE ) ), -aColumnsBtn ( this, CUI_RES( BTN_COLUMNS ) ), -aColumnsEdit( this, CUI_RES( ED_COLUMNS ) ), -aBookModeChk( this, CUI_RES( CHK_BOOK ) ), - -aBottomFl ( this, CUI_RES( FL_BOTTOM ) ), -a
(openoffice) branch Pilot-Pirx-iconset updated: Add additional icons
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/Pilot-Pirx-iconset by this push: new 5cfc63abc6 Add additional icons 5cfc63abc6 is described below commit 5cfc63abc60bb38599213934eec25367dba1a89c Author: mseidel AuthorDate: Sun May 26 14:56:54 2024 +0200 Add additional icons --- main/ooo_custom_images/remixdark/res/helpimg/tip.png | Bin 0 -> 1195 bytes .../remixdark/res/helpimg/tip_small.png | Bin 0 -> 650 bytes .../remixdark/svtools/res/helpagent.png | Bin 1474 -> 1515 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/ooo_custom_images/remixdark/res/helpimg/tip.png b/main/ooo_custom_images/remixdark/res/helpimg/tip.png new file mode 100644 index 00..ea6f529a1e Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/helpimg/tip.png differ diff --git a/main/ooo_custom_images/remixdark/res/helpimg/tip_small.png b/main/ooo_custom_images/remixdark/res/helpimg/tip_small.png new file mode 100644 index 00..97b385101c Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/helpimg/tip_small.png differ diff --git a/main/ooo_custom_images/remixdark/svtools/res/helpagent.png b/main/ooo_custom_images/remixdark/svtools/res/helpagent.png index 13ebc3d22d..715bcb058e 100644 Binary files a/main/ooo_custom_images/remixdark/svtools/res/helpagent.png and b/main/ooo_custom_images/remixdark/svtools/res/helpagent.png differ
(openoffice) branch Pilot-Pirx-iconset updated: Add additional icons
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/Pilot-Pirx-iconset by this push: new bdba472b1d Add additional icons bdba472b1d is described below commit bdba472b1dd34a47daebb9995474fe9784e3dd5e Author: mseidel AuthorDate: Sun May 26 12:51:10 2024 +0200 Add additional icons --- .../res/commandimagelist/lc_symbolcatalogue.png | Bin 0 -> 460 bytes .../res/commandimagelist/sc_symbolcatalogue.png | Bin 0 -> 367 bytes .../remixdark/svtools/res/helpagent.png | Bin 0 -> 1474 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_symbolcatalogue.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_symbolcatalogue.png new file mode 100644 index 00..9bb20ab0ca Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_symbolcatalogue.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_symbolcatalogue.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_symbolcatalogue.png new file mode 100644 index 00..d805fb0cbb Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_symbolcatalogue.png differ diff --git a/main/ooo_custom_images/remixdark/svtools/res/helpagent.png b/main/ooo_custom_images/remixdark/svtools/res/helpagent.png new file mode 100644 index 00..13ebc3d22d Binary files /dev/null and b/main/ooo_custom_images/remixdark/svtools/res/helpagent.png differ
(openoffice) 01/01: Merge branch 'trunk' into Pilot-Pirx-iconset
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git commit 01b8ba02259665ec71039a9bd9dcab56e38f8a05 Merge: b5f310a73d ad9e0707f7 Author: mseidel AuthorDate: Sat May 25 23:09:04 2024 +0200 Merge branch 'trunk' into Pilot-Pirx-iconset .../industrial/res/commandimagelist/lc_adjust.png | Bin 905 -> 572 bytes .../industrial/res/commandimagelist/lc_draw.png | Bin 882 -> 870 bytes .../res/commandimagelist/lc_symbolcatalogue.png | Bin 558 -> 300 bytes .../industrial/res/commandimagelist/sc_adjust.png | Bin 711 -> 291 bytes .../industrial/res/commandimagelist/sc_draw.png | Bin 763 -> 253 bytes .../res/commandimagelist/sc_symbolcatalogue.png | Bin 424 -> 124 bytes 6 files changed, 0 insertions(+), 0 deletions(-)
(openoffice) branch Pilot-Pirx-iconset updated (b5f310a73d -> 01b8ba0225)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a change to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git from b5f310a73d Add additional icons add ad9e0707f7 Use correct Math icons in Industrial icon set new 01b8ba0225 Merge branch 'trunk' into Pilot-Pirx-iconset The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../industrial/res/commandimagelist/lc_adjust.png | Bin 905 -> 572 bytes .../industrial/res/commandimagelist/lc_draw.png | Bin 882 -> 870 bytes .../res/commandimagelist/lc_symbolcatalogue.png | Bin 558 -> 300 bytes .../industrial/res/commandimagelist/sc_adjust.png | Bin 711 -> 291 bytes .../industrial/res/commandimagelist/sc_draw.png | Bin 763 -> 253 bytes .../res/commandimagelist/sc_symbolcatalogue.png | Bin 424 -> 124 bytes 6 files changed, 0 insertions(+), 0 deletions(-)
(openoffice) branch AOO41X updated: Use correct Math icons in Industrial icon set
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new 1ec96bd408 Use correct Math icons in Industrial icon set 1ec96bd408 is described below commit 1ec96bd408afc7f4922a07e29024410a11b88e6b Author: mseidel AuthorDate: Sat May 25 23:06:00 2024 +0200 Use correct Math icons in Industrial icon set (cherry picked from commit ad9e0707f78a7c3b8ada86a9c6e266c0eec75ee0) --- .../industrial/res/commandimagelist/lc_adjust.png | Bin 905 -> 572 bytes .../industrial/res/commandimagelist/lc_draw.png | Bin 882 -> 870 bytes .../res/commandimagelist/lc_symbolcatalogue.png | Bin 558 -> 300 bytes .../industrial/res/commandimagelist/sc_adjust.png | Bin 711 -> 291 bytes .../industrial/res/commandimagelist/sc_draw.png | Bin 763 -> 253 bytes .../res/commandimagelist/sc_symbolcatalogue.png | Bin 424 -> 124 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/lc_adjust.png b/main/ooo_custom_images/industrial/res/commandimagelist/lc_adjust.png index b4b9b07c2d..21f2b5ab82 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/lc_adjust.png and b/main/ooo_custom_images/industrial/res/commandimagelist/lc_adjust.png differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/lc_draw.png b/main/ooo_custom_images/industrial/res/commandimagelist/lc_draw.png index d4de704286..088a0cc96b 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/lc_draw.png and b/main/ooo_custom_images/industrial/res/commandimagelist/lc_draw.png differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/lc_symbolcatalogue.png b/main/ooo_custom_images/industrial/res/commandimagelist/lc_symbolcatalogue.png index 8fa8c1c59b..fe66c5de2b 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/lc_symbolcatalogue.png and b/main/ooo_custom_images/industrial/res/commandimagelist/lc_symbolcatalogue.png differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/sc_adjust.png b/main/ooo_custom_images/industrial/res/commandimagelist/sc_adjust.png index 809f309caa..d4d78b7d1e 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/sc_adjust.png and b/main/ooo_custom_images/industrial/res/commandimagelist/sc_adjust.png differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/sc_draw.png b/main/ooo_custom_images/industrial/res/commandimagelist/sc_draw.png index b65c7c2fd8..5b95487222 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/sc_draw.png and b/main/ooo_custom_images/industrial/res/commandimagelist/sc_draw.png differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/sc_symbolcatalogue.png b/main/ooo_custom_images/industrial/res/commandimagelist/sc_symbolcatalogue.png index 2980f0060d..0406351bae 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/sc_symbolcatalogue.png and b/main/ooo_custom_images/industrial/res/commandimagelist/sc_symbolcatalogue.png differ
(openoffice) branch AOO42X updated: Use correct Math icons in Industrial icon set
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new b09c1ce670 Use correct Math icons in Industrial icon set b09c1ce670 is described below commit b09c1ce67065a6d547a21aa0339cc8a3454fbcd0 Author: mseidel AuthorDate: Sat May 25 23:06:00 2024 +0200 Use correct Math icons in Industrial icon set (cherry picked from commit ad9e0707f78a7c3b8ada86a9c6e266c0eec75ee0) --- .../industrial/res/commandimagelist/lc_adjust.png | Bin 905 -> 572 bytes .../industrial/res/commandimagelist/lc_draw.png | Bin 882 -> 870 bytes .../res/commandimagelist/lc_symbolcatalogue.png | Bin 558 -> 300 bytes .../industrial/res/commandimagelist/sc_adjust.png | Bin 711 -> 291 bytes .../industrial/res/commandimagelist/sc_draw.png | Bin 763 -> 253 bytes .../res/commandimagelist/sc_symbolcatalogue.png | Bin 424 -> 124 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/lc_adjust.png b/main/ooo_custom_images/industrial/res/commandimagelist/lc_adjust.png index b4b9b07c2d..21f2b5ab82 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/lc_adjust.png and b/main/ooo_custom_images/industrial/res/commandimagelist/lc_adjust.png differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/lc_draw.png b/main/ooo_custom_images/industrial/res/commandimagelist/lc_draw.png index d4de704286..088a0cc96b 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/lc_draw.png and b/main/ooo_custom_images/industrial/res/commandimagelist/lc_draw.png differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/lc_symbolcatalogue.png b/main/ooo_custom_images/industrial/res/commandimagelist/lc_symbolcatalogue.png index 8fa8c1c59b..fe66c5de2b 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/lc_symbolcatalogue.png and b/main/ooo_custom_images/industrial/res/commandimagelist/lc_symbolcatalogue.png differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/sc_adjust.png b/main/ooo_custom_images/industrial/res/commandimagelist/sc_adjust.png index 809f309caa..d4d78b7d1e 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/sc_adjust.png and b/main/ooo_custom_images/industrial/res/commandimagelist/sc_adjust.png differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/sc_draw.png b/main/ooo_custom_images/industrial/res/commandimagelist/sc_draw.png index b65c7c2fd8..5b95487222 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/sc_draw.png and b/main/ooo_custom_images/industrial/res/commandimagelist/sc_draw.png differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/sc_symbolcatalogue.png b/main/ooo_custom_images/industrial/res/commandimagelist/sc_symbolcatalogue.png index 2980f0060d..0406351bae 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/sc_symbolcatalogue.png and b/main/ooo_custom_images/industrial/res/commandimagelist/sc_symbolcatalogue.png differ
(openoffice) branch trunk updated: Use correct Math icons in Industrial icon set
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new ad9e0707f7 Use correct Math icons in Industrial icon set ad9e0707f7 is described below commit ad9e0707f78a7c3b8ada86a9c6e266c0eec75ee0 Author: mseidel AuthorDate: Sat May 25 23:06:00 2024 +0200 Use correct Math icons in Industrial icon set --- .../industrial/res/commandimagelist/lc_adjust.png | Bin 905 -> 572 bytes .../industrial/res/commandimagelist/lc_draw.png | Bin 882 -> 870 bytes .../res/commandimagelist/lc_symbolcatalogue.png | Bin 558 -> 300 bytes .../industrial/res/commandimagelist/sc_adjust.png | Bin 711 -> 291 bytes .../industrial/res/commandimagelist/sc_draw.png | Bin 763 -> 253 bytes .../res/commandimagelist/sc_symbolcatalogue.png | Bin 424 -> 124 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/lc_adjust.png b/main/ooo_custom_images/industrial/res/commandimagelist/lc_adjust.png index b4b9b07c2d..21f2b5ab82 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/lc_adjust.png and b/main/ooo_custom_images/industrial/res/commandimagelist/lc_adjust.png differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/lc_draw.png b/main/ooo_custom_images/industrial/res/commandimagelist/lc_draw.png index d4de704286..088a0cc96b 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/lc_draw.png and b/main/ooo_custom_images/industrial/res/commandimagelist/lc_draw.png differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/lc_symbolcatalogue.png b/main/ooo_custom_images/industrial/res/commandimagelist/lc_symbolcatalogue.png index 8fa8c1c59b..fe66c5de2b 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/lc_symbolcatalogue.png and b/main/ooo_custom_images/industrial/res/commandimagelist/lc_symbolcatalogue.png differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/sc_adjust.png b/main/ooo_custom_images/industrial/res/commandimagelist/sc_adjust.png index 809f309caa..d4d78b7d1e 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/sc_adjust.png and b/main/ooo_custom_images/industrial/res/commandimagelist/sc_adjust.png differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/sc_draw.png b/main/ooo_custom_images/industrial/res/commandimagelist/sc_draw.png index b65c7c2fd8..5b95487222 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/sc_draw.png and b/main/ooo_custom_images/industrial/res/commandimagelist/sc_draw.png differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/sc_symbolcatalogue.png b/main/ooo_custom_images/industrial/res/commandimagelist/sc_symbolcatalogue.png index 2980f0060d..0406351bae 100644 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/sc_symbolcatalogue.png and b/main/ooo_custom_images/industrial/res/commandimagelist/sc_symbolcatalogue.png differ
(openoffice) branch Pilot-Pirx-iconset updated: Add additional icons
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/Pilot-Pirx-iconset by this push: new b5f310a73d Add additional icons b5f310a73d is described below commit b5f310a73d969f1edbce94bcdafce290bee98c3e Author: mseidel AuthorDate: Sat May 25 01:04:55 2024 +0200 Add additional icons --- main/ooo_custom_images/remixdark/res/foldercl.png | Bin 195 -> 305 bytes main/ooo_custom_images/remixdark/res/folderop.png | Bin 259 -> 395 bytes .../remixdark/svx/res/slidecontrol.png | Bin 0 -> 344 bytes .../remixdark/svx/res/slidezoomin_11.png| Bin 0 -> 417 bytes .../remixdark/svx/res/slidezoomout_11.png | Bin 0 -> 418 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/ooo_custom_images/remixdark/res/foldercl.png b/main/ooo_custom_images/remixdark/res/foldercl.png index 6a934ecca1..fb633e3a14 100644 Binary files a/main/ooo_custom_images/remixdark/res/foldercl.png and b/main/ooo_custom_images/remixdark/res/foldercl.png differ diff --git a/main/ooo_custom_images/remixdark/res/folderop.png b/main/ooo_custom_images/remixdark/res/folderop.png index f423b8b421..c408b40fa7 100644 Binary files a/main/ooo_custom_images/remixdark/res/folderop.png and b/main/ooo_custom_images/remixdark/res/folderop.png differ diff --git a/main/ooo_custom_images/remixdark/svx/res/slidecontrol.png b/main/ooo_custom_images/remixdark/svx/res/slidecontrol.png new file mode 100644 index 00..a73a6f71fe Binary files /dev/null and b/main/ooo_custom_images/remixdark/svx/res/slidecontrol.png differ diff --git a/main/ooo_custom_images/remixdark/svx/res/slidezoomin_11.png b/main/ooo_custom_images/remixdark/svx/res/slidezoomin_11.png new file mode 100644 index 00..7938383e37 Binary files /dev/null and b/main/ooo_custom_images/remixdark/svx/res/slidezoomin_11.png differ diff --git a/main/ooo_custom_images/remixdark/svx/res/slidezoomout_11.png b/main/ooo_custom_images/remixdark/svx/res/slidezoomout_11.png new file mode 100644 index 00..ed5b671c95 Binary files /dev/null and b/main/ooo_custom_images/remixdark/svx/res/slidezoomout_11.png differ
(openoffice) branch Pilot-Pirx-iconset updated: Change icon size to 26x26
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/Pilot-Pirx-iconset by this push: new 1a22413c61 Change icon size to 26x26 1a22413c61 is described below commit 1a22413c61422f716ada8f896fc9899b18675385 Author: mseidel AuthorDate: Sat May 25 00:22:02 2024 +0200 Change icon size to 26x26 --- .../res/commandimagelist/lc_defaultbullet.png | Bin 0 -> 493 bytes .../res/commandimagelist/lc_exportdirecttopdf.png | Bin 352 -> 624 bytes .../res/commandimagelist/lc_formatpaintbrush.png | Bin 403 -> 917 bytes .../remixdark/res/commandimagelist/lc_helpindex.png| Bin 308 -> 971 bytes .../res/commandimagelist/lc_hyperlinkdialog.png| Bin 480 -> 1000 bytes .../remixdark/res/commandimagelist/lc_navigator.png| Bin 466 -> 919 bytes .../remixdark/res/commandimagelist/lc_open.png | Bin 307 -> 581 bytes .../remixdark/res/commandimagelist/lc_printpreview.png | Bin 316 -> 634 bytes .../remixdark/res/commandimagelist/lc_searchdialog.png | Bin 440 -> 766 bytes .../remixdark/res/commandimagelist/lc_sendmail.png | Bin 325 -> 616 bytes .../res/commandimagelist/lc_toggleanchortype.png | Bin 501 -> 806 bytes .../res/commandimagelist/sc_defaultbullet.png | Bin 0 -> 284 bytes .../res/commandimagelist/sc_exportdirecttopdf.png | Bin 279 -> 456 bytes .../res/commandimagelist/sc_formatpaintbrush.png | Bin 297 -> 582 bytes .../remixdark/res/commandimagelist/sc_helpindex.png| Bin 250 -> 600 bytes .../res/commandimagelist/sc_hyperlinkdialog.png| Bin 329 -> 593 bytes .../remixdark/res/commandimagelist/sc_navigator.png| Bin 340 -> 574 bytes .../remixdark/res/commandimagelist/sc_open.png | Bin 259 -> 395 bytes .../remixdark/res/commandimagelist/sc_printpreview.png | Bin 279 -> 446 bytes .../remixdark/res/commandimagelist/sc_searchdialog.png | Bin 318 -> 531 bytes .../remixdark/res/commandimagelist/sc_sendmail.png | Bin 242 -> 397 bytes .../res/commandimagelist/sc_toggleanchortype.png | Bin 349 -> 488 bytes 22 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_defaultbullet.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_defaultbullet.png new file mode 100644 index 00..c2f3298902 Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_defaultbullet.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_exportdirecttopdf.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_exportdirecttopdf.png index ae9b789970..a9aa6538d4 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_exportdirecttopdf.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_exportdirecttopdf.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_formatpaintbrush.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_formatpaintbrush.png index 8765ac1012..2f5442803f 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_formatpaintbrush.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_formatpaintbrush.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_helpindex.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_helpindex.png index d83e93b54d..a54bdd2b80 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_helpindex.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_helpindex.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_hyperlinkdialog.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_hyperlinkdialog.png index 5b17fea68c..e5ccffa2e8 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_hyperlinkdialog.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_hyperlinkdialog.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_navigator.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_navigator.png index b3dd40c5b9..fd47236d2f 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_navigator.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_navigator.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_open.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_open.png index ccecb0e742..36c3692c8e 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_open.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_open.png differ diff --git a/main/ooo_custom_images/remixdark/
(openoffice) branch Pilot-Pirx-iconset updated: Change icon size to 26x26
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/Pilot-Pirx-iconset by this push: new f9677fa1bf Change icon size to 26x26 f9677fa1bf is described below commit f9677fa1bf87ad765ea07e95b9bbacc5cb7d9c9d Author: mseidel AuthorDate: Fri May 24 23:09:09 2024 +0200 Change icon size to 26x26 --- .../remixdark/res/commandimagelist/lc_bold.png | Bin 246 -> 545 bytes .../remixdark/res/commandimagelist/lc_centerpara.png| Bin 141 -> 354 bytes .../remixdark/res/commandimagelist/lc_copy.png | Bin 202 -> 428 bytes .../remixdark/res/commandimagelist/lc_cut.png | Bin 718 -> 694 bytes .../res/commandimagelist/lc_decrementindent.png | Bin 199 -> 472 bytes .../remixdark/res/commandimagelist/lc_editdoc.png | Bin 280 -> 509 bytes .../res/commandimagelist/lc_incrementindent.png | Bin 180 -> 473 bytes .../remixdark/res/commandimagelist/lc_inserttable.png | Bin 155 -> 153 bytes .../remixdark/res/commandimagelist/lc_italic.png| Bin 258 -> 421 bytes .../remixdark/res/commandimagelist/lc_justifypara.png | Bin 136 -> 340 bytes .../remixdark/res/commandimagelist/lc_leftpara.png | Bin 146 -> 353 bytes .../remixdark/res/commandimagelist/lc_paste.png | Bin 186 -> 409 bytes .../remixdark/res/commandimagelist/lc_printdefault.png | Bin 222 -> 564 bytes .../remixdark/res/commandimagelist/lc_rightpara.png | Bin 134 -> 347 bytes .../remixdark/res/commandimagelist/lc_save.png | Bin 214 -> 438 bytes .../remixdark/res/commandimagelist/lc_underline.png | Bin 259 -> 435 bytes .../remixdark/res/commandimagelist/sc_bold.png | Bin 238 -> 362 bytes .../remixdark/res/commandimagelist/sc_centerpara.png| Bin 172 -> 253 bytes .../remixdark/res/commandimagelist/sc_copy.png | Bin 217 -> 305 bytes .../remixdark/res/commandimagelist/sc_cut.png | Bin 509 -> 479 bytes .../res/commandimagelist/sc_decrementindent.png | Bin 198 -> 289 bytes .../remixdark/res/commandimagelist/sc_editdoc.png | Bin 255 -> 358 bytes .../res/commandimagelist/sc_incrementindent.png | Bin 186 -> 276 bytes .../remixdark/res/commandimagelist/sc_inserttable.png | Bin 135 -> 132 bytes .../remixdark/res/commandimagelist/sc_italic.png| Bin 217 -> 295 bytes .../remixdark/res/commandimagelist/sc_justifypara.png | Bin 137 -> 211 bytes .../remixdark/res/commandimagelist/sc_leftpara.png | Bin 167 -> 233 bytes .../remixdark/res/commandimagelist/sc_paste.png | Bin 189 -> 299 bytes .../remixdark/res/commandimagelist/sc_printdefault.png | Bin 273 -> 367 bytes .../remixdark/res/commandimagelist/sc_rightpara.png | Bin 168 -> 233 bytes .../remixdark/res/commandimagelist/sc_save.png | Bin 213 -> 300 bytes .../remixdark/res/commandimagelist/sc_underline.png | Bin 213 -> 285 bytes 32 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_bold.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_bold.png index a4695aad85..6931929c94 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_bold.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_bold.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_centerpara.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_centerpara.png index ae115f3548..9314d0ecf7 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_centerpara.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_centerpara.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_copy.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_copy.png index 31969f5dfa..bca2b07753 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_copy.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_copy.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_cut.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_cut.png index d317ecd6e2..82764ef635 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_cut.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_cut.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_decrementindent.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_decrementindent.png index 9ba81583d7..6090a7e497 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_decrementindent.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_decrementindent.png d
(openoffice) branch Pilot-Pirx-iconset updated: Change icon size to 26x26
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/Pilot-Pirx-iconset by this push: new eab69aa886 Change icon size to 26x26 eab69aa886 is described below commit eab69aa8863729b34ab910410525932e164f075b Author: mseidel AuthorDate: Fri May 24 22:06:39 2024 +0200 Change icon size to 26x26 --- .../remixdark/res/commandimagelist/lc_cut.png | Bin 424 -> 718 bytes .../remixdark/res/commandimagelist/lc_inserttable.png | Bin 155 -> 155 bytes .../remixdark/res/commandimagelist/lc_redo.png | Bin 309 -> 619 bytes .../remixdark/res/commandimagelist/lc_undo.png | Bin 293 -> 631 bytes .../remixdark/res/commandimagelist/sc_cut.png | Bin 279 -> 509 bytes .../remixdark/res/commandimagelist/sc_inserttable.png | Bin 142 -> 135 bytes .../remixdark/res/commandimagelist/sc_redo.png | Bin 272 -> 432 bytes .../remixdark/res/commandimagelist/sc_undo.png | Bin 282 -> 428 bytes main/vcl/inc/toolbox.h | 10 +- 9 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_cut.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_cut.png index 5c8de0c93b..d317ecd6e2 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_cut.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_cut.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_inserttable.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_inserttable.png index 77991cadb3..c81364bca0 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_inserttable.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_inserttable.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_redo.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_redo.png index 6d15caf9cc..c51eb9bc1d 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_redo.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_redo.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_undo.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_undo.png index a39ea70368..6b8a92a19a 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_undo.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_undo.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_cut.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_cut.png index fa48801f83..fceda41362 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_cut.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_cut.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_inserttable.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_inserttable.png index 46685539ce..c56d776cc2 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_inserttable.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_inserttable.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_redo.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_redo.png index 00d1bcf610..973065775a 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_redo.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_redo.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_undo.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_undo.png index 6012fcee34..479e535fa0 100644 Binary files a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_undo.png and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_undo.png differ diff --git a/main/vcl/inc/toolbox.h b/main/vcl/inc/toolbox.h index 85088e85f6..b7a04809cb 100644 --- a/main/vcl/inc/toolbox.h +++ b/main/vcl/inc/toolbox.h @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,16 +7,16 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF A
(openoffice) branch Pilot-Pirx-iconset updated: Add additional icons
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/Pilot-Pirx-iconset by this push: new e3a3fe509a Add additional icons e3a3fe509a is described below commit e3a3fe509a4d797f027ca3cf9fa4c9949077c389 Author: mseidel AuthorDate: Fri May 24 18:52:30 2024 +0200 Add additional icons --- .../remixdark/res/commandimagelist/lc_helpindex.png | Bin 0 -> 308 bytes .../remixdark/res/commandimagelist/lc_hyperlinkdialog.png | Bin 0 -> 480 bytes .../res/commandimagelist/lc_toggleanchortype.png | Bin 0 -> 501 bytes .../remixdark/res/commandimagelist/sc_helpindex.png | Bin 0 -> 250 bytes .../remixdark/res/commandimagelist/sc_hyperlinkdialog.png | Bin 0 -> 329 bytes .../res/commandimagelist/sc_toggleanchortype.png | Bin 0 -> 349 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_helpindex.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_helpindex.png new file mode 100644 index 00..d83e93b54d Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_helpindex.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_hyperlinkdialog.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_hyperlinkdialog.png new file mode 100644 index 00..5b17fea68c Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_hyperlinkdialog.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_toggleanchortype.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_toggleanchortype.png new file mode 100644 index 00..7ba23dad3b Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_toggleanchortype.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_helpindex.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_helpindex.png new file mode 100644 index 00..008060312e Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_helpindex.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_hyperlinkdialog.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_hyperlinkdialog.png new file mode 100644 index 00..9d1705288a Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_hyperlinkdialog.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_toggleanchortype.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_toggleanchortype.png new file mode 100644 index 00..e941e009d9 Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_toggleanchortype.png differ
(openoffice) branch Pilot-Pirx-iconset updated: Add additional icons
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/Pilot-Pirx-iconset by this push: new c10c1ec856 Add additional icons c10c1ec856 is described below commit c10c1ec856b927f5688cb5c38998c3847e66c7f1 Author: mseidel AuthorDate: Fri May 24 17:46:58 2024 +0200 Add additional icons --- .../remixdark/res/commandimagelist/lc_decrementindent.png | Bin 0 -> 199 bytes .../res/commandimagelist/lc_exportdirecttopdf.png | Bin 0 -> 352 bytes .../remixdark/res/commandimagelist/lc_incrementindent.png | Bin 0 -> 180 bytes .../remixdark/res/commandimagelist/lc_searchdialog.png| Bin 0 -> 440 bytes .../remixdark/res/commandimagelist/sc_decrementindent.png | Bin 0 -> 198 bytes .../res/commandimagelist/sc_exportdirecttopdf.png | Bin 0 -> 279 bytes .../remixdark/res/commandimagelist/sc_incrementindent.png | Bin 0 -> 186 bytes .../remixdark/res/commandimagelist/sc_inserttable.png | Bin 0 -> 142 bytes .../remixdark/res/commandimagelist/sc_searchdialog.png| Bin 0 -> 318 bytes 9 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_decrementindent.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_decrementindent.png new file mode 100644 index 00..9ba81583d7 Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_decrementindent.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_exportdirecttopdf.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_exportdirecttopdf.png new file mode 100644 index 00..ae9b789970 Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_exportdirecttopdf.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_incrementindent.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_incrementindent.png new file mode 100644 index 00..14a84e8b84 Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_incrementindent.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_searchdialog.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_searchdialog.png new file mode 100644 index 00..806a828ce0 Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_searchdialog.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_decrementindent.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_decrementindent.png new file mode 100644 index 00..7e90023d8b Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_decrementindent.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_exportdirecttopdf.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_exportdirecttopdf.png new file mode 100644 index 00..c76b2166a5 Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_exportdirecttopdf.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_incrementindent.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_incrementindent.png new file mode 100644 index 00..62da1b2351 Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_incrementindent.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_inserttable.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_inserttable.png new file mode 100644 index 00..46685539ce Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_inserttable.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_searchdialog.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_searchdialog.png new file mode 100644 index 00..e60c56dd67 Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_searchdialog.png differ
(openoffice) branch Pilot-Pirx-iconset updated: Additional files
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/Pilot-Pirx-iconset by this push: new d6937f214c Additional files d6937f214c is described below commit d6937f214ceed5e455598760eb995bbb45d26267 Author: mseidel AuthorDate: Fri May 24 17:31:54 2024 +0200 Additional files --- .../registry/schema/org/openoffice/Office/Common.xcs | 5 + main/packimages/Package_packimages.mk | 2 +- main/packimages/pack/makefile.mk | 2 +- main/scp2/source/ooo/file_ooo.scp | 15 +++ main/scp2/source/ooo/module_hidden_ooo.scp| 3 ++- main/vcl/inc/toolbox.h| 1 + main/vcl/inc/vcl/settings.hxx | 3 ++- main/vcl/source/app/settings.cxx | 7 +-- main/vcl/source/window/toolbox2.cxx | 11 +++ 9 files changed, 35 insertions(+), 14 deletions(-) diff --git a/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 7c6853a142..5e92348eb2 100644 --- a/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -5262,6 +5262,11 @@ Classic - the OpenOffice.org 2.0 default theme + + + Remix (dark) + + auto diff --git a/main/packimages/Package_packimages.mk b/main/packimages/Package_packimages.mk index 24a953fc76..c9faf6fb03 100644 --- a/main/packimages/Package_packimages.mk +++ b/main/packimages/Package_packimages.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Package_Package,packimages_packimages,$(WORKDIR)/CustomTarget/packimages,packimages)) # Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially -CUSTOM_IMAGE_SETS := hicontrast industrial classic +CUSTOM_IMAGE_SETS := hicontrast industrial classic remixdark CUSTOM_PREFERRED_FALLBACK_1 := -c $(SRCDIR)/ooo_custom_images/industrial CLASSIC_TARBALL=$(SRCDIR)/ooo_custom_images/classic/classic_images.tar.gz diff --git a/main/packimages/pack/makefile.mk b/main/packimages/pack/makefile.mk index 860e4b8779..8b8163ed08 100644 --- a/main/packimages/pack/makefile.mk +++ b/main/packimages/pack/makefile.mk @@ -43,7 +43,7 @@ VERBOSESWITCH= IMAGES := $(COMMONBIN)$/images.zip SORTED_LIST=$(RES)$/img$/sorted.lst # Custom sets, at 24x24 & 16x16 fall-back to Galaxy preferentially -CUSTOM_IMAGE_SETS=hicontrast industrial classic +CUSTOM_IMAGE_SETS=hicontrast industrial classic remixdark CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i) CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/default_images$/ diff --git a/main/scp2/source/ooo/file_ooo.scp b/main/scp2/source/ooo/file_ooo.scp index f58145771a..09b3c87a1f 100644 --- a/main/scp2/source/ooo/file_ooo.scp +++ b/main/scp2/source/ooo/file_ooo.scp @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,16 +7,16 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ @@ -1785,6 +1785,13 @@ File gid_File_ImagesClassic_Zip Styles = (PACKED); End +File gid_File_ImagesRemixDark_Zip +TXT_FILE_BODY; +Dir = gid_Dir_Share_Config; +Name = "images_remixdark.zip"; +Styles = (PACKED); +End + File gid_File_Share_Registry_Lingucomponent_Xcd TXT_FILE_BODY; Styles = (PACKED); diff --git a/main/scp2/source/ooo/module_hidden_ooo.scp b/main/scp2/source/ooo/module_hidden_ooo.scp index 8878189f6b..f1ff846c07 100644 --- a/main
(openoffice) branch Pilot-Pirx-iconset updated: Add some Remix icons
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/Pilot-Pirx-iconset by this push: new e5df7a0512 Add some Remix icons e5df7a0512 is described below commit e5df7a05121e78da90ae0bf5556687322ebc5445 Author: mseidel AuthorDate: Fri May 24 17:21:17 2024 +0200 Add some Remix icons --- .../remixdark/res/commandimagelist/lc_bold.png| Bin 0 -> 246 bytes .../remixdark/res/commandimagelist/lc_centerpara.png | Bin 0 -> 141 bytes .../remixdark/res/commandimagelist/lc_copy.png| Bin 0 -> 202 bytes .../remixdark/res/commandimagelist/lc_cut.png | Bin 0 -> 424 bytes .../remixdark/res/commandimagelist/lc_editdoc.png | Bin 0 -> 280 bytes .../res/commandimagelist/lc_formatpaintbrush.png | Bin 0 -> 403 bytes .../remixdark/res/commandimagelist/lc_inserttable.png | Bin 0 -> 155 bytes .../remixdark/res/commandimagelist/lc_italic.png | Bin 0 -> 258 bytes .../remixdark/res/commandimagelist/lc_justifypara.png | Bin 0 -> 136 bytes .../remixdark/res/commandimagelist/lc_leftpara.png| Bin 0 -> 146 bytes .../remixdark/res/commandimagelist/lc_navigator.png | Bin 0 -> 466 bytes .../remixdark/res/commandimagelist/lc_open.png| Bin 0 -> 307 bytes .../remixdark/res/commandimagelist/lc_paste.png | Bin 0 -> 186 bytes .../remixdark/res/commandimagelist/lc_printdefault.png| Bin 0 -> 222 bytes .../remixdark/res/commandimagelist/lc_printpreview.png| Bin 0 -> 316 bytes .../remixdark/res/commandimagelist/lc_redo.png| Bin 0 -> 309 bytes .../remixdark/res/commandimagelist/lc_rightpara.png | Bin 0 -> 134 bytes .../remixdark/res/commandimagelist/lc_save.png| Bin 0 -> 214 bytes .../remixdark/res/commandimagelist/lc_sendmail.png| Bin 0 -> 325 bytes .../remixdark/res/commandimagelist/lc_underline.png | Bin 0 -> 259 bytes .../remixdark/res/commandimagelist/lc_undo.png| Bin 0 -> 293 bytes .../remixdark/res/commandimagelist/sc_bold.png| Bin 0 -> 238 bytes .../remixdark/res/commandimagelist/sc_centerpara.png | Bin 0 -> 172 bytes .../remixdark/res/commandimagelist/sc_copy.png| Bin 0 -> 217 bytes .../remixdark/res/commandimagelist/sc_cut.png | Bin 0 -> 279 bytes .../remixdark/res/commandimagelist/sc_editdoc.png | Bin 0 -> 255 bytes .../res/commandimagelist/sc_formatpaintbrush.png | Bin 0 -> 297 bytes .../remixdark/res/commandimagelist/sc_italic.png | Bin 0 -> 217 bytes .../remixdark/res/commandimagelist/sc_justifypara.png | Bin 0 -> 137 bytes .../remixdark/res/commandimagelist/sc_leftpara.png| Bin 0 -> 167 bytes .../remixdark/res/commandimagelist/sc_navigator.png | Bin 0 -> 340 bytes .../remixdark/res/commandimagelist/sc_open.png| Bin 0 -> 259 bytes .../remixdark/res/commandimagelist/sc_paste.png | Bin 0 -> 189 bytes .../remixdark/res/commandimagelist/sc_printdefault.png| Bin 0 -> 273 bytes .../remixdark/res/commandimagelist/sc_printpreview.png| Bin 0 -> 279 bytes .../remixdark/res/commandimagelist/sc_redo.png| Bin 0 -> 272 bytes .../remixdark/res/commandimagelist/sc_rightpara.png | Bin 0 -> 168 bytes .../remixdark/res/commandimagelist/sc_save.png| Bin 0 -> 213 bytes .../remixdark/res/commandimagelist/sc_sendmail.png| Bin 0 -> 242 bytes .../remixdark/res/commandimagelist/sc_underline.png | Bin 0 -> 213 bytes .../remixdark/res/commandimagelist/sc_undo.png| Bin 0 -> 282 bytes main/ooo_custom_images/remixdark/res/foldercl.png | Bin 0 -> 195 bytes main/ooo_custom_images/remixdark/res/folderop.png | Bin 0 -> 259 bytes main/ooo_custom_images/remixdark/sw/res/all_left.png | Bin 0 -> 191 bytes main/ooo_custom_images/remixdark/sw/res/all_right.png | Bin 0 -> 186 bytes main/ooo_custom_images/remixdark/sw/res/one_left.png | Bin 0 -> 164 bytes main/ooo_custom_images/remixdark/sw/res/one_right.png | Bin 0 -> 170 bytes main/ooo_custom_images/remixdark/sw/res/point.png | Bin 0 -> 155 bytes 48 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_bold.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_bold.png new file mode 100644 index 00..a4695aad85 Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_bold.png differ diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_centerpara.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_centerpara.png new file mode
(openoffice) branch Pilot-Pirx-iconset created (now 1f31ef5c73)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a change to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git at 1f31ef5c73 Add new icon set This branch includes the following new commits: new 1f31ef5c73 Add new icon set The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(openoffice) 01/01: Add new icon set
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-iconset in repository https://gitbox.apache.org/repos/asf/openoffice.git commit 1f31ef5c73131dbe2ff2f0b964603a761329116a Author: Matthias Seidel AuthorDate: Fri May 24 17:15:43 2024 +0200 Add new icon set This is a proof of concept how to add a new icon set. --- main/cui/source/options/optgdlg.src | 1 + 1 file changed, 1 insertion(+) diff --git a/main/cui/source/options/optgdlg.src b/main/cui/source/options/optgdlg.src index d0ea28c759..e23d1960b3 100644 --- a/main/cui/source/options/optgdlg.src +++ b/main/cui/source/options/optgdlg.src @@ -250,6 +250,7 @@ TabPage OFA_TP_VIEW < "High Contrast" ; > ; < "Industrial" ;> ; < "Classic" ; > ; + < "Remix (dark)" ; > ; }; }; CheckBox CB_SYSTEM_FONT
(openoffice) branch AOO41X updated: Corrected strings in various SDF
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new 040cce5ef5 Corrected strings in various SDF 040cce5ef5 is described below commit 040cce5ef5c7e03b8d670502710793ad9b5224ec Author: mseidel AuthorDate: Fri May 24 00:45:59 2024 +0200 Corrected strings in various SDF --- extras/l10n/source/de/localize.sdf | 2 +- extras/l10n/source/es/localize.sdf | 2 +- extras/l10n/source/fr/localize.sdf | 2 +- extras/l10n/source/it/localize.sdf | 2 +- extras/l10n/source/nl/localize.sdf | 2 +- extras/l10n/source/pl/localize.sdf | 2 +- extras/l10n/source/pt/localize.sdf | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/extras/l10n/source/de/localize.sdf b/extras/l10n/source/de/localize.sdf index b0903f55d4..1309a35bc6 100644 --- a/extras/l10n/source/de/localize.sdf +++ b/extras/l10n/source/de/localize.sdf @@ -50069,7 +50069,7 @@ helpcontent2source\text\shared\00\0402.xhp 0 helppar_id3154365 8 0 de \< helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3149765 9 0 de Menü \Bearbeiten - Ausschneiden\ 20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3144762 565 0 de \\Befehl\\Strg\ \+X20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3148744 10 0 de Klicken Sie in der \Funktionsleiste\ auf 20130618 17:22:18 -helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3145173 0 de \\Symbol\\ 20130618 17:22:18 +helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3145173 0 de \\Symbol\\ 20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3154153 11 0 de Ausschneiden 20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3150742 12 0 de Menü\ Bearbeiten - Kopieren\ 20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3148923 566 0 de \\Befehl\\Strg\ \+C20130618 17:22:18 diff --git a/extras/l10n/source/es/localize.sdf b/extras/l10n/source/es/localize.sdf index d38efb0ba8..9bc56fe6f5 100644 --- a/extras/l10n/source/es/localize.sdf +++ b/extras/l10n/source/es/localize.sdf @@ -50071,7 +50071,7 @@ helpcontent2source\text\shared\00\0402.xhp 0 helppar_id3154365 8 0 es \< helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3149765 9 0 es Menú \Editar - Cortar\ 20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3144762 565 0 es \\Comando \\Ctrl\\ + X 20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3148744 10 0 es En la barra \Estándar\, haga clic en 20130618 17:22:18 -helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3145173 0 es \\Icono\\ 20130618 17:22:18 +helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3145173 0 es \\Icono\\ 20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3154153 11 0 es Cortar 20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3150742 12 0 es Menú \Editar - Copiar\ 20130618 17:22:18 helpcontent2 source\text\shared\00\0402.xhp 0 help par_id3148923 566 0 es \\Comando \\Ctrl\\ + C 20130618 17:22:18 diff --git a/extras/l10n/source/fr/localize.sdf b/extras/l10n/source/fr/localize.sdf index bff5002219..4f1c65ba9c 100644 --- a/extras/l10n/source/fr/localize.sdf +++ b/extras/l10n/source/fr/localize.sdf @@ -50071,7 +50071,7 @@ helpcontent2source\text\shared\00\0402.xhp 0 helppar_id31543
(openoffice) branch AOO41X updated: Update 00000402.xhp
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new d0e8a608bc Update 0402.xhp d0e8a608bc is described below commit d0e8a608bca4be3bf3fcf75e70f70ac7f2399417 Author: mseidel AuthorDate: Fri May 24 00:34:17 2024 +0200 Update 0402.xhp --- main/helpcontent2/source/text/shared/00/0402.xhp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/helpcontent2/source/text/shared/00/0402.xhp b/main/helpcontent2/source/text/shared/00/0402.xhp index d82a12b5fa..697da39a4e 100644 --- a/main/helpcontent2/source/text/shared/00/0402.xhp +++ b/main/helpcontent2/source/text/shared/00/0402.xhp @@ -86,7 +86,7 @@ -Icon +Icon
(openoffice) branch AOO42X updated: Remove unused helpmenu.png (HiContrast)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 76db2bba8c Remove unused helpmenu.png (HiContrast) 76db2bba8c is described below commit 76db2bba8c944f4624a01f930a2dea2cc304cc0c Author: mseidel AuthorDate: Thu May 23 19:06:36 2024 +0200 Remove unused helpmenu.png (HiContrast) (cherry picked from commit 6e9ebb6bba1259e39098c82cb4fdc8640d36f6ca) --- main/default_images/res/commandimagelist/lch_helpmenu.png | Bin 208 -> 0 bytes main/default_images/res/commandimagelist/sch_helpmenu.png | Bin 167 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/res/commandimagelist/lch_helpmenu.png b/main/default_images/res/commandimagelist/lch_helpmenu.png deleted file mode 100644 index b1b4409ccc..00 Binary files a/main/default_images/res/commandimagelist/lch_helpmenu.png and /dev/null differ diff --git a/main/default_images/res/commandimagelist/sch_helpmenu.png b/main/default_images/res/commandimagelist/sch_helpmenu.png deleted file mode 100644 index fd5ce17dac..00 Binary files a/main/default_images/res/commandimagelist/sch_helpmenu.png and /dev/null differ
(openoffice) branch trunk updated: Remove unused helpmenu.png (HiContrast)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 6e9ebb6bba Remove unused helpmenu.png (HiContrast) 6e9ebb6bba is described below commit 6e9ebb6bba1259e39098c82cb4fdc8640d36f6ca Author: mseidel AuthorDate: Thu May 23 19:06:36 2024 +0200 Remove unused helpmenu.png (HiContrast) --- main/default_images/res/commandimagelist/lch_helpmenu.png | Bin 208 -> 0 bytes main/default_images/res/commandimagelist/sch_helpmenu.png | Bin 167 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/res/commandimagelist/lch_helpmenu.png b/main/default_images/res/commandimagelist/lch_helpmenu.png deleted file mode 100644 index b1b4409ccc..00 Binary files a/main/default_images/res/commandimagelist/lch_helpmenu.png and /dev/null differ diff --git a/main/default_images/res/commandimagelist/sch_helpmenu.png b/main/default_images/res/commandimagelist/sch_helpmenu.png deleted file mode 100644 index fd5ce17dac..00 Binary files a/main/default_images/res/commandimagelist/sch_helpmenu.png and /dev/null differ
(openoffice) branch AOO42X updated (f14a906106 -> 853e4dffc6)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a change to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git from f14a906106 small cleanup (Tango icon set was removed long ago) new 8b3d16b6be Update 0402.xhp new 853e4dffc6 Remove unused helpmenu.png The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../res/commandimagelist/lc_helpmenu.png | Bin 1623 -> 0 bytes .../res/commandimagelist/sc_helpmenu.png | Bin 802 -> 0 bytes .../source/text/shared/00/0402.xhp | 2 +- .../classic/classic_images.tar.gz | Bin 1355547 -> 1364891 bytes .../res/commandimagelist/lc_helpmenu.png | Bin 652 -> 0 bytes .../res/commandimagelist/sc_helpmenu.png | Bin 275 -> 0 bytes 6 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 main/default_images/res/commandimagelist/lc_helpmenu.png delete mode 100644 main/default_images/res/commandimagelist/sc_helpmenu.png delete mode 100644 main/ooo_custom_images/industrial/res/commandimagelist/lc_helpmenu.png delete mode 100644 main/ooo_custom_images/industrial/res/commandimagelist/sc_helpmenu.png
(openoffice) 01/02: Update 00000402.xhp
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git commit 8b3d16b6be3793dc355d134c305305f649dd7c69 Author: Matthias Seidel AuthorDate: Thu May 23 17:41:07 2024 +0200 Update 0402.xhp Use correct icon for "Cut". The wrong icon(s) helpmenu.png (with a scissor) could probably be deleted. (cherry picked from commit f4c755a4bd28b734926d516a8f1faada42432b7a) --- main/helpcontent2/source/text/shared/00/0402.xhp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/helpcontent2/source/text/shared/00/0402.xhp b/main/helpcontent2/source/text/shared/00/0402.xhp index f637d2604e..3209c468c7 100644 --- a/main/helpcontent2/source/text/shared/00/0402.xhp +++ b/main/helpcontent2/source/text/shared/00/0402.xhp @@ -81,7 +81,7 @@ -Icon +Icon
(openoffice) 02/02: Remove unused helpmenu.png
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git commit 853e4dffc619d242bebaffc830abfcaf444afc3e Author: mseidel AuthorDate: Thu May 23 18:11:17 2024 +0200 Remove unused helpmenu.png (cherry picked from commit 0cb24ebdae39d1aa3c2a31906f5939108bcacb38) --- .../res/commandimagelist/lc_helpmenu.png | Bin 1623 -> 0 bytes .../res/commandimagelist/sc_helpmenu.png | Bin 802 -> 0 bytes .../classic/classic_images.tar.gz | Bin 1355547 -> 1364891 bytes .../res/commandimagelist/lc_helpmenu.png | Bin 652 -> 0 bytes .../res/commandimagelist/sc_helpmenu.png | Bin 275 -> 0 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/res/commandimagelist/lc_helpmenu.png b/main/default_images/res/commandimagelist/lc_helpmenu.png deleted file mode 100644 index 1e2a36797b..00 Binary files a/main/default_images/res/commandimagelist/lc_helpmenu.png and /dev/null differ diff --git a/main/default_images/res/commandimagelist/sc_helpmenu.png b/main/default_images/res/commandimagelist/sc_helpmenu.png deleted file mode 100644 index 001180acdd..00 Binary files a/main/default_images/res/commandimagelist/sc_helpmenu.png and /dev/null differ diff --git a/main/ooo_custom_images/classic/classic_images.tar.gz b/main/ooo_custom_images/classic/classic_images.tar.gz index af07417247..6cb6be6c66 100644 Binary files a/main/ooo_custom_images/classic/classic_images.tar.gz and b/main/ooo_custom_images/classic/classic_images.tar.gz differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/lc_helpmenu.png b/main/ooo_custom_images/industrial/res/commandimagelist/lc_helpmenu.png deleted file mode 100644 index 9837208748..00 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/lc_helpmenu.png and /dev/null differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/sc_helpmenu.png b/main/ooo_custom_images/industrial/res/commandimagelist/sc_helpmenu.png deleted file mode 100644 index 5a5a2ba3e9..00 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/sc_helpmenu.png and /dev/null differ
(openoffice) branch trunk updated: Remove unused helpmenu.png
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 0cb24ebdae Remove unused helpmenu.png 0cb24ebdae is described below commit 0cb24ebdae39d1aa3c2a31906f5939108bcacb38 Author: mseidel AuthorDate: Thu May 23 18:11:17 2024 +0200 Remove unused helpmenu.png --- .../res/commandimagelist/lc_helpmenu.png | Bin 1623 -> 0 bytes .../res/commandimagelist/sc_helpmenu.png | Bin 802 -> 0 bytes .../classic/classic_images.tar.gz | Bin 1355547 -> 1364891 bytes .../res/commandimagelist/lc_helpmenu.png | Bin 652 -> 0 bytes .../res/commandimagelist/sc_helpmenu.png | Bin 275 -> 0 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/res/commandimagelist/lc_helpmenu.png b/main/default_images/res/commandimagelist/lc_helpmenu.png deleted file mode 100644 index 1e2a36797b..00 Binary files a/main/default_images/res/commandimagelist/lc_helpmenu.png and /dev/null differ diff --git a/main/default_images/res/commandimagelist/sc_helpmenu.png b/main/default_images/res/commandimagelist/sc_helpmenu.png deleted file mode 100644 index 001180acdd..00 Binary files a/main/default_images/res/commandimagelist/sc_helpmenu.png and /dev/null differ diff --git a/main/ooo_custom_images/classic/classic_images.tar.gz b/main/ooo_custom_images/classic/classic_images.tar.gz index af07417247..6cb6be6c66 100644 Binary files a/main/ooo_custom_images/classic/classic_images.tar.gz and b/main/ooo_custom_images/classic/classic_images.tar.gz differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/lc_helpmenu.png b/main/ooo_custom_images/industrial/res/commandimagelist/lc_helpmenu.png deleted file mode 100644 index 9837208748..00 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/lc_helpmenu.png and /dev/null differ diff --git a/main/ooo_custom_images/industrial/res/commandimagelist/sc_helpmenu.png b/main/ooo_custom_images/industrial/res/commandimagelist/sc_helpmenu.png deleted file mode 100644 index 5a5a2ba3e9..00 Binary files a/main/ooo_custom_images/industrial/res/commandimagelist/sc_helpmenu.png and /dev/null differ
(openoffice) branch trunk updated: Update 00000402.xhp
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new f4c755a4bd Update 0402.xhp f4c755a4bd is described below commit f4c755a4bd28b734926d516a8f1faada42432b7a Author: Matthias Seidel AuthorDate: Thu May 23 17:41:07 2024 +0200 Update 0402.xhp Use correct icon for "Cut". The wrong icon(s) helpmenu.png (with a scissor) could probably be deleted. --- main/helpcontent2/source/text/shared/00/0402.xhp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/helpcontent2/source/text/shared/00/0402.xhp b/main/helpcontent2/source/text/shared/00/0402.xhp index f637d2604e..3209c468c7 100644 --- a/main/helpcontent2/source/text/shared/00/0402.xhp +++ b/main/helpcontent2/source/text/shared/00/0402.xhp @@ -81,7 +81,7 @@ -Icon +Icon
(openoffice) branch AOO41X updated: small cleanup (Tango icon set was removed long ago)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new 37a7587804 small cleanup (Tango icon set was removed long ago) 37a7587804 is described below commit 37a75878041bf739664b40bec0deeda26d479394 Author: mseidel AuthorDate: Tue May 21 16:52:06 2024 +0200 small cleanup (Tango icon set was removed long ago) (cherry picked from commit 0080c5f63e314b104eb63be55dbe11f964806e99) --- main/scp2/source/ooo/file_ooo.scp | 2 +- main/scp2/source/ooo/module_hidden_ooo.scp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/main/scp2/source/ooo/file_ooo.scp b/main/scp2/source/ooo/file_ooo.scp index a8a7cbc504..f58145771a 100644 --- a/main/scp2/source/ooo/file_ooo.scp +++ b/main/scp2/source/ooo/file_ooo.scp @@ -1778,7 +1778,7 @@ File gid_File_ImagesIndustrial_Zip Styles = (PACKED); End -File gid_File_ImagesClassic8_Zip +File gid_File_ImagesClassic_Zip TXT_FILE_BODY; Dir = gid_Dir_Share_Config; Name = "images_classic.zip"; diff --git a/main/scp2/source/ooo/module_hidden_ooo.scp b/main/scp2/source/ooo/module_hidden_ooo.scp index 04834465e1..c5e638cb0e 100644 --- a/main/scp2/source/ooo/module_hidden_ooo.scp +++ b/main/scp2/source/ooo/module_hidden_ooo.scp @@ -727,8 +727,7 @@ Module gid_Module_Root_Files_Images Files = (gid_File_Images_Zip, gid_File_ImagesHicontrast_Zip, gid_File_ImagesIndustrial_Zip, - gid_File_ImagesTango_Zip, - gid_File_ImagesClassic8_Zip); + gid_File_ImagesClassic_Zip); End #ifndef WITHOUT_FONTS
(openoffice) branch AOO42X updated: small cleanup (Tango icon set was removed long ago)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new f14a906106 small cleanup (Tango icon set was removed long ago) f14a906106 is described below commit f14a906106f951c0b1279e6bd5b603e555c4dd36 Author: mseidel AuthorDate: Tue May 21 16:52:06 2024 +0200 small cleanup (Tango icon set was removed long ago) (cherry picked from commit 0080c5f63e314b104eb63be55dbe11f964806e99) --- main/scp2/source/ooo/file_ooo.scp | 2 +- main/scp2/source/ooo/module_hidden_ooo.scp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/main/scp2/source/ooo/file_ooo.scp b/main/scp2/source/ooo/file_ooo.scp index a8a7cbc504..f58145771a 100644 --- a/main/scp2/source/ooo/file_ooo.scp +++ b/main/scp2/source/ooo/file_ooo.scp @@ -1778,7 +1778,7 @@ File gid_File_ImagesIndustrial_Zip Styles = (PACKED); End -File gid_File_ImagesClassic8_Zip +File gid_File_ImagesClassic_Zip TXT_FILE_BODY; Dir = gid_Dir_Share_Config; Name = "images_classic.zip"; diff --git a/main/scp2/source/ooo/module_hidden_ooo.scp b/main/scp2/source/ooo/module_hidden_ooo.scp index 6cd97f7931..8878189f6b 100644 --- a/main/scp2/source/ooo/module_hidden_ooo.scp +++ b/main/scp2/source/ooo/module_hidden_ooo.scp @@ -730,8 +730,7 @@ Module gid_Module_Root_Files_Images Files = (gid_File_Images_Zip, gid_File_ImagesHicontrast_Zip, gid_File_ImagesIndustrial_Zip, - gid_File_ImagesTango_Zip, - gid_File_ImagesClassic8_Zip); + gid_File_ImagesClassic_Zip); End #ifndef WITHOUT_FONTS
(openoffice) branch trunk updated: small cleanup (Tango icon set was removed long ago)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 0080c5f63e small cleanup (Tango icon set was removed long ago) 0080c5f63e is described below commit 0080c5f63e314b104eb63be55dbe11f964806e99 Author: mseidel AuthorDate: Tue May 21 16:52:06 2024 +0200 small cleanup (Tango icon set was removed long ago) --- main/scp2/source/ooo/file_ooo.scp | 2 +- main/scp2/source/ooo/module_hidden_ooo.scp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/main/scp2/source/ooo/file_ooo.scp b/main/scp2/source/ooo/file_ooo.scp index a8a7cbc504..f58145771a 100644 --- a/main/scp2/source/ooo/file_ooo.scp +++ b/main/scp2/source/ooo/file_ooo.scp @@ -1778,7 +1778,7 @@ File gid_File_ImagesIndustrial_Zip Styles = (PACKED); End -File gid_File_ImagesClassic8_Zip +File gid_File_ImagesClassic_Zip TXT_FILE_BODY; Dir = gid_Dir_Share_Config; Name = "images_classic.zip"; diff --git a/main/scp2/source/ooo/module_hidden_ooo.scp b/main/scp2/source/ooo/module_hidden_ooo.scp index 6cd97f7931..8878189f6b 100644 --- a/main/scp2/source/ooo/module_hidden_ooo.scp +++ b/main/scp2/source/ooo/module_hidden_ooo.scp @@ -730,8 +730,7 @@ Module gid_Module_Root_Files_Images Files = (gid_File_Images_Zip, gid_File_ImagesHicontrast_Zip, gid_File_ImagesIndustrial_Zip, - gid_File_ImagesTango_Zip, - gid_File_ImagesClassic8_Zip); + gid_File_ImagesClassic_Zip); End #ifndef WITHOUT_FONTS
(openoffice) branch AOO41X updated: #i127724# Enable fallback URL for dejavu package
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new 054bb2f14b #i127724# Enable fallback URL for dejavu package 054bb2f14b is described below commit 054bb2f14b97f65abaa1c5fffb86a0d6c0084311 Author: Andrea Pescetti AuthorDate: Sat Mar 3 22:42:38 2018 + #i127724# Enable fallback URL for dejavu package git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1825791 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 343d8a280126d4863b2ed6525e3bd43820ccc5aa) --- main/external_deps.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/external_deps.lst b/main/external_deps.lst index ad1092cb04..f22e757d7f 100644 --- a/main/external_deps.lst +++ b/main/external_deps.lst @@ -230,7 +230,7 @@ if (WITH_CATA_FONTS == YES) MD5 = d0efec10b9f110a32e9b8f796e21782c name = dejavu-fonts-ttf-2.37.tar.bz2 URL1 = https://sourceforge.net/projects/dejavu/files/dejavu/2.37/$(name) -# URL2 = $(OOO_EXTRAS)$(MD5)-$(name) +URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (WITH_CATA_FONTS==YES) MD5 = 3c90ac73fd13bd79684d9dc073840328
(openoffice) branch AOO42X updated: Minor cleanup
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new bf2083a787 Minor cleanup bf2083a787 is described below commit bf2083a78769a8759f24c4e34bc31aff1175fa7e Author: mseidel AuthorDate: Mon May 20 17:33:42 2024 +0200 Minor cleanup (cherry picked from commit c622e83ad38c464d4787e61242dd0f6ebdd5f92d) --- main/packimages/Makefile | 8 main/packimages/Module_packimages.mk | 11 --- main/packimages/Package_packimages.mk | 11 +-- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/main/packimages/Makefile b/main/packimages/Makefile index c1d144cbd4..88133e62be 100644 --- a/main/packimages/Makefile +++ b/main/packimages/Makefile @@ -1,5 +1,5 @@ #** -# +# # 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 @@ -7,16 +7,16 @@ # 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 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# +# #** ifeq ($(strip $(SOLARENV)),) diff --git a/main/packimages/Module_packimages.mk b/main/packimages/Module_packimages.mk index ac44806af8..f760513b2d 100644 --- a/main/packimages/Module_packimages.mk +++ b/main/packimages/Module_packimages.mk @@ -1,5 +1,5 @@ #** -# +# # 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 @@ -7,25 +7,22 @@ # 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 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# +# #** - - $(eval $(call gb_Module_Module,packimages)) $(eval $(call gb_Module_add_targets,packimages,\ Package_packimages \ )) - # vim: set noet sw=4 ts=4: diff --git a/main/packimages/Package_packimages.mk b/main/packimages/Package_packimages.mk index 2c6e8deaa5..24a953fc76 100644 --- a/main/packimages/Package_packimages.mk +++ b/main/packimages/Package_packimages.mk @@ -1,5 +1,5 @@ #** -# +# # 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 @@ -7,20 +7,18 @@ # 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 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# +# #** - - $(eval $(call gb_Package_Package,packimages_packimages,$(WORKDIR)/CustomTarget/packimages,packimages)) # Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially @@ -121,3 +119,4 @@ $(WORKDIR)/CustomTarget/packimages/classic.flag : cat $@ || echo "ERROR: unpacking $(CLASSIC_TARBALL) failed" endif +# vim: set noet sw=4 ts=4:
(openoffice) branch trunk updated: Minor cleanup
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new c622e83ad3 Minor cleanup c622e83ad3 is described below commit c622e83ad38c464d4787e61242dd0f6ebdd5f92d Author: mseidel AuthorDate: Mon May 20 17:33:42 2024 +0200 Minor cleanup --- main/packimages/Makefile | 8 main/packimages/Module_packimages.mk | 11 --- main/packimages/Package_packimages.mk | 11 +-- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/main/packimages/Makefile b/main/packimages/Makefile index c1d144cbd4..88133e62be 100644 --- a/main/packimages/Makefile +++ b/main/packimages/Makefile @@ -1,5 +1,5 @@ #** -# +# # 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 @@ -7,16 +7,16 @@ # 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 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# +# #** ifeq ($(strip $(SOLARENV)),) diff --git a/main/packimages/Module_packimages.mk b/main/packimages/Module_packimages.mk index ac44806af8..f760513b2d 100644 --- a/main/packimages/Module_packimages.mk +++ b/main/packimages/Module_packimages.mk @@ -1,5 +1,5 @@ #** -# +# # 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 @@ -7,25 +7,22 @@ # 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 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# +# #** - - $(eval $(call gb_Module_Module,packimages)) $(eval $(call gb_Module_add_targets,packimages,\ Package_packimages \ )) - # vim: set noet sw=4 ts=4: diff --git a/main/packimages/Package_packimages.mk b/main/packimages/Package_packimages.mk index 2c6e8deaa5..24a953fc76 100644 --- a/main/packimages/Package_packimages.mk +++ b/main/packimages/Package_packimages.mk @@ -1,5 +1,5 @@ #** -# +# # 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 @@ -7,20 +7,18 @@ # 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 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# +# #** - - $(eval $(call gb_Package_Package,packimages_packimages,$(WORKDIR)/CustomTarget/packimages,packimages)) # Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially @@ -121,3 +119,4 @@ $(WORKDIR)/CustomTarget/packimages/classic.flag : cat $@ || echo "ERROR: unpacking $(CLASSIC_TARBALL) failed" endif +# vim: set noet sw=4 ts=4:
(openoffice) branch AOO42X updated: misc: fix spelling (#213)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new b3bea0d120 misc: fix spelling (#213) b3bea0d120 is described below commit b3bea0d120d84c8332a4e85beea0c030cd6a5177 Author: John Bampton AuthorDate: Wed May 15 06:52:44 2024 +1000 misc: fix spelling (#213) * misc: fix spelling * Update olepersist.cxx - Co-authored-by: Matthias Seidel (cherry picked from commit 8735c047413135516379fb08dc40a373c8411677) --- main/embeddedobj/source/msole/olepersist.cxx | 46 +++--- main/forms/source/xforms/submission/replace.cxx| 2 +- .../source/xforms/submission/submission_get.cxx| 6 +-- .../source/xforms/submission/submission_post.cxx | 2 +- main/framework/test/typecfg/cfgview.cxx| 2 +- .../tests/java/ifc/frame/_XNotifyingDispatch.java | 2 +- main/sal/rtl/source/unload.cxx | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/main/embeddedobj/source/msole/olepersist.cxx b/main/embeddedobj/source/msole/olepersist.cxx index e4df5d028a..926f89a71c 100644 --- a/main/embeddedobj/source/msole/olepersist.cxx +++ b/main/embeddedobj/source/msole/olepersist.cxx @@ -443,7 +443,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea const uno::Reference< io::XStream >& xCachedVisualRepresentation ) throw ( uno::Exception ) { - OSL_ENSURE( xTargetStream.is() && xCachedVisualRepresentation.is(), "Invalid argumants!\n" ); + OSL_ENSURE( xTargetStream.is() && xCachedVisualRepresentation.is(), "Invalid arguments!\n" ); if ( !xTargetStream.is() || !xCachedVisualRepresentation.is() ) throw uno::RuntimeException(); @@ -594,7 +594,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStream >& xTargetStream ) throw ( uno::Exception ) { - OSL_ENSURE( xTargetStream.is(), "Invalid argumant!\n" ); + OSL_ENSURE( xTargetStream.is(), "Invalid argument!\n" ); if ( !xTargetStream.is() ) throw uno::RuntimeException(); @@ -641,7 +641,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream() SetVisReplInStream( sal_True ); else { - RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObject::HasVisualReplInStream, analizing" ); + RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObject::HasVisualReplInStream, analyzing" ); uno::Reference< io::XInputStream > xStream; @@ -818,7 +818,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres try { CreateOleComponentAndLoad_Impl( NULL ); - m_aClassID = m_pOleComponent->GetCLSID(); // was not set during consruction + m_aClassID = m_pOleComponent->GetCLSID(); // was not set during construction } catch( uno::Exception& ) { @@ -1385,7 +1385,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY ); if ( xWrappedObject.is() ) { -// the object was converted to OOo embedded object, the current implementation is now only a wrapper +// the object was converted to AOO embedded object, the current implementation is now only a wrapper xWrappedObject->setPersistentEntry( xStorage, sEntName, nEntryConnectionMode, lArguments, lObjArgs ); return; } @@ -1466,9 +1466,9 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( if ( m_bFromClipboard ) { // the object should be initialized from clipboard - // inpossibility to initialize the object means error here +
(openoffice) branch trunk updated: misc: fix spelling (#213)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 8735c04741 misc: fix spelling (#213) 8735c04741 is described below commit 8735c047413135516379fb08dc40a373c8411677 Author: John Bampton AuthorDate: Wed May 15 06:52:44 2024 +1000 misc: fix spelling (#213) * misc: fix spelling * Update olepersist.cxx - Co-authored-by: Matthias Seidel --- main/embeddedobj/source/msole/olepersist.cxx | 46 +++--- main/forms/source/xforms/submission/replace.cxx| 2 +- .../source/xforms/submission/submission_get.cxx| 6 +-- .../source/xforms/submission/submission_post.cxx | 2 +- main/framework/test/typecfg/cfgview.cxx| 2 +- .../main/java/ifc/frame/_XNotifyingDispatch.java | 2 +- main/sal/rtl/source/unload.cxx | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/main/embeddedobj/source/msole/olepersist.cxx b/main/embeddedobj/source/msole/olepersist.cxx index e4df5d028a..926f89a71c 100644 --- a/main/embeddedobj/source/msole/olepersist.cxx +++ b/main/embeddedobj/source/msole/olepersist.cxx @@ -443,7 +443,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea const uno::Reference< io::XStream >& xCachedVisualRepresentation ) throw ( uno::Exception ) { - OSL_ENSURE( xTargetStream.is() && xCachedVisualRepresentation.is(), "Invalid argumants!\n" ); + OSL_ENSURE( xTargetStream.is() && xCachedVisualRepresentation.is(), "Invalid arguments!\n" ); if ( !xTargetStream.is() || !xCachedVisualRepresentation.is() ) throw uno::RuntimeException(); @@ -594,7 +594,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStream >& xTargetStream ) throw ( uno::Exception ) { - OSL_ENSURE( xTargetStream.is(), "Invalid argumant!\n" ); + OSL_ENSURE( xTargetStream.is(), "Invalid argument!\n" ); if ( !xTargetStream.is() ) throw uno::RuntimeException(); @@ -641,7 +641,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream() SetVisReplInStream( sal_True ); else { - RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObject::HasVisualReplInStream, analizing" ); + RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObject::HasVisualReplInStream, analyzing" ); uno::Reference< io::XInputStream > xStream; @@ -818,7 +818,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres try { CreateOleComponentAndLoad_Impl( NULL ); - m_aClassID = m_pOleComponent->GetCLSID(); // was not set during consruction + m_aClassID = m_pOleComponent->GetCLSID(); // was not set during construction } catch( uno::Exception& ) { @@ -1385,7 +1385,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY ); if ( xWrappedObject.is() ) { -// the object was converted to OOo embedded object, the current implementation is now only a wrapper +// the object was converted to AOO embedded object, the current implementation is now only a wrapper xWrappedObject->setPersistentEntry( xStorage, sEntName, nEntryConnectionMode, lArguments, lObjArgs ); return; } @@ -1466,9 +1466,9 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( if ( m_bFromClipboard ) { // the object should be initialized from clipboard - // inpossibility to initialize the object means error here + // impossibility to initialize the object means error here C
(openoffice) branch AOO42X updated: Fix spelling in code comments (#212)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 82c295457e Fix spelling in code comments (#212) 82c295457e is described below commit 82c295457ef79eef7098a762a7c0eb4e376e1b26 Author: John Bampton AuthorDate: Wed May 15 00:48:35 2024 +1000 Fix spelling in code comments (#212) * Fix spelling in code comments * Update AgendaTemplate.java - Co-authored-by: Matthias Seidel (cherry picked from commit ce18a1693bf9d765237cc05d4c0ed0a0d8c4ff14) --- main/sot/source/sdstor/stgdir.hxx | 2 +- .../sun/star/wizards/agenda/AgendaTemplate.java| 52 +++--- .../com/sun/star/wizards/web/ImageListDialog.java | 6 +-- main/xmloff/source/text/txtparai.cxx | 2 +- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/main/sot/source/sdstor/stgdir.hxx b/main/sot/source/sdstor/stgdir.hxx index 50aa9f753c..ed87b9a5e1 100644 --- a/main/sot/source/sdstor/stgdir.hxx +++ b/main/sot/source/sdstor/stgdir.hxx @@ -83,7 +83,7 @@ public: sal_Bool Commit(); sal_Bool Revert(); - void OpenStream( StgIo&, sal_Bool=sal_False ); // set up an approbiate stream + void OpenStream( StgIo&, sal_Bool=sal_False ); // set up an appropriate stream void Close(); sal_Int32 GetSize(); sal_Bool SetSize( sal_Int32 ); diff --git a/main/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java b/main/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java index 454bb46a7d..8b69f43203 100644 --- a/main/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java +++ b/main/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java @@ -88,14 +88,14 @@ import com.sun.star.wizards.ui.event.DataAware; * 2.b. design is arbitrary. * As result the following limitations: * No column merge is allowed. - * One compolsary Heading row. + * One compulsory Heading row. * * To let the template be flexible, we use a kind of "detection": we look where - * the items are read the design of each table, reaplying it after writing the + * the items are read the design of each table, reapplying it after writing the * table. * * A note about threads: - * Many methods here are synchronized, in order to avoid colission made by + * Many methods here are synchronized, in order to avoid collision made by * events fired too often. * @author rpiterman * @@ -110,11 +110,11 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data /** * data model. This keeps the status of the agenda document, and * every redraw is done according to this data. - * Exception: topic data is written programatically, event-oriented. + * Exception: topic data is written programmatically, event-oriented. */ CGAgenda agenda; /** - * the UNO Text Document serrvice + * the UNO Text Document service */ Object document; /** @@ -124,8 +124,8 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data /** * The template-filename of the current template. * Since we often re-link section and the break the link, - * inorder to restore them, we need a template to link to. - * This is practically an identicall copy of the current template. + * in order to restore them, we need a template to link to. + * This is practically an identical copy of the current template. */ String template; /** @@ -146,13 +146,13 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data */ Topics topics; /** - * Stores reusable OOo Placeholder TextFields to insert to the document. + * Stores reusable AOO Placeholder TextFields to insert to the document. */ Map itemsCache; /** * This map is used to find which tables contains a certain Item, so * the keys are the different Items, the Objects are the ItemTable controllers. - * When an Item must be redrawn (because the user checked or uncheced it), + * When an Item must be redrawn (because the user checked or unchecked it), * the controller is retrieved from this Map, and a redraw is issued on this controller. */ Map itemsMap = new Hashtable(11); @@ -173,7 +173,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data int dateFormat, timeFormat; XNumberFormatter dateFormatter, timeFormatter; /** - * used to transfare time from VCL to UNO. + * used to transfer time from VCL to UNO. */ long docNullTime; Calendar calendar; @@ -424,7 +424,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data *
(openoffice) branch trunk updated: Fix spelling in code comments (#212)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new ce18a1693b Fix spelling in code comments (#212) ce18a1693b is described below commit ce18a1693bf9d765237cc05d4c0ed0a0d8c4ff14 Author: John Bampton AuthorDate: Wed May 15 00:48:35 2024 +1000 Fix spelling in code comments (#212) * Fix spelling in code comments * Update AgendaTemplate.java - Co-authored-by: Matthias Seidel --- main/sot/source/sdstor/stgdir.hxx | 2 +- .../sun/star/wizards/agenda/AgendaTemplate.java| 52 +++--- .../com/sun/star/wizards/web/ImageListDialog.java | 6 +-- main/xmloff/source/text/txtparai.cxx | 2 +- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/main/sot/source/sdstor/stgdir.hxx b/main/sot/source/sdstor/stgdir.hxx index 50aa9f753c..ed87b9a5e1 100644 --- a/main/sot/source/sdstor/stgdir.hxx +++ b/main/sot/source/sdstor/stgdir.hxx @@ -83,7 +83,7 @@ public: sal_Bool Commit(); sal_Bool Revert(); - void OpenStream( StgIo&, sal_Bool=sal_False ); // set up an approbiate stream + void OpenStream( StgIo&, sal_Bool=sal_False ); // set up an appropriate stream void Close(); sal_Int32 GetSize(); sal_Bool SetSize( sal_Int32 ); diff --git a/main/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java b/main/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java index 454bb46a7d..8b69f43203 100644 --- a/main/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java +++ b/main/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java @@ -88,14 +88,14 @@ import com.sun.star.wizards.ui.event.DataAware; * 2.b. design is arbitrary. * As result the following limitations: * No column merge is allowed. - * One compolsary Heading row. + * One compulsory Heading row. * * To let the template be flexible, we use a kind of "detection": we look where - * the items are read the design of each table, reaplying it after writing the + * the items are read the design of each table, reapplying it after writing the * table. * * A note about threads: - * Many methods here are synchronized, in order to avoid colission made by + * Many methods here are synchronized, in order to avoid collision made by * events fired too often. * @author rpiterman * @@ -110,11 +110,11 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data /** * data model. This keeps the status of the agenda document, and * every redraw is done according to this data. - * Exception: topic data is written programatically, event-oriented. + * Exception: topic data is written programmatically, event-oriented. */ CGAgenda agenda; /** - * the UNO Text Document serrvice + * the UNO Text Document service */ Object document; /** @@ -124,8 +124,8 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data /** * The template-filename of the current template. * Since we often re-link section and the break the link, - * inorder to restore them, we need a template to link to. - * This is practically an identicall copy of the current template. + * in order to restore them, we need a template to link to. + * This is practically an identical copy of the current template. */ String template; /** @@ -146,13 +146,13 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data */ Topics topics; /** - * Stores reusable OOo Placeholder TextFields to insert to the document. + * Stores reusable AOO Placeholder TextFields to insert to the document. */ Map itemsCache; /** * This map is used to find which tables contains a certain Item, so * the keys are the different Items, the Objects are the ItemTable controllers. - * When an Item must be redrawn (because the user checked or uncheced it), + * When an Item must be redrawn (because the user checked or unchecked it), * the controller is retrieved from this Map, and a redraw is issued on this controller. */ Map itemsMap = new Hashtable(11); @@ -173,7 +173,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data int dateFormat, timeFormat; XNumberFormatter dateFormatter, timeFormatter; /** - * used to transfare time from VCL to UNO. + * used to transfer time from VCL to UNO. */ long docNullTime; Calendar calendar; @@ -424,7 +424,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data * document-specific). * Initializes the Items Cache map. * Ana
(openoffice) branch AOO42X updated: Fix spelling in code comments (#211)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 60294577ea Fix spelling in code comments (#211) 60294577ea is described below commit 60294577ea0827d9b2329ded093b993de39091a7 Author: John Bampton AuthorDate: Tue May 14 21:02:13 2024 +1000 Fix spelling in code comments (#211) Thanks! (cherry picked from commit 07df5c711310d210fae9747223095e12ac5f0c18) --- main/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx | 4 ++-- main/editeng/source/misc/unolingu.cxx | 2 +- main/linguistic/source/misc.cxx | 2 +- main/psprint_config/configuration/psprint.conf| 2 +- main/sd/source/ui/inc/OutlineView.hxx | 2 +- main/xmerge/source/palmtests/qa/lib/converterlib.pm | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/main/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx b/main/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx index a142aeb8b8..317e57fc2b 100644 --- a/main/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/main/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -38,10 +38,10 @@ namespace drawinglayer { /** ControlPrimitive2D class -Base class for ControlPrimitive handling. It decoposes to a +Base class for ControlPrimitive handling. It decomposes to a graphical representation (Bitmap data) of the control. This representation is limited to a quadratic pixel maximum defined -in the applicatin settings. +in the application settings. */ class DRAWINGLAYER_DLLPUBLIC ControlPrimitive2D : public BufferedDecompositionPrimitive2D { diff --git a/main/editeng/source/misc/unolingu.cxx b/main/editeng/source/misc/unolingu.cxx index 9983174cfb..2e2711683a 100644 --- a/main/editeng/source/misc/unolingu.cxx +++ b/main/editeng/source/misc/unolingu.cxx @@ -877,7 +877,7 @@ public: LinguMgrAppExitLstnr::LinguMgrAppExitLstnr() { // add object to frame::Desktop EventListeners in order to properly call - // the AtExit function at appliction exit. + // the AtExit function at application exit. uno::Reference< XMultiServiceFactory > xMgr = getProcessServiceFactory(); if ( xMgr.is() ) diff --git a/main/linguistic/source/misc.cxx b/main/linguistic/source/misc.cxx index e5439b80ff..11222381f4 100644 --- a/main/linguistic/source/misc.cxx +++ b/main/linguistic/source/misc.cxx @@ -930,7 +930,7 @@ uno::Reference< XDictionary > GetIgnoreAllList() AppExitListener::AppExitListener() { // add object to Desktop EventListeners in order to properly call - // the AtExit function at appliction exit. + // the AtExit function at application exit. uno::Reference< XMultiServiceFactory > xMgr = getProcessServiceFactory(); if (xMgr.is()) diff --git a/main/psprint_config/configuration/psprint.conf b/main/psprint_config/configuration/psprint.conf index 5a18beac30..b606fad720 100644 --- a/main/psprint_config/configuration/psprint.conf +++ b/main/psprint_config/configuration/psprint.conf @@ -105,7 +105,7 @@ Command= ; QuickCommand: a command line that accepts PostScript as standard input (pipe) ; this command line will be used instead of the command line given in the ; "Command" key, if the user presses the direct print button. In this case -; no print dialog should be shown, neither form the printing applcation nor +; no print dialog should be shown, neither from the printing application nor ; from the command line (example "kprinter --nodialog --stdin") ; note: a shell will be started for the command ;QuickCommand= diff --git a/main/sd/source/ui/inc/OutlineView.hxx b/main/sd/source/ui/inc/OutlineView.hxx index f349a1d88e..d559e5e49a 100644 --- a/main/sd/source/ui/inc/OutlineView.hxx +++ b/main/sd/source/ui/inc/OutlineView.hxx @@ -217,7 +217,7 @@ private: */ void onUpdateStyleSettings( bool bForceUpdate = false ); - /** this link is called from the vcl applicaten when the stylesettings + /** this link is called from the vcl application when the stylesettings change. Its only purpose is to call onUpdateStyleSettings() then. */ DECL_LINK( AppEventListenerHdl, void * ); diff --git a/main/xmerge/source/palmtests/qa/lib/converterlib.pm b/main/xmerge/source/palmtests/qa/lib/converterlib.pm index 358448645b..80566ea9db 100644 --- a/main/xmerge/source/palmtests/qa/lib/converterlib.pm +++ b/main/xmerge/source/palmtests/qa/lib/converterlib.pm @@ -802,7 +802,7 @@ s
(openoffice) branch trunk updated: Fix spelling in code comments (#211)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 07df5c7113 Fix spelling in code comments (#211) 07df5c7113 is described below commit 07df5c711310d210fae9747223095e12ac5f0c18 Author: John Bampton AuthorDate: Tue May 14 21:02:13 2024 +1000 Fix spelling in code comments (#211) Thanks! --- main/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx | 4 ++-- main/editeng/source/misc/unolingu.cxx | 2 +- main/linguistic/source/misc.cxx | 2 +- main/psprint_config/configuration/psprint.conf| 2 +- main/sd/source/ui/inc/OutlineView.hxx | 2 +- main/xmerge/source/palmtests/qa/lib/converterlib.pm | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/main/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx b/main/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx index a142aeb8b8..317e57fc2b 100644 --- a/main/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/main/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -38,10 +38,10 @@ namespace drawinglayer { /** ControlPrimitive2D class -Base class for ControlPrimitive handling. It decoposes to a +Base class for ControlPrimitive handling. It decomposes to a graphical representation (Bitmap data) of the control. This representation is limited to a quadratic pixel maximum defined -in the applicatin settings. +in the application settings. */ class DRAWINGLAYER_DLLPUBLIC ControlPrimitive2D : public BufferedDecompositionPrimitive2D { diff --git a/main/editeng/source/misc/unolingu.cxx b/main/editeng/source/misc/unolingu.cxx index 9983174cfb..2e2711683a 100644 --- a/main/editeng/source/misc/unolingu.cxx +++ b/main/editeng/source/misc/unolingu.cxx @@ -877,7 +877,7 @@ public: LinguMgrAppExitLstnr::LinguMgrAppExitLstnr() { // add object to frame::Desktop EventListeners in order to properly call - // the AtExit function at appliction exit. + // the AtExit function at application exit. uno::Reference< XMultiServiceFactory > xMgr = getProcessServiceFactory(); if ( xMgr.is() ) diff --git a/main/linguistic/source/misc.cxx b/main/linguistic/source/misc.cxx index e5439b80ff..11222381f4 100644 --- a/main/linguistic/source/misc.cxx +++ b/main/linguistic/source/misc.cxx @@ -930,7 +930,7 @@ uno::Reference< XDictionary > GetIgnoreAllList() AppExitListener::AppExitListener() { // add object to Desktop EventListeners in order to properly call - // the AtExit function at appliction exit. + // the AtExit function at application exit. uno::Reference< XMultiServiceFactory > xMgr = getProcessServiceFactory(); if (xMgr.is()) diff --git a/main/psprint_config/configuration/psprint.conf b/main/psprint_config/configuration/psprint.conf index 5a18beac30..b606fad720 100644 --- a/main/psprint_config/configuration/psprint.conf +++ b/main/psprint_config/configuration/psprint.conf @@ -105,7 +105,7 @@ Command= ; QuickCommand: a command line that accepts PostScript as standard input (pipe) ; this command line will be used instead of the command line given in the ; "Command" key, if the user presses the direct print button. In this case -; no print dialog should be shown, neither form the printing applcation nor +; no print dialog should be shown, neither from the printing application nor ; from the command line (example "kprinter --nodialog --stdin") ; note: a shell will be started for the command ;QuickCommand= diff --git a/main/sd/source/ui/inc/OutlineView.hxx b/main/sd/source/ui/inc/OutlineView.hxx index f349a1d88e..d559e5e49a 100644 --- a/main/sd/source/ui/inc/OutlineView.hxx +++ b/main/sd/source/ui/inc/OutlineView.hxx @@ -217,7 +217,7 @@ private: */ void onUpdateStyleSettings( bool bForceUpdate = false ); - /** this link is called from the vcl applicaten when the stylesettings + /** this link is called from the vcl application when the stylesettings change. Its only purpose is to call onUpdateStyleSettings() then. */ DECL_LINK( AppEventListenerHdl, void * ); diff --git a/main/xmerge/source/palmtests/qa/lib/converterlib.pm b/main/xmerge/source/palmtests/qa/lib/converterlib.pm index 358448645b..80566ea9db 100644 --- a/main/xmerge/source/palmtests/qa/lib/converterlib.pm +++ b/main/xmerge/source/palmtests/qa/lib/converterlib.pm @@ -802,7 +802,7 @@ sub tap_applications # x - x-location to enter string # y - y
(openoffice) branch AOO42X updated: Cleaned up resource files
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 824b2ebe96 Cleaned up resource files 824b2ebe96 is described below commit 824b2ebe96f4b7db795716a7a76e4e48d80b4bc0 Author: mseidel AuthorDate: Mon May 13 17:29:26 2024 +0200 Cleaned up resource files (cherry picked from commit 3009d07ac22142e3b8e585177ba1d9322c1ea67d) --- main/cui/source/options/doclinkdialog.src | 78 +++ main/cui/source/options/fontsubs.src | 24 +- main/cui/source/options/optsave.src | 63 - 3 files changed, 81 insertions(+), 84 deletions(-) diff --git a/main/cui/source/options/doclinkdialog.src b/main/cui/source/options/doclinkdialog.src index 8a5753f070..2e8e489cf4 100644 --- a/main/cui/source/options/doclinkdialog.src +++ b/main/cui/source/options/doclinkdialog.src @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,20 +7,18 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - #include #ifndef _SVX_DOCLINKDIALOG_HRC_ #include "doclinkdialog.hrc" @@ -42,28 +40,28 @@ ModalDialog DLG_DOCUMENTLINK { -HelpID = "cui:ModalDialog:DLG_DOCUMENTLINK"; + HelpID = "cui:ModalDialog:DLG_DOCUMENTLINK" ; OutputSize = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT ( DIALOG_SIZE_X , DIALOG_SIZE_Y ) ; - + Size = MAP_APPFONT ( DIALOG_SIZE_X, DIALOG_SIZE_Y ) ; + Moveable = TRUE ; Closeable = TRUE ; - + FixedText FT_URL { - + Pos = MAP_APPFONT ( 6, LINE_1_Y ) ; Size = MAP_APPFONT ( DIALOG_SIZE_X - 6, HEIGHT_LABEL ) ; - Group = TRUE; + Group = TRUE ; - Text [ en-US ] = "~Database file"; + Text [ en-US ] = "~Database file" ; }; ComboBox CMB_URL { - HelpID = "cui:ComboBox:DLG_DOCUMENTLINK:CMB_URL"; - Pos = MAP_APPFONT ( 6 , LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 3) ; - Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X , HEIGHT_EDIT ) ; + HelpID = "cui:ComboBox:DLG_DOCUMENTLINK:CMB_URL" ; + Pos = MAP_APPFONT ( 6, LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 3) ; + Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X, HEIGHT_EDIT ) ; SVLook = TRUE ; Border = TRUE ; @@ -73,75 +71,75 @@ ModalDialog DLG_DOCUMENTLINK }; PushButton PB_BROWSEFILE { - HelpID = "cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE"; - Pos = MAP_APPFONT ( DIALOG_SIZE_X - BUTTON_SIZE_X - 6 , LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 4) ; - Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ); - Text [ en-US ] = "~Browse..."; + HelpID = "cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE" ; + Pos = MAP_APPFONT ( DIALOG_SIZE_X - BUTTON_SIZE_X - 6, LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 4) ; + Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ; + Text [ en-US ] = "~Browse..." ; }; FixedText FT_NAME { Pos = MAP_APPFONT ( 6, LINE_1_Y + 2*OFFSET_Y + HEIGHT_LABEL + BUTTON_SIZE_Y - 3) ; Size = MAP_APPFONT ( DIALOG_SIZE_X - 6, HEIGHT_LABEL ) ; - Group = TRUE; + Group = TRUE ; - Text [ en-US ] = "Registered ~name"; + Text [ en-US ] = "Registered ~name" ; }; Edit ET_NAME { - HelpID = "cui:Edit:DLG_DOCUMENTLINK:ET_NAME"; + HelpID = "cui:Edit:DLG_DOCUMENTLINK:ET_NAME" ; Pos = MAP_APPFONT ( 6, LINE_1_Y + 3*OFFSET_Y + 2*HEIGHT_LABEL + BUTTON_SIZE_Y - 6) ; - Size =
(openoffice) branch trunk updated: Cleaned up resource files
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 3009d07ac2 Cleaned up resource files 3009d07ac2 is described below commit 3009d07ac22142e3b8e585177ba1d9322c1ea67d Author: mseidel AuthorDate: Mon May 13 17:29:26 2024 +0200 Cleaned up resource files --- main/cui/source/options/doclinkdialog.src | 78 +++ main/cui/source/options/fontsubs.src | 24 +- main/cui/source/options/optsave.src | 63 - 3 files changed, 81 insertions(+), 84 deletions(-) diff --git a/main/cui/source/options/doclinkdialog.src b/main/cui/source/options/doclinkdialog.src index 8a5753f070..2e8e489cf4 100644 --- a/main/cui/source/options/doclinkdialog.src +++ b/main/cui/source/options/doclinkdialog.src @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,20 +7,18 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - #include #ifndef _SVX_DOCLINKDIALOG_HRC_ #include "doclinkdialog.hrc" @@ -42,28 +40,28 @@ ModalDialog DLG_DOCUMENTLINK { -HelpID = "cui:ModalDialog:DLG_DOCUMENTLINK"; + HelpID = "cui:ModalDialog:DLG_DOCUMENTLINK" ; OutputSize = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT ( DIALOG_SIZE_X , DIALOG_SIZE_Y ) ; - + Size = MAP_APPFONT ( DIALOG_SIZE_X, DIALOG_SIZE_Y ) ; + Moveable = TRUE ; Closeable = TRUE ; - + FixedText FT_URL { - + Pos = MAP_APPFONT ( 6, LINE_1_Y ) ; Size = MAP_APPFONT ( DIALOG_SIZE_X - 6, HEIGHT_LABEL ) ; - Group = TRUE; + Group = TRUE ; - Text [ en-US ] = "~Database file"; + Text [ en-US ] = "~Database file" ; }; ComboBox CMB_URL { - HelpID = "cui:ComboBox:DLG_DOCUMENTLINK:CMB_URL"; - Pos = MAP_APPFONT ( 6 , LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 3) ; - Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X , HEIGHT_EDIT ) ; + HelpID = "cui:ComboBox:DLG_DOCUMENTLINK:CMB_URL" ; + Pos = MAP_APPFONT ( 6, LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 3) ; + Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X, HEIGHT_EDIT ) ; SVLook = TRUE ; Border = TRUE ; @@ -73,75 +71,75 @@ ModalDialog DLG_DOCUMENTLINK }; PushButton PB_BROWSEFILE { - HelpID = "cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE"; - Pos = MAP_APPFONT ( DIALOG_SIZE_X - BUTTON_SIZE_X - 6 , LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 4) ; - Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ); - Text [ en-US ] = "~Browse..."; + HelpID = "cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE" ; + Pos = MAP_APPFONT ( DIALOG_SIZE_X - BUTTON_SIZE_X - 6, LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 4) ; + Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ; + Text [ en-US ] = "~Browse..." ; }; FixedText FT_NAME { Pos = MAP_APPFONT ( 6, LINE_1_Y + 2*OFFSET_Y + HEIGHT_LABEL + BUTTON_SIZE_Y - 3) ; Size = MAP_APPFONT ( DIALOG_SIZE_X - 6, HEIGHT_LABEL ) ; - Group = TRUE; + Group = TRUE ; - Text [ en-US ] = "Registered ~name"; + Text [ en-US ] = "Registered ~name" ; }; Edit ET_NAME { - HelpID = "cui:Edit:DLG_DOCUMENTLINK:ET_NAME"; + HelpID = "cui:Edit:DLG_DOCUMENTLINK:ET_NAME" ; Pos = MAP_APPFONT ( 6, LINE_1_Y + 3*OFFSET_Y + 2*HEIGHT_LABEL + BUTTON_SIZE_Y - 6) ; - Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X , HEIGHT
(openoffice) branch AOO42X updated: Maintenance cleanup
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new fe4375eeca Maintenance cleanup fe4375eeca is described below commit fe4375eeca3591a06ad163db5a43fe00c3426b05 Author: mseidel AuthorDate: Thu May 9 15:07:57 2024 +0200 Maintenance cleanup (cherry picked from commit 3215e17bb4a2dd54ee12e05da1eb07f2b834bc46) --- main/cui/source/dialogs/dlgname.cxx | 90 + main/cui/source/dialogs/dlgname.hrc | 12 +++-- 2 files changed, 45 insertions(+), 57 deletions(-) diff --git a/main/cui/source/dialogs/dlgname.cxx b/main/cui/source/dialogs/dlgname.cxx index 3d95a159ef..6fe9bd8501 100644 --- a/main/cui/source/dialogs/dlgname.cxx +++ b/main/cui/source/dialogs/dlgname.cxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,20 +7,18 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" @@ -40,9 +38,7 @@ #define MAX_DESCRIPTION_LINES ((long)5) /* -|* |* Dialog zum Editieren eines Namens -|* \/ SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String& rDesc ) : @@ -57,23 +53,23 @@ SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String aFtDescription.SetText( rDesc ); aEdtName.SetText( rName ); -aEdtName.SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); -ModifyHdl(); -aEdtName.SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl)); - -// dynamic height of the description field -Size aSize = aFtDescription.GetSizePixel(); -long nTxtWidth = aFtDescription.GetCtrlTextWidth( rDesc ); -if ( nTxtWidth > aSize.Width() ) -{ -long nLines = Min( ( nTxtWidth / aSize.Width() + 1 ), MAX_DESCRIPTION_LINES ); -long nHeight = aSize.Height(); -aSize.Height() = nHeight * nLines; -aFtDescription.SetSizePixel( aSize ); -Point aPnt = aEdtName.GetPosPixel(); -aPnt.Y() += ( aSize.Height() - nHeight ); -aEdtName.SetPosPixel( aPnt ); -} + aEdtName.SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); + ModifyHdl(); + aEdtName.SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl)); + + // dynamic height of the description field + Size aSize = aFtDescription.GetSizePixel(); + long nTxtWidth = aFtDescription.GetCtrlTextWidth( rDesc ); + if ( nTxtWidth > aSize.Width() ) + { + long nLines = Min( ( nTxtWidth / aSize.Width() + 1 ), MAX_DESCRIPTION_LINES ); + long nHeight = aSize.Height(); + aSize.Height() = nHeight * nLines; + aFtDescription.SetSizePixel( aSize ); + Point aPnt = aEdtName.GetPosPixel(); + aPnt.Y() += ( aSize.Height() - nHeight ); + aEdtName.SetPosPixel( aPnt ); + } } /* -27.02.2002 15:22-- @@ -81,18 +77,17 @@ SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String ---*/ IMPL_LINK(SvxNameDialog, ModifyHdl, Edit*, EMPTYARG) { -if(aCheckNameHdl.IsSet()) -aBtnOK.Enable(aCheckNameHdl.Call(this) > 0); -return 0; + if(aCheckNameHdl.IsSet()) + aBtnOK.Enable(aCheckNameHdl.Call(this) > 0); + return 0; } -/// // #i68101# // Dialog for editing Object Name // plus uniqueness-callback-linkHandler -SvxObjectNameDialog::SvxObjectNameDialog( - Window* pWindow, +SvxObjectNameDialog::SvxObjectNameDialog( + Window* pWindow, const String& rNam
(openoffice) branch trunk updated: Maintenance cleanup
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 3215e17bb4 Maintenance cleanup 3215e17bb4 is described below commit 3215e17bb4a2dd54ee12e05da1eb07f2b834bc46 Author: mseidel AuthorDate: Thu May 9 15:07:57 2024 +0200 Maintenance cleanup --- main/cui/source/dialogs/dlgname.cxx | 90 + main/cui/source/dialogs/dlgname.hrc | 12 +++-- 2 files changed, 45 insertions(+), 57 deletions(-) diff --git a/main/cui/source/dialogs/dlgname.cxx b/main/cui/source/dialogs/dlgname.cxx index 3d95a159ef..6fe9bd8501 100644 --- a/main/cui/source/dialogs/dlgname.cxx +++ b/main/cui/source/dialogs/dlgname.cxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,20 +7,18 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" @@ -40,9 +38,7 @@ #define MAX_DESCRIPTION_LINES ((long)5) /* -|* |* Dialog zum Editieren eines Namens -|* \/ SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String& rDesc ) : @@ -57,23 +53,23 @@ SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String aFtDescription.SetText( rDesc ); aEdtName.SetText( rName ); -aEdtName.SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); -ModifyHdl(); -aEdtName.SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl)); - -// dynamic height of the description field -Size aSize = aFtDescription.GetSizePixel(); -long nTxtWidth = aFtDescription.GetCtrlTextWidth( rDesc ); -if ( nTxtWidth > aSize.Width() ) -{ -long nLines = Min( ( nTxtWidth / aSize.Width() + 1 ), MAX_DESCRIPTION_LINES ); -long nHeight = aSize.Height(); -aSize.Height() = nHeight * nLines; -aFtDescription.SetSizePixel( aSize ); -Point aPnt = aEdtName.GetPosPixel(); -aPnt.Y() += ( aSize.Height() - nHeight ); -aEdtName.SetPosPixel( aPnt ); -} + aEdtName.SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); + ModifyHdl(); + aEdtName.SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl)); + + // dynamic height of the description field + Size aSize = aFtDescription.GetSizePixel(); + long nTxtWidth = aFtDescription.GetCtrlTextWidth( rDesc ); + if ( nTxtWidth > aSize.Width() ) + { + long nLines = Min( ( nTxtWidth / aSize.Width() + 1 ), MAX_DESCRIPTION_LINES ); + long nHeight = aSize.Height(); + aSize.Height() = nHeight * nLines; + aFtDescription.SetSizePixel( aSize ); + Point aPnt = aEdtName.GetPosPixel(); + aPnt.Y() += ( aSize.Height() - nHeight ); + aEdtName.SetPosPixel( aPnt ); + } } /* -27.02.2002 15:22-- @@ -81,18 +77,17 @@ SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String ---*/ IMPL_LINK(SvxNameDialog, ModifyHdl, Edit*, EMPTYARG) { -if(aCheckNameHdl.IsSet()) -aBtnOK.Enable(aCheckNameHdl.Call(this) > 0); -return 0; + if(aCheckNameHdl.IsSet()) + aBtnOK.Enable(aCheckNameHdl.Call(this) > 0); + return 0; } -/// // #i68101# // Dialog for editing Object Name // plus uniqueness-callback-linkHandler -SvxObjectNameDialog::SvxObjectNameDialog( - Window* pWindow, +SvxObjectNameDialog::SvxObjectNameDialog( + Window* pWindow, const String& rName) : ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_NAME)),
(openoffice) 01/01: Merge branch 'trunk' into Pilot-Pirx-patch-1
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-patch-1 in repository https://gitbox.apache.org/repos/asf/openoffice.git commit 2bd4cdeaa365aaca2b451014bd581a3c1f3792d1 Merge: afc83f5fcb 6b7c93d1f1 Author: mseidel AuthorDate: Mon May 6 22:38:37 2024 +0200 Merge branch 'trunk' into Pilot-Pirx-patch-1 README.md | 2 +- main/LICENSE | 125 - main/NOTICE| 10 +- main/README| 2 +- main/RepositoryExternal.mk | 17 +- main/RepositoryFixes.mk| 4 +- .../accessibility/standard/vclxaccessiblebox.hxx | 4 +- .../source/cairo/cairo_spritecanvashelper.cxx | 2 +- .../source/directx/dx_spritecanvashelper.cxx | 2 +- main/canvas/source/vcl/spritecanvashelper.cxx | 2 +- main/crashrep/source/unx/main.cxx | 4 +- main/curl/curl-bundled_openssl.patch | 35 +- main/curl/curl-wnt.patch | 26 +- main/curl/makefile.mk | 19 +- main/curl/prj/d.lst| 10 +- main/dbaccess/prj/dbu.xml | 6 +- main/dbaccess/source/core/api/RowSetBase.hxx | 2 +- main/dbaccess/source/ui/inc/JoinController.hxx | 4 +- .../res/commandimagelist/lch_spacepara1.png| Bin 315 -> 315 bytes .../res/commandimagelist/lch_spacepara15.png | Bin 315 -> 315 bytes main/editeng/inc/editeng/AccessibleContextBase.hxx | 2 +- main/extensions.lst| 4 +- main/external_deps.lst | 19 +- .../xslt/export/wordml/ooo2wordml_border.xsl | 4 +- .../source/xslt/import/wordml/wordml2ooo_field.xsl | 2 +- main/forms/source/component/ImageControl.cxx | 2 +- main/forms/source/misc/limitedformats.cxx | 2 +- .../source/win32/filepicker/VistaFilePicker.hxx| 2 +- .../source/uielement/recentfilesmenucontroller.cxx | 470 - .../sun/star/lib/util/AsynchronousFinalizer.java | 2 +- main/jvmfwk/inc/jvmfwk/framework.h | 2 +- .../IllegalAccessibleComponentStateException.idl | 2 +- main/oox/source/core/filterdetect.cxx | 2 +- main/openssl/makefile.mk | 94 ++-- main/openssl/openssl.patch | 214 ++-- main/openssl/openssllnx.patch | 25 - main/openssl/opensslunx.patch | 17 + main/openssl/prj/d.lst | 13 +- main/python/python-2.7.18-msvs9.patch | 579 +++-- main/redland/raptor/makefile.mk| 1 + main/redland/raptor/raptor2-2.0.15.patch | 65 +++ main/registry/inc/registry/reflwrit.hxx| 2 +- main/rsc/doku/feinkonz.43/rsc.odt | Bin 0 -> 34354 bytes main/rsc/doku/feinkonz.43/rscerror.odt | Bin 0 -> 19338 bytes main/rsc/doku/feinkonz.43/rscinst.odt | Bin 0 -> 32344 bytes main/rsc/doku/schriftw.16/change.odt | Bin 0 -> 15705 bytes main/sal/inc/rtl/bootstrap.h | 2 +- main/sc/addin/datefunc/dfa.cl | 6 +- main/sc/source/ui/inc/fieldwnd.hxx | 2 +- main/sc/source/ui/unoobj/shapeuno.cxx | 4 +- main/scp2/source/ooo/file_library_ooo.scp | 8 +- main/sd/source/ui/inc/fupoor.hxx | 2 +- main/sd/source/ui/slideshow/slideshowimpl.cxx | 23 +- main/sd/source/ui/view/ToolBarManager.cxx | 2 +- main/sfx2/source/inc/statcach.hxx | 71 +-- main/shell/qa/zip/testimpl/testzipimpl.cxx | 18 +- main/shell/qa/zip/testimpl/testzipimpl.hxx | 13 +- main/shell/qa/zip/ziptest.cxx | 2 - main/sw/source/core/access/accportions.cxx | 2 +- main/sw/source/core/text/redlnitr.cxx | 127 +++-- main/sw/source/core/unocore/unodraw.cxx| 4 +- main/sw/source/filter/html/parcss1.hxx | 76 ++- main/sw/source/filter/ww8/rtfexport.hxx| 245 + main/sw/source/ui/table/chartins.src | 2 - main/sw/source/ui/table/colwd.src | 2 - main/sw/source/ui/table/convert.src| 143 +++-- main/sw/source/ui/table/instable.src | 2 - main/sw/source/ui/table/mergetbl.src | 2 - main/sw/source/ui/table/rowht.src | 2 - main/sw/source/ui/table/splittbl.src | 88 +--- main/sw/source/ui/table/table.src | 2 - main/sw/source/ui/table/tabledlg.src | 2 - main/sw/source/ui/table/tautofmt.src | 2 - main/
(openoffice) branch Pilot-Pirx-patch-1 updated (afc83f5fcb -> 2bd4cdeaa3)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a change to branch Pilot-Pirx-patch-1 in repository https://gitbox.apache.org/repos/asf/openoffice.git from afc83f5fcb Merge branch 'trunk' into Pilot-Pirx-patch-1 add fd18302cfc Updated Ukrainian dictionary add deb3f44d6f Forgot to update MD5 add 4c5b548fb6 Upgrade OpenSSL to version 3.0.13. add 51cb29da04 Updated English dictionary add ceb51a8ef1 Fix spelling in code comments and descriptions only (#207) add 604463aab2 Fix spelling in code comments (#208) add cdfa2a0e24 Fix spelling in comments (#209) add 95939a2635 Link pthread library when using OpenSSL on Linux add c809b0d380 Fix spelling in code comments (#210) add c284e3b553 Fix for issue 60859 add 4ac3bde70f Search forward or backward for a visible slide add 1fcc6d2b2a Merge pull request #200 from oooforum/patch-12 add f116cfecc6 Use correct icons for line spacing in HC mode with large icons add a4b70a5c0d Fix typos: mehtod -> method, mehtods -> methods. add 63e8b0626c Fix German comments, cleanup add 39e5c08678 Converted files from old StarWriter format to ODT add 3a917bcab5 Remove temporary file add caeabaab39 Maintenance cleanup add 8cd9d6f874 Update README.md add 2331699343 Updated download numbers add a5818cd95c Get redland building with Clang >= 15, libxml2 >= 2.11.0, and/or FreeBSD >= 14. add 8eb9a7e66a Build OpenSSL as a dynamic link library, instead of a static library. Patch its users to use an RPATH of $ORIGIN, so they use the correct copy. This reduces the size of the build by about 4615 KiB, or 3.78%. add 9b51720274 Fix a regression in 8eb9a7e66a3128669216ddb884f844d50ac59fb9, which broke delivering libcrypto.lib and libssl.lib on Windows. add 73fec56a8c Fixed typos add 0dfdc53f91 Cleaned up resource files add e469ab6aed Upgrade Curl to version 8.7.1. add f7b97bf7d9 Override OpenSSL's certificate verification with our own, instead of using its verification and selectively overriding the result. - A nonsense self-signed expired certificate is fed into Curl to get it to initialize even when the certificates in its expected system path are missing or elsewhere. - In Curl's CURLOPT_SSL_CTX_FUNCTION, our Curl_SSLContextCallback, we then completely override OpenSSL's verification process with ours, using SSL_CTX_set_cert_verify_ [...] add d1f3eb887e Updated English dictionary add 6fd66686f1 Maintenance cleanup add 6b7c93d1f1 Maintenance cleanup new 2bd4cdeaa3 Merge branch 'trunk' into Pilot-Pirx-patch-1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 2 +- main/LICENSE | 125 - main/NOTICE| 10 +- main/README| 2 +- main/RepositoryExternal.mk | 17 +- main/RepositoryFixes.mk| 4 +- .../accessibility/standard/vclxaccessiblebox.hxx | 4 +- .../source/cairo/cairo_spritecanvashelper.cxx | 2 +- .../source/directx/dx_spritecanvashelper.cxx | 2 +- main/canvas/source/vcl/spritecanvashelper.cxx | 2 +- main/crashrep/source/unx/main.cxx | 4 +- main/curl/curl-bundled_openssl.patch | 35 +- main/curl/curl-wnt.patch | 26 +- main/curl/makefile.mk | 19 +- main/curl/prj/d.lst| 10 +- main/dbaccess/prj/dbu.xml | 6 +- main/dbaccess/source/core/api/RowSetBase.hxx | 2 +- main/dbaccess/source/ui/inc/JoinController.hxx | 4 +- .../res/commandimagelist/lch_spacepara1.png| Bin 315 -> 315 bytes .../res/commandimagelist/lch_spacepara15.png | Bin 315 -> 315 bytes main/editeng/inc/editeng/AccessibleContextBase.hxx | 2 +- main/extensions.lst| 4 +- main/external_deps.lst | 19 +- .../xslt/export/wordml/ooo2wordml_border.xsl | 4 +- .../source/xslt/import/wordml/wordml2ooo_field.xsl | 2 +- main/forms/source/component/ImageControl.cxx | 2 +- main/forms/source/misc/limitedformats.cxx | 2 +- .../source/win32/filepicker/VistaFilePicker.hxx| 2 +- .../source/uielement/recentfilesmenucontroller.cxx | 470 - .../sun/star/lib/util/AsynchronousFinalizer.java | 2 +- main/jvmfwk/inc/jvmfwk/framework.h | 2 +- .../IllegalAccessibleComponentStateException.idl | 2 +- main/oox/source/core/fil
(openoffice) branch AOO42X updated: Maintenance cleanup
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 44d9ce519f Maintenance cleanup 44d9ce519f is described below commit 44d9ce519fb698708ea3288d607700b906f349e5 Author: mseidel AuthorDate: Sun May 5 11:11:37 2024 +0200 Maintenance cleanup (cherry picked from commit 6b7c93d1f1116de547c9b9683ad03dc32909ca67) --- main/shell/qa/zip/testimpl/testzipimpl.cxx | 18 -- main/shell/qa/zip/testimpl/testzipimpl.hxx | 13 ++--- main/shell/qa/zip/ziptest.cxx | 2 -- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/main/shell/qa/zip/testimpl/testzipimpl.cxx b/main/shell/qa/zip/testimpl/testzipimpl.cxx index 83406f8edf..62b87079c7 100644 --- a/main/shell/qa/zip/testimpl/testzipimpl.cxx +++ b/main/shell/qa/zip/testimpl/testzipimpl.cxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,27 +7,25 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" #define DLLIMPLEMENTATION #include "testzipimpl.hxx" -vector expectedContents; +vector expectedContents; TestZipImpl::TestZipImpl(const char * documentName) : zipFile(ZipFile(string(documentName))) @@ -52,11 +50,10 @@ TestZipImpl::TestZipImpl(const char * documentName) : sort(expectedContents.begin(), expectedContents.end()); } -TestZipImpl::~TestZipImpl() -{ +TestZipImpl::~TestZipImpl() +{ } - // bool TestZipImpl::test_directory() { @@ -80,3 +77,4 @@ bool TestZipImpl::test_getContent() return !contentBuf.empty(); } +/* vim: set noet sw=4 ts=4: */ diff --git a/main/shell/qa/zip/testimpl/testzipimpl.hxx b/main/shell/qa/zip/testimpl/testzipimpl.hxx index 7d5804ea72..01419e9071 100644 --- a/main/shell/qa/zip/testimpl/testzipimpl.hxx +++ b/main/shell/qa/zip/testimpl/testzipimpl.hxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,20 +7,18 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" #include "internal/zipfile.hxx" @@ -36,7 +34,7 @@ using namespace std; -class DLLPUBLIC TestZipImpl +class DLLPUBLIC TestZipImpl { private: ZipFile zipFile; @@ -48,3 +46,4 @@ class DLLPUBLIC TestZipImpl bool test_getContent(); }; +/* vim: set noet sw=4 ts=4: */ diff --git a/main/shell/qa/zip/ziptest.cxx b/main/shell/qa/zip/ziptest.cxx index bb20baac1f..f57ceb1b96 100644 --- a/main/shell/qa/zip/ziptest.cxx +++ b/main/shell/qa/zip/ziptest.cxx @@ -19,8 +19,6 @@ * */ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" #include "gtest/gtest.h"
(openoffice) branch trunk updated: Maintenance cleanup
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 6b7c93d1f1 Maintenance cleanup 6b7c93d1f1 is described below commit 6b7c93d1f1116de547c9b9683ad03dc32909ca67 Author: mseidel AuthorDate: Sun May 5 11:11:37 2024 +0200 Maintenance cleanup --- main/shell/qa/zip/testimpl/testzipimpl.cxx | 18 -- main/shell/qa/zip/testimpl/testzipimpl.hxx | 13 ++--- main/shell/qa/zip/ziptest.cxx | 2 -- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/main/shell/qa/zip/testimpl/testzipimpl.cxx b/main/shell/qa/zip/testimpl/testzipimpl.cxx index 83406f8edf..62b87079c7 100644 --- a/main/shell/qa/zip/testimpl/testzipimpl.cxx +++ b/main/shell/qa/zip/testimpl/testzipimpl.cxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,27 +7,25 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" #define DLLIMPLEMENTATION #include "testzipimpl.hxx" -vector expectedContents; +vector expectedContents; TestZipImpl::TestZipImpl(const char * documentName) : zipFile(ZipFile(string(documentName))) @@ -52,11 +50,10 @@ TestZipImpl::TestZipImpl(const char * documentName) : sort(expectedContents.begin(), expectedContents.end()); } -TestZipImpl::~TestZipImpl() -{ +TestZipImpl::~TestZipImpl() +{ } - // bool TestZipImpl::test_directory() { @@ -80,3 +77,4 @@ bool TestZipImpl::test_getContent() return !contentBuf.empty(); } +/* vim: set noet sw=4 ts=4: */ diff --git a/main/shell/qa/zip/testimpl/testzipimpl.hxx b/main/shell/qa/zip/testimpl/testzipimpl.hxx index 7d5804ea72..01419e9071 100644 --- a/main/shell/qa/zip/testimpl/testzipimpl.hxx +++ b/main/shell/qa/zip/testimpl/testzipimpl.hxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,20 +7,18 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" #include "internal/zipfile.hxx" @@ -36,7 +34,7 @@ using namespace std; -class DLLPUBLIC TestZipImpl +class DLLPUBLIC TestZipImpl { private: ZipFile zipFile; @@ -48,3 +46,4 @@ class DLLPUBLIC TestZipImpl bool test_getContent(); }; +/* vim: set noet sw=4 ts=4: */ diff --git a/main/shell/qa/zip/ziptest.cxx b/main/shell/qa/zip/ziptest.cxx index bb20baac1f..f57ceb1b96 100644 --- a/main/shell/qa/zip/ziptest.cxx +++ b/main/shell/qa/zip/ziptest.cxx @@ -19,8 +19,6 @@ * */ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" #include "gtest/gtest.h"
(openoffice) branch AOO42X updated: Maintenance cleanup
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 06ff824407 Maintenance cleanup 06ff824407 is described below commit 06ff8244078651d7ffc6508dc1bbc28468ed72e3 Author: mseidel AuthorDate: Sat May 4 12:51:26 2024 +0200 Maintenance cleanup (cherry picked from commit 6fd66686f1778e9a4f81842cbfc5513bbae37325) --- main/sw/source/core/text/redlnitr.cxx | 127 +- 1 file changed, 63 insertions(+), 64 deletions(-) diff --git a/main/sw/source/core/text/redlnitr.cxx b/main/sw/source/core/text/redlnitr.cxx index 2a7be6eff6..96781b7bf5 100644 --- a/main/sw/source/core/text/redlnitr.cxx +++ b/main/sw/source/core/text/redlnitr.cxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,24 +7,21 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" - #include "hintids.hxx" #include #include @@ -55,38 +52,38 @@ using namespace ::com::sun::star; /* - * SwAttrIter::CtorInitAttrIter() + * SwAttrIter::CtorInitAttrIter() */ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, SwTxtFrm* pFrm ) { // Beim HTML-Import kann es vorkommen, dass kein Layout existiert. -SwRootFrm* pRootFrm = rTxtNode.getIDocumentLayoutAccess()->GetCurrentLayout(); -pShell = pRootFrm ? pRootFrm->GetCurrShell() : 0; //swmod 080218 + SwRootFrm* pRootFrm = rTxtNode.getIDocumentLayoutAccess()->GetCurrentLayout(); + pShell = pRootFrm ? pRootFrm->GetCurrShell() : 0; //swmod 080218 -pScriptInfo = + pScriptInfo = -// attributes set at the whole paragraph + // attributes set at the whole paragraph pAttrSet = rTxtNode.GetpSwAttrSet(); -// attribute array -pHints = rTxtNode.GetpSwpHints(); - -// Build a font matching the default paragraph style: -SwFontAccess aFontAccess( (), pShell ); -delete pFnt; -pFnt = new SwFont( *aFontAccess.Get()->GetFont() ); - -// set font to vertical if frame layout is vertical -sal_Bool bVertLayout = sal_False; -sal_Bool bRTL = sal_False; -if ( pFrm ) -{ -if ( pFrm->IsVertical() ) -{ -bVertLayout = sal_True; -pFnt->SetVertical( pFnt->GetOrientation(), sal_True ); -} -bRTL = pFrm->IsRightToLeft(); -} + // attribute array + pHints = rTxtNode.GetpSwpHints(); + + // Build a font matching the default paragraph style: + SwFontAccess aFontAccess( (), pShell ); + delete pFnt; + pFnt = new SwFont( *aFontAccess.Get()->GetFont() ); + + // set font to vertical if frame layout is vertical + sal_Bool bVertLayout = sal_False; + sal_Bool bRTL = sal_False; + if ( pFrm ) + { + if ( pFrm->IsVertical() ) + { + bVertLayout = sal_True; + pFnt->SetVertical( pFnt->GetOrientation(), sal_True ); + } + bRTL = pFrm->IsRightToLeft(); + } // Initialize the default attribute of the attribute handler // based on the attribute array cached together with the font. @@ -100,20 +97,20 @@ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, S // determine script changes if not already done for current paragraph ASSERT( pScriptInfo, "No script info available"); -if ( pScriptInfo->GetInvalidity() != STRING_LEN ) - pScriptInfo->InitScriptInfo( rTxtNode, bRTL ); + if ( pScriptInfo->GetInvalidity() != STRING_LEN ) +pScriptInfo
(openoffice) branch trunk updated: Maintenance cleanup
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 6fd66686f1 Maintenance cleanup 6fd66686f1 is described below commit 6fd66686f1778e9a4f81842cbfc5513bbae37325 Author: mseidel AuthorDate: Sat May 4 12:51:26 2024 +0200 Maintenance cleanup --- main/sw/source/core/text/redlnitr.cxx | 127 +- 1 file changed, 63 insertions(+), 64 deletions(-) diff --git a/main/sw/source/core/text/redlnitr.cxx b/main/sw/source/core/text/redlnitr.cxx index 2a7be6eff6..96781b7bf5 100644 --- a/main/sw/source/core/text/redlnitr.cxx +++ b/main/sw/source/core/text/redlnitr.cxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,24 +7,21 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" - #include "hintids.hxx" #include #include @@ -55,38 +52,38 @@ using namespace ::com::sun::star; /* - * SwAttrIter::CtorInitAttrIter() + * SwAttrIter::CtorInitAttrIter() */ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, SwTxtFrm* pFrm ) { // Beim HTML-Import kann es vorkommen, dass kein Layout existiert. -SwRootFrm* pRootFrm = rTxtNode.getIDocumentLayoutAccess()->GetCurrentLayout(); -pShell = pRootFrm ? pRootFrm->GetCurrShell() : 0; //swmod 080218 + SwRootFrm* pRootFrm = rTxtNode.getIDocumentLayoutAccess()->GetCurrentLayout(); + pShell = pRootFrm ? pRootFrm->GetCurrShell() : 0; //swmod 080218 -pScriptInfo = + pScriptInfo = -// attributes set at the whole paragraph + // attributes set at the whole paragraph pAttrSet = rTxtNode.GetpSwAttrSet(); -// attribute array -pHints = rTxtNode.GetpSwpHints(); - -// Build a font matching the default paragraph style: -SwFontAccess aFontAccess( (), pShell ); -delete pFnt; -pFnt = new SwFont( *aFontAccess.Get()->GetFont() ); - -// set font to vertical if frame layout is vertical -sal_Bool bVertLayout = sal_False; -sal_Bool bRTL = sal_False; -if ( pFrm ) -{ -if ( pFrm->IsVertical() ) -{ -bVertLayout = sal_True; -pFnt->SetVertical( pFnt->GetOrientation(), sal_True ); -} -bRTL = pFrm->IsRightToLeft(); -} + // attribute array + pHints = rTxtNode.GetpSwpHints(); + + // Build a font matching the default paragraph style: + SwFontAccess aFontAccess( (), pShell ); + delete pFnt; + pFnt = new SwFont( *aFontAccess.Get()->GetFont() ); + + // set font to vertical if frame layout is vertical + sal_Bool bVertLayout = sal_False; + sal_Bool bRTL = sal_False; + if ( pFrm ) + { + if ( pFrm->IsVertical() ) + { + bVertLayout = sal_True; + pFnt->SetVertical( pFnt->GetOrientation(), sal_True ); + } + bRTL = pFrm->IsRightToLeft(); + } // Initialize the default attribute of the attribute handler // based on the attribute array cached together with the font. @@ -100,20 +97,20 @@ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, S // determine script changes if not already done for current paragraph ASSERT( pScriptInfo, "No script info available"); -if ( pScriptInfo->GetInvalidity() != STRING_LEN ) - pScriptInfo->InitScriptInfo( rTxtNode, bRTL ); + if ( pScriptInfo->GetInvalidity() != STRING_LEN ) +pScriptInfo->InitScriptInfo( rTxtNode, bRTL ); if ( pBreakIt->GetBreakIter()
(openoffice) branch AOO41X updated: Updated English dictionary
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new f392f6ea96 Updated English dictionary f392f6ea96 is described below commit f392f6ea96e51d30cd16b90a0b300b36f4485634 Author: mseidel AuthorDate: Wed May 1 11:47:19 2024 +0200 Updated English dictionary --- main/extensions.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/extensions.lst b/main/extensions.lst index fcdd198dc8..d296c27ba9 100644 --- a/main/extensions.lst +++ b/main/extensions.lst @@ -39,7 +39,7 @@ # English dictionary [ language=en.* || language=de || language=it ] -ffbc921f2c371d179ecf29693aa0a1e1 https://sourceforge.net/projects/aoo-extensions/files/17102/101/dict-en-20240401_aoo.oxt/download "dict-en.oxt" +60871c958bbca8a67d1ce1c142805cdf https://sourceforge.net/projects/aoo-extensions/files/17102/102/dict-en-20240501_aoo.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ]
(openoffice) branch AOO42X updated: Updated English dictionary
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new e8a755c133 Updated English dictionary e8a755c133 is described below commit e8a755c13305f1c684424a6323c5f4ceb9b0a668 Author: mseidel AuthorDate: Wed May 1 11:41:53 2024 +0200 Updated English dictionary (cherry picked from commit d1f3eb887e462729520d9bf12c9b40591052bdd2) --- main/extensions.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/extensions.lst b/main/extensions.lst index ccfdde3c5d..a0de45d02d 100644 --- a/main/extensions.lst +++ b/main/extensions.lst @@ -72,7 +72,7 @@ # English (en_AU, en_CA, en_GB, en_US, en_ZA) dictionary [ language=en.* || language=de || language=it ] - ffbc921f2c371d179ecf29693aa0a1e1 https://sourceforge.net/projects/aoo-extensions/files/17102/101/dict-en-20240401_aoo.oxt/download "dict-en.oxt" + 60871c958bbca8a67d1ce1c142805cdf https://sourceforge.net/projects/aoo-extensions/files/17102/102/dict-en-20240501_aoo.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ]
(openoffice) branch trunk updated: Updated English dictionary
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new d1f3eb887e Updated English dictionary d1f3eb887e is described below commit d1f3eb887e462729520d9bf12c9b40591052bdd2 Author: mseidel AuthorDate: Wed May 1 11:41:53 2024 +0200 Updated English dictionary --- main/extensions.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/extensions.lst b/main/extensions.lst index ccfdde3c5d..a0de45d02d 100644 --- a/main/extensions.lst +++ b/main/extensions.lst @@ -72,7 +72,7 @@ # English (en_AU, en_CA, en_GB, en_US, en_ZA) dictionary [ language=en.* || language=de || language=it ] - ffbc921f2c371d179ecf29693aa0a1e1 https://sourceforge.net/projects/aoo-extensions/files/17102/101/dict-en-20240401_aoo.oxt/download "dict-en.oxt" + 60871c958bbca8a67d1ce1c142805cdf https://sourceforge.net/projects/aoo-extensions/files/17102/102/dict-en-20240501_aoo.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ]
(openoffice) branch Pilot-Pirx-wizard updated (2211ecbbb5 -> 627562ce12)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a change to branch Pilot-Pirx-wizard in repository https://gitbox.apache.org/repos/asf/openoffice.git from 2211ecbbb5 Merge branch 'trunk' into Pilot-Pirx-wizard add fd18302cfc Updated Ukrainian dictionary add deb3f44d6f Forgot to update MD5 add 4c5b548fb6 Upgrade OpenSSL to version 3.0.13. add 51cb29da04 Updated English dictionary add ceb51a8ef1 Fix spelling in code comments and descriptions only (#207) add 604463aab2 Fix spelling in code comments (#208) add cdfa2a0e24 Fix spelling in comments (#209) add 95939a2635 Link pthread library when using OpenSSL on Linux add c809b0d380 Fix spelling in code comments (#210) add c284e3b553 Fix for issue 60859 add 4ac3bde70f Search forward or backward for a visible slide add 1fcc6d2b2a Merge pull request #200 from oooforum/patch-12 add f116cfecc6 Use correct icons for line spacing in HC mode with large icons add a4b70a5c0d Fix typos: mehtod -> method, mehtods -> methods. add 63e8b0626c Fix German comments, cleanup add 39e5c08678 Converted files from old StarWriter format to ODT add 3a917bcab5 Remove temporary file add caeabaab39 Maintenance cleanup add 8cd9d6f874 Update README.md add 2331699343 Updated download numbers add a5818cd95c Get redland building with Clang >= 15, libxml2 >= 2.11.0, and/or FreeBSD >= 14. add 8eb9a7e66a Build OpenSSL as a dynamic link library, instead of a static library. Patch its users to use an RPATH of $ORIGIN, so they use the correct copy. This reduces the size of the build by about 4615 KiB, or 3.78%. add 9b51720274 Fix a regression in 8eb9a7e66a3128669216ddb884f844d50ac59fb9, which broke delivering libcrypto.lib and libssl.lib on Windows. add 73fec56a8c Fixed typos add 0dfdc53f91 Cleaned up resource files add e469ab6aed Upgrade Curl to version 8.7.1. add f7b97bf7d9 Override OpenSSL's certificate verification with our own, instead of using its verification and selectively overriding the result. - A nonsense self-signed expired certificate is fed into Curl to get it to initialize even when the certificates in its expected system path are missing or elsewhere. - In Curl's CURLOPT_SSL_CTX_FUNCTION, our Curl_SSLContextCallback, we then completely override OpenSSL's verification process with ours, using SSL_CTX_set_cert_verify_ [...] new 627562ce12 Merge branch 'trunk' into Pilot-Pirx-wizard The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 2 +- main/LICENSE | 125 - main/NOTICE| 10 +- main/README| 2 +- main/RepositoryExternal.mk | 17 +- main/RepositoryFixes.mk| 4 +- .../accessibility/standard/vclxaccessiblebox.hxx | 4 +- .../source/cairo/cairo_spritecanvashelper.cxx | 2 +- .../source/directx/dx_spritecanvashelper.cxx | 2 +- main/canvas/source/vcl/spritecanvashelper.cxx | 2 +- main/crashrep/source/unx/main.cxx | 4 +- main/curl/curl-bundled_openssl.patch | 35 +- main/curl/curl-wnt.patch | 26 +- main/curl/makefile.mk | 19 +- main/curl/prj/d.lst| 10 +- main/dbaccess/prj/dbu.xml | 6 +- main/dbaccess/source/core/api/RowSetBase.hxx | 2 +- main/dbaccess/source/ui/inc/JoinController.hxx | 4 +- .../res/commandimagelist/lch_spacepara1.png| Bin 315 -> 315 bytes .../res/commandimagelist/lch_spacepara15.png | Bin 315 -> 315 bytes main/editeng/inc/editeng/AccessibleContextBase.hxx | 2 +- main/extensions.lst| 4 +- main/external_deps.lst | 19 +- .../xslt/export/wordml/ooo2wordml_border.xsl | 4 +- .../source/xslt/import/wordml/wordml2ooo_field.xsl | 2 +- main/forms/source/component/ImageControl.cxx | 2 +- main/forms/source/misc/limitedformats.cxx | 2 +- .../source/win32/filepicker/VistaFilePicker.hxx| 2 +- .../source/uielement/recentfilesmenucontroller.cxx | 470 - .../sun/star/lib/util/AsynchronousFinalizer.java | 2 +- main/jvmfwk/inc/jvmfwk/framework.h | 2 +- .../IllegalAccessibleComponentStateException.idl | 2 +- main/oox/source/core/filterdetect.cxx | 2 +- main/openssl/makefile.mk | 94 ++-- main/openssl/openssl.patch
(openoffice) 01/01: Merge branch 'trunk' into Pilot-Pirx-wizard
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-wizard in repository https://gitbox.apache.org/repos/asf/openoffice.git commit 627562ce12ec81d52ced44379ca02db31470d142 Merge: 2211ecbbb5 f7b97bf7d9 Author: mseidel AuthorDate: Sat Apr 27 22:15:37 2024 +0200 Merge branch 'trunk' into Pilot-Pirx-wizard README.md | 2 +- main/LICENSE | 125 - main/NOTICE| 10 +- main/README| 2 +- main/RepositoryExternal.mk | 17 +- main/RepositoryFixes.mk| 4 +- .../accessibility/standard/vclxaccessiblebox.hxx | 4 +- .../source/cairo/cairo_spritecanvashelper.cxx | 2 +- .../source/directx/dx_spritecanvashelper.cxx | 2 +- main/canvas/source/vcl/spritecanvashelper.cxx | 2 +- main/crashrep/source/unx/main.cxx | 4 +- main/curl/curl-bundled_openssl.patch | 35 +- main/curl/curl-wnt.patch | 26 +- main/curl/makefile.mk | 19 +- main/curl/prj/d.lst| 10 +- main/dbaccess/prj/dbu.xml | 6 +- main/dbaccess/source/core/api/RowSetBase.hxx | 2 +- main/dbaccess/source/ui/inc/JoinController.hxx | 4 +- .../res/commandimagelist/lch_spacepara1.png| Bin 315 -> 315 bytes .../res/commandimagelist/lch_spacepara15.png | Bin 315 -> 315 bytes main/editeng/inc/editeng/AccessibleContextBase.hxx | 2 +- main/extensions.lst| 4 +- main/external_deps.lst | 19 +- .../xslt/export/wordml/ooo2wordml_border.xsl | 4 +- .../source/xslt/import/wordml/wordml2ooo_field.xsl | 2 +- main/forms/source/component/ImageControl.cxx | 2 +- main/forms/source/misc/limitedformats.cxx | 2 +- .../source/win32/filepicker/VistaFilePicker.hxx| 2 +- .../source/uielement/recentfilesmenucontroller.cxx | 470 - .../sun/star/lib/util/AsynchronousFinalizer.java | 2 +- main/jvmfwk/inc/jvmfwk/framework.h | 2 +- .../IllegalAccessibleComponentStateException.idl | 2 +- main/oox/source/core/filterdetect.cxx | 2 +- main/openssl/makefile.mk | 94 ++-- main/openssl/openssl.patch | 214 ++-- main/openssl/openssllnx.patch | 25 - main/openssl/opensslunx.patch | 17 + main/openssl/prj/d.lst | 13 +- main/python/python-2.7.18-msvs9.patch | 579 +++-- main/redland/raptor/makefile.mk| 1 + main/redland/raptor/raptor2-2.0.15.patch | 65 +++ main/registry/inc/registry/reflwrit.hxx| 2 +- main/rsc/doku/feinkonz.43/rsc.odt | Bin 0 -> 34354 bytes main/rsc/doku/feinkonz.43/rscerror.odt | Bin 0 -> 19338 bytes main/rsc/doku/feinkonz.43/rscinst.odt | Bin 0 -> 32344 bytes main/rsc/doku/schriftw.16/change.odt | Bin 0 -> 15705 bytes main/sal/inc/rtl/bootstrap.h | 2 +- main/sc/addin/datefunc/dfa.cl | 6 +- main/sc/source/ui/inc/fieldwnd.hxx | 2 +- main/sc/source/ui/unoobj/shapeuno.cxx | 4 +- main/scp2/source/ooo/file_library_ooo.scp | 8 +- main/sd/source/ui/inc/fupoor.hxx | 2 +- main/sd/source/ui/slideshow/slideshowimpl.cxx | 23 +- main/sd/source/ui/view/ToolBarManager.cxx | 2 +- main/sfx2/source/inc/statcach.hxx | 71 +-- main/sw/source/core/access/accportions.cxx | 2 +- main/sw/source/core/unocore/unodraw.cxx| 4 +- main/sw/source/filter/html/parcss1.hxx | 76 ++- main/sw/source/filter/ww8/rtfexport.hxx| 245 + main/sw/source/ui/table/chartins.src | 2 - main/sw/source/ui/table/colwd.src | 2 - main/sw/source/ui/table/convert.src| 143 +++-- main/sw/source/ui/table/instable.src | 2 - main/sw/source/ui/table/mergetbl.src | 2 - main/sw/source/ui/table/rowht.src | 2 - main/sw/source/ui/table/splittbl.src | 88 +--- main/sw/source/ui/table/table.src | 2 - main/sw/source/ui/table/tabledlg.src | 2 - main/sw/source/ui/table/tautofmt.src | 2 - main/toolkit/source/awt/vclxtoolkit.cxx| 4 +- main/toolkit/source/awt/vclxwindow1.cxx| 2 +- main/tools/source/fsys/dirent.cxx | 22 +- main/ucb/source/ucp/webdav/CurlSession.cxx | 197 --- main/ucb
svn commit: r1917384 - /openoffice/devtools/build-scripts/4.1.16/wntmsci/ReadMe.txt
Author: mseidel Date: Sat Apr 27 13:25:27 2024 New Revision: 1917384 URL: http://svn.apache.org/viewvc?rev=1917384=rev Log: Small update to build environment Modified: openoffice/devtools/build-scripts/4.1.16/wntmsci/ReadMe.txt Modified: openoffice/devtools/build-scripts/4.1.16/wntmsci/ReadMe.txt URL: http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.1.16/wntmsci/ReadMe.txt?rev=1917384=1917383=1917384=diff == --- openoffice/devtools/build-scripts/4.1.16/wntmsci/ReadMe.txt (original) +++ openoffice/devtools/build-scripts/4.1.16/wntmsci/ReadMe.txt Sat Apr 27 13:25:27 2024 @@ -1,4 +1,4 @@ -This is the configuration used for AOO 4.1.16.RC1: +This is the configuration used for AOO 4.1.16-RC1: Step by step building guide can be found here: https://wiki.openoffice.org/wiki/Documentation/Building_Guide_AOO/Step_by_step_Windows @@ -14,7 +14,7 @@ Build Environment: - MS Windows Driver Kit 7.1.0.7600 - MS Windows SDK for Windows 7.0.7600 - MS DirectX SDK (June 2010) - - NASM 2.16.02 (64-bit) + - NASM 2.16.03 (64-bit) - Oracle Java Development Kit 7 Update 80 (32-bit) - NSIS 3.10
(openoffice) branch AOO42X updated: Cleaned up resource files
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new ee9599b473 Cleaned up resource files ee9599b473 is described below commit ee9599b473dd95c336174a084a9ceaf6b348e067 Author: mseidel AuthorDate: Sun Apr 21 16:36:43 2024 +0200 Cleaned up resource files (cherry picked from commit 0dfdc53f9130d5dfc2b106b9c08c942cce624f93) --- main/sw/source/ui/table/chartins.src | 2 - main/sw/source/ui/table/colwd.src| 2 - main/sw/source/ui/table/convert.src | 143 +-- main/sw/source/ui/table/instable.src | 2 - main/sw/source/ui/table/mergetbl.src | 2 - main/sw/source/ui/table/rowht.src| 2 - main/sw/source/ui/table/splittbl.src | 88 +++-- main/sw/source/ui/table/table.src| 2 - main/sw/source/ui/table/tabledlg.src | 2 - main/sw/source/ui/table/tautofmt.src | 2 - 10 files changed, 97 insertions(+), 150 deletions(-) diff --git a/main/sw/source/ui/table/chartins.src b/main/sw/source/ui/table/chartins.src index aa00947074..3f231de97b 100644 --- a/main/sw/source/ui/table/chartins.src +++ b/main/sw/source/ui/table/chartins.src @@ -19,8 +19,6 @@ * */ - - #include "chartins.hrc" #include "helpid.h" ModelessDialog DLG_INSERT_CHART diff --git a/main/sw/source/ui/table/colwd.src b/main/sw/source/ui/table/colwd.src index 9a14dc3e84..bf22bb49c7 100644 --- a/main/sw/source/ui/table/colwd.src +++ b/main/sw/source/ui/table/colwd.src @@ -19,8 +19,6 @@ * */ - - #include "table.hrc" #include "colwd.hrc" #include "cmdid.h" diff --git a/main/sw/source/ui/table/convert.src b/main/sw/source/ui/table/convert.src index 947a038d39..35bdf7d97b 100644 --- a/main/sw/source/ui/table/convert.src +++ b/main/sw/source/ui/table/convert.src @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,20 +7,18 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - #include "table.hrc" #include "convert.hrc" #include "cmdid.h" @@ -29,15 +27,15 @@ ModalDialog DLG_CONV_TEXT_TABLE { HelpID = CMD_FN_CONVERT_TEXT_TABLE ; OUTPUTSIZE = TRUE ; -Size = MAP_APPFONT ( 203 , 169 ) ; + Size = MAP_APPFONT ( 203, 169 ) ; Text [ en-US ] = "Convert Table to Text" ; MOVEABLE = TRUE ; SVLOOK = TRUE ; RadioButton CB_TAB { - HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_TAB"; - Pos = MAP_APPFONT ( 12 , 17 ) ; -Size = MAP_APPFONT ( 60 , 10 ) ; + HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_TAB" ; + Pos = MAP_APPFONT ( 12, 17 ) ; + Size = MAP_APPFONT ( 60, 10 ) ; Text [ en-US ] = "~Tabs" ; TABSTOP = TRUE ; Group = TRUE ; @@ -45,81 +43,81 @@ ModalDialog DLG_CONV_TEXT_TABLE }; RadioButton CB_SEMI { - HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_SEMI"; -Pos = MAP_APPFONT ( 75 , 17 ) ; -Size = MAP_APPFONT ( 60 , 10 ) ; + HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_SEMI" ; + Pos = MAP_APPFONT ( 75, 17 ) ; + Size = MAP_APPFONT ( 60, 10 ) ; Text [ en-US ] = "~Semicolons" ; TABSTOP = TRUE ; }; RadioButton CB_PARA { - HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_PARA"; - Pos = MAP_APPFONT ( 12 , 33 ) ; -Size = MAP_APPFONT ( 60 , 10 ) ; + HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_PARA" ; + Pos = MAP_APPFONT ( 12, 33 ) ; + Size = MAP_APPFONT ( 60, 10 ) ; Text [ en-US ] = "~Paragraph" ; TAB
(openoffice) branch trunk updated: Cleaned up resource files
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 0dfdc53f91 Cleaned up resource files 0dfdc53f91 is described below commit 0dfdc53f9130d5dfc2b106b9c08c942cce624f93 Author: mseidel AuthorDate: Sun Apr 21 16:36:43 2024 +0200 Cleaned up resource files --- main/sw/source/ui/table/chartins.src | 2 - main/sw/source/ui/table/colwd.src| 2 - main/sw/source/ui/table/convert.src | 143 +-- main/sw/source/ui/table/instable.src | 2 - main/sw/source/ui/table/mergetbl.src | 2 - main/sw/source/ui/table/rowht.src| 2 - main/sw/source/ui/table/splittbl.src | 88 +++-- main/sw/source/ui/table/table.src| 2 - main/sw/source/ui/table/tabledlg.src | 2 - main/sw/source/ui/table/tautofmt.src | 2 - 10 files changed, 97 insertions(+), 150 deletions(-) diff --git a/main/sw/source/ui/table/chartins.src b/main/sw/source/ui/table/chartins.src index aa00947074..3f231de97b 100644 --- a/main/sw/source/ui/table/chartins.src +++ b/main/sw/source/ui/table/chartins.src @@ -19,8 +19,6 @@ * */ - - #include "chartins.hrc" #include "helpid.h" ModelessDialog DLG_INSERT_CHART diff --git a/main/sw/source/ui/table/colwd.src b/main/sw/source/ui/table/colwd.src index 9a14dc3e84..bf22bb49c7 100644 --- a/main/sw/source/ui/table/colwd.src +++ b/main/sw/source/ui/table/colwd.src @@ -19,8 +19,6 @@ * */ - - #include "table.hrc" #include "colwd.hrc" #include "cmdid.h" diff --git a/main/sw/source/ui/table/convert.src b/main/sw/source/ui/table/convert.src index 947a038d39..35bdf7d97b 100644 --- a/main/sw/source/ui/table/convert.src +++ b/main/sw/source/ui/table/convert.src @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,20 +7,18 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - #include "table.hrc" #include "convert.hrc" #include "cmdid.h" @@ -29,15 +27,15 @@ ModalDialog DLG_CONV_TEXT_TABLE { HelpID = CMD_FN_CONVERT_TEXT_TABLE ; OUTPUTSIZE = TRUE ; -Size = MAP_APPFONT ( 203 , 169 ) ; + Size = MAP_APPFONT ( 203, 169 ) ; Text [ en-US ] = "Convert Table to Text" ; MOVEABLE = TRUE ; SVLOOK = TRUE ; RadioButton CB_TAB { - HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_TAB"; - Pos = MAP_APPFONT ( 12 , 17 ) ; -Size = MAP_APPFONT ( 60 , 10 ) ; + HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_TAB" ; + Pos = MAP_APPFONT ( 12, 17 ) ; + Size = MAP_APPFONT ( 60, 10 ) ; Text [ en-US ] = "~Tabs" ; TABSTOP = TRUE ; Group = TRUE ; @@ -45,81 +43,81 @@ ModalDialog DLG_CONV_TEXT_TABLE }; RadioButton CB_SEMI { - HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_SEMI"; -Pos = MAP_APPFONT ( 75 , 17 ) ; -Size = MAP_APPFONT ( 60 , 10 ) ; + HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_SEMI" ; + Pos = MAP_APPFONT ( 75, 17 ) ; + Size = MAP_APPFONT ( 60, 10 ) ; Text [ en-US ] = "~Semicolons" ; TABSTOP = TRUE ; }; RadioButton CB_PARA { - HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_PARA"; - Pos = MAP_APPFONT ( 12 , 33 ) ; -Size = MAP_APPFONT ( 60 , 10 ) ; + HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_PARA" ; + Pos = MAP_APPFONT ( 12, 33 ) ; + Size = MAP_APPFONT ( 60, 10 ) ; Text [ en-US ] = "~Paragraph" ; TABSTOP = TRUE ; }; Radi
(openoffice) branch AOO42X updated: Fixed typos
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 984d38c3d8 Fixed typos 984d38c3d8 is described below commit 984d38c3d8b0ba1155b90e2079b895325a44bba5 Author: mseidel AuthorDate: Sat Apr 20 22:24:25 2024 +0200 Fixed typos (cherry picked from commit 73fec56a8c7e87333c35112dd7464c115a13a8c8) --- main/sfx2/source/inc/statcach.hxx | 71 --- main/tools/source/fsys/dirent.cxx | 22 ++-- 2 files changed, 46 insertions(+), 47 deletions(-) diff --git a/main/sfx2/source/inc/statcach.hxx b/main/sfx2/source/inc/statcach.hxx index 8179233120..30d131900a 100644 --- a/main/sfx2/source/inc/statcach.hxx +++ b/main/sfx2/source/inc/statcach.hxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,19 +7,18 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - #ifndef _SFXSTATCACH_HXX #define _SFXSTATCACH_HXX @@ -55,13 +54,13 @@ friend class SfxStateCache; ::com::sun::star::util::URL aURL; ::com::sun::star::frame::FeatureStateEvent aStatus; SfxStateCache* pCache; -const SfxSlot* pSlot; + const SfxSlot* pSlot; public: BindDispatch_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > & rDisp, const ::com::sun::star::util::URL& rURL, -SfxStateCache* pStateCache, const SfxSlot* pSlot ); + SfxStateCache* pStateCache, const SfxSlot* pSlot ); SFX_DECL_XINTERFACE_XTYPEPROVIDER @@ -70,24 +69,24 @@ public: voidRelease(); const ::com::sun::star::frame::FeatureStateEvent& GetStatus() const; - voidDispatch( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aProps, sal_Bool bForceSynchron = sal_False ); + voidDispatch( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aProps, sal_Bool bForceSynchron = sal_False ); }; class SfxStateCache { friend class BindDispatch_Impl; BindDispatch_Impl* pDispatch; - sal_uInt16 nId; // Slot-Id -SfxControllerItem* pInternalController; -com::sun::star::uno::Reference < com::sun::star::frame::XDispatch > xMyDispatch; - SfxControllerItem* pController; // Ptr auf 1. gebundenen Controller (untereinander verkettet) - SfxSlotServer aSlotServ; // SlotServer, SlotPtr = 0 -> Nicht auf Stack - SfxPoolItem*pLastItem; // zuletzt verschicktes Item, nie -1 - SfxItemStateeLastState;// zuletzt verschickter State - sal_BoolbCtrlDirty:1; // Controller aktualisiert? - sal_BoolbSlotDirty:1; // Funktion gfs. vorhanden, muss aktualisiert werden -sal_BoolbItemVisible:1;// item visibility - sal_BoolbItemDirty;// G"ultigkeit von pLastItem + sal_uInt16 nId;// Slot-Id + SfxControllerItem* pInternalController; + com::sun::star::uno::Reference < com::sun::star::frame::XDispatch > xMyDispatch; + SfxControllerItem* pController;// Ptr auf 1. gebundenen Controller (untereinander verkettet) + SfxSlotServer aSlotServ; // SlotServer, SlotPtr = 0 -> Nicht auf Stack + SfxPool
(openoffice) branch trunk updated: Fixed typos
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 73fec56a8c Fixed typos 73fec56a8c is described below commit 73fec56a8c7e87333c35112dd7464c115a13a8c8 Author: mseidel AuthorDate: Sat Apr 20 22:24:25 2024 +0200 Fixed typos --- main/sfx2/source/inc/statcach.hxx | 71 --- main/tools/source/fsys/dirent.cxx | 22 ++-- 2 files changed, 46 insertions(+), 47 deletions(-) diff --git a/main/sfx2/source/inc/statcach.hxx b/main/sfx2/source/inc/statcach.hxx index 8179233120..30d131900a 100644 --- a/main/sfx2/source/inc/statcach.hxx +++ b/main/sfx2/source/inc/statcach.hxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,19 +7,18 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - #ifndef _SFXSTATCACH_HXX #define _SFXSTATCACH_HXX @@ -55,13 +54,13 @@ friend class SfxStateCache; ::com::sun::star::util::URL aURL; ::com::sun::star::frame::FeatureStateEvent aStatus; SfxStateCache* pCache; -const SfxSlot* pSlot; + const SfxSlot* pSlot; public: BindDispatch_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > & rDisp, const ::com::sun::star::util::URL& rURL, -SfxStateCache* pStateCache, const SfxSlot* pSlot ); + SfxStateCache* pStateCache, const SfxSlot* pSlot ); SFX_DECL_XINTERFACE_XTYPEPROVIDER @@ -70,24 +69,24 @@ public: voidRelease(); const ::com::sun::star::frame::FeatureStateEvent& GetStatus() const; - voidDispatch( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aProps, sal_Bool bForceSynchron = sal_False ); + voidDispatch( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aProps, sal_Bool bForceSynchron = sal_False ); }; class SfxStateCache { friend class BindDispatch_Impl; BindDispatch_Impl* pDispatch; - sal_uInt16 nId; // Slot-Id -SfxControllerItem* pInternalController; -com::sun::star::uno::Reference < com::sun::star::frame::XDispatch > xMyDispatch; - SfxControllerItem* pController; // Ptr auf 1. gebundenen Controller (untereinander verkettet) - SfxSlotServer aSlotServ; // SlotServer, SlotPtr = 0 -> Nicht auf Stack - SfxPoolItem*pLastItem; // zuletzt verschicktes Item, nie -1 - SfxItemStateeLastState;// zuletzt verschickter State - sal_BoolbCtrlDirty:1; // Controller aktualisiert? - sal_BoolbSlotDirty:1; // Funktion gfs. vorhanden, muss aktualisiert werden -sal_BoolbItemVisible:1;// item visibility - sal_BoolbItemDirty;// G"ultigkeit von pLastItem + sal_uInt16 nId;// Slot-Id + SfxControllerItem* pInternalController; + com::sun::star::uno::Reference < com::sun::star::frame::XDispatch > xMyDispatch; + SfxControllerItem* pController;// Ptr auf 1. gebundenen Controller (untereinander verkettet) + SfxSlotServer aSlotServ; // SlotServer, SlotPtr = 0 -> Nicht auf Stack + SfxPoolItem*pLastItem; // zuletzt ver
(openoffice-org) branch main updated: Updated download numbers for social media links
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new bb7661c1b8 Updated download numbers for social media links bb7661c1b8 is described below commit bb7661c1b8c693facb3d8b0c72e4941d1fe0b360 Author: mseidel AuthorDate: Wed Apr 10 22:51:07 2024 +0200 Updated download numbers for social media links --- content/af/download/index.html | 8 content/am/download/index.html | 8 content/ar/download/index.html | 8 content/ast/download/index.html | 8 content/bg/download/index.html | 8 content/bg_new/download/index.html | 8 content/ca/download/index.html | 8 content/cs/download/index.html | 8 content/da/download/index.html | 8 content/de/download/index.html | 8 content/download/index.html | 8 content/el/download/index.html | 8 content/eo/download/index.html | 8 content/es/descargar/index.html | 8 content/et/download/index.html | 8 content/eu/download/index.html | 8 content/fi/download/index.html | 8 content/fr/download/index.html | 8 content/gd/download/index.html | 8 content/gl/download/index.html | 8 content/hi/download/index.html | 8 content/hu/download/index.html | 8 content/hy/download/index.html | 8 content/is/download/index.html | 8 content/it-new/download/index.html | 8 content/ja/download/index.html | 8 content/kab/download/index.html | 8 content/km/download/index.html | 8 content/ko/download/index.html | 8 content/lt/download/index.html | 8 content/nl/download/index.html | 8 content/no/download/index.html | 8 content/om/download/index.html | 8 content/pl/download/index.html | 8 content/pt-br/download/index.html | 8 content/pt/download/index.html | 10 +- content/ro/download/index.html | 8 content/ru/download/index.html | 8 content/sk/download/index.html | 8 content/sl/download/index.html | 8 content/sr-cyrl/download/index.html | 8 content/sr/download/index.html | 8 content/sv/download/index.html | 8 content/ta/download/index.html | 8 content/th/download/index.html | 8 content/tr/download/index.html | 8 content/uk/download/index.html | 8 content/vi/download/index.html | 8 content/xx/download/index.html | 8 content/zh-tw/download/index.html | 10 +- 50 files changed, 202 insertions(+), 202 deletions(-) diff --git a/content/af/download/index.html b/content/af/download/index.html index 7cdc63c982..84263fcbc3 100644 --- a/content/af/download/index.html +++ b/content/af/download/index.html @@ -3,12 +3,12 @@ http://schema.org/Article;> - + https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png; /> - + https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png; /> - + Apache OpenOffice Downloads - Official Site @@ -37,7 +37,7 @@ } else if ( platform == 'facebook' ) { window.open( 'https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fwww.openoffice.org%2Fdownload%2F', '_blank', 'toolbar=0, status=0, width=580, height=325' ); } else if ( platform == 'twitter' ) { -window.open( 'https://twitter.com/intent/tweet?url=https%3A%2F%2Fwww.openoffice.org%2Fdownload%2F=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+360+million+trusted+downloads.', '_blank', 'toolbar=0, status=0, width=580, height=325' ); +window.open( 'https://twitter.com/intent/tweet?url=https%3A%2F%2Fwww.openoffice.org%2Fdownload%2F=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+375+million+trusted+downloads.', '_blank', 'toolbar=0, status=0, width=580, height=325' ); } } diff --git a/content/am/download/index.html b/content/am/download/index.html index d8ed38c29b..e2123df23d 100644 --- a/content/am/download/index.html +++ b/content/am/download/index.html @@ -3,12 +3,12 @@ http://schema.org/Article;> - + https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png; /> - + https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png; /> - + Apache OpenOffice Downloads - Official Site @@ -37,7 +37,7 @@ } else if ( pla
(openoffice) branch AOO41X updated: Updated download numbers
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new d661cc3839 Updated download numbers d661cc3839 is described below commit d661cc383947992f7e31bf28e71ced1bfcc208b7 Author: mseidel AuthorDate: Tue Apr 9 12:34:34 2024 +0200 Updated download numbers (cherry picked from commit 23316993437e535ee1ae8b97435f8b65c8f46691) --- main/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/README b/main/README index 0e8e29b86b..bc0f5e21dc 100644 --- a/main/README +++ b/main/README @@ -18,7 +18,7 @@ Apache OpenOffice (AOO) FreeBSD OS/2 -OpenOffice is used by millions of users worldwide and with more than 360 million +OpenOffice is used by millions of users worldwide and with more than 375 million downloads it is one of the most successful open source projects. Getting the latest sources via Git
(openoffice) branch AOO42X updated: Updated download numbers
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 4c234e2d3e Updated download numbers 4c234e2d3e is described below commit 4c234e2d3eedbcb76b76b7a8a09f7af6352dee26 Author: mseidel AuthorDate: Tue Apr 9 12:34:34 2024 +0200 Updated download numbers (cherry picked from commit 23316993437e535ee1ae8b97435f8b65c8f46691) --- main/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/README b/main/README index bdf86766c4..fe965d3d5f 100644 --- a/main/README +++ b/main/README @@ -19,7 +19,7 @@ Apache OpenOffice (AOO) FreeBSD OS/2 -OpenOffice is used by millions of users worldwide and with more than 360 million +OpenOffice is used by millions of users worldwide and with more than 375 million downloads it is one of the most successful open source projects. Getting the latest sources via Git
(openoffice) branch trunk updated: Updated download numbers
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 2331699343 Updated download numbers 2331699343 is described below commit 23316993437e535ee1ae8b97435f8b65c8f46691 Author: mseidel AuthorDate: Tue Apr 9 12:34:34 2024 +0200 Updated download numbers --- main/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/README b/main/README index bdf86766c4..fe965d3d5f 100644 --- a/main/README +++ b/main/README @@ -19,7 +19,7 @@ Apache OpenOffice (AOO) FreeBSD OS/2 -OpenOffice is used by millions of users worldwide and with more than 360 million +OpenOffice is used by millions of users worldwide and with more than 375 million downloads it is one of the most successful open source projects. Getting the latest sources via Git
(openoffice) branch trunk updated: Update README.md
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 8cd9d6f874 Update README.md 8cd9d6f874 is described below commit 8cd9d6f8744b096fb5e4560bad29ab4291257788 Author: Matthias Seidel AuthorDate: Tue Apr 9 12:32:11 2024 +0200 Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index af881fdf7b..91167605c8 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Currently supported platforms include: - FreeBSD - OS/2 -OpenOffice is used by millions of users worldwide and with more than 360 million downloads it is one of the most successful open source projects. +OpenOffice is used by millions of users worldwide and with more than 375 million downloads it is one of the most successful open source projects. # Getting the latest sources via Git
(openoffice-org) branch main updated: Celebrating 375 Million downloads
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new d95efabc26 Celebrating 375 Million downloads d95efabc26 is described below commit d95efabc2663f7278fde9697dcb7b4477460f6b4 Author: mseidel AuthorDate: Tue Apr 9 12:30:40 2024 +0200 Celebrating 375 Million downloads --- assets/images/AOO_logos/100MillAOO100px.png | Bin 32074 -> 32271 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/images/AOO_logos/100MillAOO100px.png b/assets/images/AOO_logos/100MillAOO100px.png index 9799c472eb..0ce4651883 100644 Binary files a/assets/images/AOO_logos/100MillAOO100px.png and b/assets/images/AOO_logos/100MillAOO100px.png differ
(openoffice) branch AOO42X updated: Maintenance cleanup
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 694cb55c1a Maintenance cleanup 694cb55c1a is described below commit 694cb55c1a439c3395ae15b8fc78804a3865b6f5 Author: mseidel AuthorDate: Mon Apr 8 17:53:09 2024 +0200 Maintenance cleanup (cherry picked from commit caeabaab393eea3de03af65cb68f7b944d2c9898) --- .../source/uielement/recentfilesmenucontroller.cxx | 470 ++--- main/sw/source/filter/ww8/rtfexport.hxx| 245 ++- 2 files changed, 357 insertions(+), 358 deletions(-) diff --git a/main/framework/source/uielement/recentfilesmenucontroller.cxx b/main/framework/source/uielement/recentfilesmenucontroller.cxx index 3fe04e79d9..74b8af3362 100644 --- a/main/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/main/framework/source/uielement/recentfilesmenucontroller.cxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,20 +7,18 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" @@ -52,7 +50,7 @@ using namespace com::sun::star::util; static const char SFX_REFERER_USER[] = "private:user"; static const char CMD_CLEAR_LIST[] = ".uno:ClearRecentFileList"; static const char CMD_PREFIX[] = "vnd.sun.star.popup:RecentFileList?entry="; -static const char MENU_SHOTCUT[] = "~N: "; +static const char MENU_SHORTCUT[]= "~N: "; namespace framework { @@ -71,17 +69,17 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper1< ::com::sun::star } }; -DEFINE_XSERVICEINFO_MULTISERVICE( RecentFilesMenuController , -OWeakObject , -SERVICENAME_POPUPMENUCONTROLLER , +DEFINE_XSERVICEINFO_MULTISERVICE ( RecentFilesMenuController , + OWeakObject , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_RECENTFILESMENUCONTROLLER ) -DEFINE_INIT_SERVICE ( RecentFilesMenuController, {} ) +DEFINE_INIT_SERVICE( RecentFilesMenuController, {} ) RecentFilesMenuController::RecentFilesMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) : svt::PopupMenuControllerBase( xServiceManager ), -m_bDisabled( sal_False ) + m_bDisabled( sal_False ) { } @@ -92,74 +90,74 @@ RecentFilesMenuController::~RecentFilesMenuController() // private function void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { -VCLXPopupMenu* pPopupMenu= (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); -PopupMenu* pVCLPopupMenu = 0; - -vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - -resetPopupMenu( rPopupMenu ); -if ( pPopupMenu ) -pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); - -if ( pVCLPopupMenu ) -{ - Sequence< Sequence< PropertyValue > > aHistoryList = SvtHistoryOptions().GetList( ePICKLIST ); - Reference< XStringWidth > xStringLength( new RecentFilesStringLength ); - -int nPickListMenuItems = ( aHistoryList.getLength() > MAX_MENU_
(openoffice) branch trunk updated: Maintenance cleanup
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new caeabaab39 Maintenance cleanup caeabaab39 is described below commit caeabaab393eea3de03af65cb68f7b944d2c9898 Author: mseidel AuthorDate: Mon Apr 8 17:53:09 2024 +0200 Maintenance cleanup --- .../source/uielement/recentfilesmenucontroller.cxx | 470 ++--- main/sw/source/filter/ww8/rtfexport.hxx| 245 ++- 2 files changed, 357 insertions(+), 358 deletions(-) diff --git a/main/framework/source/uielement/recentfilesmenucontroller.cxx b/main/framework/source/uielement/recentfilesmenucontroller.cxx index 3fe04e79d9..74b8af3362 100644 --- a/main/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/main/framework/source/uielement/recentfilesmenucontroller.cxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,20 +7,18 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" @@ -52,7 +50,7 @@ using namespace com::sun::star::util; static const char SFX_REFERER_USER[] = "private:user"; static const char CMD_CLEAR_LIST[] = ".uno:ClearRecentFileList"; static const char CMD_PREFIX[] = "vnd.sun.star.popup:RecentFileList?entry="; -static const char MENU_SHOTCUT[] = "~N: "; +static const char MENU_SHORTCUT[]= "~N: "; namespace framework { @@ -71,17 +69,17 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper1< ::com::sun::star } }; -DEFINE_XSERVICEINFO_MULTISERVICE( RecentFilesMenuController , -OWeakObject , -SERVICENAME_POPUPMENUCONTROLLER , +DEFINE_XSERVICEINFO_MULTISERVICE ( RecentFilesMenuController , + OWeakObject , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_RECENTFILESMENUCONTROLLER ) -DEFINE_INIT_SERVICE ( RecentFilesMenuController, {} ) +DEFINE_INIT_SERVICE( RecentFilesMenuController, {} ) RecentFilesMenuController::RecentFilesMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) : svt::PopupMenuControllerBase( xServiceManager ), -m_bDisabled( sal_False ) + m_bDisabled( sal_False ) { } @@ -92,74 +90,74 @@ RecentFilesMenuController::~RecentFilesMenuController() // private function void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { -VCLXPopupMenu* pPopupMenu= (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); -PopupMenu* pVCLPopupMenu = 0; - -vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - -resetPopupMenu( rPopupMenu ); -if ( pPopupMenu ) -pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); - -if ( pVCLPopupMenu ) -{ - Sequence< Sequence< PropertyValue > > aHistoryList = SvtHistoryOptions().GetList( ePICKLIST ); - Reference< XStringWidth > xStringLength( new RecentFilesStringLength ); - -int nPickListMenuItems = ( aHistoryList.getLength() > MAX_MENU_ITEMS ) ? MAX_MENU_ITEMS : aHistoryList.getLength(); - -m_
(openoffice) branch AOO41X updated: Remove temporary file
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new 2150dec23c Remove temporary file 2150dec23c is described below commit 2150dec23c5da73320c80d60487595d2321ae2d8 Author: mseidel AuthorDate: Sun Apr 7 22:53:09 2024 +0200 Remove temporary file (cherry picked from commit 3a917bcab5ff9038f7edda89e6739bf74fcb9314) --- .../qa/documents/docx/tables/~$sted-tables3.docx | Bin 162 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/main/writerfilter/qa/documents/docx/tables/~$sted-tables3.docx b/main/writerfilter/qa/documents/docx/tables/~$sted-tables3.docx deleted file mode 100644 index bfea337b7d..00 Binary files a/main/writerfilter/qa/documents/docx/tables/~$sted-tables3.docx and /dev/null differ
(openoffice) branch AOO42X updated: Remove temporary file
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 4be3b82fde Remove temporary file 4be3b82fde is described below commit 4be3b82fdedeec79f4f2bedab3ff7c7978b023ba Author: mseidel AuthorDate: Sun Apr 7 22:53:09 2024 +0200 Remove temporary file (cherry picked from commit 3a917bcab5ff9038f7edda89e6739bf74fcb9314) --- .../qa/documents/docx/tables/~$sted-tables3.docx | Bin 162 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/main/writerfilter/qa/documents/docx/tables/~$sted-tables3.docx b/main/writerfilter/qa/documents/docx/tables/~$sted-tables3.docx deleted file mode 100644 index bfea337b7d..00 Binary files a/main/writerfilter/qa/documents/docx/tables/~$sted-tables3.docx and /dev/null differ