[openoffice] branch AOO42X updated: Fixed typos, removed whitespace
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 bc0e0e04fd Fixed typos, removed whitespace
bc0e0e04fd is described below
commit bc0e0e04fd8009ec0c1265fb3ec70fc419ca72db
Author: mseidel
AuthorDate: Sun Dec 25 21:04:00 2022 +0100
Fixed typos, removed whitespace
(cherry picked from commit c0176e29f1b73ee9933236b76a82e2bc81761923)
---
.../source/ui/sidebar/RecentlyUsedMasterPages.hxx | 134 ++---
1 file changed, 67 insertions(+), 67 deletions(-)
diff --git a/main/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
b/main/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index b1d9736183..43d812a7d3 100644
--- a/main/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/main/sd/source/ui/sidebar/RecentlyUsedMasterPages.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,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.
- *
+ *
*/
@@ -47,74 +47,74 @@ namespace sd { namespace sidebar {
/** This singleton holds a list of the most recently used master pages.
*/
class RecentlyUsedMasterPages
-: public SdGlobalResource
+ : public SdGlobalResource
{
public:
-/** Return the single instance of this class.
-*/
-static RecentlyUsedMasterPages& Instance (void);
+ /** Return the single instance of this class.
+ */
+ static RecentlyUsedMasterPages& Instance (void);
-void AddEventListener (const Link& rEventListener);
-void RemoveEventListener (const Link& rEventListener);
-
-int GetMasterPageCount (void) const;
-MasterPageContainer::Token GetTokenForIndex (sal_uInt32 nIndex) const;
+ void AddEventListener (const Link& rEventListener);
+ void RemoveEventListener (const Link& rEventListener);
+
+ int GetMasterPageCount (void) const;
+ MasterPageContainer::Token GetTokenForIndex (sal_uInt32 nIndex) const;
private:
-/** The single instance of this class. It is created on demand when
-Instance() is called for the first time.
-*/
-static RecentlyUsedMasterPages* mpInstance;
-
-::std::vector maListeners;
-
-class MasterPageList;
-::std::auto_ptr mpMasterPages;
-unsigned long int mnMaxListSize;
-::boost::shared_ptr mpContainer;
-
-RecentlyUsedMasterPages (void);
-virtual ~RecentlyUsedMasterPages (void);
-
-/** Call this method after a new object has been created.
-*/
-void LateInit (void);
-
-/// The copy constructor is not implemented. Do not use!
-RecentlyUsedMasterPages (const RecentlyUsedMasterPages&);
-
-/// The assignment operator is not implemented. Do not use!
-RecentlyUsedMasterPages& operator= (const RecentlyUsedMasterPages&);
-
-void SendEvent (void);
-DECL_LINK(MasterPageChangeListener, MasterPageObserverEvent*);
-DECL_LINK(MasterPageContainerChangeListener,
MasterPageContainerChangeEvent*);
-
-/** Add a descriptor for the specified master page to the end of the
-list of most recently used master pages. When the page is already a
-member of that list the associated descriptor is moved to the end of
-the list to make it the most recently used entry.
-@param bMakePersistent
-When is given then the new list of recently used master
-pages is written back into the configuration to make it
-persistent. Giving to ommit this is used while loading
-the persistent list from the configuration.
-*/
-void AddMasterPage (
-MasterPageContainer::Token aToken,
-bool bMakePersistent = true);
-
-/** Load the list of recently used master pages from the registry where
-it was saved to make it persistent.
-*/
-void LoadPersistentValues (void);
-
-/** Save the list of recently used master pages to the registry to make
-it presistent.
-*/
-void SavePersistentValues (void);
-
-void ResolveList (void);
+ /** The single instance of this
[openoffice] branch trunk updated: Fixed typos, removed whitespace
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 c0176e29f1 Fixed typos, removed whitespace
c0176e29f1 is described below
commit c0176e29f1b73ee9933236b76a82e2bc81761923
Author: mseidel
AuthorDate: Sun Dec 25 21:04:00 2022 +0100
Fixed typos, removed whitespace
---
.../source/ui/sidebar/RecentlyUsedMasterPages.hxx | 134 ++---
1 file changed, 67 insertions(+), 67 deletions(-)
diff --git a/main/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
b/main/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index b1d9736183..43d812a7d3 100644
--- a/main/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/main/sd/source/ui/sidebar/RecentlyUsedMasterPages.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,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.
- *
+ *
*/
@@ -47,74 +47,74 @@ namespace sd { namespace sidebar {
/** This singleton holds a list of the most recently used master pages.
*/
class RecentlyUsedMasterPages
-: public SdGlobalResource
+ : public SdGlobalResource
{
public:
-/** Return the single instance of this class.
-*/
-static RecentlyUsedMasterPages& Instance (void);
+ /** Return the single instance of this class.
+ */
+ static RecentlyUsedMasterPages& Instance (void);
-void AddEventListener (const Link& rEventListener);
-void RemoveEventListener (const Link& rEventListener);
-
-int GetMasterPageCount (void) const;
-MasterPageContainer::Token GetTokenForIndex (sal_uInt32 nIndex) const;
+ void AddEventListener (const Link& rEventListener);
+ void RemoveEventListener (const Link& rEventListener);
+
+ int GetMasterPageCount (void) const;
+ MasterPageContainer::Token GetTokenForIndex (sal_uInt32 nIndex) const;
private:
-/** The single instance of this class. It is created on demand when
-Instance() is called for the first time.
-*/
-static RecentlyUsedMasterPages* mpInstance;
-
-::std::vector maListeners;
-
-class MasterPageList;
-::std::auto_ptr mpMasterPages;
-unsigned long int mnMaxListSize;
-::boost::shared_ptr mpContainer;
-
-RecentlyUsedMasterPages (void);
-virtual ~RecentlyUsedMasterPages (void);
-
-/** Call this method after a new object has been created.
-*/
-void LateInit (void);
-
-/// The copy constructor is not implemented. Do not use!
-RecentlyUsedMasterPages (const RecentlyUsedMasterPages&);
-
-/// The assignment operator is not implemented. Do not use!
-RecentlyUsedMasterPages& operator= (const RecentlyUsedMasterPages&);
-
-void SendEvent (void);
-DECL_LINK(MasterPageChangeListener, MasterPageObserverEvent*);
-DECL_LINK(MasterPageContainerChangeListener,
MasterPageContainerChangeEvent*);
-
-/** Add a descriptor for the specified master page to the end of the
-list of most recently used master pages. When the page is already a
-member of that list the associated descriptor is moved to the end of
-the list to make it the most recently used entry.
-@param bMakePersistent
-When is given then the new list of recently used master
-pages is written back into the configuration to make it
-persistent. Giving to ommit this is used while loading
-the persistent list from the configuration.
-*/
-void AddMasterPage (
-MasterPageContainer::Token aToken,
-bool bMakePersistent = true);
-
-/** Load the list of recently used master pages from the registry where
-it was saved to make it persistent.
-*/
-void LoadPersistentValues (void);
-
-/** Save the list of recently used master pages to the registry to make
-it presistent.
-*/
-void SavePersistentValues (void);
-
-void ResolveList (void);
+ /** The single instance of this class. It is created on demand when
+ Instance() is called for the
[openoffice] branch AOO41X updated: Corrected string in German 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 e338bd8929 Corrected string in German SDF e338bd8929 is described below commit e338bd89297894ca63a4dc258559ceb1db82b162 Author: mseidel AuthorDate: Sun Dec 25 11:42:05 2022 +0100 Corrected string in German SDF --- extras/l10n/source/de/localize.sdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/l10n/source/de/localize.sdf b/extras/l10n/source/de/localize.sdf index 56d6834ff7..4b0190e67e 100644 --- a/extras/l10n/source/de/localize.sdf +++ b/extras/l10n/source/de/localize.sdf @@ -63862,7 +63862,7 @@ sw source\ui\misc\glossary.src 0 modaldialog DLG_GLOSSARYCMD_FN_GLOSSARY_DLG sw source\ui\misc\glossary.src 0 infobox MSG_DOUBLE_SHORTNAME 0 de Kürzel wird bereits verwendet. Bitte einen anderen Namen vergeben! 20130618 17:22:18 sw source\ui\misc\glossary.src 0 querybox MSG_QUERY_DELETE0 de Soll der AutoText gelöscht werden? 20130618 17:22:18 sw source\ui\misc\glossary.src 0 string STR_QUERY_DELETE_GROUP1 0 de Soll der Bereich 20130618 17:22:18 -sw source\ui\misc\glossary.src 0 string STR_QUERY_DELETE_GROUP2 0 de ? 20130618 17:22:18 +sw source\ui\misc\glossary.src 0 string STR_QUERY_DELETE_GROUP2 0 de gelöscht werden? 20130618 17:22:18 sw source\ui\misc\glossary.src 0 string STR_GLOSSARY 0 de AutoText : 20130618 17:22:18 sw source\ui\misc\glossary.src 0 string STR_ACCESS_SW_CATEGORY 0 de Bereichstitel 20130618 17:22:18 sw source\ui\misc\glossary.src 0 fixedtext DLG_RENAME_GLOS FT_ON 30 de Na~me 20130618 17:22:18
[openoffice] annotated tag AOO420-Dev4-m4 created (now 0d6f759b65)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a change to annotated tag AOO420-Dev4-m4 in repository https://gitbox.apache.org/repos/asf/openoffice.git at 0d6f759b65 (tag) tagging 18ec844f88251cfdd417f5e3ed96b962c7c8156a (commit) replaces AOO420-Dev3-m3 by mseidel on Sun Dec 25 10:32:05 2022 +0100 - Log - Apache OpenOffice Developer Build 4 --- No new revisions were added by this update.
[openoffice] 02/02: Temporary fix for issue 128546
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 f98c8c9fb533e52d336e63fe0780036e8b7997d8
Author: mseidel
AuthorDate: Thu Dec 22 17:28:33 2022 +0100
Temporary fix for issue 128546
(cherry picked from commit d9c7a900a20cf65441c562efd7b0803b10dc7af7)
---
main/svx/source/sidebar/text/TextPropertyPanel.src | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/svx/source/sidebar/text/TextPropertyPanel.src
b/main/svx/source/sidebar/text/TextPropertyPanel.src
index 39fcea2126..cb56060544 100644
--- a/main/svx/source/sidebar/text/TextPropertyPanel.src
+++ b/main/svx/source/sidebar/text/TextPropertyPanel.src
@@ -43,7 +43,7 @@ Control RID_SIDEBAR_TEXT_PANEL
TabStop = TRUE ;
DropDown = TRUE ;
HelpID = HID_COMBO_FONT_NAME ;
- QuickHelpText [ en-US ] = "Font" ;
+ QuickHelpText [ en-US ] = "Font Name" ;
// Command = ".uno:CharFontName" ;
};
MetricBox MB_SBFONT_FONTSIZE
@@ -513,7 +513,7 @@ Control RID_POPUPPANEL_TEXTPAGE_SPACING
ListBox LB_KERNING
{
Border = TRUE ;
- Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE,
CUSTOM_Y + POPUPPANEL_MARGIN_LARGE + TEXT_HEIGHT + POPUPPANEL_MARGIN_SMALL );
// 20
+ Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE,
CUSTOM_Y + POPUPPANEL_MARGIN_LARGE + TEXT_HEIGHT + POPUPPANEL_MARGIN_SMALL ) ;
// 20
Size = MAP_APPFONT ( CUSTOM_WIDTH - POPUPPANEL_MARGIN_LARGE *
2, 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
[openoffice] branch AOO42X updated (18ec844f88 -> f98c8c9fb5)
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 18ec844f88 Changes required w/ AOO42X and trunk new e614db4a8b Bump up revision after tagging Dev4 new f98c8c9fb5 Temporary fix for issue 128546 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: main/setup_native/source/win32/nsis/downloadtemplate.nsi | 2 +- main/solenv/inc/minor.mk | 6 +++--- main/svx/source/sidebar/text/TextPropertyPanel.src | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
[openoffice] 01/02: Bump up revision after tagging Dev4
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 e614db4a8b33b3b95f1f92f547ed77c498e952c3 Author: mseidel AuthorDate: Fri Dec 23 14:48:51 2022 +0100 Bump up revision after tagging Dev4 --- main/setup_native/source/win32/nsis/downloadtemplate.nsi | 2 +- main/solenv/inc/minor.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main/setup_native/source/win32/nsis/downloadtemplate.nsi b/main/setup_native/source/win32/nsis/downloadtemplate.nsi index 4592d61b2a..1393e3130b 100644 --- a/main/setup_native/source/win32/nsis/downloadtemplate.nsi +++ b/main/setup_native/source/win32/nsis/downloadtemplate.nsi @@ -9,7 +9,7 @@ VIAddVersionKey CompanyName "Apache Software Foundation" VIAddVersionKey LegalCopyright "(c) 2012-2022 The Apache Software Foundation" VIAddVersionKey FileDescription "Apache PRODUCTNAMEPLACEHOLDER Installer" VIAddVersionKey ProductVersion "PRODUCTVERSIONPLACEHOLDER" -VIProductVersion "4.2.9823.500" +VIProductVersion "4.2.9824.500" ; Enable Unicode Unicode true diff --git a/main/solenv/inc/minor.mk b/main/solenv/inc/minor.mk index de1ff097e5..40be5ff465 100644 --- a/main/solenv/inc/minor.mk +++ b/main/solenv/inc/minor.mk @@ -21,7 +21,7 @@ # $Id$ RSCVERSION=420 -RSCREVISION=420m4(Build:9823) -BUILD=9823 -LAST_MINOR=m4 +RSCREVISION=420m5(Build:9824) +BUILD=9824 +LAST_MINOR=m5 SOURCEVERSION=AOO420
[openoffice] branch trunk updated: Fix some typos.
This is an automated email from the ASF dual-hosted git repository.
damjan 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 e405e85b1e Fix some typos.
e405e85b1e is described below
commit e405e85b1e72df1f328622e9d59104794ec740e8
Author: Damjan Jovanovic
AuthorDate: Sun Dec 25 07:43:38 2022 +0200
Fix some typos.
Patch by: me
---
main/bridges/source/cpp_uno/msvc_win64_x86-64/cpp2uno.cxx | 2 +-
main/bridges/test/testsameprocess.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/bridges/source/cpp_uno/msvc_win64_x86-64/cpp2uno.cxx
b/main/bridges/source/cpp_uno/msvc_win64_x86-64/cpp2uno.cxx
index 723d2fef04..59a963723a 100644
--- a/main/bridges/source/cpp_uno/msvc_win64_x86-64/cpp2uno.cxx
+++ b/main/bridges/source/cpp_uno/msvc_win64_x86-64/cpp2uno.cxx
@@ -48,7 +48,7 @@ namespace
// Perform the UNO call
//
-// We must convert the paramaters stored in pCallStack to UNO
+// We must convert the parameters stored in pCallStack to UNO
// arguments and call pThis->getUnoI()->pDispatcher.
//
// pCallStack: ret addr, this, [ret *], [params]
diff --git a/main/bridges/test/testsameprocess.cxx
b/main/bridges/test/testsameprocess.cxx
index 3263258629..471776a69a 100644
--- a/main/bridges/test/testsameprocess.cxx
+++ b/main/bridges/test/testsameprocess.cxx
@@ -119,7 +119,7 @@ int main( int argc, char *argv[] )
{
if( argc < 2 )
{
- printf( "usage : testsamprocess host:port\n" );
+ printf( "usage : testsameprocess host:port\n" );
return 0;
}
