(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 6485cf7b38 Fixed typos, removed whitespace 6485cf7b38 is described below commit 6485cf7b3877c588beeaeeaaa283722984d1c651 Author: mseidel AuthorDate: Sat Jan 6 23:56:53 2024 +0100 Fixed typos, removed whitespace (cherry picked from commit 520e75ba70bcd5f3bccaace624e4e4d1dad991a9) --- .../ui/framework/factories/FullScreenPane.cxx | 359 +-- main/vcl/source/control/tabctrl.cxx| 3352 ++-- 2 files changed, 1844 insertions(+), 1867 deletions(-) diff --git a/main/sd/source/ui/framework/factories/FullScreenPane.cxx b/main/sd/source/ui/framework/factories/FullScreenPane.cxx index f3ee32fd3e..af5b6fee1a 100644 --- a/main/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/main/sd/source/ui/framework/factories/FullScreenPane.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. - * + * */ - - #include "precompiled_sd.hxx" #include "FullScreenPane.hxx" @@ -47,244 +45,227 @@ using ::rtl::OUString; namespace sd { namespace framework { FullScreenPane::FullScreenPane ( -const Reference& rxComponentContext, -const Reference& rxPaneId, -const ::Window* pViewShellWindow) -: FrameWindowPane(rxPaneId,NULL), - mxComponentContext(rxComponentContext), - mpWorkWindow(NULL) + const Reference& rxComponentContext, + const Reference& rxPaneId, + const ::Window* pViewShellWindow) + :FrameWindowPane(rxPaneId,NULL), +mxComponentContext(rxComponentContext), +mpWorkWindow(NULL) { -::Window* pParent = NULL; -mpWorkWindow.reset(new WorkWindow( -pParent, -0)); // For debugging (non-fullscreen) use WB_BORDER | WB_MOVEABLE | WB_SIZEABLE)); - -if ( ! rxPaneId.is()) -throw lang::IllegalArgumentException(); - -sal_Int32 nScreenNumber = 1; -ExtractArguments(rxPaneId, nScreenNumber); - -if (mpWorkWindow.get() == NULL) -return; - -// Create a new top-leve window that is displayed full screen. -mpWorkWindow->ShowFullScreenMode(sal_True, nScreenNumber); -// For debugging (non-fullscreen) use mpWorkWindow->SetScreenNumber(nScreenNumber); -mpWorkWindow->SetMenuBarMode(MENUBAR_MODE_HIDE); -mpWorkWindow->SetBorderStyle(WINDOW_BORDER_REMOVEBORDER); -mpWorkWindow->SetBackground(Wallpaper()); -// Don't show the window right now in order to allow the setting of an -// accessibility object: accessibility objects are typically -// requested by AT-tools when the window is shown. Chaning it -// afterwards may or may not work. - -// Add resize listener at the work window. -Link aWindowEventHandler (LINK(this, FullScreenPane, WindowEventHandler)); -mpWorkWindow->AddEventListener(aWindowEventHandler); - -// Set title and icon of the new window to those of the current window -// of the view shell. -if (pViewShellWindow != NULL) -{ -const SystemWindow* pSystemWindow = pViewShellWindow->GetSystemWindow(); -mpWorkWindow->SetText(pSystemWindow->GetText()); -mpWorkWindow->SetIcon(pSystemWindow->GetIcon()); -} - -// For some reason the VCL canvas can not paint into a WorkWindow. -// Therefore a child window is created that covers the WorkWindow -// completely. -mpWindow = new ::Window(mpWorkWindow.get()); -mpWindow->SetPosSizePixel(Point(0,0), mpWorkWindow->GetSizePixel()); -mpWindow->SetBackground(Wallpaper()); -mxWindow = VCLUnoHelper::GetInterface(mpWindow); - -// Create the canvas. -mxCanvas = CreateCanvas(); - -mpWindow->GrabFocus(); + ::Window* pParent = NULL; + mpWorkWindow.reset(new WorkWindow( + pParent, + 0)); // For debugging (non-fullscreen) use WB_BORDER | WB_MOVEABLE | WB_SIZEABLE)); + + if ( ! rxPaneId.is()) + throw
(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 ef6cbe3cb1 Fixed typos, removed whitespace ef6cbe3cb1 is described below commit ef6cbe3cb12c4ff3b91bda6df15cfa64440a5258 Author: mseidel AuthorDate: Sun Nov 19 12:17:51 2023 +0100 Fixed typos, removed whitespace (cherry picked from commit ac186415c6dad2a9daf05ff4be6f27c5bc921331) --- .../sun/star/wizards/agenda/TemplateConsts.java| 229 +++-- .../com/sun/star/wizards/web/WebWizard.java| 59 +++--- 2 files changed, 145 insertions(+), 143 deletions(-) diff --git a/main/wizards/com/sun/star/wizards/agenda/TemplateConsts.java b/main/wizards/com/sun/star/wizards/agenda/TemplateConsts.java index d005a5864b..8a38f39e46 100644 --- a/main/wizards/com/sun/star/wizards/agenda/TemplateConsts.java +++ b/main/wizards/com/sun/star/wizards/agenda/TemplateConsts.java @@ -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,20 @@ * 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. - * + * */ + package com.sun.star.wizards.agenda; /** @@ -29,114 +30,114 @@ package com.sun.star.wizards.agenda; public interface TemplateConsts { -public final static String FILLIN_TITLE = ""; -public final static String FILLIN_DATE = ""; -public final static String FILLIN_TIME = ""; -public final static String FILLIN_LOCATION = ""; -/** - * section name prefix for sections that contain items. - * this is also used as table name prefix, since each items section - * must contain a table whos name is identical name to the section's name. - */ -public final static String SECTION_ITEMS = "AGENDA_ITEMS"; -/** - * the name of the section which contains the topics. - */ -public final static String SECTION_TOPICS = "AGENDA_TOPICS"; -/** - * the name of the parent minutes section. - */ -public final static String SECTION_MINUTES_ALL = "MINUTES_ALL"; -/** - * the name of the child nimutes section. - * This section will be duplicated for each topic. - */ -public final static String SECTION_MINUTES = "MINUTES";//public final static String AGENDA_ITEM = "AGENDA_ITEM"; -/** - * taged headings and names. - * These will be searched in item tables (in the template) and will be - * replaced with resource strings. - * - * headings... - */ -public final static String FILLIN_MEETING_TYPE = ""; -public final static String FILLIN_BRING = ""; -public final static String FILLIN_READ = ""; -public final static String FILLIN_NOTES = ""; -/** - * names... - */ -public final static String FILLIN_CALLED_BY = ""; -public final static String FILLIN_FACILITATOR = ""; -public final static String FILLIN_PARTICIPANTS = ""; -public final static String FILLIN_NOTETAKER = ""; -public final static String FILLIN_TIMEKEEPER = ""; -public final static String FILLIN_OBSERVERS = ""; -public final static String FILLIN_RESOURCE_PERSONS = ""; -/** - * Styles (paragraph styles) used for agenda items. - * headings styles - * - */ -public final static String STYLE_MEETING_TYPE = "MeetingType"; -public final static String STYLE_BRING = "Bring"; -public final static String STYLE_READ = "Read"; -public final static String STYLE_NOTES = "Notes"; -/** - * names styles - */ -public final static String STYLE_CALLED_BY = "CalledBy"; -public final static String STYLE_FACILITATOR = "Facilitator"; -public final static String STYLE_PARTICIPANTS = "Attendees"; -public final static String STYLE_NOTETAKER = "Notetaker"; -public final static String STYLE_TIMEKEEPER = "Timekeeper"; -public final static String STYLE_OBSERVERS = "Observers"; -public final static String STYLE_RESOURCE_PERSONS = "ResourcePersons"; -/** - * Styles (paragraph styles) used for the text of agenda items - * The agenda wizard creates fill-in fields with
(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 b941c31503 Fixed typos, removed whitespace b941c31503 is described below commit b941c3150372582499c41d28ecab7d846f9bb257 Author: mseidel AuthorDate: Tue Nov 14 13:47:17 2023 +0100 Fixed typos, removed whitespace (cherry picked from commit b117abe83caeb58197276bada6e5243f273e3553) --- main/svx/inc/svx/svdobj.hxx | 129 +--- 1 file changed, 61 insertions(+), 68 deletions(-) diff --git a/main/svx/inc/svx/svdobj.hxx b/main/svx/inc/svx/svdobj.hxx index 91e564dfb5..8cce8185b0 100644 --- a/main/svx/inc/svx/svdobj.hxx +++ b/main/svx/inc/svx/svdobj.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. - * + * */ @@ -31,8 +31,8 @@ #include #include #include -#include // fuer SdrLayerID -#include // Klebepunkte +#include // for SdrLayerID +#include // gluepoints #include #include #include @@ -43,7 +43,7 @@ #include // -// Vorausdeklarationen +// Vorausdeklarationen // class SfxBroadcaster; @@ -92,11 +92,11 @@ namespace sdr namespace svx { -class PropertyChangeNotifier; + class PropertyChangeNotifier; } // -// Defines +// Defines // enum SdrObjKind {OBJ_NONE = 0, // Abstraktes Objekt (SdrObject) @@ -156,7 +156,7 @@ enum SdrUserCallType {SDRUSERCALL_MOVEONLY, // Nur verschoben, Groesse un // #define nLayerID nLayerId // -// Hilfsklasse SdrObjUserCall +// Hilfsklasse SdrObjUserCall // class SVX_DLLPUBLIC SdrObjUserCall @@ -168,7 +168,7 @@ public: }; // -// Hilfsklasse SdrObjMacroHitRec +// Hilfsklasse SdrObjMacroHitRec // class SdrObjMacroHitRec @@ -193,7 +193,7 @@ public: }; // -// Hilfsklasse SdrObjUserData +// Hilfsklasse SdrObjUserData // // Anwenderdaten an einem Zeichenobjekt, z.B. applikationsspezifische Daten. // Jedes Zeichenobjekt kann beliebig viele dieser Records haben (SV-Liste). @@ -210,9 +210,9 @@ protected: sal_uInt16 nVersion; private: - SVX_DLLPRIVATE void operator=(const SdrObjUserData& rData);// nicht implementiert - SVX_DLLPRIVATE sal_Bool operator==(const SdrObjUserData& rData) const; // nicht implementiert - SVX_DLLPRIVATE sal_Bool operator!=(const SdrObjUserData& rData) const; // nicht implementiert + SVX_DLLPRIVATE void operator=(const SdrObjUserData& rData); // not implemented + SVX_DLLPRIVATE sal_Bool operator==(const SdrObjUserData& rData) const; // not implemented + SVX_DLLPRIVATE sal_Bool operator!=(const SdrObjUserData& rData) const; // not implemented public: TYPEINFO(); @@ -242,7 +242,7 @@ public: }; // -// Hilfsklasse SdrObjUserDataList +// Hilfsklasse SdrObjUserDataList // class SdrObjUserDataList @@ -264,9 +264,9 @@ public: }; // -// Hilfsklasse SdrObjGeoData +// Hilfsklasse SdrObjGeoData // -// Alle geometrischen Daten eines beliebigen Objektes zur �bergabe an's Undo/Redo +// Alle geometrischen Daten eines beliebigen Objektes zur Übergabe an Undo/Redo // // @@ -289,7 +289,7 @@ public: };
[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 d0db74eec9 Fixed typos, removed whitespace d0db74eec9 is described below commit d0db74eec9c1bc4522fc3fd441059b5db589c492 Author: mseidel AuthorDate: Thu Oct 5 00:05:47 2023 +0200 Fixed typos, removed whitespace (cherry picked from commit 0ac3728e1a96e788ca8a295f83d279b6214d295f) --- .../dbaccess/source/ui/relationdesign/relation.src | 65 + main/offapi/com/sun/star/embed/EmbedStates.idl | 24 +- .../com/sun/star/ui/XContextMenuInterceptor.idl| 15 +- main/sc/source/ui/drawfunc/drformsh.src| 6 +- main/svtools/source/misc/imagemgr.src | 262 +++-- 5 files changed, 163 insertions(+), 209 deletions(-) diff --git a/main/dbaccess/source/ui/relationdesign/relation.src b/main/dbaccess/source/ui/relationdesign/relation.src index 0f38648522..ad7bcda97a 100644 --- a/main/dbaccess/source/ui/relationdesign/relation.src +++ b/main/dbaccess/source/ui/relationdesign/relation.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,20 @@ * 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 _DBU_REL_HRC_ #include "dbu_rel.hrc" #endif @@ -65,62 +66,12 @@ QueryBox RELATION_DESIGN_SAVEMODIFIED String STR_QUERY_REL_DELETE_WINDOW { - Text [ en-US ] = "When you delete this table all corresponding relations will be deleted as well. Continue?"; + Text [ en-US ] = "When you delete this table all corresponding relations will be deleted as well. Continue?" ; }; String STR_QUERY_REL_COULD_NOT_CREATE { - Text [ en-US ] = "The database could not create the relation. May be foreign keys for this kind of table aren't supported.\nPlease check your documentation of the database."; + Text [ en-US ] = "The database could not create the relation. Maybe foreign keys for this kind of table aren't supported.\nPlease check your documentation of the database." ; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +// ** EOF diff --git a/main/offapi/com/sun/star/embed/EmbedStates.idl b/main/offapi/com/sun/star/embed/EmbedStates.idl index 9cce247ad8..8d57969270 100644 --- a/main/offapi/com/sun/star/embed/EmbedStates.idl +++ b/main/offapi/com/sun/star/embed/EmbedStates.idl @@ -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,20 @@ * 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 __com_sun_star_embed_EmbedStates_idl__ #define __com_sun_star_embed_EmbedStates_idl__ @@ -38,10 +39,10 @@ published constants EmbedStates /** "Loaded" - the persistent representation of the object is loaded in memory. - - The object is created and assigned with a persistent entry, - and a view representation ( metafile and etc. ) can be retrieved - ( if there is any ). + + The object is created and assigned with a persistent entry, + and a view representation (metafile, etc.) can be
[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 a3f67fb4d2 Fixed typos, removed whitespace a3f67fb4d2 is described below commit a3f67fb4d220fe5bca57e7af54239899b2ff8f8b Author: mseidel AuthorDate: Wed Sep 13 00:22:46 2023 +0200 Fixed typos, removed whitespace (cherry picked from commit 0f46dff71a3a0e0942a743e8b5b7c556cf7fbc70) --- main/UnoControls/source/controls/framecontrol.cxx | 51 --- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/main/UnoControls/source/controls/framecontrol.cxx b/main/UnoControls/source/controls/framecontrol.cxx index 4afbfa5d06..24ecdcac9f 100644 --- a/main/UnoControls/source/controls/framecontrol.cxx +++ b/main/UnoControls/source/controls/framecontrol.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,21 +7,20 @@ * 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. - * + * */ - //__ // my own include //__ @@ -89,13 +88,13 @@ Any SAL_CALL FrameControl::queryInterface( const Type& rType ) throw( RuntimeExc Reference< XInterface > xDel = BaseControl::impl_getDelegator(); if ( xDel.is() ) { - // If an delegator exist, forward question to his queryInterface. + // If a delegator exists, forward question to his queryInterface. // Delegator will ask his own queryAggregation! aReturn = xDel->queryInterface( rType ); } else { - // If an delegator unknown, forward question to own queryAggregation. + // If a delegator unknown, forward question to own queryAggregation. aReturn = queryAggregation( rType ); } @@ -149,8 +148,8 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException ) { // Create a static typecollection ... static OTypeCollection aTypeCollection ( ::getCppuType(( const Reference< XControlModel >*)NULL ) , - ::getCppuType(( const Reference< XControlContainer >*)NULL ) , - ::getCppuType(( const Reference< XConnectionPointContainer >*)NULL ) , + ::getCppuType(( const Reference< XControlContainer >*)NULL ) , + ::getCppuType(( const Reference< XConnectionPointContainer >*)NULL ) , BaseControl::getTypes() ); // ... and set his address to static pointer! @@ -170,8 +169,8 @@ Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeE // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! Any aReturn ( ::cppu::queryInterface( aType , - static_cast< XControlModel* > ( this ) , -
[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 3935342bc9 Fixed typos, removed whitespace 3935342bc9 is described below commit 3935342bc929690cfc5920becdc9d5455a0ce89d Author: mseidel AuthorDate: Tue Aug 15 13:37:26 2023 +0200 Fixed typos, removed whitespace (cherry picked from commit 245cfa3273a796efe837af30e8f9170e3ad3ab98) --- main/vcl/source/fontsubset/cff.cxx | 29 - main/vcl/source/fontsubset/gsub.cxx | 12 ++-- main/vcl/source/fontsubset/gsub.h | 10 ++-- main/vcl/source/fontsubset/list.cxx | 12 ++-- main/vcl/source/fontsubset/sft.cxx | 68 ++--- main/vcl/source/fontsubset/ttcr.cxx | 114 ++-- main/vcl/source/fontsubset/ttcr.hxx | 24 main/vcl/source/fontsubset/xlat.cxx | 29 - main/vcl/source/fontsubset/xlat.hxx | 31 +- 9 files changed, 166 insertions(+), 163 deletions(-) diff --git a/main/vcl/source/fontsubset/cff.cxx b/main/vcl/source/fontsubset/cff.cxx index 56b695a96b..2c33cf3e6a 100644 --- a/main/vcl/source/fontsubset/cff.cxx +++ b/main/vcl/source/fontsubset/cff.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,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. - * + * */ @@ -82,7 +82,7 @@ static const char* pStringIds[] = { "grave","acute", "circumflex", "tilde", /*128*/"macron", "breve", "dotaccent","dieresis", "ring", "cedilla", "hungarumlaut", "ogonek", - "caron","endash", "AE", "ordfeminine", + "caron","emdash", "AE", "ordfeminine", "Lslash", "Oslash", "OE", "ordmasculine", /*144*/"ae", "dotlessi", "lslash", "oslash", "oe", "germandbls", "onesuperior", "logicalnot", @@ -497,7 +497,7 @@ public: // TODO: is public really needed? private: // typeop exceution context - // Count of mnValStack elements + // Count of mnValStack elements int mnStackIdx; // Stack for holding CFF DICT operands ValType mnValStack[ NMAXSTACK+4]; @@ -752,7 +752,7 @@ void CffSubsetterContext::readDictOp( void) break; } - return; + return; } else if( (c >= 32) || (c == 28) ) { // --mpReadPtr; read2push(); @@ -838,10 +838,10 @@ void CffSubsetterContext::writeType1Val( ValType aVal) } else if( nOutCharstrType == 1) { // numtype==255 means int32 for Type1, but 16.16 for Type2 charstrings!!! *(pOut++) = 255; -*(pOut++) = static_cast(nInt >> 24); -*(pOut++) = static_cast(nInt >> 16); -*(pOut++) = static_cast(nInt >> 8); -*(pOut++) = static_cast(nInt); + *(pOut++) = static_cast(nInt >> 24); + *(pOut++) = static_cast(nInt >> 16); + *(pOut++) = static_cast(nInt >> 8); + *(pOut++) = static_cast(nInt); } mpWritePtr = pOut; @@ -1441,7 +1441,7 @@ if( mbSawError) { // encrypt the Type1 charstring int nRDCryptR = 4330; // TODO: mnRDCryptSeed; for( U8* p = pT1Ops; p < mpWritePtr; ++p) { - *p ^= (nRDCryptR >> 8); + *p ^= (nRDCryptR >> 8); nRDCryptR = (*(U8*)p + nRDCryptR) * 52845 + 22719; } @@ -2214,7 +2214,7 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter, // update PFB header segment const int nPfbHeaderLen =
[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 f2e5373e51 Fixed typos, removed whitespace f2e5373e51 is described below commit f2e5373e51488812856ecde65220ca1bb98d504e Author: mseidel AuthorDate: Sun Aug 13 16:55:38 2023 +0200 Fixed typos, removed whitespace (cherry picked from commit 0399a9fdaf9a50397f1c64f11d2eab3459cab875) --- main/vcl/source/gdi/bitmap.cxx | 228 +++--- main/vcl/source/gdi/bitmap3.cxx | 1522 +++--- main/vcl/source/gdi/bitmap4.cxx | 95 ++- main/vcl/source/gdi/bitmapex.cxx | 1235 --- 4 files changed, 1542 insertions(+), 1538 deletions(-) diff --git a/main/vcl/source/gdi/bitmap.cxx b/main/vcl/source/gdi/bitmap.cxx index 4325b513b1..7f529d053d 100644 --- a/main/vcl/source/gdi/bitmap.cxx +++ b/main/vcl/source/gdi/bitmap.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,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. - * + * */ @@ -55,9 +55,9 @@ Bitmap::Bitmap( const ResId& rResId ) : mpImpBmp( NULL ) { const BitmapEx aBmpEx( rResId ); - + if( !aBmpEx.IsEmpty() ) - *this = aBmpEx.GetBitmap(); + *this = aBmpEx.GetBitmap(); } // -- @@ -76,10 +76,10 @@ Bitmap::Bitmap( const Bitmap& rBitmap ) : Bitmap::Bitmap( SalBitmap* pSalBitmap ) { -mpImpBmp = new ImpBitmap(); -mpImpBmp->ImplSetSalBitmap( pSalBitmap ); -maPrefMapMode = MapMode( MAP_PIXEL ); -maPrefSize = mpImpBmp->ImplGetSize(); + mpImpBmp = new ImpBitmap(); + mpImpBmp->ImplSetSalBitmap( pSalBitmap ); + maPrefMapMode = MapMode( MAP_PIXEL ); + maPrefSize = mpImpBmp->ImplGetSize(); } // -- @@ -236,10 +236,10 @@ bool BitmapPalette::IsGreyPalette() const // see above: only certain entry values will result in a valid call to GetGreyPalette if( nEntryCount == 2 || nEntryCount == 4 || nEntryCount == 16 || nEntryCount == 256 ) { - const BitmapPalette& rGreyPalette = Bitmap::GetGreyPalette( nEntryCount ); - if( rGreyPalette == *this ) -return true; -} + const BitmapPalette& rGreyPalette = Bitmap::GetGreyPalette( nEntryCount ); + if( rGreyPalette == *this ) + return true; + } // TODO: is it worth to compare the entries? return false; } @@ -291,10 +291,10 @@ Size Bitmap::GetSizePixel() const void Bitmap::SetSizePixel( const Size& rNewSize, sal_uInt32 nScaleFlag ) { -if(GetSizePixel() != rNewSize) -{ -Scale( rNewSize, nScaleFlag ); -} + if(GetSizePixel() != rNewSize) + { + Scale( rNewSize, nScaleFlag ); + } } // -- @@ -332,17 +332,17 @@ sal_Bool Bitmap::HasGreyPalette() const if( pRAcc ) { - const BitmapColor& rCol0( pRAcc->GetPaletteColor( 0 ) ); - const BitmapColor& rCol1( pRAcc->GetPaletteColor( 1 ) ); - if( rCol0.GetRed() == rCol0.GetGreen() && rCol0.GetRed() == rCol0.GetBlue() && - rCol1.GetRed() == rCol1.GetGreen() && rCol1.GetRed() == rCol1.GetBlue() ) - { - bRet = sal_True; - } + const BitmapColor& rCol0( pRAcc->GetPaletteColor( 0 ) ); + const BitmapColor& rCol1( pRAcc->GetPaletteColor( 1 ) ); + if( rCol0.GetRed() == rCol0.GetGreen() && rCol0.GetRed() == rCol0.GetBlue() && + rCol1.GetRed() == rCol1.GetGreen() && rCol1.GetRed() == rCol1.GetBlue() ) + { + bRet = sal_True; + }
[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 a6c6745046 Fixed typos, removed whitespace a6c6745046 is described below commit a6c674504679bbb2b9107876aa3ee75e7c974518 Author: mseidel AuthorDate: Thu Aug 3 12:15:08 2023 +0200 Fixed typos, removed whitespace (cherry picked from commit e38dead826984fce4c06947f6b265a8f34a7aa72) --- .../source/primitive2d/cropprimitive2d.cxx | 23 ++--- .../primitive2d/discretebitmapprimitive2d.cxx | 17 ++-- .../source/primitive2d/maskprimitive2d.cxx | 15 ++- .../source/primitive2d/pagepreviewprimitive2d.cxx | 103 ++--- .../source/primitive2d/patternfillprimitive2d.cxx | 17 ++-- .../source/primitive2d/shadowprimitive2d.cxx | 51 +- .../source/primitive2d/textlineprimitive2d.cxx | 19 ++-- 7 files changed, 120 insertions(+), 125 deletions(-) diff --git a/main/drawinglayer/source/primitive2d/cropprimitive2d.cxx b/main/drawinglayer/source/primitive2d/cropprimitive2d.cxx index 60a5efc19d..bbb1ab0392 100644 --- a/main/drawinglayer/source/primitive2d/cropprimitive2d.cxx +++ b/main/drawinglayer/source/primitive2d/cropprimitive2d.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,18 +7,20 @@ * 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_drawinglayer.hxx" @@ -43,7 +45,7 @@ namespace drawinglayer { CropPrimitive2D::CropPrimitive2D( const Primitive2DSequence& rChildren, -const basegfx::B2DHomMatrix& rTransformation, +const basegfx::B2DHomMatrix& rTransformation, double fCropLeft, double fCropTop, double fCropRight, @@ -95,7 +97,7 @@ namespace drawinglayer const double fRight(getCropRight() * fBackScaleX); const double fBottom(getCropBottom() * fBackScaleY); -// calc new unit range for comparisons; the original range is the unit range +// calculate new unit range for comparisons; the original range is the unit range const basegfx::B2DRange aUnitRange(0.0, 0.0, 1.0, 1.0); const basegfx::B2DRange aNewRange( -fLeft, @@ -109,7 +111,7 @@ namespace drawinglayer { // create new transform; first take out old transform to get // to unit coordinates by inverting. Inverting should be flawless -// since we already cheched that object size is not zero in X or Y +// since we already checked that object size is not zero in X or Y basegfx::B2DHomMatrix aNewTransform(getTransformation()); aNewTransform.invert(); @@ -128,7 +130,7 @@ namespace drawinglayer // prepare TransformPrimitive2D with xPrimitive const Primitive2DReference xTransformPrimitive( new TransformPrimitive2D( -aNewTransform, +aNewTransform, getChildren())); if(aUnitRange.isInside(aNewRange)) @@ -146,7 +148,7 @@ namespace drawinglayer // create maskPrimitive with aMaskPolyPolygon and aMaskContentVector const Primitive2DReference xMask( new MaskPrimitive2D( -aMaskPolyPolygon, +aMaskPolyPolygon, Primitive2DSequence(, 1))); xRetval = Primitive2DSequence(, 1); @@ -164,5 +166,4 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer
[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 17e0665f00 Fixed typos, removed whitespace 17e0665f00 is described below commit 17e0665f005ea14aefd8c501e948471f1006b182 Author: mseidel AuthorDate: Tue Aug 1 23:45:58 2023 +0200 Fixed typos, removed whitespace (cherry picked from commit 99989fd556ef1be0ef27482f4b43a2a132e549c0) --- main/vcl/inc/vcl/bitmap.hxx | 108 +- main/vcl/inc/vcl/bitmapex.hxx | 80 --- main/vcl/inc/vcl/btndlg.hxx | 22 + main/vcl/inc/vcl/button.hxx | 23 - 4 files changed, 120 insertions(+), 113 deletions(-) diff --git a/main/vcl/inc/vcl/bitmap.hxx b/main/vcl/inc/vcl/bitmap.hxx index 19dcadb418..fe64222969 100644 --- a/main/vcl/inc/vcl/bitmap.hxx +++ b/main/vcl/inc/vcl/bitmap.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. - * + * */ @@ -62,7 +62,7 @@ typedef policy< #define BMP_SCALE_BOX 0x0007UL // new default assigns for having slots for best quality and -// an alternative with a good compromize between speed and quality. +// an alternative with a good compromise between speed and quality. // Currently BMP_SCALE_BESTQUALITY maps to BMP_SCALE_LANCZOS and // BMP_SCALE_FASTESTINTERPOLATE to BMP_SCALE_SUPER #define BMP_SCALE_BESTQUALITY 0x00feUL @@ -258,10 +258,10 @@ public: Lanczos3Kernel( void) {} virtual double GetWidth() const -{ -return 3.0; +{ +return 3.0; } - + virtual double Calculate(double x) const { return (-3.0 <= x && 3.0 > x) ? SincFilter(x) * SincFilter( x / 3.0 ) : 0.0; @@ -279,16 +279,16 @@ public: } }; -class BicubicKernel : public Kernel +class BicubicKernel : public Kernel { public: BicubicKernel( void) {} virtual double GetWidth() const -{ -return 2.0; +{ +return 2.0; } - + virtual double Calculate(double x) const { if(0.0 > x) @@ -309,14 +309,14 @@ public: } }; -class BilinearKernel : public Kernel +class BilinearKernel : public Kernel { public: BilinearKernel( void) {} virtual double GetWidth() const -{ -return 1.0; +{ +return 1.0; } virtual double Calculate(double x) const @@ -330,19 +330,19 @@ public: { return 1.0 - x; } - + return 0.0; } }; -class BoxKernel : public Kernel +class BoxKernel : public Kernel { public: BoxKernel( void) {} virtual double GetWidth() const -{ -return 0.5; +{ +return 0.5; } virtual double Calculate(double x) const @@ -420,10 +420,10 @@ public: SAL_DLLPRIVATE sal_Bool ImplReduceSimple( sal_uInt16 nColorCount ); SAL_DLLPRIVATE sal_Bool ImplReducePopular( sal_uInt16 nColorCount ); SAL_DLLPRIVATE sal_Bool ImplReduceMedian( sal_uInt16 nColorCount ); - SAL_DLLPRIVATE void ImplMedianCut( sal_uLong* pColBuf, BitmapPalette& rPal, + SAL_DLLPRIVATE void ImplMedianCut( sal_uLong* pColBuf, BitmapPalette& rPal, long nR1, long nR2, long nG1, long nG2, long nB1, long nB2, long nColors, long nPixels, long& rIndex ); - SAL_DLLPRIVATE sal_Bool ImplConvolute3( const long* pMatrix, long nDivisor, + SAL_DLLPRIVATE sal_Bool ImplConvolute3( const long* pMatrix, long nDivisor, const
[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 53e4371b57 Fixed typos, removed whitespace 53e4371b57 is described below commit 53e4371b579d1a3c82b19aa7770fde6dad6c0eed Author: mseidel AuthorDate: Sun May 7 11:40:23 2023 +0200 Fixed typos, removed whitespace (cherry picked from commit cd9a0925cfbdd58b3de3e4c88580bac79f5233fa) --- .../schema/org/openoffice/Office/Addons.xcs| 304 ++--- .../schema/org/openoffice/Office/Events.xcs| 12 +- .../org/openoffice/Office/ExtensionManager.xcs | 91 +++--- .../org/openoffice/Office/UI/WindowState.xcs | 227 --- 4 files changed, 316 insertions(+), 318 deletions(-) diff --git a/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs b/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs index b8d0929b18..af9d519c62 100644 --- a/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs +++ b/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs @@ -22,9 +22,9 @@ -http://openoffice.org/2001/registry; xmlns:xs="http://www.w3.org/2001/XMLSchema; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; oor:name="Addons" oor:package="org.openoffice.Office" xml:lang="en-US"> - CD - Contains general structures used to integrate external components into the Office user interface. +http://openoffice.org/2001/registry; xmlns:xs="http://www.w3.org/2001/XMLSchema; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; oor:name="Addons" oor:package="org.openoffice.Office" xml:lang="en-US"> + + Contains general structures used to integrate external components into the Office user interface. @@ -97,9 +97,9 @@ - - Optional parameters for a merge command. Interpretation depends on the individual command. - + + Optional parameters for a merge command. Interpretation depends on the individual command. + @@ -127,9 +127,9 @@ - - Describes the command that should be used as a reference point for the merge command. - + + Describes the command that should be used as a reference point for the merge command. + @@ -151,28 +151,28 @@ A property to define the context of this merge instruction. It can be empty or a colon separated list of the supported application modules. - - - Contains a list of toolbar items used by an Add-On. - - + + + Contains a list of toolbar items used by an Add-On. + + + + + + Contains the structure of a toolbar. + + + + A localized string used as the toolbar title. + + + + + + Contains a list of sets of toolbar items that are part of add-on toolbars. + + - - -Contains the structure of a toolbar. - - - -A localized string used as the toolbar title. - - - - - -Contains a list of sets of toolbar items that are part of add-on toolbars. - - - Describes a toolbar item representing a function of of an external component. The name must be unique and should be written using a package-scheme like
[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 b8c015e0bb Fixed typos, removed whitespace b8c015e0bb is described below commit b8c015e0bba87a82fe338343582792711e4ea3a3 Author: mseidel AuthorDate: Mon May 1 21:42:36 2023 +0200 Fixed typos, removed whitespace (cherry picked from commit 97679416e31bac29618986bf4c78080afcf870f0) --- main/padmin/source/adddlg.cxx | 616 main/padmin/source/helper.cxx | 248 main/padmin/source/padialog.cxx | 381 - 3 files changed, 625 insertions(+), 620 deletions(-) diff --git a/main/padmin/source/adddlg.cxx b/main/padmin/source/adddlg.cxx index 93bba44a23..530a65e6df 100644 --- a/main/padmin/source/adddlg.cxx +++ b/main/padmin/source/adddlg.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,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. - * + * */ @@ -43,8 +43,8 @@ using namespace std; APTabPage::APTabPage( AddPrinterDialog* pParent, const ResId& rResId ) : TabPage( pParent, rResId ), - m_aTitle( PaResId( RID_ADDP_STR_TITLE ) ), - m_pParent( pParent ) + m_aTitle( PaResId( RID_ADDP_STR_TITLE ) ), + m_pParent( pParent ) { } @@ -61,15 +61,15 @@ APChooseDevicePage::APChooseDevicePage( AddPrinterDialog* pParent ) : m_aFaxBtn.Check( sal_False ); m_aPDFBtn.Check( sal_False ); m_aOldBtn.Check( sal_False ); -if( ! AddPrinterDialog::getOldPrinterLocation().Len() ) -m_aOldBtn.Enable( sal_False ); -if( ! PrinterInfoManager::get().addOrRemovePossible() ) -{ -m_aPrinterBtn.Check( sal_False ); -m_aFaxBtn.Check( sal_True ); -m_aPrinterBtn.Enable( sal_False ); -m_aOldBtn.Enable( sal_False ); -} + if( ! AddPrinterDialog::getOldPrinterLocation().Len() ) + m_aOldBtn.Enable( sal_False ); + if( ! PrinterInfoManager::get().addOrRemovePossible() ) + { + m_aPrinterBtn.Check( sal_False ); + m_aFaxBtn.Check( sal_True ); + m_aPrinterBtn.Enable( sal_False ); + m_aOldBtn.Enable( sal_False ); + } } APChooseDevicePage::~APChooseDevicePage() @@ -129,9 +129,9 @@ void APChooseDriverPage::fill( PrinterInfo& rInfo ) String* pDriver = (String*)m_aDriverBox.GetEntryData( nPos ); rInfo.m_aDriverName = *pDriver; #if OSL_DEBUG_LEVEL > 1 -fprintf( stderr, "m_aLastPrinterName = \"%s\", rInfo.m_aPrinterName = \"%s\"\n", - OUStringToOString( m_aLastPrinterName, RTL_TEXTENCODING_ISO_8859_1 ).getStr(), - OUStringToOString( rInfo.m_aPrinterName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); + fprintf( stderr, "m_aLastPrinterName = \"%s\", rInfo.m_aPrinterName = \"%s\"\n", +OUStringToOString( m_aLastPrinterName, RTL_TEXTENCODING_ISO_8859_1 ).getStr(), +OUStringToOString( rInfo.m_aPrinterName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); #endif if( rInfo.m_aPrinterName.equals( m_aLastPrinterName ) ) { @@ -146,25 +146,25 @@ void APChooseDriverPage::updateDrivers( bool bRefresh, const rtl::OUString& rSel delete (String*)m_aDriverBox.GetEntryData( k ); m_aDriverBox.Clear(); -std::list< rtl::OUString > aDrivers; -psp::PPDParser::getKnownPPDDrivers( aDrivers, bRefresh ); - -rtl::OUString aSelectDriver( psp::PPDParser::getPPDPrinterName( rSelectDriver ) ); - -rtl::OUString aSelectedEntry; -for( std::list< rtl::OUString >::const_iterator it = aDrivers.begin(); it != aDrivers.end(); ++it ) -{ -rtl::OUString aDriver( psp::PPDParser::getPPDPrinterName( *it ) ); -if( aDriver.getLength() ) -{ -int nPos = m_aDriverBox.InsertEntry( aDriver ); -m_aDriverBox.SetEntryData( nPos, new String( *it ) ); -
[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 af1fe498b1 Fixed typos, removed whitespace af1fe498b1 is described below commit af1fe498b17eacffef81cf773bc174c9def81f77 Author: mseidel AuthorDate: Tue Apr 25 08:26:22 2023 +0200 Fixed typos, removed whitespace (cherry picked from commit 4cef5a18466c469f4cb45fa7dd242aa97a22b662) --- .../sun/star/deployment/DependencyException.idl| 12 ++-- .../com/sun/star/deployment/InstallException.idl | 10 +-- .../sun/star/deployment/UpdateInformationEntry.idl | 10 +-- .../com/sun/star/deployment/XExtensionManager.idl | 64 +-- main/offapi/com/sun/star/deployment/XPackage.idl | 72 +++--- .../deployment/XPackageInformationProvider.idl | 11 ++-- .../com/sun/star/deployment/XPackageManager.idl| 58 - .../sun/star/deployment/XPackageManagerFactory.idl | 14 ++--- .../com/sun/star/deployment/XPackageRegistry.idl | 24 .../com/sun/star/deployment/XPackageTypeInfo.idl | 28 - .../star/deployment/XUpdateInformationProvider.idl | 21 +++ main/oox/inc/oox/xls/stylesbuffer.hxx | 16 ++--- main/oox/source/xls/stylesbuffer.cxx | 10 +-- 13 files changed, 174 insertions(+), 176 deletions(-) diff --git a/main/offapi/com/sun/star/deployment/DependencyException.idl b/main/offapi/com/sun/star/deployment/DependencyException.idl index a9739a5a11..89d231ba7d 100644 --- a/main/offapi/com/sun/star/deployment/DependencyException.idl +++ b/main/offapi/com/sun/star/deployment/DependencyException.idl @@ -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. - * + * */ @@ -52,11 +52,11 @@ exception DependencyException: com::sun::star::uno::Exception { namespace name http://openoffice.org/extensions/description/2006 and the local part name and whose value is a human-readable - (english) description of the dependency. If an instance of OpenOffice does not + (English) description of the dependency. If an instance of OpenOffice does not know more about a specific kind of dependency, it should display the value of that attribute to the user. - The sequence must not be emtpy, and none of the elements may be + The sequence must not be empty, and none of the elements may be . */ sequence< com::sun::star::xml::dom::XElement > UnsatisfiedDependencies; diff --git a/main/offapi/com/sun/star/deployment/InstallException.idl b/main/offapi/com/sun/star/deployment/InstallException.idl index 8f1aa9ef1c..2a145d6b1e 100644 --- a/main/offapi/com/sun/star/deployment/InstallException.idl +++ b/main/offapi/com/sun/star/deployment/InstallException.idl @@ -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. - * + * */ @@ -31,7 +31,7 @@ module com { module sun { module star { module deployment { interface XPackage; /** - describes the fact that deployment unit is about to be installed. + describes the fact that deployment unit is about to be installed.
[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 afc863d99f Fixed typos, removed whitespace afc863d99f is described below commit afc863d99fa813bf773e1ea05007abc40c05f4bb Author: mseidel AuthorDate: Mon Jan 16 23:26:49 2023 +0100 Fixed typos, removed whitespace (cherry picked from commit 52230ee933e31bb26d753c1599317216f6e3ec57) --- main/basegfx/source/polygon/b2dtrapezoid.cxx | 1196 +- 1 file changed, 598 insertions(+), 598 deletions(-) diff --git a/main/basegfx/source/polygon/b2dtrapezoid.cxx b/main/basegfx/source/polygon/b2dtrapezoid.cxx index a65b9fa741..3404af0575 100644 --- a/main/basegfx/source/polygon/b2dtrapezoid.cxx +++ b/main/basegfx/source/polygon/b2dtrapezoid.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,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. - * + * */ @@ -32,23 +32,23 @@ namespace basegfx { -namespace trapezoidhelper -{ - // -// helper class to hold a simple ege. This is only used for horizontal edges -// currently, thus the YPositions will be equal. I did not create a special -// class for this since holdingthe pointers is more effective and also can be -// used as baseclass for the traversing edges - -class TrDeSimpleEdge + namespace trapezoidhelper + { + // + // helper class to hold a simple edge. This is only used for horizontal edges + // currently, thus the YPositions will be equal. I did not create a special + // class for this since holding the pointers is more effective and also can be + // used as baseclass for the traversing edges + + class TrDeSimpleEdge { -protected: -// pointers to start and end point + protected: + // pointers to start and end point const B2DPoint* mpStart; const B2DPoint* mpEnd; public: -// constructor + // constructor TrDeSimpleEdge( const B2DPoint* pStart, const B2DPoint* pEnd) @@ -57,35 +57,35 @@ namespace basegfx { } -// data read access + // data read access const B2DPoint& getStart() const { return *mpStart; } const B2DPoint& getEnd() const { return *mpEnd; } }; - // -// define vector of simple edges + // + // define vector of simple edges -typedef ::std::vector< TrDeSimpleEdge > TrDeSimpleEdges; + typedef ::std::vector< TrDeSimpleEdge > TrDeSimpleEdges; - // -// helper class for holding a traversing edge. It will always have some -// distance in YPos. The slope (in a numerically useful form, see comments) is -// hold and used in SortValue to allow sorting traversing edges by Y, X and slope -// (in that order) + // + // helper class for holding a traversing edge. It will always have some + // distance in YPos. The slope (in a numerically useful form, see comments) is + // hold and used in SortValue to allow sorting traversing edges by Y, X and slope +
[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 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 30c596f287 Fixed typos, removed whitespace 30c596f287 is described below commit 30c596f28733932db8356afd25aef01e52f57909 Author: mseidel AuthorDate: Sun Sep 18 11:34:55 2022 +0200 Fixed typos, removed whitespace (cherry picked from commit 23b2c88cd6a69e823600adadb373bff76b7eaa26) --- .../complex/framework/recovery/RecoveryTest.java | 368 ++--- 1 file changed, 184 insertions(+), 184 deletions(-) diff --git a/main/framework/qa/complex/framework/recovery/RecoveryTest.java b/main/framework/qa/complex/framework/recovery/RecoveryTest.java index 13b0348f0e..016f4e63cb 100644 --- a/main/framework/qa/complex/framework/recovery/RecoveryTest.java +++ b/main/framework/qa/complex/framework/recovery/RecoveryTest.java @@ -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. - * + * */ @@ -91,22 +91,22 @@ import static org.junit.Assert.*; // -- public class RecoveryTest extends ComplexTestCase { - + static XMultiServiceFactory xMSF; static SOfficeFactory SOF; static RecoveryTools rt; /** - * If you devid the screen in four parts in the first of them the office + * If you divide the screen in four parts in the first of them the office * windows should be placed. The range of the first quarter is stored in the variable. - */ + */ static Point windowMaxPosition; /** * The office windows starts in the first quarter of the screen. In this variable * the maximum size for the windows was stored so the windows can be placed * visible on the screen. - */ + */ static Size windowMaxSize; - + /** * All office windows will be placed by this test on randomized positions. * This positions was stored in this Hashmap. The keys are the frame names @@ -114,30 +114,30 @@ public class RecoveryTest extends ComplexTestCase { * @see com.sun.star.awt.Rectangle */ private Hashtable windowsPosSize = new Hashtable(); - + /** * A function to tell the framework, which test functions are available. * @return All test methods. * * @todo: hidden documents * @todo: running presentation - * @todo: modular dialogs like Hpyerlink-Dialog - * @todo: sceond view of a document + * @todo: modular dialogs like Hyperlink-Dialog + * @todo: second view of a document * @todo: remove recovery data before start test * @todo: after a second start after the crash there should no documents recovered anymore * @todo: enable remove of recovery files - * @todo: makefile anpassen auf Parameter überprüfen + * @todo: modify makefile to check for parameters */ public String[] getTestMethodNames() { return new String[]{"testCrash"}; } - + /** Create the environment for following tests. * Use either a component loader from desktop or * from frame * @throws Exception Exception */ - + public void normalCrash(){ cleanRecoveryData(); startOffice(); @@ -150,18 +150,18 @@ public class RecoveryTest extends ComplexTestCase { handleCrashReporterDialog(true, true); checkDocumentCount(expectedDocumentCount); } - + public void testCrash(){ cleanRecoveryData(); restoreBackupRecoveryData(); startOffice(); int expectedDocumentCount = 3; -//handleRecoveryDialog_QuickExit(expectedDocumentCount); +// handleRecoveryDialog_QuickExit(expectedDocumentCount); handleRecoveryDialog_QuickExitAndSave(expectedDocumentCount); //handleCrashReporterDialog(true, true); //checkDocumentCount(expectedDocumentCount); } - + public void before() throws Exception { String msg ="\n\n\tPATH
[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 57a904c9d2 Fixed typos, removed whitespace 57a904c9d2 is described below commit 57a904c9d2d7a282aa411e5e14633a27b80300b3 Author: mseidel AuthorDate: Sat Sep 17 15:46:45 2022 +0200 Fixed typos, removed whitespace (cherry picked from commit 6e496631967b81de2ca58b050aa221fc91b6c02b) --- .../sidebar/graphic/GraphicPropertyPanel.cxx | 42 ++-- .../sidebar/graphic/GraphicPropertyPanel.hxx | 14 +- main/svx/source/sidebar/tools/ColorControl.cxx | 254 +++-- main/svx/source/sidebar/tools/ColorPopup.cxx | 34 +-- 4 files changed, 176 insertions(+), 168 deletions(-) diff --git a/main/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/main/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 4db319e00a..f17f4ef832 100644 --- a/main/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/main/svx/source/sidebar/graphic/GraphicPropertyPanel.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,18 +7,20 @@ * 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 #include #include @@ -53,7 +55,7 @@ GraphicPropertyPanel::GraphicPropertyPanel( const cssu::Reference& rxFrame, SfxBindings* pBindings) : Control( -pParent, +pParent, SVX_RES(RID_SIDEBAR_GRAPHIC_PANEL)), mpFtBrightness(new FixedText(this, SVX_RES(FT_BRIGHTNESS))), mpMtrBrightness(new MetricField(this, SVX_RES(MTR_BRIGHTNESS))), @@ -89,22 +91,22 @@ GraphicPropertyPanel::GraphicPropertyPanel( // Setup the grid layouter. maLayouter.GetCell(0,0).SetControl(*mpFtBrightness).SetGridWidth(2); maLayouter.GetCell(1,0).SetControl(*mpMtrBrightness).SetGridWidth(2); - + maLayouter.GetCell(0,3).SetControl(*mpFtContrast).SetGridWidth(2); maLayouter.GetCell(1,3).SetControl(*mpMtrContrast).SetGridWidth(2); - + maLayouter.GetCell(2,0).SetControl(*mpFtColorMode).SetGridWidth(2); maLayouter.GetCell(3,0).SetControl(*mpLBColorMode).SetGridWidth(2); - + maLayouter.GetCell(2,3).SetControl(*mpFtTrans).SetGridWidth(2); maLayouter.GetCell(3,3).SetControl(*mpMtrTrans).SetGridWidth(2); - + maLayouter.GetCell(4,0).SetControl(maImgRed).SetFixedWidth(); maLayouter.GetCell(4,1).SetControl(*mpMtrRed); maLayouter.GetCell(5,0).SetControl(maImgBlue).SetFixedWidth(); maLayouter.GetCell(5,1).SetControl(*mpMtrBlue); - + maLayouter.GetCell(4,3).SetControl(maImgGreen).SetFixedWidth(); maLayouter.GetCell(4,4).SetControl(*mpMtrGreen); maLayouter.GetCell(5,3).SetControl(maImgGamma).SetFixedWidth(); @@ -125,7 +127,7 @@ GraphicPropertyPanel::GraphicPropertyPanel( .SetWeight(1) .SetMinimumWidth(Layouter::MapWidth(*this, MBOX_WIDTH - 10)) .SetRightPadding(Layouter::MapWidth(*this,SECTIONPAGE_MARGIN_HORIZONTAL)); - + // Make controls that display text handle short widths more // graceful. Layouter::PrepareForLayouting(*mpFtBrightness); @@ -304,12 +306,12 @@ GraphicPropertyPanel* GraphicPropertyPanel::Create ( SfxBindings* pBindings) { if (pParent == NULL) -throw lang::IllegalArgumentException(A2S("no parent Window given to GraphicPropertyPanel::Create"), NULL, 0); +throw lang::IllegalArgumentException(A2S("no parent window given to GraphicPropertyPanel::Create"), NULL, 0); if ( ! rxFrame.is()) throw lang::IllegalArgumentException(A2S("no XFrame given to GraphicPropertyPanel::Create"), NULL, 1); if (pBindings == NULL) throw lang::IllegalArgumentException(A2S("no SfxBindings given to GraphicPropertyPanel::Create"), NULL, 2); - + return new GraphicPropertyPanel( pParent, rxFrame, @@ -322,15 +324,15 @@ void GraphicPropertyPanel::DataChanged( const DataChangedEvent& rEvent) { (void)rEvent; - + SetupIcons(); }
[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 3adb8b6e02 Fixed typos, removed whitespace 3adb8b6e02 is described below commit 3adb8b6e02d65ce05eb8800f296b8697d2f749ab Author: mseidel AuthorDate: Fri Sep 9 22:40:52 2022 +0200 Fixed typos, removed whitespace (cherry picked from commit a27c115a070e5f15bedb543d2a457c4589d7776c) --- main/l10ntools/source/file.cxx | 25 +- main/l10ntools/source/gsicheck.cxx | 1334 ++-- main/l10ntools/source/utf8conv.cxx | 16 +- 3 files changed, 687 insertions(+), 688 deletions(-) diff --git a/main/l10ntools/source/file.cxx b/main/l10ntools/source/file.cxx index 4f4d778f14..243dbedbf0 100644 --- a/main/l10ntools/source/file.cxx +++ b/main/l10ntools/source/file.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,45 +7,44 @@ * 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_l10ntools.hxx" #include namespace transex { - + File::File( const rtl::OUString sFile ) { -sFileName = sFile; + sFileName = sFile; } File::File( const rtl::OUString sFullPath , const rtl::OUString sFile ) { -sFileName = sFile; -sFullName = sFullPath; + sFileName = sFile; + sFullName = sFullPath; } bool File::lessFile ( const File& rKey1, const File& rKey2 ) { -rtl::OUString sName1( ( static_cast< File >( rKey1 ) ).getFileName() ); -rtl::OUString sName2( ( static_cast< File >( rKey2 ) ).getFileName() ); - -return sName1.compareTo( sName2 ) < 0 ; + rtl::OUString sName1( ( static_cast< File >( rKey1 ) ).getFileName() ); + rtl::OUString sName2( ( static_cast< File >( rKey2 ) ).getFileName() ); + + return sName1.compareTo( sName2 ) < 0 ; } } diff --git a/main/l10ntools/source/gsicheck.cxx b/main/l10ntools/source/gsicheck.cxx index d60d5974a9..70021a7838 100644 --- a/main/l10ntools/source/gsicheck.cxx +++ b/main/l10ntools/source/gsicheck.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,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. - * + * */ @@ -54,29 +54,29 @@ void PrintError( ByteString aMsg, ByteString aPrefix, ByteString aContext, sal_Bool bPrintContext, sal_uLong nLine, ByteString aUniqueId = ByteString() ) /*/ { -PrintMessage( "Error:", aMsg, aPrefix, aContext, bPrintContext, nLine, aUniqueId ); + PrintMessage( "Error:", aMsg, aPrefix, aContext, bPrintContext, nLine, aUniqueId ); } sal_Bool LanguageOK( ByteString aLang ) { -if ( !aLang.Len() ) -return sal_False; - -if ( aLang.IsNumericAscii() ) -return sal_True; - -if ( aLang.GetTokenCount( '-' ) == 1 ) -return aLang.IsAlphaAscii() && aLang.IsLowerAscii(); -else if ( aLang.GetTokenCount( '-' ) == 2 ) -{ -ByteString aTok0( aLang.GetToken( 0, '-' ) ); -ByteString aTok1( aLang.GetToken( 1, '-' ) ); -return aTok0.Len() && aTok0.IsAlphaAscii() && aTok0.IsLowerAscii() -
[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 672a906222 Fixed typos, removed whitespace 672a906222 is described below commit 672a906222560ce8c8a5e464d3cf5882c08b49f2 Author: mseidel AuthorDate: Sun May 15 12:54:51 2022 +0200 Fixed typos, removed whitespace (cherry picked from commit 3be598994e7b43df5b6acf9cd98e334f564d9374) --- .../sdr/contact/viewcontactofsdrcaptionobj.cxx | 98 +++--- .../sdr/contact/viewcontactofsdrmediaobj.cxx | 26 +++--- .../svx/source/sdr/contact/viewcontactofsdrobj.cxx | 54 ++-- 3 files changed, 89 insertions(+), 89 deletions(-) diff --git a/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx index 641d6b5488..e64d440f58 100644 --- a/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx +++ b/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.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,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. - * + * */ @@ -64,17 +64,17 @@ namespace sdr const SfxItemSet& rItemSet = rCaptionObj.GetMergedItemSet(); const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute( drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute( -rItemSet, -rCaptionObj.getText(0), -false)); + rItemSet, + rCaptionObj.getText(0), + false)); // take unrotated snap rect (direct model data) for position and size const Rectangle& rRectangle = rCaptionObj.GetGeoRect(); const ::basegfx::B2DRange aObjectRange( - rRectangle.Left(), rRectangle.Top(), + rRectangle.Left(), rRectangle.Top(), rRectangle.Right(), rRectangle.Bottom()); const GeoStat& rGeoStat(rCaptionObj.GetGeoStat()); - + // fill object matrix basegfx::B2DHomMatrix aObjectMatrix(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix( aObjectRange.getWidth(), aObjectRange.getHeight(), @@ -92,10 +92,10 @@ namespace sdr // of SdrCaptionPrimitive2D create needed invisible elements for HitTest and BoundRect const drawinglayer::primitive2d::Primitive2DReference xReference( new drawinglayer::primitive2d::SdrCaptionPrimitive2D( - aObjectMatrix, - aAttribute, - rCaptionObj.getTailPolygon(), - fCornerRadiusX, + aObjectMatrix, + aAttribute, + rCaptionObj.getTailPolygon(), + fCornerRadiusX, fCornerRadiusY)); xRetval = drawinglayer::primitive2d::Primitive2DSequence(, 1); @@ -144,41 +144,41 @@ namespace sdr const sal_uInt32 nXDist(((SdrShadowXDistItem&)(rItemSet.Get(SDRATTR_SHADOWXDIST))).GetValue()); const sal_uInt32 nYDist(((SdrShadowYDistItem&)(rItemSet.Get(SDRATTR_SHADOWYDIST))).GetValue()); -if(nXDist || nYDist) -{ -// #119750# create obect and shadow outline, clip shadow outline -// on object outline. If there is a rest, create shadow. Do this to -
[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 4a9f8924a7 Fixed typos, removed whitespace 4a9f8924a7 is described below commit 4a9f8924a7d60b322ba9aff2ebb74ff9855f17cd Author: mseidel AuthorDate: Thu Apr 21 23:03:53 2022 +0200 Fixed typos, removed whitespace (cherry picked from commit da5310fc34324f729be8b74ccf3f009ae791ba01) --- main/vcl/source/control/lstbox.cxx | 664 ++--- 1 file changed, 332 insertions(+), 332 deletions(-) diff --git a/main/vcl/source/control/lstbox.cxx b/main/vcl/source/control/lstbox.cxx index 1a14e6efd7..dcfdff4f09 100644 --- a/main/vcl/source/control/lstbox.cxx +++ b/main/vcl/source/control/lstbox.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,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. - * + * */ @@ -78,10 +78,10 @@ ListBox::ListBox( Window* pParent, const ResId& rResId ) : ListBox::~ListBox() { -//#109201# -ImplCallEventListeners( VCLEVENT_OBJECT_DYING ); + //#109201# + ImplCallEventListeners( VCLEVENT_OBJECT_DYING ); -delete mpImplLB; + delete mpImplLB; // Beim zerstoeren des FloatWins macht TH ein GrabFocus auf den Parent, // also diese ListBox => PreNotify()... @@ -101,9 +101,9 @@ void ListBox::ImplInitListBoxData() mpBtn = NULL; mnDDHeight = 0; mnSaveValue = LISTBOX_ENTRY_NOTFOUND; -mnLineCount = 0; + mnLineCount = 0; mbDDAutoSize= true; -mbEdgeBlending = false; + mbEdgeBlending = false; } // --- @@ -117,48 +117,48 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle ) Control::ImplInit( pParent, nStyle, NULL ); SetBackground(); -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener> xDrop = new DNDEventDispatcher(this); + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener> xDrop = new DNDEventDispatcher(this); if( nStyle & WB_DROPDOWN ) { -sal_Int32 nLeft, nTop, nRight, nBottom; -GetBorder( nLeft, nTop, nRight, nBottom ); -mnDDHeight = (sal_uInt16)(GetTextHeight() + nTop + nBottom + 4); - -if( IsNativeWidgetEnabled() && -IsNativeControlSupported( CTRL_LISTBOX, PART_ENTIRE_CONTROL ) ) -{ -ImplControlValue aControlValue; -Rectangle aCtrlRegion( Point( 0, 0 ), Size( 20, mnDDHeight ) ); -Rectangle aBoundingRgn( aCtrlRegion ); -Rectangle aContentRgn( aCtrlRegion ); -if( GetNativeControlRegion( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aCtrlRegion, -CTRL_STATE_ENABLED, aControlValue, rtl::OUString(), -aBoundingRgn, aContentRgn ) ) -{ -sal_Int32 nHeight = aBoundingRgn.GetHeight(); -if( nHeight > mnDDHeight ) -mnDDHeight = static_cast(nHeight); -} -} + sal_Int32 nLeft, nTop, nRight, nBottom; + GetBorder( nLeft, nTop, nRight, nBottom ); + mnDDHeight = (sal_uInt16)(GetTextHeight() + nTop + nBottom + 4); + + if( IsNativeWidgetEnabled() && + IsNativeControlSupported( CTRL_LISTBOX, PART_ENTIRE_CONTROL ) ) + { + ImplControlValue aControlValue; + Rectangle aCtrlRegion( Point( 0, 0 ), Size( 20, mnDDHeight ) ); + Rectangle aBoundingRgn( aCtrlRegion ); + Rectangle aContentRgn( aCtrlRegion ); + if( GetNativeControlRegion( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aCtrlRegion, +
[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 c7c1ab4 Fixed typos, removed whitespace c7c1ab4 is described below commit c7c1ab4fba8302322bb616e6b3074304620e74d9 Author: mseidel AuthorDate: Thu Mar 17 13:33:38 2022 +0100 Fixed typos, removed whitespace (cherry picked from commit 805551cc14ce732b210f2cf98871869a3d131bd9) --- main/vcl/source/window/brdwin.cxx | 236 +++--- 1 file changed, 118 insertions(+), 118 deletions(-) diff --git a/main/vcl/source/window/brdwin.cxx b/main/vcl/source/window/brdwin.cxx index 2b7e1d1..114b694 100644 --- a/main/vcl/source/window/brdwin.cxx +++ b/main/vcl/source/window/brdwin.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,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. - * + * */ @@ -57,9 +57,9 @@ static void ImplGetPinImage( sal_uInt16 nStyle, sal_Bool bPinIn, Image& rImage ) ImplSVData* pSVData = ImplGetSVData(); if ( !pSVData->maCtrlData.mpPinImgList ) { -ResMgr* pResMgr = ImplGetResMgr(); + ResMgr* pResMgr = ImplGetResMgr(); pSVData->maCtrlData.mpPinImgList = new ImageList(); -if( pResMgr ) + if( pResMgr ) { Color aMaskColor( 0x00, 0x00, 0xFF ); pSVData->maCtrlData.mpPinImgList->InsertFromHorizontalBitmap @@ -126,13 +126,13 @@ static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev, const Rectangle& rRect, SymbolType eSymbol, sal_uInt16 nState ) { -sal_Bool bMouseOver = (nState & BUTTON_DRAW_HIGHLIGHT) != 0; -nState &= ~BUTTON_DRAW_HIGHLIGHT; + sal_Bool bMouseOver = (nState & BUTTON_DRAW_HIGHLIGHT) != 0; + nState &= ~BUTTON_DRAW_HIGHLIGHT; Rectangle aTempRect; -Window *pWin = dynamic_cast< Window* >(pDev); -if( pWin ) -{ + Window *pWin = dynamic_cast< Window* >(pDev); + if( pWin ) + { if( bMouseOver ) { // provide a bright background for selection effect @@ -147,12 +147,12 @@ static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev, aTempRect.nRight-=4; aTempRect.nTop+=3; aTempRect.nBottom-=4; -} -else -{ - DecorationView aDecoView( pDev ); - aTempRect = aDecoView.DrawButton( rRect, nState|BUTTON_DRAW_FLAT ); -} + } + else + { + DecorationView aDecoView( pDev ); + aTempRect = aDecoView.DrawButton( rRect, nState|BUTTON_DRAW_FLAT ); + } ImplDrawBrdWinSymbol( pDev, aTempRect, eSymbol ); } @@ -199,7 +199,7 @@ String ImplBorderWindowView::RequestHelp( const Point&, Rectangle& ) Rectangle ImplBorderWindowView::GetMenuRect() const { -return Rectangle(); + return Rectangle(); } // --- @@ -271,12 +271,12 @@ sal_uInt16 ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pData, const if ( nSizeWidth < 16 ) nSizeWidth = 16; -// no corner resize for floating toolbars, which would lead to jumps while formatting -// setting nSizeWidth = 0 will only return pure left,top,right,bottom -if( pBorderWindow->GetStyle() & WB_OWNERDRAWDECORATION ) -nSizeWidth = 0; + // no corner resize for floating toolbars, which would lead to jumps while formatting + // setting nSizeWidth = 0 will only return pure left,top,right,bottom + if( pBorderWindow->GetStyle() & WB_OWNERDRAWDECORATION ) + nSizeWidth = 0; -if ( rPos.X() < pData->mnLeftBorder ) + if ( rPos.X() < pData->mnLeftBorder ) { if (
[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 5b007cd Fixed typos, removed whitespace 5b007cd is described below commit 5b007cdbdafe28cd8808e0bdaa08c6429787cd9a Author: mseidel AuthorDate: Mon Mar 14 16:55:23 2022 +0100 Fixed typos, removed whitespace (cherry picked from commit 40af24dde132952d751fe82f1a6c2cf29e6c4741) --- main/connectivity/source/sdbcx/VCatalog.cxx| 25 +++--- main/connectivity/source/sdbcx/VCollection.cxx | 110 - main/connectivity/source/sdbcx/VView.cxx | 16 ++-- main/connectivity/source/sdbcx/makefile.mk | 10 +-- 4 files changed, 79 insertions(+), 82 deletions(-) diff --git a/main/connectivity/source/sdbcx/VCatalog.cxx b/main/connectivity/source/sdbcx/VCatalog.cxx index 40117e6..16557b6 100644 --- a/main/connectivity/source/sdbcx/VCatalog.cxx +++ b/main/connectivity/source/sdbcx/VCatalog.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,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. - * + * */ @@ -101,7 +101,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getTables( ) throw(RuntimeException { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OCatalog_BASE::rBHelper.bDisposed); - + try { if(!m_pTables) @@ -125,7 +125,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getViews( ) throw(RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OCatalog_BASE::rBHelper.bDisposed); - + try { if(!m_pViews) @@ -149,7 +149,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getUsers( ) throw(RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OCatalog_BASE::rBHelper.bDisposed); - + try { if(!m_pUsers) @@ -173,7 +173,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getGroups( ) throw(RuntimeException { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OCatalog_BASE::rBHelper.bDisposed); - + try { if(!m_pGroups) @@ -197,15 +197,15 @@ Reference< XNameAccess > SAL_CALL OCatalog::getGroups( ) throw(RuntimeException ::rtl::OUString sCatalog = _xRow->getString(1); if ( _xRow->wasNull() ) sCatalog = ::rtl::OUString(); - ::rtl::OUString sSchema = _xRow->getString(2); + ::rtl::OUString sSchema = _xRow->getString(2); if ( _xRow->wasNull() ) sSchema = ::rtl::OUString(); - ::rtl::OUString sTable = _xRow->getString(3); + ::rtl::OUString sTable = _xRow->getString(3); if ( _xRow->wasNull() ) sTable = ::rtl::OUString(); ::rtl::OUString sComposedName( - ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_False, ::dbtools::eInDataManipulation ) ); + ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_False, ::dbtools::eInDataManipulation ) ); return sComposedName; } // - @@ -226,7 +226,7 @@ void OCatalog::fillNames(Reference< XResultSet >& _xResult,TStringVector& _rName // - void ODescriptor::construct() { -sal_Int32 nAttrib = isNew() ? 0 : ::com::sun::star::beans::PropertyAttribute::READONLY; + sal_Int32 nAttrib = isNew() ? 0 : ::com::sun::star::beans::PropertyAttribute::READONLY; registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME), PROPERTY_ID_NAME ,nAttrib,_Name,::getCppuType(static_cast< ::rtl::OUString*>(NULL))); } // - @@ -234,4 +234,3 @@ ODescriptor::~ODescriptor() { } // - - diff --git
[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 ffea605 Fixed typos, removed whitespace ffea605 is described below commit ffea60523271b67baae4c54a3a54c286332dfa1c Author: mseidel AuthorDate: Sat Feb 12 14:05:06 2022 +0100 Fixed typos, removed whitespace (cherry picked from commit 002e2b2b0f316c060b83ff39613d9c63682a4d0d) --- .../DevelopersGuide/Config/ConfigExamples.java | 276 - .../FirstSteps/FirstConnection.java| 10 +- .../FirstSteps/FirstUnoContact.java| 8 +- .../FirstSteps/HelloTextTableShape.java| 26 +- .../DevelopersGuide/Text/TextDocuments.java| 660 ++--- 5 files changed, 490 insertions(+), 490 deletions(-) diff --git a/main/odk/examples/DevelopersGuide/Config/ConfigExamples.java b/main/odk/examples/DevelopersGuide/Config/ConfigExamples.java index a3d3af5..aacad47 100644 --- a/main/odk/examples/DevelopersGuide/Config/ConfigExamples.java +++ b/main/odk/examples/DevelopersGuide/Config/ConfigExamples.java @@ -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. - * + * */ @@ -73,39 +73,39 @@ import com.sun.star.util.ChangesEvent; o Resetting data to their defaults Each example is in a separate method call. -*/ -public class ConfigExamples +*/ +public class ConfigExamples { // The ComponentContext interface of the remote component context private XComponentContext mxContext = null; -// The MultiComponentFactory interface of the ServiceManager + // The MultiComponentFactory interface of the ServiceManager private XMultiComponentFactory mxServiceManager = null; // The MultiServiceFactory interface of the ConfigurationProvider private XMultiServiceFactory mxProvider = null; - public static void main( String args[] ) + public static void main( String args[] ) { try { // get the remote office component context com.sun.star.uno.XComponentContext xContext = com.sun.star.comp.helper.Bootstrap.bootstrap(); - + if( xContext != null ) System.out.println("Connected to a running office ..."); else System.out.println( "ERROR: Cannot connect - no remote component context available." ); - + // Create an instance of the class and call it's run method ConfigExamples aExample = new ConfigExamples(xContext); aExample.run( ); - -// if you own the service manager dispose it here -// to ensure that the default provider is properly disposed and flushed + +// if you own the service manager dispose it here +// to ensure that the default provider is properly disposed and flushed System.exit(0); - } - catch( Exception e ) + } + catch( Exception e ) { e.printStackTrace(); System.exit(-1); @@ -122,10 +122,10 @@ public class ConfigExamples /** Run the examples with a default ConfigurationProvider */ - public void run() + public void run() throws com.sun.star.uno.Exception { -mxProvider = createProvider(); +mxProvider = createProvider(); runExamples( ); @@ -135,7 +135,7 @@ public class ConfigExamples /** Run the examples with a given ConfigurationProvider */ - public void runExamples( ) + public void runExamples( ) { if (checkProvider(mxProvider)) { @@ -156,9 +156,9 @@ public class ConfigExamples else System.out.println("ERROR: Cannot run examples without ConfigurationProvider."); - } + } -/** Do some simple checks,
[openoffice] branch AOO42X updated: Fixed typos, removed whitespace, removed multiple license headers
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 cc57ba3 Fixed typos, removed whitespace, removed multiple license headers cc57ba3 is described below commit cc57ba345c81f429cf0b8b3d7e8fb7802efa85ef Author: mseidel AuthorDate: Sat Jan 15 14:20:05 2022 +0100 Fixed typos, removed whitespace, removed multiple license headers (cherry picked from commit 916729d09a13a81b9710827c57afa2a17578286c) --- main/basegfx/source/workbench/Makefile | 48 ++- main/scp2/source/templates/module_langpack.sct | 8 +-- .../scp2/source/templates/module_langpack_base.sct | 8 +-- .../source/templates/module_langpack_binfilter.sct | 29 ++--- .../scp2/source/templates/module_langpack_calc.sct | 29 ++--- .../scp2/source/templates/module_langpack_draw.sct | 8 +-- .../source/templates/module_langpack_impress.sct | 8 +-- .../scp2/source/templates/module_langpack_math.sct | 8 +-- .../templates/module_langpack_onlineupdate.sct | 29 ++--- .../scp2/source/templates/module_langpack_root.sct | 8 +-- .../source/templates/module_langpack_writer.sct| 29 ++--- .../controller/SlsInsertionIndicatorHandler.hxx| 10 +-- .../slidesorter/inc/controller/SlsPageSelector.hxx | 14 ++--- .../slidesorter/inc/controller/SlsProperties.hxx | 17 +++-- .../inc/controller/SlsScrollBarManager.hxx | 16 ++--- .../inc/controller/SlsSelectionFunction.hxx| 34 +- .../inc/controller/SlsSelectionManager.hxx | 10 +-- .../inc/controller/SlsSelectionObserver.hxx| 8 +-- .../inc/controller/SlsSlideFunction.hxx| 8 +-- .../slidesorter/inc/controller/SlsSlotManager.hxx | 14 ++--- .../inc/controller/SlsTransferableData.hxx | 16 ++--- .../inc/controller/SlsVisibleAreaManager.hxx | 12 ++-- main/xmerge/source/activesync/XMergeFilter.h | 72 ++ .../source/fvt/uno/sc/rowcolumn/CellMerge.java | 46 +++--- .../source/fvt/uno/sc/sheet/SheetBasicTest.java| 28 + 25 files changed, 171 insertions(+), 346 deletions(-) diff --git a/main/basegfx/source/workbench/Makefile b/main/basegfx/source/workbench/Makefile index 34f1edb..68b55e3 100644 --- a/main/basegfx/source/workbench/Makefile +++ b/main/basegfx/source/workbench/Makefile @@ -1,6 +1,6 @@ # Testbuild # * -# +# # 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 @@ -8,56 +8,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. -# -# * -# * -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -#http://www.apache.org/licenses/LICENSE-2.0 -# -# 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. -# -# * -# * -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -#http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by
[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 42942a3 Fixed typos, removed whitespace 42942a3 is described below commit 42942a3041162254a25bc2383065c24bd4635860 Author: mseidel AuthorDate: Sat Jan 15 00:28:54 2022 +0100 Fixed typos, removed whitespace (cherry picked from commit c13e41403aa6d7a7e325af90dca42bdfba8ded2e) --- .../ui/slidesorter/inc/cache/SlsCacheContext.hxx | 13 + .../ui/slidesorter/inc/cache/SlsPageCache.hxx | 2 +- .../slidesorter/inc/cache/SlsPageCacheManager.hxx | 14 +- .../inc/controller/SlideSorterController.hxx | 16 +-- .../inc/controller/SlsAnimationFunction.hxx| 8 +++--- .../ui/slidesorter/inc/controller/SlsAnimator.hxx | 18 ++--- .../ui/slidesorter/inc/controller/SlsClipboard.hxx | 31 +++--- .../inc/controller/SlsCurrentSlideManager.hxx | 12 - .../slidesorter/inc/controller/SlsFocusManager.hxx | 15 +-- 9 files changed, 63 insertions(+), 66 deletions(-) diff --git a/main/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx b/main/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx index f4a1461..a0c4dc6 100644 --- a/main/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx +++ b/main/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.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. - * + * */ @@ -36,7 +36,7 @@ namespace sd { namespace slidesorter { namespace cache { typedef const SdrPage* CacheKey; -/** This interface allows the individualisation of different instances of +/** This interface allows the individualization of different instances of the PreviewCache. */ class CacheContext @@ -64,7 +64,7 @@ public: */ virtual bool IsVisible (CacheKey aKey) = 0; -/** Return the page associdated with the given key. Note that different +/** Return the page associated with the given key. Note that different keys may map to a single page (this may be the case with custom slide shows.) */ @@ -99,4 +99,3 @@ typedef ::boost::shared_ptr SharedCacheContext; } } } // end of namespace ::sd::slidesorter::cache #endif - diff --git a/main/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/main/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx index 17c0007..67d10cb 100644 --- a/main/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx +++ b/main/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx @@ -59,7 +59,7 @@ class RequestData; bitmaps as needing an update but use them while the new bitmap in the correct size is not available. Give the UI the chance to handle user events between the rendering -of differe slides. +of different slides. Limit the amount of space that may be used for storing preview bitmaps and throw. diff --git a/main/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx b/main/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx index 80280f9..33a621d 100644 --- a/main/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx +++ b/main/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.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
[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 7b2f5c2 Fixed typos, removed whitespace 7b2f5c2 is described below commit 7b2f5c247fad6aaa1cc6bb50086b9b29658935b4 Author: mseidel AuthorDate: Tue Jan 11 15:11:19 2022 +0100 Fixed typos, removed whitespace (cherry picked from commit b7d2c8470c348858b50b6ab6b047a8ef0f02195f) --- .../ui/slidesorter/inc/view/SlideSorterView.hxx| 16 .../ui/slidesorter/inc/view/SlsButtonBar.hxx | 22 +++--- .../ui/slidesorter/inc/view/SlsILayerPainter.hxx | 20 ++-- .../ui/slidesorter/inc/view/SlsInsertAnimator.hxx | 8 .../inc/view/SlsInsertionIndicatorOverlay.hxx | 8 .../source/ui/slidesorter/inc/view/SlsLayouter.hxx | 16 .../slidesorter/inc/view/SlsPageObjectLayouter.hxx | 14 +++--- .../inc/view/SlsPageObjectViewContact.hxx | 16 .../inc/view/SlsPageObjectViewObjectContact.hxx| 20 ++-- 9 files changed, 70 insertions(+), 70 deletions(-) diff --git a/main/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/main/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 78c4e07..70a2707 100644 --- a/main/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/main/sd/source/ui/slidesorter/inc/view/SlideSorterView.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. - * + * */ @@ -78,7 +78,7 @@ public: @param rViewShell This reference is simply passed to the base class and not used by this class. - + */ SlideSorterView (SlideSorter& rSlideSorter); void Init (void); @@ -161,7 +161,7 @@ public: ::boost::shared_ptr GetPreviewCache (void); /** Set the bounding box of the insertion marker in model coordinates. - + It will be painted as a dark rectangle that fills the given box. */ void SetInsertionMarker (const Rectangle& rBBox); @@ -171,7 +171,7 @@ public: void SetInsertionMarkerVisibility (bool bVisible); /** Set the size and position of the selection rectangle. - + It will be painted as a dashed rectangle. */ void SetSelectionRectangle (const Rectangle& rBox); @@ -235,7 +235,7 @@ public: ::boost::shared_ptr GetPageObjectPainter (void); ::boost::shared_ptr GetLayeredDevice (void) const; - + class DrawLock { public: diff --git a/main/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx b/main/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx index b4b88d6..56a16b0 100644 --- a/main/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx +++ b/main/sd/source/ui/slidesorter/inc/view/SlsButtonBar.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. - * + * */ @@ -63,7 +63,7 @@ public: const model::SharedPageDescriptor& rpDescriptor, const Point aMouseModelLocation, const bool bIsMouseButtonDown); - + void ResetPage (void); /** Return the number of
[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 8bd2625 Fixed typos, removed whitespace 8bd2625 is described below commit 8bd262515b9fd7755949e87fcbe256e07d20f417 Author: mseidel AuthorDate: Tue Jan 4 13:27:38 2022 +0100 Fixed typos, removed whitespace (cherry picked from commit 627628354578bc12b977fd84871d68bc0860b13f) --- main/svx/source/sidebar/area/AreaPropertyPanel.cxx | 2592 ++-- main/svx/source/sidebar/area/AreaPropertyPanel.hrc | 124 +- main/svx/source/sidebar/area/AreaPropertyPanel.hxx | 280 +-- .../area/AreaTransparencyGradientControl.cxx | 90 +- .../area/AreaTransparencyGradientControl.hxx | 46 +- .../sidebar/area/AreaTransparencyGradientPopup.cxx | 30 +- .../sidebar/area/AreaTransparencyGradientPopup.hxx | 22 +- 7 files changed, 1599 insertions(+), 1585 deletions(-) diff --git a/main/svx/source/sidebar/area/AreaPropertyPanel.cxx b/main/svx/source/sidebar/area/AreaPropertyPanel.cxx index a7a40f1..05ada35 100644 --- a/main/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/main/svx/source/sidebar/area/AreaPropertyPanel.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,18 +7,20 @@ * 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 "svx/sidebar/PopupContainer.hxx" #include "AreaTransparencyGradientControl.hxx" @@ -67,577 +69,577 @@ const sal_Int32 AreaPropertyPanel::DEFAULT_BORDER = 0; AreaPropertyPanel::AreaPropertyPanel( -Window* pParent, -const cssu::Reference& rxFrame, -SfxBindings* pBindings) -: Control(pParent, SVX_RES(RID_SIDEBAR_AREA_PANEL)), - meLastXFS(-1), - maLastColor(Color(COL_DEFAULT_SHAPE_FILLING)), - mnLastPosGradient(0), - mnLastPosHatch(0), - mnLastPosBitmap(0), - mnLastTransSolid(50), - maGradientLinear(), - maGradientAxial(), - maGradientRadial(), - maGradientElliptical(), - maGradientSquare(), - maGradientRect(), - mpColorTextFT(new FixedText(this, SVX_RES(FT_COLOR_LIST))), - mpLbFillType(new SvxFillTypeBox(this)), - mpLbFillAttr(new SvxFillAttrBox(this)), - mpToolBoxColorBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)), - mpToolBoxColor(sfx2::sidebar::ControlFactory::CreateToolBox(mpToolBoxColorBackground.get(), SVX_RES(TB_COLOR))), - mpTrspTextFT(new FixedText(this, SVX_RES(FL_TRSP_TEXT))), - mpLBTransType(new ListBox(this, SVX_RES(LB_TRGR_TYPES))), - mpMTRTransparent(new MetricField(this, SVX_RES(MTR_TRANSPARENT))), - mpBTNGradientBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)), - mpBTNGradient(sfx2::sidebar::ControlFactory::CreateToolBox(mpBTNGradientBackground.get(), SVX_RES(BTN_GRADIENT))), - mpColorUpdater(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_FILL_COLOR, TBI_COLOR, mpToolBoxColor.get(), TBX_UPDATER_MODE_CHAR_COLOR_NEW)), - mpStyleItem(), - mpColorItem(), - mpFillGradientItem(), - mpHatchItem(), - mpBitmapItem(), - maStyleControl(SID_ATTR_FILL_STYLE, *pBindings, *this), - maColorControl(SID_ATTR_FILL_COLOR, *pBindings, *this), - maGradientControl(SID_ATTR_FILL_GRADIENT, *pBindings, *this), - maHatchControl(SID_ATTR_FILL_HATCH, *pBindings, *this), - maBitmapControl(SID_ATTR_FILL_BITMAP, *pBindings, *this), - maColorTableControl(SID_COLOR_TABLE, *pBindings, *this), - maGradientListControl(SID_GRADIENT_LIST, *pBindings, *this), - maHatchListControl(SID_HATCH_LIST, *pBindings, *this), - maBitmapListControl(SID_BITMAP_LIST, *pBindings, *this), - maFillTransparenceController(SID_ATTR_FILL_TRANSPARENCE, *pBindings, *this), - maFillFloatTransparenceController(SID_ATTR_FILL_FLOATTRANSPARENCE, *pBindings, *this), - maImgAxial(SVX_RES(IMG_AXIAL)), - maImgElli(SVX_RES(IMG_ELLI)), - maImgQuad(SVX_RES(IMG_QUAD)), - maImgRadial(SVX_RES(IMG_RADIAL)), -
[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 111082d Fixed typos, removed whitespace 111082d is described below commit 111082d9cf8adc949f33ae440b44bd6cb3d3576f Author: mseidel AuthorDate: Thu Dec 16 17:22:15 2021 +0100 Fixed typos, removed whitespace (cherry picked from commit 8873b33ac88121a6e442878b17c5655b77902ff6) --- main/sw/source/core/view/printdata.cxx | 81 +- main/sw/source/core/view/vdraw.cxx | 45 +++ main/sw/source/core/view/viewimp.cxx | 69 ++--- main/sw/source/core/view/viewpg.cxx| 32 +++--- 4 files changed, 95 insertions(+), 132 deletions(-) diff --git a/main/sw/source/core/view/printdata.cxx b/main/sw/source/core/view/printdata.cxx index 6c89bb4..48b784a 100644 --- a/main/sw/source/core/view/printdata.cxx +++ b/main/sw/source/core/view/printdata.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,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. - * + * */ @@ -69,7 +69,7 @@ SwRenderData::~SwRenderData() DBG_ASSERT( !m_pPostItShell, "m_pPostItShell should already have been deleted" ); DBG_ASSERT( !m_pPostItDoc, "m_pPostItDoc should already have been deleted" ); DBG_ASSERT( !m_pPostItFields, " should already have been deleted" ); -} +} void SwRenderData::CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, OutputDevice *pOutDev ) @@ -83,29 +83,29 @@ void SwRenderData::CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, //!! Disable spell and grammar checking in the temporary document. //!! Otherwise the grammar checker might process it and crash if we later on //!! simply delete this document while he is still at it. -SwViewOption aViewOpt( *pViewOpt ); +SwViewOption aViewOpt( *pViewOpt ); aViewOpt.SetOnlineSpell( sal_False ); -m_pPostItShell = new ViewShell( *m_pPostItDoc, 0, , pOutDev ); +m_pPostItShell = new ViewShell( *m_pPostItDoc, 0, , pOutDev ); } - + void SwRenderData::DeletePostItData() { if (HasPostItData()) { -m_pPostItDoc->setPrinter( 0, false, false ); //damit am echten DOC der Drucker bleibt +m_pPostItDoc->setPrinter( 0, false, false ); // damit am echten DOC der Drucker bleibt delete m_pPostItShell; -m_pPostItShell = 0; +m_pPostItShell = 0; delete m_pPostItFields; m_pPostItFields = 0; if ( !m_pPostItDoc->release() ) { delete m_pPostItDoc; } -m_pPostItDoc= 0; +m_pPostItDoc = 0; } -} +} bool SwRenderData::NeedNewViewOptionAdjust( const ViewShell& rCompare ) const { @@ -170,7 +170,7 @@ void SwRenderData::MakeSwPrtOptions( rOptions.bPrintProspectRTL = pOpt->IsPrintProspectRTL(); // bPrintSingleJobs <-- not set here; mail merge and or configuration // bModified<-- not set here; mail merge only -rOptions.bPrintBlackFont= pOpt->IsPrintWithBlackTextColor(); +rOptions.bPrintBlackFont= pOpt->IsPrintWithBlackTextColor(); rOptions.bPrintHiddenText = pOpt->IsPrintHiddenText(); rOptions.bPrintTextPlaceholder = pOpt->IsPrintTextPlaceholders(); rOptions.nPrintPostIts = pOpt->GetPrintPostItsType(); @@ -184,11 +184,11 @@ void SwRenderData::MakeSwPrtOptions( // -SwPrintUIOptions::SwPrintUIOptions( -bool bWeb, -bool bSwSrcView, -bool bHasSelection, -bool bHasPostIts, +SwPrintUIOptions::SwPrintUIOptions( +bool bWeb, +bool bSwSrcView, +bool bHasSelection, +bool bHasPostIts, const SwPrintData ) : m_pLast( NULL ), m_rDefaultPrintData( rDefaultPrintData ) @@ -198,15 +198,15 @@ SwPrintUIOptions::SwPrintUIOptions( DBG_ASSERT( aLocalizedStrings.Count() >= 30, "resource incomplete" ); if(
[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 60d7827 Fixed typos, removed whitespace 60d7827 is described below commit 60d782780c0f16676683b73525942a0cc4373483 Author: mseidel AuthorDate: Tue Dec 14 17:20:47 2021 +0100 Fixed typos, removed whitespace (cherry picked from commit c72520d534804340d6648e5bc715e01b3be8f130) --- main/sw/source/core/inc/pagefrm.hxx| 80 +- main/sw/source/core/layout/paintfrm.cxx| 10 ++-- main/sw/source/core/view/pagepreviewlayout.cxx | 28 - 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/main/sw/source/core/inc/pagefrm.hxx b/main/sw/source/core/inc/pagefrm.hxx index b4ec458..bdd1c89 100644 --- a/main/sw/source/core/inc/pagefrm.hxx +++ b/main/sw/source/core/inc/pagefrm.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,20 @@ * 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 _PAGEFRM_HXX #define _PAGEFRM_HXX @@ -66,19 +67,19 @@ class SwPageFrm: public SwFtnBossFrm sal_uInt16 nPhyPageNum;//Physikalische Seitennummer. - sal_Bool bInvalidCntnt :1; - sal_Bool bInvalidLayout :1; - sal_Bool bInvalidFlyCntnt :1; - sal_Bool bInvalidFlyLayout :1; - sal_Bool bInvalidFlyInCnt :1; - sal_Bool bFtnPage :1; //Diese Seite ist fuer Dokumentende-Fussnoten. - sal_Bool bEmptyPage :1; //Dies ist eine explizite Leerseite -sal_Bool bEndNotePage :1; //'Fussnotenseite' fuer Endnoten -sal_Bool bInvalidSpelling :1; //Das Online-Spelling ist gefordert -sal_Bool bInvalidSmartTags :1; //checking for smarttags is needed // SMARTTAGS -sal_Bool bInvalidAutoCmplWrds :1; //Auto-Complete Wordliste aktualisieren -sal_Bool bInvalidWordCount :1; -sal_Bool bHasGrid :1; // Grid for Asian layout + sal_Bool bInvalidCntnt :1; + sal_Bool bInvalidLayout :1; + sal_Bool bInvalidFlyCntnt :1; + sal_Bool bInvalidFlyLayout :1; + sal_Bool bInvalidFlyInCnt :1; + sal_Bool bFtnPage :1; //Diese Seite ist fuer Dokumentende-Fussnoten. + sal_Bool bEmptyPage :1; //Dies ist eine explizite Leerseite + sal_Bool bEndNotePage :1; //'Fussnotenseite' fuer Endnoten + sal_Bool bInvalidSpelling :1; //Das Online-Spelling ist gefordert + sal_Bool bInvalidSmartTags :1; //checking for smarttags is needed // SMARTTAGS + sal_Bool bInvalidAutoCmplWrds :1; //Auto-Complete Wordliste aktualisieren + sal_Bool bInvalidWordCount :1; + sal_Bool bHasGrid :1; // Grid for Asian layout // OD 2004-05-17 #i28701# - boolean, indicating that layout of page frame // is in progress. @@ -167,7 +168,7 @@ class SwPageFrm: public SwFtnBossFrm SwRect& _orBottomShadowRect, bool bRightSidebar ); -/** adds the sidebar used for notes to right and left border +/** adds the sidebar used for comments to right and left border mod 20.10.2007 for #i6193# @author mod @@ -253,12 +254,12 @@ public: virtual void Cut(); virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); -virtual void CheckDirection( sal_Bool bVert ); -void CheckGrid( sal_Bool bInvalidate ); -void PaintGrid( OutputDevice* pOut, SwRect ) const; -sal_Bool HasGrid() const { return bHasGrid; } + virtual void CheckDirection( sal_Bool bVert ); + void CheckGrid( sal_Bool bInvalidate ); + void PaintGrid( OutputDevice* pOut, SwRect ) const; + sal_Bool HasGrid() const { return bHasGrid; } -
[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 579128b Fixed typos, removed whitespace 579128b is described below commit 579128bdcdfb9f064693afcea932008f0dae7cb3 Author: mseidel AuthorDate: Thu Dec 9 15:34:28 2021 +0100 Fixed typos, removed whitespace (cherry picked from commit 5829e3e65d041dae4777b7e48d9eac1549ff4f1a) --- main/sd/source/ui/app/optsitem.cxx | 278 + main/sd/source/ui/app/sddll2.cxx | 36 +++-- main/sd/source/ui/app/sdmod.cxx| 96 ++--- main/sd/source/ui/app/sdmod2.cxx | 208 ++- main/sd/source/ui/app/sdpopup.cxx | 32 ++--- 5 files changed, 298 insertions(+), 352 deletions(-) diff --git a/main/sd/source/ui/app/optsitem.cxx b/main/sd/source/ui/app/optsitem.cxx index 543e235..e75f1ac 100644 --- a/main/sd/source/ui/app/optsitem.cxx +++ b/main/sd/source/ui/app/optsitem.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,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. - * + * */ @@ -198,18 +198,16 @@ void SdOptionsGeneric::Store() bool SdOptionsGeneric::isMetricSystem() { SvtSysLocale aSysLocale; -MeasurementSystem eSys = aSysLocale.GetLocaleDataPtr()->getMeasurementSystemEnum(); + MeasurementSystem eSys = aSysLocale.GetLocaleDataPtr()->getMeasurementSystemEnum(); return ( eSys == MEASURE_METRIC ); } /* -|* |* SdOptionsLayout -|* \/ -SdOptionsLayout::SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : +SdOptionsLayout::SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Layout" ) : @@ -221,7 +219,7 @@ SdOptionsLayout::SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : bHandlesBezier( sal_False ), bHelplines( sal_True ), nMetric((sal_uInt16)(isMetricSystem() ? FUNIT_CM : FUNIT_INCH)), - nDefTab( 1250 ) + nDefTab( 1250 ) { EnableModify( sal_True ); } @@ -304,9 +302,7 @@ sal_Bool SdOptionsLayout::WriteData( Any* pValues ) const } /* -|* |* SdOptionsLayoutItem -|* \/ SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich ) @@ -358,7 +354,7 @@ SfxPoolItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) const int SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const { const bool bSameType = SfxPoolItem::operator==( rAttr ); - DBG_ASSERT( bSameType, "SdOptionsLayoutItem::operator==(), differen pool item type!" ); + DBG_ASSERT( bSameType, "SdOptionsLayoutItem::operator==(), different pool item type!" ); return bSameType && ( maOptionsLayout == static_cast< const SdOptionsLayoutItem& >( rAttr ).maOptionsLayout ); } @@ -379,9 +375,7 @@ void SdOptionsLayoutItem::SetOptions( SdOptions* pOpts ) const } /* -|* |* SdOptionsContents -|* \/ SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : @@ -398,7 +392,7 @@ SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId, sal_Bool bUseConfig sal_Bool SdOptionsContents::operator==(const SdOptionsContents&) const { -return true; + return true; } // - @@ -438,9 +432,7 @@ sal_Bool SdOptionsContents::WriteData( Any* pValues ) const }
[openoffice] branch AOO42X updated: Fixed typos, removed whitespace, change document border color (Draw/Impress) to black
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 a70413d Fixed typos, removed whitespace, change document border color (Draw/Impress) to black a70413d is described below commit a70413d29f1883bcae9ae9c56de4a4edc73bcc8d Author: mseidel AuthorDate: Fri Dec 3 21:31:57 2021 +0100 Fixed typos, removed whitespace, change document border color (Draw/Impress) to black (cherry picked from commit 16bba488c3d48e207291611c0a87d272868594f2) --- main/svx/source/sdr/contact/objectcontact.cxx | 68 +- main/svx/source/sdr/contact/viewcontact.cxx| 144 ++--- .../sdr/contact/viewcontactofsdrmeasureobj.cxx | 22 ++-- .../source/sdr/contact/viewcontactofsdrpage.cxx| 8 +- .../sdr/contact/viewobjectcontactofsdrmediaobj.cxx | 50 +++ 5 files changed, 146 insertions(+), 146 deletions(-) diff --git a/main/svx/source/sdr/contact/objectcontact.cxx b/main/svx/source/sdr/contact/objectcontact.cxx index 18d509c..1efb6f9 100644 --- a/main/svx/source/sdr/contact/objectcontact.cxx +++ b/main/svx/source/sdr/contact/objectcontact.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,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. - * + * */ @@ -98,12 +98,12 @@ namespace sdr { maViewObjectContactVector.push_back(); } - + // A ViewObjectContact was deleted and shall be forgotten. void ObjectContact::RemoveViewObjectContact(ViewObjectContact& rVOContact) { std::vector< ViewObjectContact* >::iterator aFindResult = std::find(maViewObjectContactVector.begin(), maViewObjectContactVector.end(), ); - + if(aFindResult != maViewObjectContactVector.end()) { maViewObjectContactVector.erase(aFindResult); @@ -129,7 +129,7 @@ namespace sdr // default has no active VC return 0; } - + // Invalidate given rectangle at the window/output which is represented by // this ObjectContact. void ObjectContact::InvalidatePartOfView(const basegfx::B2DRange& /*rRange*/) const @@ -164,7 +164,7 @@ namespace sdr } // method to get the EventHandler. It will - // return a existing one or create a new one using CreateEventHandler(). + // return an existing one or create a new one using CreateEventHandler(). sdr::event::TimerEventHandler& ObjectContact::GetEventHandler() const { if(!HasEventHandler()) @@ -205,7 +205,7 @@ namespace sdr return true; } - // check if asynchronious graphis loading is allowed. Default is false. + // check if asynchronous graphics loading is allowed. Default is false. bool ObjectContact::IsAsynchronGraphicsLoadingAllowed() const { return false; @@ -279,37 +279,37 @@ namespace sdr return false; } -// access to SdrPageView. Default implementation returns NULL + // access to SdrPageView. Default implementation returns NULL SdrPageView* ObjectContact::TryToGetSdrPageView() const -{ -return 0; -} - + { + return 0; + } + // access to OutputDevice. Default implementation returns NULL OutputDevice* ObjectContact::TryToGetOutputDevice() const -{ -return 0; -} + { + return 0; + } -void ObjectContact::resetViewPort() -{ + void
[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 23d0572 Fixed typos, removed whitespace 23d0572 is described below commit 23d0572fc74fa4bb0beab811ea675698affc4d46 Author: mseidel AuthorDate: Sun Nov 28 10:25:34 2021 +0100 Fixed typos, removed whitespace (cherry picked from commit 090aaae739f944b4fb7197c55bd7d8d282d83cba) --- main/sd/source/ui/dlg/AnimationChildWindow.cxx | 22 +- main/sd/source/ui/dlg/animobjs.cxx | 268 - main/sd/source/ui/dlg/assclass.cxx | 16 +- main/sd/source/ui/dlg/brkdlg.cxx | 60 +++--- main/sd/source/ui/dlg/copydlg.cxx | 86 5 files changed, 218 insertions(+), 234 deletions(-) diff --git a/main/sd/source/ui/dlg/AnimationChildWindow.cxx b/main/sd/source/ui/dlg/AnimationChildWindow.cxx index 3831076..d82c4aa 100644 --- a/main/sd/source/ui/dlg/AnimationChildWindow.cxx +++ b/main/sd/source/ui/dlg/AnimationChildWindow.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,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. - * + * */ @@ -38,20 +38,18 @@ namespace sd { SFX_IMPL_DOCKINGWINDOW(AnimationChildWindow, SID_ANIMATION_OBJECTS) /* -|* |* Ableitung vom SfxChildWindow als "Behaelter" fuer Animator -|* \/ AnimationChildWindow::AnimationChildWindow( -::Window* _pParent, -sal_uInt16 nId, -SfxBindings* pBindings, -SfxChildWinInfo* pInfo ) -: SfxChildWindow( _pParent, nId ) + ::Window* _pParent, + sal_uInt16 nId, + SfxBindings* pBindings, + SfxChildWinInfo* pInfo ) + : SfxChildWindow( _pParent, nId ) { AnimationWindow* pAnimWin = new AnimationWindow( -pBindings, this, _pParent, SdResId( FLT_WIN_ANIMATION ) ); + pBindings, this, _pParent, SdResId( FLT_WIN_ANIMATION ) ); pWindow = pAnimWin; eChildAlignment = SFX_ALIGN_NOALIGNMENT; diff --git a/main/sd/source/ui/dlg/animobjs.cxx b/main/sd/source/ui/dlg/animobjs.cxx index 75eeab2..08486e9 100644 --- a/main/sd/source/ui/dlg/animobjs.cxx +++ b/main/sd/source/ui/dlg/animobjs.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,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. - * + * */ @@ -26,7 +26,7 @@ #include #include -#define _ANIMATION //animation freischalten +#define _ANIMATION // animation freischalten #define _SV_BITMAPEX #include @@ -51,11 +51,11 @@ #include "res_bmp.hrc" #include "ViewShell.hxx" -#ifndef _SV_SVAPP_HXX_ +#ifndef _SV_SVAPP_HXX_ #include #endif -// #42894# +// #42894# #include #include @@ -134,9 +134,9 @@ void SdDisplay::DataChanged( const DataChangedEvent& rDCEvt ) { const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings(); SetBackground( Wallpaper( Color( rStyles.GetFieldColor() ) ) ); - SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() -?
[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 5ffb42a Fixed typos, removed whitespace 5ffb42a is described below commit 5ffb42a1b653295613c666ba1c9002ce87d340f2 Author: mseidel AuthorDate: Thu Nov 11 18:58:43 2021 +0100 Fixed typos, removed whitespace (cherry picked from commit a6c9da1f594bff216e44f0716493904db5a8054f) --- main/svx/source/toolbars/extrusionbar.cxx | 58 ++- main/svx/source/toolbars/extrusionbar.src | 38 +++- main/svx/source/toolbars/fontworkbar.cxx | 24 + main/svx/source/toolbars/fontworkbar.src | 10 +++--- 4 files changed, 62 insertions(+), 68 deletions(-) diff --git a/main/svx/source/toolbars/extrusionbar.cxx b/main/svx/source/toolbars/extrusionbar.cxx index e9631f6..892e60d 100644 --- a/main/svx/source/toolbars/extrusionbar.cxx +++ b/main/svx/source/toolbars/extrusionbar.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,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. - * + * */ @@ -60,10 +60,8 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::uno; /* -|* |* Standardinterface deklarieren (Die Slotmap darf nicht leer sein, also |* tragen wir etwas ein, was hier (hoffentlich) nie vorkommt). -|* \/ #define ShellClass ExtrusionBar @@ -82,9 +80,7 @@ TYPEINIT1( ExtrusionBar, SfxShell ); /* -|* |* Standard-Konstruktor -|* \/ ExtrusionBar::ExtrusionBar(SfxViewShell* pViewShell ) @@ -100,9 +96,7 @@ ExtrusionBar::ExtrusionBar(SfxViewShell* pViewShell ) /* -|* |* Destruktor -|* \/ ExtrusionBar::~ExtrusionBar() @@ -151,7 +145,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem static const rtl::OUString sViewPoint( RTL_CONSTASCII_USTRINGPARAM ( "ViewPoint" ) ); static const rtl::OUString sOrigin( RTL_CONSTASCII_USTRINGPARAM ( "Origin" ) ); static const rtl::OUString sSkew( RTL_CONSTASCII_USTRINGPARAM ( "Skew" ) ); - static const rtl::OUString sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) ); + static const rtl::OUString sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) ); sal_uInt16 nSID = rReq.GetSlot(); switch( nSID ) @@ -273,7 +267,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem aPropValue.Value <<= aViewPoint; rGeometryItem.SetPropertyValue( sExtrusion, aPropValue ); - + EnhancedCustomShapeParameterPair aOriginPropPair; aOriginPropPair.First.Value <<= fOriginX; aOriginPropPair.First.Type = EnhancedCustomShapeParameterType::NORMAL; @@ -328,7 +322,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_3D_COLOR: { - static const rtl::OUString sExtrusionColor( RTL_CONSTASCII_USTRINGPARAM ( "Color" ) ); + static const rtl::OUString sExtrusionColor( RTL_CONSTASCII_USTRINGPARAM ( "Color" ) ); if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_3D_COLOR ) == SFX_ITEM_SET) { @@ -417,7 +411,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_LIGHTING_INTENSITY ) == SFX_ITEM_SET) { sal_Int32
[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 3e459a3 Fixed typos, removed whitespace 3e459a3 is described below commit 3e459a30a654402b4a609149977e2ed08ff61a31 Author: mseidel AuthorDate: Sun Nov 7 12:13:16 2021 +0100 Fixed typos, removed whitespace (cherry picked from commit bdbe0d937ac38513c387a6a64cf77aa99045553f) --- .../sd/source/ui/inc/taskpane/ControlContainer.hxx | 284 ++-- main/sd/source/ui/inc/taskpane/ScrollPanel.hxx | 270 +-- .../ui/inc/taskpane/SlideSorterCacheDisplay.hxx| 210 +++ main/sd/source/ui/inc/taskpane/SubToolPanel.hxx| 156 +-- .../ui/inc/taskpane/TaskPaneControlFactory.hxx | 50 ++-- .../sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx | 286 ++--- main/sd/source/ui/inc/taskpane/TitleBar.hxx| 230 - main/sd/source/ui/inc/taskpane/TitledControl.hxx | 224 .../source/ui/inc/taskpane/ToolPanelViewShell.hxx | 174 ++--- 9 files changed, 942 insertions(+), 942 deletions(-) diff --git a/main/sd/source/ui/inc/taskpane/ControlContainer.hxx b/main/sd/source/ui/inc/taskpane/ControlContainer.hxx index 5403ade..c962d64 100644 --- a/main/sd/source/ui/inc/taskpane/ControlContainer.hxx +++ b/main/sd/source/ui/inc/taskpane/ControlContainer.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. - * + * */ @@ -35,157 +35,157 @@ namespace sd { namespace toolpanel { class TreeNode; -/** This container manages the children of a TreeNode. It handles the -expansion and visibility state of its child controls. The container -does not do the layouting or painting of the controls. Instead it asks -its owner to do that. +/** This container manages the children of a TreeNode. It handles the + expansion and visibility state of its child controls. The container + does not do the layouting or painting of the controls. Instead it asks + its owner to do that. -The difference between expansion state and visibility is that when a -control is collapsed at least a title bar is shown for it. When it is -not visible then even this title bar is not shown. In that case the -user can not expand the control. A control has to be visible in order -to be expanded or collapsed. + The difference between expansion state and visibility is that when a + control is collapsed at least a title bar is shown for it. When it is + not visible then even this title bar is not shown. In that case the + user can not expand the control. A control has to be visible in order + to be expanded or collapsed. -Whenever you expand or collapse, show or hide a child control then use -this container class. Do not call the respective methods of the child -directly. + Whenever you expand or collapse, show or hide a child control then use + this container class. Do not call the respective methods of the child + directly. */ class ControlContainer { public: -enum VisibilityState { VS_SHOW, VS_HIDE, VS_TOGGLE }; -enum ExpansionState { ES_EXPAND, ES_COLLAPSE, ES_TOGGLE }; - -/** Create a new control container. -@param pParent -This node is asked to re-calculate the size of its children when -a child of this container is expanded or collapsed. -*/ -ControlContainer (TreeNode* pNode); - -virtual ~ControlContainer (void); - -/** This is function makes sure that all children are deleted. Call -this function from the destructor of a sub class to have all child -windows deleted before the destructor of another base class of that -sub class is called. When that other base class is some kind of a -window it would otherwise complain that there are living children. -*/ -void DeleteChildren (void); - -/**
[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 0569cb2 Fixed typos, removed whitespace 0569cb2 is described below commit 0569cb28dbd784578009356acc2696e61bb200ba Author: mseidel AuthorDate: Sat Nov 6 20:12:43 2021 +0100 Fixed typos, removed whitespace (cherry picked from commit 16e7aaaec5597da94bf8beaa15cf3b9f77a80cc7) --- main/sd/source/ui/app/_app.hrc | 8 main/sd/source/ui/app/sddll.cxx| 39 +++ main/sd/source/ui/app/sddll1.cxx | 42 +- main/sd/source/ui/app/sdresid.cxx | 12 --- main/sd/source/ui/app/strings.src | 37 ++--- main/sd/source/ui/app/tmplctrl.cxx | 29 -- 6 files changed, 77 insertions(+), 90 deletions(-) diff --git a/main/sd/source/ui/app/_app.hrc b/main/sd/source/ui/app/_app.hrc index 3ba60e9..81f2a6d 100644 --- a/main/sd/source/ui/app/_app.hrc +++ b/main/sd/source/ui/app/_app.hrc @@ -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. - * + * */ diff --git a/main/sd/source/ui/app/sddll.cxx b/main/sd/source/ui/app/sddll.cxx index 6a8a27e..3610a3d 100644 --- a/main/sd/source/ui/app/sddll.cxx +++ b/main/sd/source/ui/app/sddll.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,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. - * + * */ @@ -55,9 +55,7 @@ using namespace ::com::sun::star; /* -|* |* Init -|* \/ void SdDLL::Init() @@ -91,15 +89,15 @@ void SdDLL::Init() if (SvtModuleOptions().IsImpress()) { -// Register the Impress shape types in order to make the shapes accessible. -::accessibility::RegisterImpressShapeTypes (); -::sd::DrawDocShell::Factory().SetDocumentServiceName( String( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) ); + // Register the Impress shape types in order to make the shapes accessible. + ::accessibility::RegisterImpressShapeTypes (); + ::sd::DrawDocShell::Factory().SetDocumentServiceName( String( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) ); } -if (SvtModuleOptions().IsDraw()) + if (SvtModuleOptions().IsDraw()) { -::sd::GraphicDocShell::Factory().SetDocumentServiceName( String( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) ); -} + ::sd::GraphicDocShell::Factory().SetDocumentServiceName( String( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) ); + } // register your view-factories here RegisterFactorys(); @@ -110,14 +108,14 @@ void SdDLL::Init() // register your controllers here RegisterControllers(); -// SvDraw-Felder registrieren -SdrRegisterFieldClasses(); + // SvDraw-Felder registrieren + SdrRegisterFieldClasses(); -
[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 af1407b Fixed typos, removed whitespace af1407b is described below commit af1407b92dd487f389e9d0498dfd31aeef227a90 Author: mseidel AuthorDate: Wed Nov 3 21:30:41 2021 +0100 Fixed typos, removed whitespace (cherry picked from commit 124483a353bd96cd81c84b9ddbe78ff4bf5efad3) --- main/sd/source/ui/view/ViewShellImplementation.cxx | 440 ++--- main/sd/source/ui/view/ViewShellManager.cxx| 1944 ++-- 2 files changed, 1192 insertions(+), 1192 deletions(-) diff --git a/main/sd/source/ui/view/ViewShellImplementation.cxx b/main/sd/source/ui/view/ViewShellImplementation.cxx index 7eb6cc4..2d13bc8 100644 --- a/main/sd/source/ui/view/ViewShellImplementation.cxx +++ b/main/sd/source/ui/view/ViewShellImplementation.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,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. - * + * */ @@ -69,13 +69,13 @@ using ::sd::framework::FrameworkHelper; namespace sd { ViewShell::Implementation::Implementation (ViewShell& rViewShell) -: mbIsShowingUIControls(false), - mbIsMainViewShell(false), - mbIsInitialized(false), - mbArrangeActive(false), - mpSubShellFactory(), - mpUpdateLockForMouse(), - mrViewShell(rViewShell) + : mbIsShowingUIControls(false), + mbIsMainViewShell(false), + mbIsInitialized(false), + mbArrangeActive(false), + mpSubShellFactory(), + mpUpdateLockForMouse(), + mrViewShell(rViewShell) { } @@ -84,114 +84,114 @@ ViewShell::Implementation::Implementation (ViewShell& rViewShell) ViewShell::Implementation::~Implementation (void) { -if ( ! mpUpdateLockForMouse.expired()) -{ -::boost::shared_ptr pLock(mpUpdateLockForMouse); -if (pLock.get() != NULL) -{ -// Force the ToolBarManagerLock to be released even when the -// IsUICaptured() returns . -pLock->Release(true); -} -} + if ( ! mpUpdateLockForMouse.expired()) + { + ::boost::shared_ptr pLock(mpUpdateLockForMouse); + if (pLock.get() != NULL) + { + // Force the ToolBarManagerLock to be released even when the + // IsUICaptured() returns . + pLock->Release(true); + } + } } void ViewShell::Implementation::ProcessModifyPageSlot ( -SfxRequest& rRequest, -SdPage* pCurrentPage, -PageKind ePageKind) + SfxRequest& rRequest, + SdPage* pCurrentPage, + PageKind ePageKind) { -SdDrawDocument* pDocument = mrViewShell.GetDoc(); -SdrLayerAdmin& rLayerAdmin = pDocument->GetLayerAdmin(); -sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); -sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); -SetOfByte aVisibleLayers; -sal_Bool bHandoutMode = sal_False; -SdPage* pHandoutMPage = NULL; -String aNewName; - -// #95981# -String aOldName; - -AutoLayout aNewAutoLayout; - -sal_Bool bBVisible; -sal_Bool bBObjsVisible; -const SfxItemSet* pArgs = rRequest.GetArgs(); - -if (pCurrentPage != NULL && pCurrentPage->TRG_HasMasterPage()) -aVisibleLayers = pCurrentPage->TRG_GetMasterPageVisibleLayers(); -else -aVisibleLayers.SetAll(); - -do -{ -if (pCurrentPage == NULL) -break; - -if (!pArgs || pArgs->Count() == 1 || pArgs->Count() == 2 ) -{ -if (pArgs && pArgs->Count() == 2) -{ -// We have been called with a request that contains two -// arguments. One was used as preselected layout in a -// dialog. We could select that layout in the -// layout panel instead. -/* -
[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 461ab46 Fixed typos, removed whitespace 461ab46 is described below commit 461ab462610f8ced8c464a3e79286f64d6765179 Author: mseidel AuthorDate: Sun Oct 24 14:15:41 2021 +0200 Fixed typos, removed whitespace (cherry picked from commit 69a4cf47f4a8c2f5f30c319663376c9b9799457f) --- main/cui/source/tabpages/measure.src | 196 - .../source/text/simpress/01/0515.xhp | 21 ++- 2 files changed, 86 insertions(+), 131 deletions(-) diff --git a/main/cui/source/tabpages/measure.src b/main/cui/source/tabpages/measure.src index b91c13d..e33012e 100644 --- a/main/cui/source/tabpages/measure.src +++ b/main/cui/source/tabpages/measure.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,54 +7,55 @@ * 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 --- + +// include --- #include #include "measure.hrc" #include "helpid.hrc" #include #define DELTA 20 - // pragma +// pragma - // RID_SVXPAGE_MEASURE --- +// RID_SVXPAGE_MEASURE --- TabPage RID_SVXPAGE_MEASURE { HelpId = HID_PAGE_MEASURE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( 260, 185 ) ; Text [ en-US ] = "Dimensioning" ; FixedLine FL_LINE { -Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 120 , 8 ) ; - Text [ en-US ] = "Line"; + Pos = MAP_APPFONT ( 6, 3 ) ; + Size = MAP_APPFONT ( 120, 8 ) ; + Text [ en-US ] = "Line" ; }; FixedText FT_LINE_DIST { -Pos = MAP_APPFONT ( 12 , 16 ) ; - Size = MAP_APPFONT ( 65 , 8 ) ; + Pos = MAP_APPFONT ( 12, 16 ) ; + Size = MAP_APPFONT ( 65, 8 ) ; Text [ en-US ] = "Line ~distance" ; }; MetricField MTR_LINE_DIST { - HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST"; + HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST" ; Border = TRUE ; -Pos = MAP_APPFONT ( 78 , 14 ) ; -Size = MAP_APPFONT ( 42 , 12 ) ; + Pos = MAP_APPFONT ( 78, 14 ) ; + Size = MAP_APPFONT ( 42, 12 ) ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; @@ -68,16 +69,16 @@ TabPage RID_SVXPAGE_MEASURE }; FixedText FT_HELPLINE_OVERHANG { -Pos = MAP_APPFONT ( 12 , 32 ) ; - Size = MAP_APPFONT ( 65 , 8 ) ; + Pos = MAP_APPFONT ( 12, 32 ) ; + Size = MAP_APPFONT ( 65, 8 ) ; Text [ en-US ] = "Guide ~overhang" ; }; MetricField MTR_FLD_HELPLINE_OVERHANG { - HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG"; + HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG" ; Border = TRUE ; -Pos = MAP_APPFONT ( 78 , 30 ) ; -Size = MAP_APPFONT ( 42 , 12 ) ; + Pos = MAP_APPFONT ( 78, 30 ) ; + Size = MAP_APPFONT ( 42, 12 ) ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; @@ -91,16 +92,16 @@ TabPage RID_SVXPAGE_MEASURE }; FixedText FT_HELPLINE_DIST { -Pos = MAP_APPFONT ( 12 , 48 ) ; - Size = MAP_APPFONT ( 65 , 8 ) ; + Pos = MAP_APPFONT ( 12, 48 ) ; + Size = MAP_APPFONT ( 65, 8 ) ; Text [ en-US ] =
[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 9b1ac90 Fixed typos, removed whitespace 9b1ac90 is described below commit 9b1ac90519f5d954ad8168938c55a081d7b1ba00 Author: mseidel AuthorDate: Thu Oct 21 00:41:57 2021 +0200 Fixed typos, removed whitespace (cherry picked from commit a25b98880c8ea98078d213f117d6b81f2c1653e0) --- main/sd/source/core/sdpage.cxx | 12 +-- main/sd/source/core/sdpage2.cxx | 157 ++-- 2 files changed, 77 insertions(+), 92 deletions(-) diff --git a/main/sd/source/core/sdpage.cxx b/main/sd/source/core/sdpage.cxx index f4527d2..13a2b11 100644 --- a/main/sd/source/core/sdpage.cxx +++ b/main/sd/source/core/sdpage.cxx @@ -432,7 +432,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const aTempAttr.Put(SdrTextAutoGrowHeightItem(sal_False)); } - // check if we need another vertical adjustment than the default + // check if we need another vertical adjustment then the default SdrTextVertAdjust eV = SDRTEXTVERTADJUST_TOP; if( (eObjKind == PRESOBJ_FOOTER) && (mePageKind != PK_STANDARD) ) @@ -1547,12 +1547,12 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, sal_Bool bInit, sal_Bool bCreate meAutoLayout = eLayout; - // if needed, creates and initialises the presentation shapes on this slides master page + // if needed, creates and initializes the presentation shapes on this slides master page CreateTitleAndLayout(bInit, bCreate); if((meAutoLayout == AUTOLAYOUT_NONE && maPresentationShapeList.isEmpty()) || mbMaster) { - // MasterPage or no layout and no presentation shapes available, noting to do + // MasterPage or no layout and no presentation shapes available, nothing to do return; } @@ -1985,7 +1985,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR ((SdStyleSheet*) pOutlineSheet)->AdjustToFontHeight(aTempSet, sal_False); // Sonderbehandlung: die INVALIDS auf NULL-Pointer - // zurueckgesetzen (sonst landen INVALIDs oder + // zuruecksetzen (sonst landen INVALIDs oder // Pointer auf die DefaultItems in der Vorlage; // beides wuerde die Attribut-Vererbung unterbinden) aTempSet.ClearInvalidItems(); @@ -2563,7 +2563,7 @@ const String& SdPage::GetName() const if( GetModel()->GetPageNumType() == SVX_NUMBER_NONE ) { // if the document has number none as a formating - // for page numbers we still default to arabic numbering + // for page numbers we still default to Arabic numbering // to keep the default page names unique aCreatedPageName += String::CreateFromInt32( (sal_Int32)nNum ); } @@ -2962,7 +2962,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, { Size aArea = rHandoutMaster.GetSize(); - const long nGapW = 1000; // gap is 1cm + const long nGapW = 1000; // gap is 1 cm const long nGapH = 1000; long nLeftBorder = rHandoutMaster.GetLftBorder(); diff --git a/main/sd/source/core/sdpage2.cxx b/main/sd/source/core/sdpage2.cxx index aa8c9d2..7ae405c 100644 --- a/main/sd/source/core/sdpage2.cxx +++ b/main/sd/source/core/sdpage2.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,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
[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 ee9d3b9 Fixed typos, removed whitespace ee9d3b9 is described below commit ee9d3b973da3ebe7a1772dfe6ced1ed463b875e4 Author: mseidel AuthorDate: Tue Oct 19 16:29:41 2021 +0200 Fixed typos, removed whitespace (cherry picked from commit d88d3165fe83d355d6f5a6be3591cce6d0ed94ea) --- main/sd/source/core/sdpage.cxx | 472 + .../ui/framework/module/SlideSorterModule.cxx | 162 +++ .../ui/framework/module/SlideSorterModule.hxx | 42 +- 3 files changed, 311 insertions(+), 365 deletions(-) diff --git a/main/sd/source/core/sdpage.cxx b/main/sd/source/core/sdpage.cxx index 6d97689..f4527d2 100644 --- a/main/sd/source/core/sdpage.cxx +++ b/main/sd/source/core/sdpage.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,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. - * + * */ @@ -90,9 +90,7 @@ using namespace ::com::sun::star; TYPEINIT2( SdPage, FmFormPage, SdrObjUserCall ); /* -|* |* Ctor -|* \/ SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, sal_Bool bMasterPage) @@ -105,7 +103,7 @@ SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, sal_Bool bMasterPage) , mnTime(1) , mbSoundOn(sal_False) , mbExcluded(sal_False) -, mbLoopSound(sal_False) +, mbLoopSound(sal_False) , mbStopSound(sal_False) , mbScaleObjects(sal_True) , mbBackgroundFullSize( sal_False ) @@ -118,12 +116,12 @@ SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, sal_Bool bMasterPage) , mbTransitionDirection(sal_True) , mnTransitionFadeColor(0) , mfTransitionDuration(2.0) -, mbIsPrecious(true) +, mbIsPrecious(true) { // Der Layoutname der Seite wird von SVDRAW benutzt, um die Praesentations- // vorlagen der Gliederungsobjekte zu ermitteln. Darum enthaelt er bereits // den Bezeichner fuer die Gliederung (STR_LAYOUT_OUTLINE). - maLayoutName = String(SdResId(STR_LAYOUT_DEFAULT_NAME)); + maLayoutName = String(SdResId(STR_LAYOUT_DEFAULT_NAME)); maLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR )); maLayoutName += String(SdResId(STR_LAYOUT_OUTLINE)); @@ -140,9 +138,7 @@ SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, sal_Bool bMasterPage) } /* -|* |* Dtor -|* \/ SdPage::~SdPage() @@ -226,20 +222,20 @@ void SdPage::EnsureMasterPageDefaultBackground() if(mbMaster) { // no hard attributes on MasterPage attributes -getSdrPageProperties().ClearItem(); + getSdrPageProperties().ClearItem(); SfxStyleSheet* pSheetForPresObj = GetStyleSheetForMasterPageBackground(); -if(pSheetForPresObj) -{ -// set StyleSheet for background fill attributes -getSdrPageProperties().SetStyleSheet(pSheetForPresObj); -} -else -{ -// no style found, assert and set at least XFILL_NONE -OSL_ENSURE(false, "No Style for MasterPageBackground fill found (!)"); -getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE)); -} + if(pSheetForPresObj) + { + // set StyleSheet for background fill attributes + getSdrPageProperties().SetStyleSheet(pSheetForPresObj); + } + else + { + // no style found, assert and set at least XFILL_NONE + OSL_ENSURE(false, "No Style for MasterPageBackground fill found (!)"); +
[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 a02f915 Fixed typos, removed whitespace a02f915 is described below commit a02f915e57f23a2fb054057f8432f1b267040505 Author: mseidel AuthorDate: Tue Sep 21 18:08:08 2021 +0200 Fixed typos, removed whitespace (cherry picked from commit f36d4cdc7a803b3544aac6219cff04e0eaf450db) --- .../source/ui/slidesorter/view/SlideSorterView.cxx | 1282 ++-- .../source/ui/slidesorter/view/SlsFontProvider.cxx | 120 +- .../source/ui/slidesorter/view/SlsFramePainter.cxx | 350 +++--- .../source/ui/slidesorter/view/SlsFramePainter.hxx | 158 +-- .../view/SlsInsertionIndicatorOverlay.cxx | 543 + .../ui/slidesorter/view/SlsLayeredDevice.hxx | 66 +- main/sd/source/ui/slidesorter/view/SlsResource.hxx | 12 +- main/sd/source/ui/slidesorter/view/SlsToolTip.cxx | 236 ++-- .../ui/slidesorter/view/SlsViewCacheContext.cxx| 92 +- .../ui/slidesorter/view/SlsViewCacheContext.hxx| 38 +- 10 files changed, 1448 insertions(+), 1449 deletions(-) diff --git a/main/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/main/sd/source/ui/slidesorter/view/SlideSorterView.cxx index b88e3fb..0f8e4a6 100644 --- a/main/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/main/sd/source/ui/slidesorter/view/SlideSorterView.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,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. - * + * */ @@ -90,52 +90,52 @@ using namespace ::drawinglayer::primitive2d; namespace sd { namespace slidesorter { namespace view { namespace { -/** Wrapper around the SlideSorterView that supports the IPainter -interface and that allows the LayeredDevice to hold the -SlideSorterView (held as scoped_ptr by the SlideSorter) as -shared_ptr. -*/ -class Painter : public ILayerPainter -{ -public: -Painter (SlideSorterView& rView) : mrView(rView) {} -virtual ~Painter (void) {} - -virtual void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea) -{ -mrView.Paint(rDevice,rRepaintArea); -} - -virtual void SetLayerInvalidator (const SharedILayerInvalidator&) {} - -private: -SlideSorterView& mrView; -}; + /** Wrapper around the SlideSorterView that supports the IPainter + interface and that allows the LayeredDevice to hold the + SlideSorterView (held as scoped_ptr by the SlideSorter) as + shared_ptr. + */ + class Painter : public ILayerPainter + { + public: + Painter (SlideSorterView& rView) : mrView(rView) {} + virtual ~Painter (void) {} + + virtual void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea) + { + mrView.Paint(rDevice,rRepaintArea); + } + + virtual void SetLayerInvalidator (const SharedILayerInvalidator&) {} + + private: + SlideSorterView& mrView; + }; } class BackgroundPainter -: public ILayerPainter, - public ::boost::noncopyable + : public ILayerPainter, + public ::boost::noncopyable { public: -BackgroundPainter (const Color aBackgroundColor) : maBackgroundColor(aBackgroundColor) {} -virtual ~BackgroundPainter (void) {} - -virtual void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea) -{ -rDevice.SetFillColor(maBackgroundColor); -rDevice.SetLineColor(); -rDevice.DrawRect(rRepaintArea); -} + BackgroundPainter (const Color aBackgroundColor) : maBackgroundColor(aBackgroundColor) {} + virtual ~BackgroundPainter (void) {} + + virtual void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea) + { + rDevice.SetFillColor(maBackgroundColor); + rDevice.SetLineColor(); +
[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 cd1c183 Fixed typos, removed whitespace cd1c183 is described below commit cd1c183b0a0b1e92c2d752a4cecf247b59092ef9 Author: mseidel AuthorDate: Mon Sep 20 16:09:37 2021 +0200 Fixed typos, removed whitespace (cherry picked from commit c22beca602a5819c83f48afc2fe0d88e01fb0f06) --- main/svx/source/sdr/contact/displayinfo.cxx| 8 +- main/svx/source/sdr/contact/sdrmediawindow.hxx | 35 ++- .../source/sdr/contact/viewcontactofe3dcube.cxx| 14 +- .../source/sdr/contact/viewcontactofe3dextrude.cxx | 10 +- .../source/sdr/contact/viewcontactofe3dlathe.cxx | 16 +- .../source/sdr/contact/viewcontactofe3dsphere.cxx | 12 +- main/svx/source/sdr/contact/viewcontactofgroup.cxx | 16 +- .../source/sdr/contact/viewcontactofpageobj.cxx| 16 +- .../source/sdr/contact/viewcontactofsdrcircobj.cxx | 32 +-- .../source/sdr/contact/viewcontactofsdredgeobj.cxx | 18 +- .../source/sdr/contact/viewcontactofsdrpage.cxx| 290 ++--- .../source/sdr/contact/viewcontactofsdrrectobj.cxx | 46 ++-- .../source/sdr/contact/viewcontactoftextobj.cxx| 8 +- .../source/sdr/contact/viewcontactofvirtobj.cxx| 34 +-- .../source/sdr/contact/viewobjectcontactofe3d.cxx | 60 ++--- .../sdr/contact/viewobjectcontactofgroup.cxx | 14 +- .../sdr/contact/viewobjectcontactofsdrobj.cxx | 118 - .../sdr/contact/viewobjectcontactredirector.cxx| 10 +- 18 files changed, 378 insertions(+), 379 deletions(-) diff --git a/main/svx/source/sdr/contact/displayinfo.cxx b/main/svx/source/sdr/contact/displayinfo.cxx index c32818f..3e04498 100644 --- a/main/svx/source/sdr/contact/displayinfo.cxx +++ b/main/svx/source/sdr/contact/displayinfo.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,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. - * + * */ diff --git a/main/svx/source/sdr/contact/sdrmediawindow.hxx b/main/svx/source/sdr/contact/sdrmediawindow.hxx index 76138b4..1a9ab1a 100644 --- a/main/svx/source/sdr/contact/sdrmediawindow.hxx +++ b/main/svx/source/sdr/contact/sdrmediawindow.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,20 @@ * 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 _SDR_CONTACT_SDRMEDIAWIMNDOW_HXX #include @@ -39,20 +39,20 @@ public: SdrMediaWindow( Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact ); ~SdrMediaWindow(); - -virtual voidMouseMove( const MouseEvent& rMEvt ); -virtual voidMouseButtonDown( const MouseEvent& rMEvt ); -virtual voidMouseButtonUp( const MouseEvent& rMEvt ); - -virtual voidKeyInput( const KeyEvent& rKEvt ); -virtual voidKeyUp( const KeyEvent& rKEvt ); -virtual voidCommand( const CommandEvent& rCEvt ); + virtual voidMouseMove( const MouseEvent& rMEvt ); + virtual voidMouseButtonDown( const
[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 8ae656e Fixed typos, removed whitespace 8ae656e is described below commit 8ae656ed70368f2808524c7a29a03519909ea2b1 Author: mseidel AuthorDate: Sun Aug 22 19:50:23 2021 +0200 Fixed typos, removed whitespace (cherry picked from commit 8927ee86bef23fd08661b88a59493a46e7017564) --- main/solenv/bin/make_ext_update_info.pl | 142 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/main/solenv/bin/make_ext_update_info.pl b/main/solenv/bin/make_ext_update_info.pl index 26132d6..c1ff25b 100755 --- a/main/solenv/bin/make_ext_update_info.pl +++ b/main/solenv/bin/make_ext_update_info.pl @@ -2,7 +2,7 @@ eval 'exec perl -wS $0 ${1+"$@"}' if 0; #** -# +# # 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 @@ -10,22 +10,22 @@ eval 'exec perl -wS $0 ${1+"$@"}' # 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. -# +# #** #here the definition for d would be written into dependencies. The reason is that when the event handler -#for the element is called, we can only find out the namespace but not the prefix. So we cannot +#for the element is called, we can only find out the namespace but not the prefix. So we cannot #distinguish if the namespace is used because the element was prefixed or because it uses the default #namespace. use warnings; @@ -48,7 +48,7 @@ my $inDependencies = 0; my $inIdentifier = 0; my $inVersion = 0; my $descNS = "http://openoffice.org/extensions/description/2006;; - my $indent; +my $indent; my $identifier; my $version; @@ -56,8 +56,8 @@ my $version; #element and all children of the description.xml my @usedNsInDependencies; -#Maps prefix to namespaces which are valid in . That is, they are -#either defined in or in the hirarchy above +#Maps prefix to namespaces which are valid in . That is, they are +#either defined in or in the hierarchy above my %validPrefsInDep; #Contains the prefixes which are defined in my @newPrefsInDep; @@ -73,21 +73,21 @@ my $defNsInDep; #The prefix which we use for the default namespace used in my $generatedPrefix; -my $helptext = +my $helptext = "make_ext_update_info.pl produces an update information file for an extension. ". -"It will use a dummy URL as URL for the extension update unless a URL has been ". +"It will use a dummy URL as URL for the extension update unless a URL has been ". "provided with the --update_url option. The name of the update ". "information file, which must be provided with the --out switch, should be formed ". -"according to this scheme: \n\n". +"according to this scheme:\n\n". "extension_identifier.update.xml\n\n". "extension_identifier should correspond to the extension identifier. In some cases ". "this may not be possible because the identifier may contain characters which are not ". "allowd in file names.\n\n". "usage:\n". -"perl make_ext_update_info.pl [--help][--update_url url] --out update_information_file description.xml \n\n". -"Options: \n". -"--help - prints the help message and exits \n". -"--out file - the update information file to be written including the path \n". +"perl make_ext_update_info.pl [--help][--update_url url] --out update_information_file description.xml\n\n". +"Options:\n". +"--help - prints the help message and exits\n". +"--out file - the update information file to be written including the path\n". "--update-url url - inserts the url under the element. It may be necessary to enclose the urls in quotes in case they contain characters such as \"?\". ". "It can be used multiple times\n\n"; @@ -106,7 +106,7 @@ my $cArgs = scalar @ARGV; die "You need to provide a description.xml\n\n$helptext" if $cArgs ==0; die "You need to provide the name of the update information file ". "with the --out switch.\n" unless ($out); -die "Too many arguments. \n\n$helptext" if $cArgs > 1; +die "Too many arguments.\n\n$helptext" if $cArgs > 1; print $helptext if
[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 8e71f3c Fixed typos, removed whitespace 8e71f3c is described below commit 8e71f3cb1feaadb4c2deebfa85f22714af40d13c Author: mseidel AuthorDate: Tue Aug 17 20:01:24 2021 +0200 Fixed typos, removed whitespace (cherry picked from commit 4b7fb1cf720619ead536099e92b0fa4b3a262e53) --- .../source/text/shared/02/0117.xhp | 2 +- .../source/text/swriter/01/04090001.xhp| 21 +- main/svtools/source/dialogs/addresstemplate.src| 198 +++ main/sw/source/ui/fldui/fldfunc.src| 275 + main/sw/source/ui/fldui/fldui.src | 106 5 files changed, 266 insertions(+), 336 deletions(-) diff --git a/main/helpcontent2/source/text/shared/02/0117.xhp b/main/helpcontent2/source/text/shared/02/0117.xhp index 3326157..ba5e541 100644 --- a/main/helpcontent2/source/text/shared/02/0117.xhp +++ b/main/helpcontent2/source/text/shared/02/0117.xhp @@ -223,7 +223,7 @@ -Creates a list box. A list box lets users select an entry from a list. If the form is linked to a database and the database connection is active, theList Box Wizard will automatically appear after the list box is inserted in the document. This wizard helps you create the list box. +Creates a list box. A list box lets users select an entry from a list. If the form is linked to a database and the database connection is active, the List Box Wizard will automatically appear after the list box is inserted in the document. This wizard helps you create the list box. diff --git a/main/helpcontent2/source/text/swriter/01/04090001.xhp b/main/helpcontent2/source/text/swriter/01/04090001.xhp index 8532de8..bc0ca2e 100644 --- a/main/helpcontent2/source/text/swriter/01/04090001.xhp +++ b/main/helpcontent2/source/text/swriter/01/04090001.xhp @@ -1,8 +1,8 @@ - + - - + Document @@ -117,7 +116,7 @@ Templates - Inserts the filename, the path, or the filename without the file extension of the current template. You can also insert the names of the "Category" and the "Style" formats used in the current template. To view the names of the template categories and the styles used in the templates, choose File - Templates -Org [...] + Inserts the filename, the path, or the filename without the file extension of the current template. You can also insert the names of the "Category" and the "Style" formats used in the current template. To view the names of the template categories and the styles used in the templates, choose File - Templates - Or [...] @@ -138,7 +137,7 @@ Selecton "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection" Lists the available fields for the field type selected in the Type list. To insert a field, click the field, and then click Insert. - To quickly insert a field from the list, hold down Command + To quickly insert a field from the list, hold down Command Ctrl and double-click the field. @@ -191,7 +190,7 @@ oldref="41">Format Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format. - When you click "Additional formats", the Number Format dialog opens, where you can define a custom format. + When you click "Additional formats", the Number Format dialog opens, where you can define a custom format. If you choose "Chapter number without separator" for a chapter field, the separators that are specified for chapter number in Tools - Outline numbering are not displayed. If you choose "chapter number" as the format for reference fields, only the number of the chapter heading containing the referenced object is displayed in the field. If the paragraph style for the chapter heading is not numbered, the field is left blank. @@ -240,4 +239,4 @@ Enter the contents that you want to add to a user-defined field. - \ No newline at end of file + diff --git a/main/svtools/source/dialogs/addresstemplate.src b/main/svtools/source/dialogs/addresstemplate.src index 48f0575..58f7b35 100644 --- a/main/svtools/source/dialogs/addresstemplate.src +++ b/main/svtools/source/dialogs/addresstemplate.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
[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 e62cf9b Fixed typos, removed whitespace e62cf9b is described below commit e62cf9b45f07cfba7c5819e334783ca862044524 Author: mseidel AuthorDate: Sun Aug 15 20:32:14 2021 +0200 Fixed typos, removed whitespace (cherry picked from commit 8b7f65dd6db2479b7ae7529f8b484f6095fe9ada) --- main/chart2/source/tools/ReferenceSizeProvider.cxx | 18 ++-- main/connectivity/source/inc/adabas/BCatalog.hxx | 17 ++-- main/filter/source/flash/swfwriter.hxx | 24 ++--- main/framework/inc/classes/checkediterator.hxx | 22 ++--- main/framework/source/dispatch/closedispatcher.cxx | 36 .../inc/resourcemodel/TableManager.hxx | 102 ++--- 6 files changed, 110 insertions(+), 109 deletions(-) diff --git a/main/chart2/source/tools/ReferenceSizeProvider.cxx b/main/chart2/source/tools/ReferenceSizeProvider.cxx index b04914b..c0239c0 100644 --- a/main/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/main/chart2/source/tools/ReferenceSizeProvider.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,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. - * + * */ @@ -140,7 +140,7 @@ void ReferenceSizeProvider::setValuesAtAllDataSeries() ASSERT_EXCEPTION( ex ); } -//it is important to correct the datapoint properties first as they do reference the series properties +// it is important to correct the datapoint properties first as they do reference the series properties setValuesAtPropertySet( xSeriesProp ); } } @@ -154,7 +154,7 @@ void ReferenceSizeProvider::setValuesAtPropertySet( return; static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize")); - + try { awt::Size aRefSize( getPageSize() ); @@ -206,7 +206,7 @@ void ReferenceSizeProvider::getAutoResizeFromPropSet( } } -// curent state unknown => nothing changes. Otherwise if current state +// current state unknown => nothing changes. Otherwise if current state // differs from state so far, we have an ambiguity if( rInOutState == AUTO_RESIZE_UNKNOWN ) { @@ -232,11 +232,11 @@ void ReferenceSizeProvider::impl_getAutoResizeFromTitled( } /** Retrieves the state auto-resize from all objects that support this -feature. If all objects return the same state, AUTO_RESIZE_YES or +feature. If all objects return the same state, AUTO_RESIZE_YES or AUTO_RESIZE_NO is returned. If no object supporting the feature is found, AUTO_RESIZE_UNKNOWN is -returned. If there are multiple objects, some with state YES and some +returned. If there are multiple objects, some with state YES and some with state NO, AUTO_RESIZE_AMBIGUOUS is returned. */ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState( diff --git a/main/connectivity/source/inc/adabas/BCatalog.hxx b/main/connectivity/source/inc/adabas/BCatalog.hxx index 7101d08..e2d657d 100644 --- a/main/connectivity/source/inc/adabas/BCatalog.hxx +++ b/main/connectivity/source/inc/adabas/BCatalog.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,20 @@ * 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
[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 862b834 Fixed typos, removed whitespace 862b834 is described below commit 862b83472281c9cc14891f7d4c9e4857743b6073 Author: mseidel AuthorDate: Sat Aug 14 12:47:57 2021 +0200 Fixed typos, removed whitespace (cherry picked from commit 8489506c99682a093a9d5c87b7cb012b8a1be4b7) --- .../source/text/shared/01/05100100.xhp | 18 ++-- .../helpcontent2/source/text/shared/01/gallery.xhp | 15 +- .../source/text/shared/02/2401.xhp | 33 +++--- .../source/text/shared/02/2410.xhp | 19 ++--- .../text/shared/explorer/database/dabawiz01.xhp| 11 .../shared/explorer/database/migrate_macros.xhp| 17 ++- main/helpcontent2/source/text/shared/main0108.xhp | 4 +-- main/helpcontent2/source/text/shared/main0201.xhp | 18 ++-- 8 files changed, 61 insertions(+), 74 deletions(-) diff --git a/main/helpcontent2/source/text/shared/01/05100100.xhp b/main/helpcontent2/source/text/shared/01/05100100.xhp index 80ca7da..1881d38 100644 --- a/main/helpcontent2/source/text/shared/01/05100100.xhp +++ b/main/helpcontent2/source/text/shared/01/05100100.xhp @@ -1,8 +1,8 @@ - + - - + Merge @@ -52,15 +51,14 @@ -icon - +Icon + Merge Cells - Merging cells can lead to calculation errors in formulas in the table. diff --git a/main/helpcontent2/source/text/shared/01/gallery.xhp b/main/helpcontent2/source/text/shared/01/gallery.xhp index 65ffc9d..aa49add 100644 --- a/main/helpcontent2/source/text/shared/01/gallery.xhp +++ b/main/helpcontent2/source/text/shared/01/gallery.xhp @@ -2,7 +2,7 @@ - Gallery @@ -48,18 +47,18 @@ -Themes are listed on the left side of the Gallery.Click a theme to view the objects associated with the theme. +Themes are listed on the left side of the Gallery. Click a theme to view the objects associated with the theme. To insert a Gallery object, select the object, and then drag it into the document. Adding a New File to the Gallery -To add a file to the Gallery, right-click a theme, choose Properties, click the Files tab, and then click Add. You can also click an object in the current document, hold, and then drag it to the Gallery window. +To add a file to the Gallery, right-click a theme, choose Properties, click the Files tab, and then click Add. You can also click an object in the current document, hold, and then drag it to the Gallery window. New theme -Adds a new theme to the Gallery and lets you choose the files to include in the theme.. +Adds a new theme to the Gallery and lets you choose the files to include in the theme. To access the following commands, right-click a theme in the Gallery: diff --git a/main/helpcontent2/source/text/shared/02/2401.xhp b/main/helpcontent2/source/text/shared/02/2401.xhp index 7148c52..49eb433 100644 --- a/main/helpcontent2/source/text/shared/02/2401.xhp +++ b/main/helpcontent2/source/text/shared/02/2401.xhp @@ -1,8 +1,7 @@ - @@ -48,7 +47,7 @@ Icon - + Filter @@ -67,7 +66,7 @@ Icon - + Invert @@ -85,7 +84,7 @@ Icon - + Smooth @@ -103,7 +102,7 @@ Icon - + Sharpen @@ -121,7 +120,7 @@ Icon - + Remove Noise @@ -138,7 +137,7 @@ Icon - + Solarization @@ -163,7 +162,7 @@ Icon - + Aging @@ -183,7 +182,7 @@ Icon - + Posterize @@ -203,7 +202,7 @@ Icon - + Pop Art @@ -220,7 +219,7 @@ Icon - + Charcoal Sketch @@ -237,7 +236,7 @@ Icon - + Relief @@ -256,7 +255,7 @@ Icon - + Mosaic diff --git a/main/helpcontent2/source/text/shared/02/2410.xhp b/main/helpcontent2/source/text/shared/02/2410.xhp index 1dc6491..60bf4df 100644 --- a/main/helpcontent2/source/text/shared/02/2410.xhp +++ b/main/helpcontent2/source/text/shared/02/2410.xhp @@ -1,9 +1,8 @@ - - + - - + Crop @@ -47,15 +45,14 @@ -icon - +Icon + Crop - diff --git a/main/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp b/main/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp index 74793ce..5fb9350 100644 --- a/main/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp +++ b/main/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp @@ -2,7 +2,7 @@ - Database Selection @@ -41,7 +40,7 @@ Create a new database Select to create a new database. This option uses the HSQL database engine with default settings. The final page of the wizard appears next.
[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 fd9e694 Fixed typos, removed whitespace fd9e694 is described below commit fd9e69429010db343e5e49e808f306c89231b329 Author: mseidel AuthorDate: Fri Aug 13 17:12:58 2021 +0200 Fixed typos, removed whitespace (cherry picked from commit 4c3f23345f71fb81b4aa855be26b7562db4c752c) --- .../source/text/shared/01/06040400.xhp | 2 +- .../source/text/shared/guide/filternavigator.xhp | 13 +- .../source/text/shared/guide/flat_icons.xhp| 11 +- .../source/text/shared/guide/floating_toolbar.xhp | 13 +- .../source/text/shared/guide/hyperlink_search.xhp | 11 +- .../source/text/shared/guide/labels.xhp| 11 +- main/sc/source/ui/src/scfuncs.src | 926 ++--- 7 files changed, 489 insertions(+), 498 deletions(-) diff --git a/main/helpcontent2/source/text/shared/01/06040400.xhp b/main/helpcontent2/source/text/shared/01/06040400.xhp index e9e16ca..f1aacc8 100644 --- a/main/helpcontent2/source/text/shared/01/06040400.xhp +++ b/main/helpcontent2/source/text/shared/01/06040400.xhp @@ -53,7 +53,7 @@ Inserts a non breaking space before ";", "!", "?" and ":" when the character language is set to French (France, Belgium, Luxembourg, Monaco, or Switzerland) and before ":" only when the character language is set to French (Canada). moved two paras from 06040100.xhp, cws cbosdo01 -Format ordinal number suffixes (1st ... 1^st) +Format ordinal number suffixes (1st -> 1^st) Formats the text characters of ordinals, such as 1st, 2nd, or 3rd, as superscripts. For example, in English text, 1st will be converted to 1^st. diff --git a/main/helpcontent2/source/text/shared/guide/filternavigator.xhp b/main/helpcontent2/source/text/shared/guide/filternavigator.xhp index 024a2be..803ac2f 100644 --- a/main/helpcontent2/source/text/shared/guide/filternavigator.xhp +++ b/main/helpcontent2/source/text/shared/guide/filternavigator.xhp @@ -1,8 +1,7 @@ - - + @@ -45,7 +44,7 @@ To connect several filter conditions with Boolean OR, click the Filter navigation icon on the filter bar. The Filter navigator window appears. -The filter conditions that have been set appear in the Filter navigator. As soon as a filter is set, you see a blank filter entry at the bottom of the Filter navigator . You can select this entry by clicking the word "Or". Once you have selected the blank filter entry, you can enter additional filter conditions in the form. These conditions are [...] +The filter conditions that have been set appear in the Filter navigator. As soon as a filter is set, you see a blank filter entry at the bottom of the Filter navigator. You can select this entry by clicking the word "Or". Once you have selected the blank filter entry, you can enter additional filter conditions in the form. These conditions are l [...] diff --git a/main/helpcontent2/source/text/shared/guide/flat_icons.xhp b/main/helpcontent2/source/text/shared/guide/flat_icons.xhp index ddebebb..2ee57ae 100644 --- a/main/helpcontent2/source/text/shared/guide/flat_icons.xhp +++ b/main/helpcontent2/source/text/shared/guide/flat_icons.xhp @@ -1,8 +1,7 @@ - - - diff --git a/main/helpcontent2/source/text/shared/guide/floating_toolbar.xhp b/main/helpcontent2/source/text/shared/guide/floating_toolbar.xhp index 652a223..34c43cf 100644 --- a/main/helpcontent2/source/text/shared/guide/floating_toolbar.xhp +++ b/main/helpcontent2/source/text/shared/guide/floating_toolbar.xhp @@ -1,9 +1,7 @@ - - - - + Using Toolbars diff --git a/main/helpcontent2/source/text/shared/guide/hyperlink_search.xhp b/main/helpcontent2/source/text/shared/guide/hyperlink_search.xhp index cc5ea9c..9f86af6 100644 --- a/main/helpcontent2/source/text/shared/guide/hyperlink_search.xhp +++ b/main/helpcontent2/source/text/shared/guide/hyperlink_search.xhp @@ -1,8 +1,7 @@ - - + diff --git a/main/helpcontent2/source/text/shared/guide/labels.xhp b/main/helpcontent2/source/text/shared/guide/labels.xhp index 7188497..8c625dc 100644 --- a/main/helpcontent2/source/text/shared/guide/labels.xhp +++ b/main/helpcontent2/source/text/shared/guide/labels.xhp @@ -1,8 +1,7 @@ - - + diff --git a/main/sc/source/ui/src/scfuncs.src b/main/sc/source/ui/src/scfuncs.src index 2acd5a1..572892c 100644 --- a/main/sc/source/ui/src/scfuncs.src +++ b/main/sc/source/ui/src/scfuncs.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 @@
[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 4550381 Fixed typos, removed whitespace 4550381 is described below commit 4550381cbfe225c25c43f60d159a4ae8fd885ca2 Author: mseidel AuthorDate: Tue Jul 20 11:24:34 2021 +0200 Fixed typos, removed whitespace (cherry picked from commit 4732e1a01a3e81245c18366953f9f8f384f77245) --- main/svtools/inc/svtools/wizardmachine.hxx | 129 +++-- 1 file changed, 65 insertions(+), 64 deletions(-) diff --git a/main/svtools/inc/svtools/wizardmachine.hxx b/main/svtools/inc/svtools/wizardmachine.hxx index 6f94505..c6dcdac 100644 --- a/main/svtools/inc/svtools/wizardmachine.hxx +++ b/main/svtools/inc/svtools/wizardmachine.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,20 @@ * 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 _SVTOOLS_WIZARDMACHINE_HXX_ #define _SVTOOLS_WIZARDMACHINE_HXX_ @@ -38,7 +39,7 @@ namespace svt //. // wizard buttons -#define WZB_NONE0x +#define WZB_NONE 0x #define WZB_NEXT 0x0001 #define WZB_PREVIOUS 0x0002 #define WZB_FINISH 0x0004 @@ -51,34 +52,34 @@ namespace svt //= //= WizardTypes //= -struct WizardTypes -{ -typedef sal_Int16 WizardState; -enum CommitPageReason -{ -eTravelForward, // traveling forward (maybe with skipping pages) -eTravelBackward,// traveling backward (maybe with skipping pages) -eFinish,// the wizard is about to be finished -eValidate // the data should be validated only, no traveling wll happen -}; -}; + struct WizardTypes + { + typedef sal_Int16 WizardState; + enum CommitPageReason + { + eTravelForward, // traveling forward (maybe with skipping pages) + eTravelBackward,// traveling backward (maybe with skipping pages) + eFinish,// the wizard is about to be finished + eValidate // the data should be validated only, no traveling will happen + }; + }; class SAL_NO_VTABLE IWizardPageController { public: //- - // This methods behave somewhat different than ActivatePage/DeactivatePage + // This method behaves somewhat different than ActivatePage/DeactivatePage // The latter are handled by the base class itself whenever changing the pages is in the offing, // i.e., when it's already decided which page is the next. // We may have situations where the next page depends on the state of the current, which needs // to be committed for this. - // So initializePage and commitPage are designated to initialitzing/committing data on the page. + // So initializePage and commitPage are designated to initializing/committing data on the page. virtual voidinitializePage() = 0; -virtual sal_Bool commitPage( WizardTypes::CommitPageReason _eReason ) = 0; + virtual sal_BoolcommitPage( WizardTypes::CommitPageReason _eReason ) = 0; -/** determines whether or not it is allowed to advance to a next page + /** determines whether or not it is allowed to advance to a next page -You should make this dependent on the current
[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 982d8cc Fixed typos, removed whitespace 982d8cc is described below commit 982d8ccde5b2426401fed8bd586ad3e0ac1ddc20 Author: mseidel AuthorDate: Mon May 17 14:13:44 2021 +0200 Fixed typos, removed whitespace (cherry picked from commit d016691d2e0980460f9df67cb8684185c68c2703) --- main/desktop/source/deployment/misc/dp_misc.cxx| 60 main/framework/source/inc/loadenv/loadenv.hxx | 49 +++--- main/offapi/com/sun/star/awt/AccessibleButton.idl | 30 ++-- .../offapi/com/sun/star/awt/AccessibleCheckBox.idl | 32 ++-- main/offapi/com/sun/star/awt/Command.idl | 100 ++-- main/offapi/com/sun/star/awt/WindowAttribute.idl | 167 +++-- main/offapi/com/sun/star/awt/WindowEvent.idl | 134 - .../sun/star/awt/grid/DefaultGridColumnModel.idl | 41 ++--- .../com/sun/star/awt/tree/XTreeEditListener.idl| 13 +- .../ui/Accessibility/AccessibleFilterMenu.cxx | 44 +++--- .../ui/slidesorter/inc/cache/SlsPageCache.hxx | 36 ++--- main/slideshow/source/engine/slide/slideimpl.cxx | 144 +- 12 files changed, 427 insertions(+), 423 deletions(-) diff --git a/main/desktop/source/deployment/misc/dp_misc.cxx b/main/desktop/source/deployment/misc/dp_misc.cxx index 53f9020..a03c692 100644 --- a/main/desktop/source/deployment/misc/dp_misc.cxx +++ b/main/desktop/source/deployment/misc/dp_misc.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,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,7 +47,7 @@ #include "boost/scoped_array.hpp" #include "boost/shared_ptr.hpp" #include - + #ifdef WNT //#include "tools/prewin.h" #define UNICODE @@ -96,29 +96,29 @@ const OUString OfficePipeId::operator () () OUString userPath; ::utl::Bootstrap::PathStatus aLocateResult = ::utl::Bootstrap::locateUserInstallation( userPath ); - if (!(aLocateResult == ::utl::Bootstrap::PATH_EXISTS || + if (!(aLocateResult == ::utl::Bootstrap::PATH_EXISTS || aLocateResult == ::utl::Bootstrap::PATH_VALID)) { throw Exception(OUSTR("Extension Manager: Could not obtain path for UserInstallation."), 0); } - + rtlDigest digest = rtl_digest_create( rtl_Digest_AlgorithmMD5 ); if (digest == NULL) { throw RuntimeException( OUSTR("cannot get digest rtl_Digest_AlgorithmMD5!"), 0 ); } - + sal_uInt8 const * data = reinterpret_cast(userPath.getStr()); sal_Size size = (userPath.getLength() * sizeof (sal_Unicode)); sal_uInt32 md5_key_len = rtl_digest_queryLength( digest ); ::boost::scoped_array md5_buf( new sal_uInt8 [ md5_key_len ] ); - + rtl_digest_init( digest, data, static_cast(size) ); rtl_digest_update( digest, data, static_cast(size) ); rtl_digest_get( digest, md5_buf.get(), md5_key_len ); rtl_digest_destroy( digest ); - + // create hex-value string from the MD5 value to keep // the string size minimal ::rtl::OUStringBuffer buf; @@ -161,20 +161,20 @@ bool compareExtensionFolderWithLastSynchronizedFile( return true; //sync just in case } -//If last synchronized does not exist, then OOo is started for the first time +//If last synchronized does not exist, then AOO is started for the first time ::osl::DirectoryItem itemFile; ::osl::File::RC err2 = ::osl::DirectoryItem::get(fileURL, itemFile); if (err2 == ::osl::File::E_NOENT) { return true; - + } else if (err2 != ::osl::File::E_None) { OSL_ENSURE(0, "Cannot access file lastsynchronized"); return true; //sync just in case } - + //compare the modification time of the extension folder and the last //modified file ::osl::FileStatus statFolder(FileStatusMask_ModifyTime); @@ -192,7 +192,7 @@
[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 13ab1ff Fixed typos, removed whitespace 13ab1ff is described below commit 13ab1ff59eeaa43453815f3c23c762d21042e2fd Author: mseidel AuthorDate: Sat May 15 18:04:27 2021 +0200 Fixed typos, removed whitespace (cherry picked from commit 8ca5c32494228b7d30eee9a738e1008f188136d9) --- main/ucb/source/ucp/webdav/SerfSession.cxx | 80 + main/xmlsecurity/source/xmlsec/nss/secerror.cxx | 19 +++--- 2 files changed, 50 insertions(+), 49 deletions(-) diff --git a/main/ucb/source/ucp/webdav/SerfSession.cxx b/main/ucb/source/ucp/webdav/SerfSession.cxx index 358a054..4643fc9 100644 --- a/main/ucb/source/ucp/webdav/SerfSession.cxx +++ b/main/ucb/source/ucp/webdav/SerfSession.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,18 +7,20 @@ * 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_webdav.hxx" @@ -171,9 +173,9 @@ void SerfSession::Init() { apr_sockaddr_t *proxy_address = NULL; status = apr_sockaddr_info_get( _address, - rtl::OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ).getStr(), + rtl::OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ).getStr(), APR_UNSPEC, - static_cast(m_nProxyPort), + static_cast(m_nProxyPort), 0, getAprPool() ); if ( status != APR_SUCCESS ) @@ -322,7 +324,7 @@ apr_status_t SerfSession::setupSerfConnection( apr_socket_t * inAprSocket, 0, getSerfBktAlloc() ); /** Set the callback that is called to authenticate the -certifcate (chain). +certificate (chain). */ serf_ssl_server_cert_chain_callback_set( serf_bucket_ssl_decrypt_context_get(tmpInputBkt), @@ -332,7 +334,7 @@ apr_status_t SerfSession::setupSerfConnection( apr_socket_t * inAprSocket, serf_ssl_set_hostname( serf_bucket_ssl_decrypt_context_get( tmpInputBkt ), getHostinfo() ); -*outSerfOutputBucket = serf_bucket_ssl_encrypt_create( *outSerfOutputBucket, +*outSerfOutputBucket = serf_bucket_ssl_encrypt_create( *outSerfOutputBucket, serf_bucket_ssl_decrypt_context_get( tmpInputBkt ), getSerfBktAlloc() ); } @@ -513,7 +515,7 @@ apr_status_t SerfSession::verifySerfCertificateChain ( : SERF_SSL_CERT_UNKNOWN_FAILURE; } -// The shortcut failed, so try to verify the whole chain. This is +// The shortcut failed, so try to verify the whole chain. This is // done outside the isDomainMatch() block because the result is // used by the interaction handler. std::vector< uno::Reference< security::XCertificate > > aChain; @@ -548,7 +550,7 @@ apr_status_t SerfSession::verifySerfCertificateChain ( if ( aId.equals( OID_SUBJECT_ALTERNATIVE_NAME ) ) { uno::Reference< security::XSanExtension > sanExtension ( element, uno::UNO_QUERY ); -altNames = sanExtension->getAlternativeNames(); +altNames = sanExtension->getAlternativeNames(); break; } } @@ -557,7 +559,7 @@ apr_status_t SerfSession::verifySerfCertificateChain ( certHostNames[0] = sServerCertificateSubject;
[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 206e4df Fixed typos, removed whitespace 206e4df is described below commit 206e4dff78ceca8f75cfc9eb2494a808bf063860 Author: mseidel AuthorDate: Tue May 11 14:49:54 2021 +0200 Fixed typos, removed whitespace (cherry picked from commit ab40857287c6726927810e0521e53d699ee4888e) --- main/l10ntools/source/filter/utils/XMLHelper.java | 56 +++ main/sw/source/filter/ww8/writerhelper.hxx| 51 +++-- 2 files changed, 54 insertions(+), 53 deletions(-) diff --git a/main/l10ntools/source/filter/utils/XMLHelper.java b/main/l10ntools/source/filter/utils/XMLHelper.java index 77f85c2..e6fa172 100644 --- a/main/l10ntools/source/filter/utils/XMLHelper.java +++ b/main/l10ntools/source/filter/utils/XMLHelper.java @@ -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. - * + * */ @@ -43,46 +43,46 @@ public class XMLHelper //___ // public const -/** its a possible value of the xml attribute "oor:type" and identify an integer type. */ +/** it's a possible value of the xml attribute "oor:type" and identify an integer type. */ public static final java.lang.String XMLTYPE_INTEGER = "xs:int"; -/** its a possible value of the xml attribute "oor:type" and identify an boolean type. */ +/** it's a possible value of the xml attribute "oor:type" and identify an boolean type. */ public static final java.lang.String XMLTYPE_BOOLEAN = "xs:boolean"; -/** its a possible value of the xml attribute "oor:type" and identify an string type. */ +/** it's a possible value of the xml attribute "oor:type" and identify an string type. */ public static final java.lang.String XMLTYPE_STRING = "xs:string"; -/** its a possible value of the xml attribute "oor:type" and identify an string list type. */ +/** it's a possible value of the xml attribute "oor:type" and identify an string list type. */ public static final java.lang.String XMLTYPE_STRINGLIST = "oor:string-list"; -/** its a xml attribute, which specify a property name. */ +/** it's a xml attribute, which specify a property name. */ public static final java.lang.String XMLATTRIB_OOR_NAME = "oor:name"; -/** its a xml attribute, which specify a property type. */ +/** it's a xml attribute, which specify a property type. */ public static final java.lang.String XMLATTRIB_OOR_TYPE = "oor:type"; -/** its a xml attribute, which specify a list separator. */ +/** it's a xml attribute, which specify a list separator. */ public static final java.lang.String XMLATTRIB_OOR_SEPARATOR = "oor:separator"; -/** its a xml attribute, which specify a localized value. */ +/** it's a xml attribute, which specify a localized value. */ public static final java.lang.String XMLATTRIB_OOR_LOCALIZED = "oor:localized"; -/** its a xml attribute, which specify a merge operation for cfg layering. */ +/** it's a xml attribute, which specify a merge operation for cfg layering. */ public static final java.lang.String XMLATTRIB_OOR_OP = "oor:op"; /** can be used as value for XMLATTRIB_OOR_OP. */ public static final java.lang.String XMLATTRIB_OP_REPLACE = "replace"; -/** its a xml attribute, which specify a locale value. */ +/** it's a xml attribute, which specify a locale value. */ public static final java.lang.String XMLATTRIB_XML_LANG = "xml:lang"; -/** its the tag name of a entry. */ +/** it's the tag name of a entry. */ public static final java.lang.String XMLTAG_VALUE = "value"; -/** its the tag name of a entry. */ +/** it's the tag name of a entry. */ public static final java.lang.String XMLTAG_PROP = "prop"; -/** its the tag name of a entry. */ +/** it's the tag name of a entry. */
[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 084e071 Fixed typos, removed whitespace 084e071 is described below commit 084e0718daaccace197b8798c4eb787f28d8e719 Author: mseidel AuthorDate: Thu Mar 11 21:38:04 2021 +0100 Fixed typos, removed whitespace (cherry picked from commit b57f57573a250213d9f284e3b5fd3d3e548405eb) --- .../mod/_dbaccess/ConnectionLineAccessibility.java | 96 +++--- .../tests/java/mod/_dbaccess/DBContentLoader.java | 10 +-- .../java/mod/_dbaccess/JoinViewAccessibility.java | 76 - .../java/mod/_dbaccess/OCommandDefinition.java | 10 +-- .../tests/java/mod/_dbaccess/ODatabaseContext.java | 15 ++-- .../tests/java/mod/_dbaccess/ODatabaseSource.java | 39 - .../_dbaccess/ODatasourceAdministrationDialog.java | 10 +-- .../java/mod/_dbaccess/ODatasourceBrowser.java | 38 + .../java/mod/_dbaccess/OInteractionHandler.java| 12 +-- .../qadevOOo/tests/java/mod/_dbaccess/ORowSet.java | 43 +- .../java/mod/_dbaccess/OSQLMessageDialog.java | 18 ++-- .../mod/_dbaccess/OSingleSelectQueryComposer.java | 39 - .../tests/java/mod/_dbaccess/SbaXGridControl.java | 72 .../mod/_dbaccess/TableWindowAccessibility.java| 86 +-- .../qadevOOo/tests/java/mod/_dbaccess/package.html | 8 +- 15 files changed, 293 insertions(+), 279 deletions(-) diff --git a/main/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java b/main/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java index 71d5588..8e88c7a 100644 --- a/main/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java +++ b/main/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java @@ -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,20 @@ * 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. - * + * */ + package mod._dbaccess; import java.io.PrintWriter; @@ -82,14 +83,14 @@ public class ConnectionLineAccessibility extends TestCase XComponent QueryComponent = null; String user = ""; String password=""; - + /** * Creates a new DataSource and stores it. * Creates a connection and using it * creates two tables in database. * Creates a new query and adds it to DefinitionContainer. * Opens the QueryComponent.with loadComponentFromURL - * and gets the object with the role UNKNOWN and the Impplementation + * and gets the object with the role UNKNOWN and the Implementation * name that contains ConnectionLine * @param Param test parameters * @param log writer to log information while testing @@ -101,13 +102,13 @@ public class ConnectionLineAccessibility extends TestCase PrintWriter log) { XInterface oObj = null; - + Object oDBContext = null; Object oDBSource = null; Object newQuery = null; Object toolkit = null; XStorable store = null; - + try { oDBContext = ((XMultiServiceFactory) Param.getMSF()) @@ -124,24 +125,24 @@ public class ConnectionLineAccessibility extends TestCase e.printStackTrace(log); throw new StatusException(Status.failed("Couldn't create instance")); } - + String mysqlURL = (String) Param.get("mysql.url"); - + if (mysqlURL == null) { throw new StatusException(Status.failed( "Couldn't get 'mysql.url' from ini-file")); } - + user = (String) Param.get("jdbc.user"); password = (String) Param.get("jdbc.password"); - + if ((user == null) || (password == null)) { throw new StatusException(Status.failed( "Couldn't get 'jdbc.user' or 'jdbc.password' from ini-file")); } - + PropertyValue[] info = new PropertyValue[2];
[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 7958887 Fixed typos, removed whitespace 7958887 is described below commit 7958887939f24d3946e112c28ba21a4a0c201414 Author: mseidel AuthorDate: Wed Mar 10 18:57:18 2021 +0100 Fixed typos, removed whitespace (cherry picked from commit 65e976d8aa33de618e4243063b22a5388da39a96) --- main/offapi/com/sun/star/chart/ChartAxis.idl | 396 +++ .../tests/java/mod/_dbaccess/OQueryDesign.java | 531 +++-- .../tests/java/mod/_forms/GenericModelTest.java| 154 +++--- 3 files changed, 542 insertions(+), 539 deletions(-) diff --git a/main/offapi/com/sun/star/chart/ChartAxis.idl b/main/offapi/com/sun/star/chart/ChartAxis.idl index b3aa30e..7d32635 100644 --- a/main/offapi/com/sun/star/chart/ChartAxis.idl +++ b/main/offapi/com/sun/star/chart/ChartAxis.idl @@ -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,330 +7,330 @@ * 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 __com_sun_star_chart_ChartAxis_idl__ -#define __com_sun_star_chart_ChartAxis_idl__ - -#ifndef __com_sun_star_drawing_LineProperties_idl__ -#include -#endif - -#ifndef __com_sun_star_style_CharacterProperties_idl__ -#include -#endif - -#ifndef __com_sun_star_beans_XPropertySet_idl__ -#include -#endif - -#ifndef __com_sun_star_chart_ChartAxisArrangeOrderType_idl__ -#include -#endif +#ifndef __com_sun_star_chart_ChartAxis_idl__ +#define __com_sun_star_chart_ChartAxis_idl__ -#ifndef __com_sun_star_chart_ChartAxisPosition_idl__ -#include -#endif +#ifndef __com_sun_star_drawing_LineProperties_idl__ +#include +#endif -#ifndef __com_sun_star_chart_ChartAxisLabelPosition_idl__ -#include -#endif +#ifndef __com_sun_star_style_CharacterProperties_idl__ +#include +#endif + +#ifndef __com_sun_star_beans_XPropertySet_idl__ +#include +#endif + +#ifndef __com_sun_star_chart_ChartAxisArrangeOrderType_idl__ +#include +#endif + +#ifndef __com_sun_star_chart_ChartAxisPosition_idl__ +#include +#endif -#ifndef __com_sun_star_chart_ChartAxisMarkPosition_idl__ -#include +#ifndef __com_sun_star_chart_ChartAxisLabelPosition_idl__ +#include #endif -#ifndef __com_sun_star_chart_ChartAxisType_idl__ -#include +#ifndef __com_sun_star_chart_ChartAxisMarkPosition_idl__ +#include #endif -#ifndef __com_sun_star_chart_TimeIncrement_idl__ -#include +#ifndef __com_sun_star_chart_ChartAxisType_idl__ +#include #endif -#ifndef __com_sun_star_chart_XAxis_idl__ -#include +#ifndef __com_sun_star_chart_TimeIncrement_idl__ +#include +#endif + +#ifndef __com_sun_star_chart_XAxis_idl__ +#include #endif #ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_ #include #endif - -//= - - module com { module sun { module star { module chart { - -//= - + +//= + + module com { module sun { module star { module chart { + +//= + /** Specifies the axes in a diagram. - + Note: The text properties correlate to all axis description elements, not to just a single text element. */ published service ChartAxis -{ +{ /** set the properties for the entire axis line as well as for the -tick marks. + tick marks. */ - service com::sun::star::drawing::LineProperties; - + service com::sun::star::drawing::LineProperties; + /** set the properties for all text labels of the axis */ - service com::sun::star::style::CharacterProperties; - + service com::sun::star::style::CharacterProperties; + /** If a ChartAxis may be stored as XML element, this -service should
[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 7de2d4d Fixed typos, removed whitespace 7de2d4d is described below commit 7de2d4d7a8e7188633f10daf107e662a13b72eed Author: mseidel AuthorDate: Mon Jan 4 16:06:31 2021 +0100 Fixed typos, removed whitespace (cherry picked from commit b556d77e0a6c6a9db178b78826704c50983873c0) --- .../filter/detection/typeDetection/Helper.java | 179 +++-- 1 file changed, 90 insertions(+), 89 deletions(-) diff --git a/main/filter/qa/complex/filter/detection/typeDetection/Helper.java b/main/filter/qa/complex/filter/detection/typeDetection/Helper.java index 18cf8bc..a75d5e2 100644 --- a/main/filter/qa/complex/filter/detection/typeDetection/Helper.java +++ b/main/filter/qa/complex/filter/detection/typeDetection/Helper.java @@ -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. - * + * */ @@ -44,27 +44,27 @@ import util.utils; /** Helper class for "TypeDetection" * This class do file hanlding. */ -public class Helper { - +public class Helper { + /** The runner log writer * @member m_logfor log purposes - * @member m_sTestDocPath directory for seraching files to load - * @member m_vFiles list of all files describet in "files.csv" - * @member m_hFileURLs contains the postition of a file name in the m_vFiles Vector - * @member m_hFileTypes contains the postition of a file type in the m_vFiles Vector + * @member m_sTestDocPath directory for searching files to load + * @member m_vFiles list of all files described in "files.csv" + * @member m_hFileURLs contains the position of a file name in the m_vFiles Vector + * @member m_hFileTypes contains the position of a file type in the m_vFiles Vector * @member m_param the test parameters */ - + LogWriter m_log = null; String m_sTestDocPath = null; - + Vector m_vFiles = null; - + Hashtable m_hFileURLs = new Hashtable(); - + Hashtable m_hFileTypes = new Hashtable(); - + TestParameters m_param = null; /** @@ -76,50 +76,50 @@ public class Helper { * * @param log the log writer */ - + public Helper(TestParameters param, LogWriter log) { m_param = param; m_log = log; - - + + // get all files from the given directory m_sTestDocPath = (String)param.get("TestDocumentPath"); // get all files from "files.csv" m_vFiles = getToDoList((String)m_param.get("csv.files")); - + createFilesList(); } - + /** Reads a comma separated file (CSV). Every line of the file is - * repesented by an Vector entry. Every data entry of a row is + * represented by an Vector entry. Every data entry of a row is * also stored in a Vector. So the returned value is a * Vector[][] where the first dimension represents a row - * and the second dimenesion inclueds the data values. + * and the second dimension includes the data values. * @param csvFileName the name of the csv file * @return Vector filled with Vector filled with data of a row */ public Vector getToDoList(String csvFileName){ - - try { - + + try { + Vector vAll = new Vector(); Vector vFields = new Vector(); - + // get content of file Vector content = getCSVFileContent(csvFileName); - + // remove superfluous content like "#" started lines content = removeSuperfluousContent(content); - + // replace all place holders in file content = replacePlaceHolder(content); - + // create Enumeration Enumeration contentEnum = content.elements(); - + // the first line
[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 f1cca3b Fixed typos, removed whitespace f1cca3b is described below commit f1cca3b86242188c336142e5ffe3c9d3f2b0ef64 Author: mseidel AuthorDate: Fri Dec 11 22:46:58 2020 +0100 Fixed typos, removed whitespace (cherry picked from commit cd12592044eab9c4ce1541eff3b8ab33dc166ad5) --- .../tests/java/ifc/awt/tree/_XTreeNode.java| 123 +++-- 1 file changed, 62 insertions(+), 61 deletions(-) diff --git a/main/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java b/main/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java index defab13..44fdcfc 100644 --- a/main/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java +++ b/main/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java @@ -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,44 +47,44 @@ import lib.StatusException; * @see com.sun.star.awt.tree.XTreeDataModel */ public class _XTreeNode extends MultiMethodTest { - + public XTreeNode oObj = null; - + private int mCount = 0; - + String msDisplayValue = null; String msExpandedGraphicURL = null; String msCollapsedGraphicURL = null; String msNodeGraphicURL = null; - - + + public void before(){ msDisplayValue = (String) tEnv.getObjRelation("XTreeNode_DisplayValue"); if (msDisplayValue == null){ throw new StatusException(Status.failed( "Couldn't get relation 'XTreeNode_DisplayVlaue'")); } - + msExpandedGraphicURL = (String) tEnv.getObjRelation("XTreeNode_ExpandedGraphicURL"); if (msExpandedGraphicURL == null){ throw new StatusException(Status.failed( "Couldn't get relation 'XTreeNode_ExpandedGraphicURL'")); } - + msCollapsedGraphicURL = (String) tEnv.getObjRelation("XTreeNode_CollapsedGraphicURL"); if (msCollapsedGraphicURL == null){ throw new StatusException(Status.failed( "Couldn't get relation 'XTreeNode_CollapsedGraphicURL'")); } - + msNodeGraphicURL = (String) tEnv.getObjRelation("XTreeNode_NodeGraphicURL"); if(msNodeGraphicURL == null){ throw new StatusException(Status.failed( "Couldn't get relation 'XTreeNode_NodeGraphicURL'")); } - + } - + /** * Gets the title and compares it to the value set in * setTitle method test. @@ -97,7 +97,7 @@ public class _XTreeNode extends MultiMethodTest { public void _getChildAt(){ this.requiredMethod("getChildCount()"); boolean bOK = true; - + for (int i=0; i < mCount ; i++){ XTreeNode xNode = null; try { @@ -110,27 +110,27 @@ public class _XTreeNode extends MultiMethodTest { bOK = false; } } - + tRes.tested("getChildAt()", bOK); } - - + + public void _getChildCount(){ - + boolean bOK = true; mCount = oObj.getChildCount(); log.println("got count '" + mCount + "' of children"); if (mCount < 1 ) { -log.println("ERROR: got a count < 1. The test object must be support morw then zero children => FAILED"); +log.println("ERROR: got a count < 1. The test object must support more than zero children => FAILED"); bOK = false; } tRes.tested("getChildCount()", bOK); } - - + + public void _getParent(){ this.requiredMethod("getChildAt()"); - + boolean bOK = true; XTreeNode xNode = null; try { @@ -139,20 +139,20 @@ public class _XTreeNode extends MultiMethodTest { } catch (com.sun.star.lang.IndexOutOfBoundsException ex) { log.println("ERROR: getChildAt(0): " +
[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 3adbb62 Fixed typos, removed whitespace 3adbb62 is described below commit 3adbb628d31cb9667e2201dae1256e0cfc623c0c Author: mseidel AuthorDate: Tue Dec 8 23:01:04 2020 +0100 Fixed typos, removed whitespace (cherry picked from commit f30f79b7372056bdef90ae6368e7fa5ef14968ca) --- main/sw/source/filter/ww1/w1struct.hxx | 18 +++--- main/ucb/source/core/provprox.cxx | 82 main/ucb/source/ucp/file/prov.cxx | 114 - 3 files changed, 107 insertions(+), 107 deletions(-) diff --git a/main/sw/source/filter/ww1/w1struct.hxx b/main/sw/source/filter/ww1/w1struct.hxx index b946f56..f1881ad 100644 --- a/main/sw/source/filter/ww1/w1struct.hxx +++ b/main/sw/source/filter/ww1/w1struct.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. - * + * */ @@ -717,7 +717,7 @@ struct W1_FLD FieldDescriptor struct W1_PIC /// PictureStructure { - SVBT32 lcb;// 0x0 number of bytes in the PIC structure plus size of following picture data which may be a Window's metafile, a bitmap, or the filename of a TIFF file. + SVBT32 lcb;// 0x0 number of bytes in the PIC structure plus size of following picture data which may be a Windows metafile, a bitmap, or the filename of a TIFF file. sal_uLong lcbGet() { return SVBT32ToUInt32(lcb); } SVBT16 cbHeader;// 0x4 number of bytes in the PIC (to allow for future expansion). @@ -738,7 +738,7 @@ struct W1_PIC /// PictureStructure return SVBT16ToShort(hMF); } } mfp; union W1_MFP_BMP { - SVBT8 bm[14];// 0xe BITMAP(14 bytes)Window's bitmap structure when PIC describes a BITMAP. + SVBT8 bm[14];// 0xe BITMAP(14 bytes)Windows bitmap structure when PIC describes a BITMAP. SVBT8 rcWinMF[14];// 0xerc (rectangle - 8 bytes) rect for window origin and extents when metafile is stored -- ignored if 0 } MFP_BMP; SVBT16 dxaGoal;// 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within. @@ -800,7 +800,7 @@ struct W1_PIC /// PictureStructure // SVBT16 dyaOrigin;// 0x38vertical offset of hand annotation origin // sal_uInt16 dyaOriginGet() { // return SVBT16ToShort(dyaOrigin); } - SVBT8 rgb;// 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename. + SVBT8 rgb;// 0x3a variable array of bytes containing Windows metafile, bitmap or TIFF file filename. sal_uInt8* rgbGet() { return rgb; } }; @@ -900,10 +900,10 @@ struct W1_ANLV struct W1_ANLD { W1_ANLV eAnlv;// 0 - SVBT8 fNumber1;// 0x10 number only 1 item per table cell + SVBT8 fNumber1;// 0x10 number only 1 item per table cell SVBT8 fNumberAcross;// 0x11 number across cells in table rows(instead of down) SVBT8 fRestartHdn;// 0x12 restart heading number on section boundary - SVBT8 fSpareX;// 0x13 unused( should be 0) + SVBT8 fSpareX;// 0x13 unused( should be 0) sal_Char rgchAnld[32];// 0x14 characters displayed before/after autonumber }; diff --git a/main/ucb/source/core/provprox.cxx b/main/ucb/source/core/provprox.cxx index 188ba14..686a4ff 100644 --- a/main/ucb/source/core/provprox.cxx +++ b/main/ucb/source/core/provprox.cxx @@ -1,5 +1,5 @@ /** - * + * *
[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 99e632b Fixed typos, removed whitespace 99e632b is described below commit 99e632bc7c95db821d42b4075be8174711f27490 Author: mseidel AuthorDate: Fri Dec 4 22:25:56 2020 +0100 Fixed typos, removed whitespace (cherry picked from commit 41e09fa92c50065ecf599158644193ba71ae5561) --- main/dtrans/source/win32/dnd/source.cxx | 159 main/dtrans/source/win32/dnd/source.hxx | 68 +++--- main/dtrans/source/win32/dnd/target.cxx | 141 ++-- main/dtrans/source/win32/dnd/target.hxx | 95 +-- 4 files changed, 230 insertions(+), 233 deletions(-) diff --git a/main/dtrans/source/win32/dnd/source.cxx b/main/dtrans/source/win32/dnd/source.cxx index 07aceb1..e7020b4 100644 --- a/main/dtrans/source/win32/dnd/source.cxx +++ b/main/dtrans/source/win32/dnd/source.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,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. - * + * */ @@ -75,7 +75,7 @@ DragSource::DragSource( const Reference& sf): // m_pcurrentContext_impl(0), m_hAppWindow(0), m_MouseButton(0), -m_RunningDndOperationCount(0) + m_RunningDndOperationCount(0) { g_moduleCount.modCnt.acquire( _moduleCount.modCnt ); } @@ -90,23 +90,23 @@ DragSource::~DragSource() // /** First start a new drag and drop thread if - the last one has finished + the last one has finished - - Do we really need a separate thread for - every Dnd opeartion or only if the source - thread is an MTA thread - + + Do we really need a separate thread for + every Dnd operation or only if the source + thread is an MTA thread + */ void DragSource::StartDragImpl( -const DragGestureEvent& trigger, -sal_Int8 sourceActions, -sal_Int32 /*cursor*/, -sal_Int32 /*image*/, -const Reference& trans, -const Reference& listener ) + const DragGestureEvent& trigger, + sal_Int8 sourceActions, + sal_Int32 /*cursor*/, + sal_Int32 /*image*/, + const Reference& trans, + const Reference& listener ) { -// The actions supported by the drag source + // The actions supported by the drag source m_sourceActions= sourceActions; // We need to know which mouse button triggered the operation. // If it was the left one, then the drop occurs when that button @@ -132,26 +132,26 @@ void DragSource::StartDragImpl( g_XTransferable = trans; //<-- TRA -m_spDataObject= m_aDataConverter.createDataObjFromTransferable( + m_spDataObject= m_aDataConverter.createDataObjFromTransferable( m_serviceFactory, trans); // Obtain the id of the thread that created the window DWORD processId; m_threadIdWindow= GetWindowThreadProcessId( m_hAppWindow, ); -// hold the instance for the DnD thread, it's to late -// to acquire at the start of the thread procedure -// the thread procedure is responsible for the release -acquire(); + // hold the instance for the DnD thread, it's to late + // to acquire at the start of the thread procedure + // the thread procedure is responsible for the release + acquire(); - // The thread acccesses members of this instance but does not call acquire. + // The thread accesses members of this instance but does not call acquire. // Hopefully this instance is not destroyed before the thread has terminated. unsigned threadId; HANDLE hThread= reinterpret_cast(_beginthreadex( -0, 0, DndOleSTAFunc, reinterpret_cast(this), 0, )); + 0, 0, DndOleSTAFunc, reinterpret_cast(this), 0, )); -// detach from thread -CloseHandle(hThread); +
[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 24049be Fixed typos, removed whitespace 24049be is described below commit 24049bef1e15be3b561ce6dc8cce0cceb3dda1e5 Author: mseidel AuthorDate: Thu Nov 26 16:42:03 2020 +0100 Fixed typos, removed whitespace (cherry picked from commit 3dd473e4ac4461434a4b21fa5d701c93a7dd66f3) --- .../source/xslt/odf2xhtml/export/common/body.xsl | 176 ++--- .../converter/xml/sxc/SxcDocumentDeserializer.java | 167 ++- 2 files changed, 171 insertions(+), 172 deletions(-) diff --git a/main/filter/source/xslt/odf2xhtml/export/common/body.xsl b/main/filter/source/xslt/odf2xhtml/export/common/body.xsl index 3670ece..7e52b03 100644 --- a/main/filter/source/xslt/odf2xhtml/export/common/body.xsl +++ b/main/filter/source/xslt/odf2xhtml/export/common/body.xsl @@ -1,28 +1,28 @@ - - + + http://www.w3.org/1999/XSL/Transform; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xml [...] @@ -70,7 +70,7 @@ +Sometimes less spaces than 8 might be needed and the output might be more difficult to read --> @@ -158,7 +158,7 @@ - + @@ -170,15 +170,15 @@ - - - + + + - + @@ -321,7 +321,7 @@ - + + - + @@ -350,7 +350,7 @@ - + diff --git a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java index 8fd0229..5d4b4f8 100644 --- a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java +++ b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java @@ -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,7 +47,7 @@ import org.openoffice.xmerge.util.Debug; * General spreadsheet implementation of DocumentDeserializer * for the
[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 0a64c50 Fixed typos, removed whitespace 0a64c50 is described below commit 0a64c505d880b8abd9e6dd5cff5ce19a53471399 Author: mseidel AuthorDate: Wed Nov 25 22:17:31 2020 +0100 Fixed typos, removed whitespace (cherry picked from commit f3abe5945e37559acdd237ffd9fb82559c65fbe1) --- .../com/sun/star/tooling/converter/Convert.java| 162 +++-- .../com/sun/star/tooling/converter/Converter.java | 107 +++--- 2 files changed, 136 insertions(+), 133 deletions(-) diff --git a/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java b/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java index 14146fe..594ade0 100644 --- a/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java +++ b/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java @@ -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,22 +7,23 @@ * 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. - * + * */ + /* * the main Class - * + * * Command Line arguments are reviewed * and a Converter is constructed */ @@ -38,32 +39,32 @@ import com.sun.star.tooling.DirtyTags.DirtyTagWrapper; /** * The main class of the converter tool - * + * * The converter tool is command line based. * Its classes allow the converting between the * file formats sdf, gsi and http://www.oasis-open.org/committees/xliff/documents/cs-xliff-core-1.1-20031031.htm;>xliff. - * + * * Those file formats are used in localization - * of Star-Office and Open-Office. - * - * Information about the whole localization process can be found in + * of Star-Office and OpenOffice. + * + * Information about the whole localization process can be found in * http://ded-1.germany.sun.com/webcontent/guidelines/pdf/L10NSO8.pdf;>http://ded-1.germany.sun.com/webcontent/guidelines/pdf/L10NSO8.pdf - * + * * @author Christian Schmidt 2005 - * + * */ public class Convert { private static Calendar cal; - + private static final String EMPTY = ""; - + /** * The name of the file containing the debug information * that where found while converting (every output goes here too) */ private static String dbgName= EMPTY; - + /** * the character that separates the extension from the file name */ @@ -91,7 +92,7 @@ public class Convert { private static File secondSource; //private static final char pathSeperator = '\\'; - + /** * The language that should be the source language * that means the language to translate from @@ -107,7 +108,7 @@ public class Convert { * the type of the source file (sdf,xliff,...) */ private static String sourceType = EMPTY; - + /** * The time when converting started */ @@ -129,7 +130,7 @@ public class Convert { private static String targetType = EMPTY; /** - * Store the current version ID and number of this tool + * Store the current version ID and number of this tool */ final static String version= " Prod.20050710:1255 "; @@ -139,19 +140,19 @@ public class Convert { private static String secondSourceName=EMPTY; /** * Indicate whether strings in xliff files should - * be wrapped with ept/bpt or sub tags to enable translation tools + * be wrapped with ept/bpt or sub tags to enable translation tools * to synchronize source language string with there translation - * + * * @see http://ded-1.germany.sun.com/webcontent/guidelines/pdf/L10NSO8.pdf;>http://ded-1.germany.sun.com/webcontent/guidelines/pdf/L10NSO8.pdf */ private static boolean doWrap=true; - + public static void main(String[] args) throws IOException, Exception {
[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 c6948b8 Fixed typos, removed whitespace c6948b8 is described below commit c6948b83e7b257b5c11b289518a9110a97da3d52 Author: mseidel AuthorDate: Thu Nov 19 16:50:43 2020 +0100 Fixed typos, removed whitespace (cherry picked from commit 8085f79885e8084e5cce76e54522d35cc1535996) --- .../source/extended/AccessibleBrowseBox.cxx| 17 +- main/basic/source/basmgr/basmgr.cxx| 166 +- .../source/deployment/manager/dp_manager.cxx | 188 ++--- main/testtools/source/cliversioning/makefile.mk| 69 4 files changed, 220 insertions(+), 220 deletions(-) diff --git a/main/accessibility/source/extended/AccessibleBrowseBox.cxx b/main/accessibility/source/extended/AccessibleBrowseBox.cxx index 3e7f6bc..c739d99 100644 --- a/main/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/main/accessibility/source/extended/AccessibleBrowseBox.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,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. - * + * */ @@ -109,7 +109,7 @@ void SAL_CALL AccessibleBrowseBox::disposing() m_pImpl->m_pRowHeaderBar= NULL; m_pImpl->m_aCreator = Reference< XAccessible >(); -Reference< XAccessible > xTable = m_pImpl->mxTable; +Reference< XAccessible > xTable = m_pImpl->mxTable; Reference< XComponent > xComp( m_pImpl->mxTable, UNO_QUERY ); if ( xComp.is() ) @@ -272,7 +272,7 @@ AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType ) if( eObjType == BBTYPE_ROWHEADERBAR ) pxMember = _pImpl->mxRowHeaderBar; -else if( eObjType == BBTYPE_COLUMNHEADERBAR ) +else if( eObjType == BBTYPE_COLUMNHEADERBAR ) pxMember = _pImpl->mxColumnHeaderBar; if( pxMember ) @@ -375,7 +375,7 @@ Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibl DBG_ASSERT( ( m_pContext && m_xContext.is() ) || ( !m_pContext && !m_xContext.is() ), "accessibility/extended/AccessibleBrowseBoxAccess::getAccessibleContext: inconsistency!" ); -// if the context died meanwhile (we're no listener, so it won't tell us explicitily when this happens), +// if the context died meanwhile (we're no listener, so it won't tell us explicitly when this happens), // then reset an re-create. if ( m_pContext && !m_pContext->isAlive() ) m_xContext = m_pContext = NULL; @@ -389,9 +389,10 @@ Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibl // - bool AccessibleBrowseBoxAccess::isContextAlive() const { -return ( NULL != m_pContext ) && m_pContext->isAlive(); +return ( NULL != m_pContext ) && m_pContext->isAlive(); } // } // namespace accessibility + diff --git a/main/basic/source/basmgr/basmgr.cxx b/main/basic/source/basmgr/basmgr.cxx index 3415730..9e319bd 100644 --- a/main/basic/source/basmgr/basmgr.cxx +++ b/main/basic/source/basmgr/basmgr.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,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
[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 90ed883 Fixed typos, removed whitespace 90ed883 is described below commit 90ed883b86099fe2fffd4e1380d66cd02ea67ba5 Author: mseidel AuthorDate: Tue Nov 10 14:15:24 2020 +0100 Fixed typos, removed whitespace (cherry picked from commit 2c8c108ad7f2c5beb4b9b8617c2004bf2d017c8f) --- main/offapi/com/sun/star/i18n/CTLScriptType.idl| 13 - .../com/sun/star/i18n/XCharacterClassification.idl | 19 ++-- .../com/sun/star/i18n/XExtendedTextConversion.idl | 23 --- .../com/sun/star/i18n/XExtendedTransliteration.idl | 13 + main/offapi/com/sun/star/i18n/XLocaleData.idl | 12 main/offapi/com/sun/star/i18n/XTransliteration.idl | 34 -- 6 files changed, 60 insertions(+), 54 deletions(-) diff --git a/main/offapi/com/sun/star/i18n/CTLScriptType.idl b/main/offapi/com/sun/star/i18n/CTLScriptType.idl index 8c75aa7..8f28e9f 100644 --- a/main/offapi/com/sun/star/i18n/CTLScriptType.idl +++ b/main/offapi/com/sun/star/i18n/CTLScriptType.idl @@ -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. - * + * */ @@ -24,15 +24,14 @@ #ifndef __com_sun_star_i18n_CTLScriptType_idl__ #define __com_sun_star_i18n_CTLScriptType_idl__ - //= -module com { module sun { module star { module i18n { +module com { module sun { module star { module i18n { //= //-- -/** CTL tcript type constants for layout engine, returned by +/** CTL script type constants for layout engine, returned by XScriptTypeDetector::getCTLScriptType() @since OpenOffice 1.1.2 diff --git a/main/offapi/com/sun/star/i18n/XCharacterClassification.idl b/main/offapi/com/sun/star/i18n/XCharacterClassification.idl index 7c31835..c932d03 100644 --- a/main/offapi/com/sun/star/i18n/XCharacterClassification.idl +++ b/main/offapi/com/sun/star/i18n/XCharacterClassification.idl @@ -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. - * + * */ @@ -41,7 +41,7 @@ module com { module sun { module star { module i18n { /* -Possible tokens to be parsed with parse...Token(): +Possible tokens to be parsed with parse...Token(): UPASCALPHA=[A-Z] LOASCALPHA=[a-z] @@ -71,8 +71,8 @@ ALPHA_NAME=ALPHA *(ALNUM|DEFCHARS) ANY_NAME=1*(ALNUM|DEFCHARS) SINGLE_QUOTE_NAME=ASC_QUOTE(1*CHAR)ASC_QUOTE DOUBLE_QUOTE_NAME=ASC_DBL_QUOTE(*CHAR)ASC_DBL_QUOTE -ASC_NUMBER=[SIGN]*(1*ASC_DIGIT *(GRPSEP 1*ASC_DIGIT))[DECSEP]1*ASC_DIGIT[EXPONENT] -NUMBER=[SIGN]*(1*DIGIT *(GRPSEP 1*DIGIT))[DECSEP]1*DIGIT[EXPONENT] +ASC_NUMBER=[SIGN]*(1*ASC_DIGIT *(GRPSEP 1*ASC_DIGIT))[DECSEP]1*ASC_DIGIT[EXPONENT] +NUMBER=[SIGN]*(1*DIGIT *(GRPSEP 1*DIGIT))[DECSEP]1*DIGIT[EXPONENT] */ @@ -122,7 +122,7 @@ published interface XCharacterClassification : com::sun::star::uno::XInterface
[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 e27da66 Fixed typos, removed whitespace e27da66 is described below commit e27da661ef0dd40c653e9f67c13291cfcd592aa8 Author: mseidel AuthorDate: Sun Nov 8 15:46:02 2020 +0100 Fixed typos, removed whitespace (cherry picked from commit 46d9d3979fdc0063f6d44c300d3225cf267eae57) --- main/extensions/source/dbpilots/controlwizard.cxx | 64 ++--- .../source/xml/acceleratorconfigurationreader.cxx | 89 +++ main/framework/source/xml/imagesconfiguration.cxx | 18 +- .../framework/source/xml/imagesdocumenthandler.cxx | 29 +-- main/l10ntools/source/directory.cxx| 74 +++--- main/sw/source/core/doc/doc.cxx| 277 +++-- 6 files changed, 276 insertions(+), 275 deletions(-) diff --git a/main/extensions/source/dbpilots/controlwizard.cxx b/main/extensions/source/dbpilots/controlwizard.cxx index 045e55b..565a242 100644 --- a/main/extensions/source/dbpilots/controlwizard.cxx +++ b/main/extensions/source/dbpilots/controlwizard.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,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. - * + * */ @@ -184,7 +184,7 @@ namespace dbp // nothing to do return; -ModuleRes aModuleRes(RID_PAGE_FORM_DATASOURCE_STATUS); + ModuleRes aModuleRes(RID_PAGE_FORM_DATASOURCE_STATUS); OLocalResourceAccess aLocalControls(aModuleRes, RSC_TABPAGE); m_pFormSettingsSeparator= new FixedLine(this, ModuleRes(FL_FORMSETINGS)); @@ -402,7 +402,7 @@ namespace dbp Reference< XController > xController = xModel->getCurrentController(); DBG_ASSERT(xController.is(), "OControlWizard::implDeterminePage: no current controller!"); - // maybe it's a spredsheet + // maybe it's a spreadsheet Reference< XSpreadsheetView > xView(xController, UNO_QUERY); if (xView.is()) { // okay, it is one @@ -413,7 +413,7 @@ namespace dbp xPage = xPageSupp->getDrawPage(); } else - { // can be a draw/impress doc only + { // can be a Draw/Impress doc only Reference< XDrawView > xDrawView(xController, UNO_QUERY); DBG_ASSERT(xDrawView.is(), "OControlWizard::implDeterminePage: no alternatives left ... can't determine the page!"); if (xDrawView.is()) @@ -422,7 +422,7 @@ namespace dbp } } else - { + { DBG_ASSERT(xPage.is(), "OControlWizard::implDeterminePage: can't determine the page (no model)!"); } m_aContext.xDrawPage = xPage; @@ -457,17 +457,17 @@ namespace dbp //- Reference< XConnection > OControlWizard::getFormConnection(const OAccessRegulator&) const - { + { return getFormConnection(); } -//- + //- Reference< XConnection > OControlWizard::getFormConnection() const { Reference< XConnection > xConn;
[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 329107e Fixed typos, removed whitespace 329107e is described below commit 329107e99e3f4cba2cf68350118227c6fef2e928 Author: mseidel AuthorDate: Thu Nov 5 22:09:26 2020 +0100 Fixed typos, removed whitespace (cherry picked from commit 6ed1dc3eff63dd2c77295d034fd10207505ba1ea) --- main/extensions/source/update/check/download.cxx | 167 +- .../source/update/check/updatecheckconfig.cxx | 343 ++--- main/extensions/source/update/check/updatehdl.cxx | 105 +++ main/sw/source/core/doc/extinput.cxx | 47 ++- 4 files changed, 331 insertions(+), 331 deletions(-) diff --git a/main/extensions/source/update/check/download.cxx b/main/extensions/source/update/check/download.cxx index a6b2bef..4942cac 100644 --- a/main/extensions/source/update/check/download.cxx +++ b/main/extensions/source/update/check/download.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,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. - * + * */ @@ -68,17 +68,17 @@ static void openFile( OutData& out ) { char * effective_url; curl_easy_getinfo(out.curl, CURLINFO_EFFECTIVE_URL, _url); - + double fDownloadSize; curl_easy_getinfo(out.curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, ); - + rtl::OString aURL(effective_url); - + // ensure no trailing '/' sal_Int32 nLen = aURL.getLength(); while( (nLen > 0) && ('/' == aURL[nLen-1]) ) aURL = aURL.copy(0, --nLen); - + // extract file name last '/' sal_Int32 nIndex = aURL.lastIndexOf('/'); if( nIndex > 0 ) @@ -86,48 +86,48 @@ static void openFile( OutData& out ) out.File = out.DestinationDir + rtl::OStringToOUString(aURL.copy(nIndex), RTL_TEXTENCODING_UTF8); oslFileError rc; - + // Give the user an overwrite warning if the target file exists const sal_Int32 openFlags = osl_File_OpenFlag_Write | osl_File_OpenFlag_Create; do { rc = osl_openFile(out.File.pData, , openFlags); - + if( osl_File_E_EXIST == rc && ! out.Handler->downloadTargetExists(out.File) ) { out.StopCondition.set(); break; } - + } while( osl_File_E_EXIST == rc ); - + if( osl_File_E_None == rc ) out.Handler->downloadStarted(out.File, (sal_Int64) fDownloadSize); -} +} } //-- -static inline rtl::OString +static inline rtl::OString getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, const rtl::OUString& aName) { rtl::OString aRet; - + OSL_ASSERT(xNameAccess->hasByName(aName)); uno::Any aValue = xNameAccess->getByName(aName); - + return rtl::OUStringToOString(aValue.get(), RTL_TEXTENCODING_UTF8); } //-- -static inline sal_Int32 -getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess, +static inline sal_Int32 +getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess, const rtl::OUString& aName, sal_Int32 nDefault=-1) { OSL_ASSERT(xNameAccess->hasByName(aName)); uno::Any aValue = xNameAccess->getByName(aName); - + sal_Int32 n=nDefault; aValue >>= n; return n; @@ -135,19 +135,19 @@ getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess, //-- -static size_t +static size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream ) { OutData *out = reinterpret_cast < OutData * > (stream); - + if( NULL == out->FileHandle ) openFile(*out); - +
[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 11fdb13 Fixed typos, removed whitespace 11fdb13 is described below commit 11fdb139a6ae8dcb4b9b1abe19779688181f4a64 Author: mseidel AuthorDate: Tue Nov 3 11:05:43 2020 +0100 Fixed typos, removed whitespace (cherry picked from commit de57a71b4c7763dcb58c39badd7e2d67d1e608b9) --- .../source/geometry/viewinformation2d.cxx | 236 - .../source/geometry/viewinformation3d.cxx | 120 ++--- .../source/primitive2d/metafileprimitive2d.cxx | 542 ++--- .../source/spellcheck/spell/sspellimp.cxx | 224 - 4 files changed, 561 insertions(+), 561 deletions(-) diff --git a/main/drawinglayer/source/geometry/viewinformation2d.cxx b/main/drawinglayer/source/geometry/viewinformation2d.cxx index 641ef19..03edaf4 100644 --- a/main/drawinglayer/source/geometry/viewinformation2d.cxx +++ b/main/drawinglayer/source/geometry/viewinformation2d.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,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. - * + * */ @@ -53,33 +53,33 @@ namespace drawinglayer sal_uInt32 mnRefCount; protected: -// the object transformation + // the object transformation basegfx::B2DHomMatrix maObjectTransformation; -// the view transformation + // the view transformation basegfx::B2DHomMatrix maViewTransformation; -// the ObjectToView and it's inverse, both on demand from ObjectTransformation -// and ViewTransformation + // the ObjectToView and its inverse, both on demand from ObjectTransformation + // and ViewTransformation basegfx::B2DHomMatrix maObjectToViewTransformation; basegfx::B2DHomMatrix maInverseObjectToViewTransformation; -// the visible range and the on-demand one in ViewCoordinates + // the visible range and the on-demand one in ViewCoordinates basegfx::B2DRange maViewport; basegfx::B2DRange maDiscreteViewport; // the DrawPage which is target of visualisation. This is needed e.g. for // the view-dependent decomposition of PageNumber TextFields. -// This parameter is buffered here, but mainly resides in mxExtendedInformation, -// so it will be interpreted, but held there. It will also not be added -// to mxExtendedInformation in impFillViewInformationFromContent (it's there already) + // This parameter is buffered here, but mainly resides in mxExtendedInformation, + // so it will be interpreted, but held there. It will also not be added + // to mxExtendedInformation in impFillViewInformationFromContent (it's there already) uno::Reference< drawing::XDrawPage > mxVisualizedPage; // the point in time double mfViewTime; -// bitfield -bool mbReducedDisplayQuality : 1; + // bitfield + bool mbReducedDisplayQuality : 1; // the
[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 59c05f3 Fixed typos, removed whitespace 59c05f3 is described below commit 59c05f3d3d636b173ac1a8a4efed0e0ff04eadd1 Author: mseidel AuthorDate: Sun Nov 1 13:36:10 2020 +0100 Fixed typos, removed whitespace (cherry picked from commit 391aa42d4488fac3e566bbd71f7cd038811a81fe) --- .../deployment/misc/dp_descriptioninfoset.cxx | 156 - main/l10ntools/source/export.cxx | 375 +++-- main/starmath/source/document.cxx | 75 ++--- 3 files changed, 303 insertions(+), 303 deletions(-) diff --git a/main/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/main/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 86cdccc..53438c0 100644 --- a/main/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/main/desktop/source/deployment/misc/dp_descriptioninfoset.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,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. - * + * */ @@ -51,7 +51,7 @@ #include "com/sun/star/xml/dom/XNodeList.hpp" #include "com/sun/star/xml/dom/XDocumentBuilder.hpp" #include "com/sun/star/xml/xpath/XXPathAPI.hpp" -#include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp" +#include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp" #include "cppuhelper/implbase1.hxx" #include "cppuhelper/implbase2.hxx" #include "cppuhelper/weak.hxx" @@ -70,18 +70,18 @@ using ::rtl::OUString; class EmptyNodeList: public ::cppu::WeakImplHelper1< css::xml::dom::XNodeList > { public: -EmptyNodeList(); + EmptyNodeList(); -virtual ~EmptyNodeList(); + virtual ~EmptyNodeList(); -virtual ::sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException); -virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL -item(::sal_Int32 index) throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL + item(::sal_Int32 index) throw (css::uno::RuntimeException); private: -EmptyNodeList(EmptyNodeList &); // not defined -void operator =(EmptyNodeList &); // not defined + EmptyNodeList(EmptyNodeList &); // not defined + void operator =(EmptyNodeList &); // not defined }; EmptyNodeList::EmptyNodeList() {} @@ -89,21 +89,21 @@ EmptyNodeList::EmptyNodeList() {} EmptyNodeList::~EmptyNodeList() {} ::sal_Int32 EmptyNodeList::getLength() throw (css::uno::RuntimeException) { -return 0; + return 0; } css::uno::Reference< css::xml::dom::XNode > EmptyNodeList::item(::sal_Int32) -throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException) { -throw css::uno::RuntimeException( -::rtl::OUString( -RTL_CONSTASCII_USTRINGPARAM( -"bad EmptyNodeList com.sun.star.xml.dom.XNodeList.item call")), -static_cast< ::cppu::OWeakObject * >(this)); + throw css::uno::RuntimeException( + ::rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "bad EmptyNodeList com.sun.star.xml.dom.XNodeList.item call")), + static_cast< ::cppu::OWeakObject * >(this)); } ::rtl::OUString getNodeValue( -css::uno::Reference< css::xml::dom::XNode > const & node) + css::uno::Reference< css::xml::dom::XNode > const & node) { OSL_ASSERT(node.is()); try { @@ -126,9 +126,9 @@ css::uno::Reference< css::xml::dom::XNode > EmptyNodeList::item(::sal_Int32) class ExtensionDescription { public: -/**throws an exception if the description.xml is not +/**throws an exception if the description.xml is not available, cannot be read, does not contain the expected data, - or any other error occurred. Therefore it shoult only be used with + or any
[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 960b059 Fixed typos, removed whitespace 960b059 is described below commit 960b059c8b1d7dc469c52856163d126e06ac8fea Author: mseidel AuthorDate: Sat Oct 3 20:21:43 2020 +0200 Fixed typos, removed whitespace (cherry picked from commit 97c864ccfe6c563736c463d8df22c104e3b40fee) --- main/avmedia/source/framework/mediamisc.cxx| 25 +++-- main/avmedia/source/viewer/mediaevent_impl.cxx | 10 +- main/avmedia/source/viewer/mediawindow.cxx | 13 ++- .../avmedia/source/viewer/mediawindowbase_impl.cxx | 50 - .../desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 46 main/desktop/win32/source/guistdio/guistdio.inc| 60 +- main/desktop/win32/source/setup/setup.cpp | 124 ++--- 7 files changed, 165 insertions(+), 163 deletions(-) diff --git a/main/avmedia/source/framework/mediamisc.cxx b/main/avmedia/source/framework/mediamisc.cxx index 1d51809..726e75a 100644 --- a/main/avmedia/source/framework/mediamisc.cxx +++ b/main/avmedia/source/framework/mediamisc.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,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. - * + * */ @@ -29,16 +29,17 @@ namespace avmedia { ResMgr* GetResMgr() { -static ResMgr* pResMgr = NULL; + static ResMgr* pResMgr = NULL; -if( !pResMgr ) -{ -ByteString aResMgrName( "avmedia" ); + if( !pResMgr ) + { + ByteString aResMgrName( "avmedia" ); -pResMgr = ResMgr::CreateResMgr(aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() ); -} + pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() ); + } -return pResMgr; + return pResMgr; } -} // namespace avemdia +} // namespace avmedia + diff --git a/main/avmedia/source/viewer/mediaevent_impl.cxx b/main/avmedia/source/viewer/mediaevent_impl.cxx index a5de07b..db0779b 100644 --- a/main/avmedia/source/viewer/mediaevent_impl.cxx +++ b/main/avmedia/source/viewer/mediaevent_impl.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,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. - * + * */ @@ -215,5 +215,5 @@ void SAL_CALL MediaEventListenersImpl::focusLost( const ::com::sun::star::awt::F } } // namespace priv -} // namespace avemdia +} // namespace avmedia diff --git a/main/avmedia/source/viewer/mediawindow.cxx b/main/avmedia/source/viewer/mediawindow.cxx index fe2f1eb..3217c54 100644 --- a/main/avmedia/source/viewer/mediawindow.cxx +++ b/main/avmedia/source/viewer/mediawindow.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,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
[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 53d915a Fixed typos, removed whitespace 53d915a is described below commit 53d915a9aadc909eb24ce1d40fc104301d7ca7ad Author: mseidel AuthorDate: Sat Oct 3 14:37:53 2020 +0200 Fixed typos, removed whitespace (cherry picked from commit 33608c82206695bbbe0b645fe8a658bc051dbbbe) --- main/desktop/source/app/lockfile.cxx | 112 ++-- main/desktop/source/migration/migration.cxx| 55 +++--- main/desktop/source/pkgchk/unopkg/unopkg_app.cxx | 99 +- .../win32/source/guiloader/genericloader.cxx | 98 +- .../source/layoutmanager/toolbarlayoutmanager.cxx | 201 +++-- main/framework/source/tabwin/tabwindow.cxx | 23 +-- 6 files changed, 291 insertions(+), 297 deletions(-) diff --git a/main/desktop/source/app/lockfile.cxx b/main/desktop/source/app/lockfile.cxx index 0758404..b8da3cf 100644 --- a/main/desktop/source/app/lockfile.cxx +++ b/main/desktop/source/app/lockfile.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,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. - * + * */ @@ -51,29 +51,29 @@ namespace desktop { // initialize static members... // lock suffix const OUString Lockfile::Suffix() - { return OUString::createFromAscii( "/.lock" ); } + { return OUString::createFromAscii( "/.lock" ); } // values for datafile const ByteString Lockfile::Group() -{ return ByteString( "Lockdata" ); } + { return ByteString( "Lockdata" ); } const ByteString Lockfile::Userkey() -{ return ByteString( "User" ); } + { return ByteString( "User" ); } const ByteString Lockfile::Hostkey() -{ return ByteString( "Host" ); } + { return ByteString( "Host" ); } const ByteString Lockfile::Stampkey() -{ return ByteString( "Stamp" ); } + { return ByteString( "Stamp" ); } const ByteString Lockfile::Timekey() -{ return ByteString( "Time" ); } + { return ByteString( "Time" ); } const ByteString Lockfile::IPCkey() -{ return ByteString( "IPCServer" ); } + { return ByteString( "IPCServer" ); } Lockfile::Lockfile( bool bIPCserver ) -:m_bIPCserver(bIPCserver) + :m_bIPCserver(bIPCserver) ,m_bRemove(sal_False) -,m_bIsLocked(sal_False) + ,m_bIsLocked(sal_False) { // build the file-url to use for the lock OUString aUserPath; -utl::Bootstrap::locateUserInstallation( aUserPath ); + utl::Bootstrap::locateUserInstallation( aUserPath ); m_aLockname = aUserPath + Suffix(); // generate ID @@ -92,11 +92,11 @@ namespace desktop { // generate date string char *tmpTime = ctime( ); if (tmpTime != NULL) { -m_aDate = OUString::createFromAscii( tmpTime ); -sal_Int32 i = m_aDate.indexOf('\n'); -if (i > 0) -m_aDate = m_aDate.copy(0, i); -} + m_aDate = OUString::createFromAscii( tmpTime ); + sal_Int32 i = m_aDate.indexOf('\n'); + if (i > 0) + m_aDate = m_aDate.copy(0, i); + } // try to create file @@ -117,7 +117,7 @@ namespace desktop { if (m_bIsLocked) { // lock existed, ask user what to do if (isStale() || -(execWarning != 0 && (*execWarning)( this ))) { + (execWarning != 0 && (*execWarning)( this ))) { // remove file and create new File::remove( m_aLockname ); File aFile(m_aLockname); @@ -145,29
[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 58a988d Fixed typos, removed whitespace 58a988d is described below commit 58a988d92c9014b775be77867311d144409a6e16 Author: mseidel AuthorDate: Wed Aug 26 20:24:45 2020 +0200 Fixed typos, removed whitespace (cherry picked from commit c3b7da30377815802429c889b153852f1ce44980) --- .../OfficeDev/DesktopEnvironment/DocumentView.java | 16 +-- .../OfficeDev/DesktopEnvironment/StatusView.java | 20 ++-- .../AsciiFilter/FilterOptions.java | 20 ++-- main/offapi/com/sun/star/document/ExportFilter.idl | 117 +- main/offapi/com/sun/star/document/ImportFilter.idl | 117 +- main/offapi/com/sun/star/task/XStatusIndicator.idl | 133 +++-- 6 files changed, 213 insertions(+), 210 deletions(-) diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java index 247ee06..796f884 100644 --- a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java +++ b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java @@ -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. - * + * */ @@ -192,7 +192,7 @@ public class DocumentView extendsJFrame /** * Create the view frame for showing the office documents on demand. - * Dependend from given command line parameter we create + * Dependent from given command line parameter we create * an office XFrame and initialize it with a window. This * window can be a pure toolkit window (means toolkit of office!) * or a plugged java canvas - office window combination. @@ -200,8 +200,8 @@ public class DocumentView extendsJFrame public void createFrame() { // create view frame (as a XFrame!) here -// Look for right view mode setted by user command line parameter. -// First try to get a new unambigous frame name from our global ViewContainer. +// Look for right view mode set by user command line parameter. +// First try to get a new unambiguous frame name from our global ViewContainer. if(ViewContainer.mbInplace==true) { // inplace document view can't be initialized without a visible parent window hierarchy! @@ -333,7 +333,7 @@ public class DocumentView extendsJFrame maInterceptor = null; // close the frame and his document -// Relaesing of our listener connections for disposing() +// Releasing of our listener connections for disposing() // will be forced automatically then. Because the frame // will call us back ... if (mxFrame!=null) diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java index a792044..53dca6c 100644 --- a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java +++ b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java @@ -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
[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 f5484c2 Fixed typos, removed whitespace f5484c2 is described below commit f5484c28a9f93b7ffd5277f4c07926a74767c60c Author: mseidel AuthorDate: Thu Feb 27 22:22:39 2020 +0100 Fixed typos, removed whitespace (cherry picked from commit c58c98639aee672dad53c365db9757a13bf51016) --- main/dtrans/source/win32/dtobj/APNDataObject.hxx | 45 +++--- main/dtrans/source/win32/dtobj/DataFmtTransl.cxx | 186 +++ main/dtrans/source/win32/dtobj/Fetc.hxx | 13 +- main/dtrans/source/win32/dtobj/XTDataObject.cxx | 122 +++ main/dtrans/source/win32/dtobj/XTDataObject.hxx | 111 +++--- 5 files changed, 237 insertions(+), 240 deletions(-) diff --git a/main/dtrans/source/win32/dtobj/APNDataObject.hxx b/main/dtrans/source/win32/dtobj/APNDataObject.hxx index f4fae74..96ab329 100644 --- a/main/dtrans/source/win32/dtobj/APNDataObject.hxx +++ b/main/dtrans/source/win32/dtobj/APNDataObject.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,64 +7,63 @@ * 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 _APNDATAOBJECT_HXX_ #define _APNDATAOBJECT_HXX_ #include // -// deklarations +// declarations // /* an APartment Neutral dataobject wrapper; this wrapper of a IDataObject pointer can be used from any apartment without RPC_E_WRONG_THREAD - which normally occurs if an apartment tries to use an interface + which normally occurs if an apartment tries to use an interface pointer of another apartment; we use containment to hold the original DataObject */ class CAPNDataObject : public IDataObject { -public: +public: CAPNDataObject( IDataObjectPtr rIDataObject ); virtual ~CAPNDataObject( ); //- -//IUnknown interface methods + // IUnknown interface methods //- -STDMETHODIMP QueryInterface(REFIID iid, LPVOID* ppvObject); -STDMETHODIMP_( ULONG ) AddRef( ); -STDMETHODIMP_( ULONG ) Release( ); + STDMETHODIMP QueryInterface(REFIID iid, LPVOID* ppvObject); + STDMETHODIMP_( ULONG ) AddRef( ); + STDMETHODIMP_( ULONG ) Release( ); //- -// IDataObject interface methods + // IDataObject interface methods //- -STDMETHODIMP GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ); -STDMETHODIMP GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ); -STDMETHODIMP QueryGetData( LPFORMATETC pFormatetc ); -STDMETHODIMP GetCanonicalFormatEtc( LPFORMATETC pFormatectIn, LPFORMATETC pFormatetcOut ); -STDMETHODIMP SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium, BOOL fRelease ); -STDMETHODIMP EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc ); -STDMETHODIMP DAdvise( LPFORMATETC pFormatetc, DWORD advf, LPADVISESINK pAdvSink, DWORD* pdwConnection ); -STDMETHODIMP DUnadvise( DWORD dwConnection ); -STDMETHODIMP EnumDAdvise( LPENUMSTATDATA* ppenumAdvise ); + STDMETHODIMP GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ); + STDMETHODIMP GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ); + STDMETHODIMP QueryGetData( LPFORMATETC pFormatetc ); + STDMETHODIMP GetCanonicalFormatEtc( LPFORMATETC pFormatectIn, LPFORMATETC pFormatetcOut ); + STDMETHODIMP SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium, BOOL fRelease ); + STDMETHODIMP EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc ); +
[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 9f86329 Fixed typos, removed whitespace 9f86329 is described below commit 9f86329e209224f16c3c97fcd7a6e25e041e5179 Author: mseidel AuthorDate: Thu Feb 27 11:39:02 2020 +0100 Fixed typos, removed whitespace (cherry picked from commit 52ec01ac05bde4ba6193689bce5c5f172e6b5f3d) --- main/dtrans/source/win32/dtobj/DOTransferable.cxx | 176 +++--- main/dtrans/source/win32/dtobj/DOTransferable.hxx | 45 +++--- main/dtrans/source/win32/dtobj/FetcList.hxx | 55 --- 3 files changed, 137 insertions(+), 139 deletions(-) diff --git a/main/dtrans/source/win32/dtobj/DOTransferable.cxx b/main/dtrans/source/win32/dtobj/DOTransferable.cxx index 28a5f5a..17b5f4e 100644 --- a/main/dtrans/source/win32/dtobj/DOTransferable.cxx +++ b/main/dtrans/source/win32/dtobj/DOTransferable.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,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. - * + * */ @@ -66,7 +66,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::container; // -// +// // namespace @@ -78,7 +78,7 @@ namespace sal_Bool isValidFlavor( const DataFlavor& aFlavor ) { return ( aFlavor.MimeType.getLength( ) && -( ( aFlavor.DataType == CPPUTYPE_SEQINT8 ) || +( ( aFlavor.DataType == CPPUTYPE_SEQINT8 ) || ( aFlavor.DataType == CPPUTYPE_OUSTRING ) ) ); } @@ -89,21 +89,21 @@ namespace // ctor // -CDOTransferable::CDOTransferable( +CDOTransferable::CDOTransferable( const Reference< XMultiServiceFactory >& ServiceManager, IDataObjectPtr rDataObject ) : m_rDataObject( rDataObject ), m_SrvMgr( ServiceManager ), m_DataFormatTranslator( m_SrvMgr ), m_bUnicodeRegistered( sal_False ), m_TxtFormatOnClipboard( CF_INVALID ) -{ +{ } // -// +// // -Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor ) +Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor ) throw( UnsupportedFlavorException, IOException, RuntimeException ) { OSL_ASSERT( isValidFlavor( aFlavor ) ); @@ -120,30 +120,30 @@ Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor ) // // get the data from clipboard in a byte stream // - + ByteSequence_t clipDataStream; - + try { clipDataStream = getClipboardData( fetc ); } catch( UnsupportedFlavorException& ) { - if ( m_DataFormatTranslator.isUnicodeTextFormat( fetc.getClipformat( ) ) && + if ( m_DataFormatTranslator.isUnicodeTextFormat( fetc.getClipformat( ) ) && m_bUnicodeRegistered ) { -OUString aUnicodeText = synthesizeUnicodeText( ); +OUString aUnicodeText = synthesizeUnicodeText( ); Any aAny = makeAny( aUnicodeText ); return aAny; } -// #124085# CF_DIBV5 should not be possible, but keep for reading from the +// #124085# CF_DIBV5 should not be possible, but keep for reading from the // clipboard for being on the safe side else if(CF_DIBV5 == fetc.getClipformat()) { -
[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 0774268 Fixed typos, removed whitespace 0774268 is described below commit 0774268a5fc736ed45771687f8e30b49b935e750 Author: mseidel AuthorDate: Sun Dec 15 17:09:24 2019 +0100 Fixed typos, removed whitespace (cherry picked from commit a13525166a65233fcf6b3b706b061efce47edbad) --- .../org/openoffice/Office/ExtendedColorScheme.xcs | 16 +- .../schema/org/openoffice/Office/Labels.xcs| 22 +- .../schema/org/openoffice/Office/Linguistic.xcs| 633 ++--- .../org/openoffice/Office/ProtocolHandler.xcs | 19 +- .../schema/org/openoffice/Office/Substitution.xcs | 24 +- 5 files changed, 334 insertions(+), 380 deletions(-) diff --git a/main/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs b/main/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs index b95ace6..1a495a3 100644 --- a/main/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs +++ b/main/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs @@ -1,6 +1,6 @@ @@ -50,7 +50,7 @@ OJ Specifies the color settings for customizing the appearance the extension. - + @@ -76,14 +76,14 @@ OJ Specifies the entry names. - + OJ Specifies the color settings for customizing the appearance of extensions. - + @@ -98,7 +98,7 @@ - + OJ Lists entries with color settings. diff --git a/main/officecfg/registry/schema/org/openoffice/Office/Labels.xcs b/main/officecfg/registry/schema/org/openoffice/Office/Labels.xcs index 488640d..5b74702 100644 --- a/main/officecfg/registry/schema/org/openoffice/Office/Labels.xcs +++ b/main/officecfg/registry/schema/org/openoffice/Office/Labels.xcs @@ -1,6 +1,6 @@ @@ -25,7 +25,7 @@ http://openoffice.org/2001/registry; xmlns:xs="http://www.w3.org/2001/XMLSchema; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; oor:name="Labels" oor:package="org.openoffice.Office" xml:lang="en-US"> OS - Contains settings for Writer documents used as labels. + Contains settings for Writer documents used as labels. @@ -33,13 +33,13 @@ Contains the properties used for a label. - + Contains the descriptive name for the label format. - @@ -62,11 +62,3 @@ - - - - - - - - diff --git a/main/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs b/main/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs index dd02a01..0d8889b 100644 --- a/main/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs +++ b/main/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs @@ -1,6 +1,6 @@ -http://openoffice.org/2001/registry; xmlns:xs="http://www.w3.org/2001/XMLSchema; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; oor:name="Linguistic" oor:package="org.openoffice.Office" xml:lang="en-US"> - +http://openoffice.org/2001/registry; xmlns:xs="http://www.w3.org/2001/XMLSchema; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; oor:name="Linguistic" oor:package="org.openoffice.Office" xml:lang="en-US"> + TL - Contains linguistic (spell checking, hyphenation, thesaurus) related configurations. + Contains linguistic (spell checking, hyphenation, thesaurus) related configurations. - - - - -Specifies the
[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 a7d7722 Fixed typos, removed whitespace a7d7722 is described below commit a7d77226714330a984cc24ed3805c5de7db58771 Author: mseidel AuthorDate: Sun Dec 15 11:53:31 2019 +0100 Fixed typos, removed whitespace (cherry picked from commit 6a6958860763dc3a2c9252da63befc1c63b575ed) --- .../schema/org/openoffice/Office/Common.xcs| 1314 ++-- 1 file changed, 656 insertions(+), 658 deletions(-) diff --git a/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 8f1e4f7..714141e 100644 --- a/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1,6 +1,6 @@ http://openoffice.org/2001/registry; xmlns:xs="http://www.w3.org/2001/XMLSchema; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; oor:name="Common" oor:package="org.openoffice.Office" xml:lang="en-US"> - + Contains common settings which are potentially shared by other components. @@ -837,28 +837,29 @@ - -specifies whether the controls should use dynamic border coloring, if possible. -Dymamic border coloring means that when the mouse is hovered over a control, and when a control receives the focus, this is indicated with special border colors. - + + specifies whether the controls should use dynamic border coloring, if possible. + Dynamic border coloring means that when the mouse is hovered over a control, and + when a control receives the focus, this is indicated with special border colors. + false - - - -controls whether form controls, when they render their text, use the same metrics as the document -does. If this is set to true, then the control text's appearance better matches the text -in the surrounding document./p -pTechnically, documents use a reference device for formatting, which usually has a higher -resolution than the actual output device. The option decides whether form controls should use -the same reference device as the surrounding document. However, some of OOo's document implementations -do not properly use their reference device in all situations, in which case the option might better -be disabled.p - - -true - + + + + controls whether form controls, when they render their text, use the same metrics as the document + does. If this is set to true, then the control text's appearance better matches the text + in the surrounding document./p + pTechnically, documents use a reference device for formatting, which usually has a higher + resolution than the actual output device. The option decides whether form controls should use + the same reference device as the surrounding document. However, some of AOO's document implementations + do not properly use their reference device in all situations, in which case the option might better + be disabled.p + + + true + @@ -970,19 +971,19 @@ false - - -CD -Contains settings related to dictionaries. - - - - CD - Specifies a repository URL where users can download additional dictionaries. - - - - + + + CD + Contains settings related to dictionaries. + + + + CD +
[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 22dd4c0 Fixed typos, removed whitespace 22dd4c0 is described below commit 22dd4c0a5a1dab783c7f252864ac1cc4487e7858 Author: mseidel AuthorDate: Sat Dec 14 22:49:18 2019 +0100 Fixed typos, removed whitespace (cherry picked from commit 837a288dc33668306d6556e9877bd6fa6aecdae8) --- .../registry/schema/org/openoffice/Office/Draw.xcs | 91 ++ .../registry/schema/org/openoffice/Office/SFX.xcs | 21 ++--- .../org/openoffice/Office/UI/GlobalSettings.xcs| 80 +-- 3 files changed, 69 insertions(+), 123 deletions(-) diff --git a/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs b/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs index 319c298..4ec572c 100644 --- a/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs +++ b/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs @@ -1,6 +1,6 @@ -http://openoffice.org/2001/registry; xmlns:xs="http://www.w3.org/2001/XMLSchema; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; oor:name="Draw" oor:package="org.openoffice.Office" xml:lang="en-US"> +http://openoffice.org/2001/registry; xmlns:xs="http://www.w3.org/2001/XMLSchema; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; oor:name="Draw" oor:package="org.openoffice.Office" xml:lang="en-US"> + AF - Defines the properties of the Draw application. + Defines the properties of the Draw application. @@ -100,7 +101,7 @@ - + AF Specifies the distance between adjacent tab stops. @@ -360,18 +361,18 @@ true - - - - - - AF - Indicates whether to show simple (true) or enhanced handles (false). - Simple Handles - -true - - + + + + + + AF + Indicates whether to show simple (true) or enhanced handles (false). + Simple Handles + + true + + @@ -473,7 +474,7 @@ - + AW Defines the default size of newly created objects using CTRL-Return or CTRL-Click at a object creating Button @@ -494,7 +495,7 @@ 5000 - + Contains the group of options that control the compatibility to other applications. Compatibility options. @@ -1072,51 +1073,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/main/officecfg/registry/schema/org/openoffice/Office/SFX.xcs b/main/officecfg/registry/schema/org/openoffice/Office/SFX.xcs index 7c9f173..f101b772 100644 --- a/main/officecfg/registry/schema/org/openoffice/Office/SFX.xcs +++ b/main/officecfg/registry/schema/org/openoffice/Office/SFX.xcs @@ -1,6 +1,6 @@ -http://openoffice.org/2001/registry; xmlns:xs="http://www.w3.org/2001/XMLSchema; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; oor:name="SFX" oor:package="org.openoffice.Office" xml:lang="en-US"> +http://openoffice.org/2001/registry; xmlns:xs="http://www.w3.org/2001/XMLSchema; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; oor:name="SFX" oor:package="org.openoffice.Office" xml:lang="en-US"> + MBA - Contains the component-schema for the sfx module. + Contains the component-schema for the sfx module. @@ -42,11 +43,3 @@
[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 89c8c73 Fixed typos, removed whitespace 89c8c73 is described below commit 89c8c73b9a24e313f2f5b1502f766ff8e055f189 Author: mseidel AuthorDate: Thu Dec 12 21:23:08 2019 +0100 Fixed typos, removed whitespace (cherry picked from commit 19cb898b7f399fe5cfdcb76cd710a3e384402e88) --- .../schema/org/openoffice/Office/Writer.xcs| 184 ++--- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 30f25ac..b9ef08e 100644 --- a/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1,6 +1,6 @@ @@ -527,11 +527,11 @@ Sender PostCode. - - -Sender State. - - + + + Sender State. + + Sender City. @@ -549,7 +549,7 @@ - Enables that the Footer is only displayed of the Second and following pages. + Enables that the Footer is only displayed on the Second and following pages. @@ -966,7 +966,7 @@ OS SMTP server requires authentication at the POP or IMAP server -SMPT after POP +SMTP after POP @@ -1096,7 +1096,7 @@ true - + OS @@ -1191,8 +1191,8 @@ OS -Specifies if hidden text fields are displayed on the screen. -Fields: Hidden text + Specifies if hidden text fields are displayed on the screen. + Fields: Hidden text false @@ -1598,7 +1598,7 @@ - Specified which kind of paper mode is used in the whole document + Specifies which kind of paper mode is used in the whole document Use squared paper mode true @@ -1648,7 +1648,7 @@ Contains view layout settings. - + FME @@ -1657,7 +1657,7 @@ 0 - + FME @@ -2311,7 +2311,7 @@ - + OS Specifies the default value for moving a table row [UNIT=1/100 mm]. @@ -2323,7 +2323,7 @@
[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 fde2938 Fixed typos, removed whitespace fde2938 is described below commit fde29386b97cf2a92cfaa94fb1d1c1b6ff0663c6 Author: mseidel AuthorDate: Mon Nov 18 15:43:02 2019 +0100 Fixed typos, removed whitespace (cherry picked from commit d7056c59ad3c993e2bfa38f5e86555896868d4b8) --- main/sw/source/core/table/swnewtable.cxx | 42 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/main/sw/source/core/table/swnewtable.cxx b/main/sw/source/core/table/swnewtable.cxx index c89aa8c..1e5399c 100644 --- a/main/sw/source/core/table/swnewtable.cxx +++ b/main/sw/source/core/table/swnewtable.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,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. - * + * */ @@ -216,7 +216,7 @@ SwTableBox* lcl_LeftBorder2Box( long nLeft, const SwTableLine* pLine ) } nCurrLeft += pBox->GetFrmFmt()->GetFrmSize().GetWidth(); } -ASSERT( false, "Didn't found wished box" ); +ASSERT( false, "Didn't find wished box" ); return 0; } @@ -266,7 +266,7 @@ void lcl_ChangeRowSpan( const SwTable& rTable, const long nDiff, do { bGoOn = false; // will be set to true if we found a non-master cell -// which has to be manipulated => we have to chekc the previous row, too. +// which has to be manipulated => we have to check the previous row, too. const SwTableLine* pLine = rTable.GetTabLines()[ nRowIdx ]; sal_uInt16 nBoxCount = pLine->GetTabBoxes().Count(); for( sal_uInt16 nCurrBox = 0; nCurrBox < nBoxCount; ++nCurrBox ) @@ -291,10 +291,10 @@ void lcl_ChangeRowSpan( const SwTable& rTable, const long nDiff, { if( nRowSpan > 0 ) { // A master cell - // end of row span behind the deleted area .. + // end of row span behind the deleted area... if( nRowSpan - nDistance > -nDiff ) nRowSpan += nDiff; -else // .. or inside the deleted area +else // ...or inside the deleted area nRowSpan = nDistance + 1; } else @@ -313,11 +313,11 @@ void lcl_ChangeRowSpan( const SwTable& rTable, const long nDiff, if( nRowIdx ) --nRowIdx; else -bGoOn = false; //robust +bGoOn = false; // robust } while( bGoOn ); } -/** CollectBoxSelection(..) create a rectangulare selection based on the given SwPaM +/** CollectBoxSelection(..) create a rectangular selection based on the given SwPaM and prepares the selected cells for merging */ @@ -619,7 +619,7 @@ long lcl_InsertPosition( SwTable , std::vector& rInsPos, nAddWidth += nWidth; sal_uInt16 nCurrBox = pLine->GetTabBoxes().C40_GETPOS(SwTableBox, pBox ); sal_uInt16 nCurrLine = rTable.GetTabLines().C40_GETPOS(SwTableLine, pLine ); -ASSERT( nCurrLine != USHRT_MAX, "Time to say Good-Bye.." ); +ASSERT( nCurrLine != USHRT_MAX, "Time to say goodbye..." ); if( rInsPos[ nCurrLine ] == USHRT_MAX ) { rInsPos[ nCurrLine ] = nCurrBox; @@ -701,7 +701,7 @@ sal_Bool SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, { SwTableLine* pLine = aLines[ i ]; sal_uInt16 nInsPos = aInsPos[i]; -ASSERT( nInsPos != USHRT_MAX, "Didn't found insert position" ); +ASSERT( nInsPos != USHRT_MAX, "Didn't find insert position" ); SwTableBox* pBox = pLine->GetTabBoxes()[ nInsPos ]; if( bBehind ) ++nInsPos; @@ -790,7 +790,7 @@ sal_Bool SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, For the old table model, ::GetMergeSel(..) is called only, for the new table model,
[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 9957b46 Fixed typos, removed whitespace 9957b46 is described below commit 9957b4659c1f3bb02a3c57d9c90a49fb5b54042a Author: mseidel AuthorDate: Sun Nov 17 15:49:15 2019 +0100 Fixed typos, removed whitespace (cherry picked from commit 0cf988a7abfdbda8c5326a450fef021af93ab2bd) --- .../checkrunningofficelanguagepack.cxx | 26 ++--- .../languagepacks/lngpckinsthelper.cxx | 128 ++--- .../customactions/languagepacks/respintest.cxx | 47 3 files changed, 100 insertions(+), 101 deletions(-) diff --git a/main/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx b/main/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx index 81e5464..eeceec3 100644 --- a/main/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx +++ b/main/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.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,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. - * + * */ @@ -81,14 +81,14 @@ static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sPro LPTSTR buffer = reinterpret_cast(_alloca(nBytes)); ZeroMemory( buffer, nBytes ); MsiGetProperty(handle, sProperty.c_str(), buffer, ); - result = buffer; + result = buffer; } return result; } - + static inline bool IsSetMsiProperty(MSIHANDLE handle, const std::_tstring& sProperty) -{ +{ std::_tstring value = GetMsiProperty(handle, sProperty); return (value.length() > 0); } @@ -116,7 +116,7 @@ static BOOL MoveFileEx9x( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, DWO // Path names in WININIT.INI must be in short path name form - if ( + if ( GetShortPathNameA( lpExistingFileNameA, szExistingFileNameA, MAX_PATH ) && (!lpNewFileNameA || GetShortPathNameA( lpNewFileNameA, szNewFileNameA, MAX_PATH )) ) @@ -124,7 +124,7 @@ static BOOL MoveFileEx9x( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, DWO CHARszBuffer[32767];// The buffer size must not exceed 32K DWORD dwBufLen = GetPrivateProfileSectionA( RENAME_SECTION, szBuffer, elementsof(szBuffer), WININIT_FILENAME ); - CHARszRename[MAX_PATH]; // This is enough for at most to times 67 chracters + CHARszRename[MAX_PATH]; // This is enough for at most to times 67 characters strcpy( szRename, szNewFileNameA ); strcat( szRename, "=" ); strcat( szRename, szExistingFileNameA ); @@ -200,10 +200,10 @@ extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle ) } while ( fSuccess && fRenameSucceeded ); if ( !fRenameSucceeded ) -{ + { MsiSetProperty(handle, TEXT("OFFICERUNS"), TEXT("1")); -SetMsiErrorCode( MSI_ERROR_OFFICE_IS_RUNNING ); -} + SetMsiErrorCode( MSI_ERROR_OFFICE_IS_RUNNING ); + } FindClose( hFind ); } @@ -211,5 +211,3 @@ extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle ) return ERROR_SUCCESS; } - - diff --git a/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx b/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx index 01bb595..7b5fa9e 100644 --- a/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx +++
[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 79b8682 Fixed typos, removed whitespace 79b8682 is described below commit 79b868258f4b267f418930c8d4240c8a16651212 Author: mseidel AuthorDate: Sat Nov 16 19:01:34 2019 +0100 Fixed typos, removed whitespace (cherry picked from commit c36aa0f147e300f1e12fc96d3a3427fe1c697165) --- .../indexingfilter/restartindexingservice.cxx | 160 ++--- .../customactions/reg4allmsdoc/reg4allmsi.cxx | 50 +++ 2 files changed, 105 insertions(+), 105 deletions(-) diff --git a/main/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx b/main/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx index 66ef55d..c8027b1 100644 --- a/main/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx +++ b/main/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.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,29 +7,29 @@ * 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. - * + * */ -/* -After installation of the OOo filter for the indexing service -it is necessary to restart the indexing service in order to +/* +After installation of the AOO filter for the indexing service +it is necessary to restart the indexing service in order to activate the filter. This is the most reliable way to get the indexing service working. We only restart the service if it is already running. If we have insufficient privileges to restart -the service we do nothing. +the service we do nothing. */ - + #ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ #endif @@ -59,70 +59,70 @@ QueryServiceStatus_t QueryServiceStatus_ = NULL; StartService_t StartService_ = NULL; const LPTSTR INDEXING_SERVICE_NAME = TEXT("cisvc"); - + bool StopIndexingService(SC_HANDLE hService) { -SERVICE_STATUS status; - +SERVICE_STATUS status; + if (ControlService_(hService, SERVICE_CONTROL_STOP, )) -{ - // Check the status until the service is no longer stop pending. -if (QueryServiceStatus_(hService, )) -{ +{ + // Check the status until the service is no longer stop pending. +if (QueryServiceStatus_(hService, )) +{ DWORD startTime = GetTickCount(); DWORD oldCheckPoint = status.dwCheckPoint; -while (status.dwCurrentState == SERVICE_STOP_PENDING) -{ -// Do not wait longer than the wait hint. A good interval is -// one tenth the wait hint, but no less than 1 second and no -// more than 10 seconds. +while (status.dwCurrentState == SERVICE_STOP_PENDING) +{ +// Do not wait longer than the wait hint. A good interval is +// one tenth the wait hint, but no less than 1 second and no +// more than 10 seconds. DWORD waitTime = status.dwWaitHint / 10; - + if (waitTime < 1000) waitTime = 1000; else if (waitTime > 1) waitTime = 1; - + Sleep(waitTime); -// Check the status again. +// Check the status again. if (!QueryServiceStatus_(hService, ) || -(status.dwCurrentState == SERVICE_STOPPED)) +(status.dwCurrentState == SERVICE_STOPPED)) break; - + if (status.dwCheckPoint > oldCheckPoint) -{ +{ startTime = GetTickCount();
[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 edd5c1e Fixed typos, removed whitespace edd5c1e is described below commit edd5c1e389a75fad274944e498d96d324819c5b0 Author: mseidel AuthorDate: Sat Nov 16 17:02:38 2019 +0100 Fixed typos, removed whitespace (cherry picked from commit 09316e06825712f4b194db859b4b9bb529374218) --- .../win32/customactions/javafilter/jfregca.cxx | 139 +++-- 1 file changed, 70 insertions(+), 69 deletions(-) diff --git a/main/setup_native/source/win32/customactions/javafilter/jfregca.cxx b/main/setup_native/source/win32/customactions/javafilter/jfregca.cxx index 5d009bf..7afa530 100644 --- a/main/setup_native/source/win32/customactions/javafilter/jfregca.cxx +++ b/main/setup_native/source/win32/customactions/javafilter/jfregca.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,19 +7,20 @@ * 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 #ifdef _MSC_VER @@ -37,52 +38,52 @@ #endif #include -//Simple function prototypes +// Simple function prototypes bool update_activesync_regvalues(bool, bool, char** ); void createKeys(HKEY hKey, char **); void deleteKeys(HKEY hKey, char **); bool isMulti(MSIHANDLE); -//Simple data arrays for registry values +// Simple data arrays for registry values TCHAR *pxlData[8]= { - "{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}", //CLSID 1 - key name at InstalledFilters Key - "{43887C67-4D5D-4127-BAAC-87A288494C7C}", //CLSID 2 - key value for Default Export - ".pxl", //Registry key for device type - already there if ActiveSync installerd - ".sxc", //New registry key for SO docs - "InstalledFilters", //Sub-key of device/so doc key - "DefaultImport", //Key name added at device/so level key - "DefaultExport", //Key name added at device/so level key - "Binary Copy",//Key value for DefaultImport + "{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}", // CLSID 1 - key name at InstalledFilters Key + "{43887C67-4D5D-4127-BAAC-87A288494C7C}", // CLSID 2 - key value for Default Export + ".pxl", // Registry key for device type - already there if ActiveSync installed + ".sxc", // New registry key for SO docs + "InstalledFilters", // Sub-key of device/so doc key + "DefaultImport", // Key name added at device/so level key + "DefaultExport", // Key name added at device/so level key + "Binary Copy",// Key value for DefaultImport }; TCHAR *pswData[8] = { - "{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}", //CLSID 1 - key name at InstalledFilters Key - "{CB43F086-838D-4FA4-B5F6-3406B9A57439}", //CLSID 2 - key value for Default Export - ".psw", //Registry key for device type - already there if ActiveSync installe - ".sxw", //New registry key for SO docs - "InstalledFilters", //Sub-key of device/so doc key - "DefaultImport", //Key name added at device/so level key - "DefaultExport", //Key name added at device/so level key -
[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 5af57ba Fixed typos, removed whitespace 5af57ba is described below commit 5af57ba11098e344b4583780aaf8652b046dd745 Author: mseidel AuthorDate: Mon Sep 16 23:49:46 2019 +0200 Fixed typos, removed whitespace (cherry picked from commit b2b6b138749e974ca2c6396b5ae0a0b78591c7d4) --- main/vcl/unx/gtk/window/gtkframe.cxx | 230 +-- 1 file changed, 115 insertions(+), 115 deletions(-) diff --git a/main/vcl/unx/gtk/window/gtkframe.cxx b/main/vcl/unx/gtk/window/gtkframe.cxx index 13769e6..aca9ecd 100644 --- a/main/vcl/unx/gtk/window/gtkframe.cxx +++ b/main/vcl/unx/gtk/window/gtkframe.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,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. - * + * */ @@ -205,7 +205,7 @@ static sal_uInt16 GetKeyCode( guint keyval ) case GDK_KP_Separator: nCode = KEY_DECIMAL;break; case GDK_asciitilde: nCode = KEY_TILDE; break; case GDK_leftsinglequotemark: -case GDK_quoteleft:nCode = KEY_QUOTELEFT; break; +case GDK_quoteleft:nCode = KEY_QUOTELEFT; break; // some special cases, also see saldisp.cxx // - - - - - - - - - - - - - Apollo - - - - - - - - - - - - - 0x1000 case 0x1000FF02: // apXK_Copy @@ -324,10 +324,10 @@ void GtkSalFrame::doKeyCallback( guint state, { SalKeyEvent aEvent; -aEvent.mnTime = time; +aEvent.mnTime = time; aEvent.mnCharCode = aOrigCode; aEvent.mnRepeat= 0; - + vcl::DeletionListener aDel( this ); /* #i42122# translate all keys with Ctrl and/or Alt to group 0 * else shortcuts (e.g. Ctrl-o) will not work but be inserted by @@ -343,7 +343,7 @@ void GtkSalFrame::doKeyCallback( guint state, GdkModifierType consumed; guint updated_keyval = 0; // use gdk_keymap_get_default instead of NULL; -// workaround a crahs fixed in gtk 2.4 +// work around a crash fixed in gtk 2.4 if( gdk_keymap_translate_keyboard_state( gdk_keymap_get_default(), hardware_keycode, (GdkModifierType)0, @@ -357,7 +357,7 @@ void GtkSalFrame::doKeyCallback( guint state, } } aEvent.mnCode |= GetKeyModCode( state ); - + if( bDown ) { bool bHandled = CallCallback( SALEVENT_KEYINPUT, ); @@ -419,9 +419,9 @@ GtkSalFrame::~GtkSalFrame() if( m_pParent ) m_pParent->m_aChildren.remove( this ); - + getDisplay()->deregisterFrame( this ); - + if( m_pRegion ) gdk_region_destroy( m_pRegion ); @@ -469,13 +469,13 @@ void GtkSalFrame::resizeWindow( long nWidth, long nHeight ) else if( ! isChild( true, false ) ) gtk_window_resize( GTK_WINDOW(m_pWindow), nWidth, nHeight ); } - + /* * Always use a sub-class of GtkFixed we can tag for a11y. This allows us to - * utilize GAIL for the toplevel window and toolkit implementation incl. - * key event listener support .. + * utilize GAIL for the toplevel window and toolkit implementation incl. + * key event listener support... */ - + GType ooo_fixed_get_type() { @@ -496,11 +496,11 @@ ooo_fixed_get_type() NULL /* value table */ }; -type = g_type_register_static( GTK_TYPE_FIXED, "OOoFixed", +type = g_type_register_static( GTK_TYPE_FIXED, "OOoFixed", , (GTypeFlags) 0); } -return type; +return type; } void GtkSalFrame::updateScreenNumber() @@ -562,7 +562,7 @@ void GtkSalFrame::InitCommon() m_pRegion
[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 65e9c39 Fixed typos, removed whitespace 65e9c39 is described below commit 65e9c39539ccd723f96a5a67008c244585aa6f21 Author: mseidel AuthorDate: Fri Sep 13 17:33:07 2019 +0200 Fixed typos, removed whitespace (cherry picked from commit 0c85547751d28076cc4afd0024c8fad5cb6b3da1) --- .../com/sun/star/form/DataAwareControlModel.idl| 175 ++--- .../sun/star/form/PropertyBrowserController.idl| 65 2 files changed, 119 insertions(+), 121 deletions(-) diff --git a/main/offapi/com/sun/star/form/DataAwareControlModel.idl b/main/offapi/com/sun/star/form/DataAwareControlModel.idl index 5dfbe33..49400a3 100644 --- a/main/offapi/com/sun/star/form/DataAwareControlModel.idl +++ b/main/offapi/com/sun/star/form/DataAwareControlModel.idl @@ -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,87 +7,86 @@ * 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 __com_sun_star_form_DataAwareControlModel_idl__ -#define __com_sun_star_form_DataAwareControlModel_idl__ - -#ifndef __com_sun_star_form_FormControlModel_idl__ -#include -#endif - -#ifndef __com_sun_star_form_XBoundComponent_idl__ -#include -#endif - -#ifndef __com_sun_star_form_XLoadListener_idl__ -#include -#endif - -#ifndef __com_sun_star_form_XReset_idl__ -#include -#endif - -#ifndef __com_sun_star_beans_XPropertySet_idl__ -#include -#endif - - -//= - - module com { module sun { module star { module form { - -//= - +#ifndef __com_sun_star_form_DataAwareControlModel_idl__ +#define __com_sun_star_form_DataAwareControlModel_idl__ + +#ifndef __com_sun_star_form_FormControlModel_idl__ +#include +#endif + +#ifndef __com_sun_star_form_XBoundComponent_idl__ +#include +#endif + +#ifndef __com_sun_star_form_XLoadListener_idl__ +#include +#endif + +#ifndef __com_sun_star_form_XReset_idl__ +#include +#endif + +#ifndef __com_sun_star_beans_XPropertySet_idl__ +#include +#endif + +//= + + module com { module sun { module star { module form { + +//= + /** is an abstract service for specialized FormControlModels which are data aware and thus can be bound to a data source. - The connection between a data-aware control model and a form which's data the + The connection between a data-aware control model and a form whose data the control should display is made by parentship relations. The parent of a data-aware control model (see XChild, inherited via the FormControlModel and FormComponent services) has always to be a DataForm. */ published service DataAwareControlModel -{ - service com::sun::star::form::FormControlModel; - +{ + service com::sun::star::form::FormControlModel; + /** makes it possible to transfer the data of the model to the connected data field. This interface is optional, if a component doesn't support it, it has to forward - the changes of it's value to the field it is connected to immediately (means whenever a user - interaction changes it's content). + the changes of its value to the field it is connected to immediately (means whenever a user + interaction changes its content). */ - [optional] interface com::sun::star::form::XBoundComponent; - - + [optional] interface com::sun::star::form::XBoundComponent; + + /** must be implemented in order to recognize when the containing form of the model connects - to its data source (loads its data). After
[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 b32066d Fixed typos, removed whitespace b32066d is described below commit b32066da778d5d83d36ff0c08dd7c614205851af Author: mseidel AuthorDate: Thu Sep 12 19:23:16 2019 +0200 Fixed typos, removed whitespace (cherry picked from commit f6f0fd12ae2ac22cbfd4056e706c95c5daaf3794) --- main/offapi/com/sun/star/form/XChangeListener.idl | 76 +-- .../com/sun/star/form/XConfirmDeleteListener.idl | 75 +- main/offapi/com/sun/star/form/XUpdateListener.idl | 88 +++--- 3 files changed, 120 insertions(+), 119 deletions(-) diff --git a/main/offapi/com/sun/star/form/XChangeListener.idl b/main/offapi/com/sun/star/form/XChangeListener.idl index aa05944..b7e5be6 100644 --- a/main/offapi/com/sun/star/form/XChangeListener.idl +++ b/main/offapi/com/sun/star/form/XChangeListener.idl @@ -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,63 +7,63 @@ * 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 __com_sun_star_form_XChangeListener_idl__ -#define __com_sun_star_form_XChangeListener_idl__ - -#ifndef __com_sun_star_lang_XEventListener_idl__ -#include -#endif - -#ifndef __com_sun_star_lang_EventObject_idl__ -#include -#endif - - -//= - - module com { module sun { module star { module form { - -//= - +#ifndef __com_sun_star_form_XChangeListener_idl__ +#define __com_sun_star_form_XChangeListener_idl__ + +#ifndef __com_sun_star_lang_XEventListener_idl__ +#include +#endif + +#ifndef __com_sun_star_lang_EventObject_idl__ +#include +#endif + +//= + + module com { module sun { module star { module form { + +//= + /** is the listener interface for receiving notifications about data changes. - + The concrete semantics of a change (i.e. the conditions for when a change event is fired) must be specified in the description of the service broadcasting the change. - + @see XChangeBroadcaster */ published interface XChangeListener: com::sun::star::lang::XEventListener -{ - //- +{ + //- /** is invoked when the data of a component has been changed. @param rEvent - A dedscriptor specifying the source of the event. + A descriptor specifying the source of the event. */ - [oneway] void changed( [in] com::sun::star::lang::EventObject rEvent ); - -}; - -//= - -}; }; }; }; - -/*= - -=*/ + [oneway] void changed( [in] com::sun::star::lang::EventObject rEvent ); + +}; + +//= + +}; }; }; }; + +/*= + +=*/ + #endif diff --git a/main/offapi/com/sun/star/form/XConfirmDeleteListener.idl b/main/offapi/com/sun/star/form/XConfirmDeleteListener.idl index b4b040f..2c292b7 100644 --- a/main/offapi/com/sun/star/form/XConfirmDeleteListener.idl +++ b/main/offapi/com/sun/star/form/XConfirmDeleteListener.idl @@ -1,5 +1,5 @@ /** - * + * * Licensed to the Apache Software