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 21c145e356 Fixed typo (choise -> choice), cleanup
21c145e356 is described below
commit 21c145e356f6a0edd62b29e937cec3641b1b1268
Author: mseidel <[email protected]>
AuthorDate: Wed Jul 30 18:18:41 2025 +0200
Fixed typo (choise -> choice), cleanup
(cherry picked from commit 22f6cfd8a00d14c3f076489b26cc2c99f12ddee6)
---
.../runner/convwatch/EnhancedComplexTestCase.java | 4 +---
.../runner/convwatch/GraphicalTestArguments.java | 16 ++++++-------
.../qadevOOo/runner/graphical/ParameterHelper.java | 16 ++++++-------
main/sw/source/ui/dialog/ascfldlg.cxx | 27 +++++++++++-----------
main/vcl/source/window/winproc.cxx | 21 ++++++++---------
5 files changed, 38 insertions(+), 46 deletions(-)
diff --git a/main/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java
b/main/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java
index 78605fd478..5c43842244 100644
--- a/main/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java
+++ b/main/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
package convwatch;
import complexlib.ComplexTestCase;
@@ -95,7 +93,7 @@ public abstract class EnhancedComplexTestCase extends
ComplexTestCase
String sNEEDCHECK = (String)param.get(
PropertyName.CHECK_NEED_TOOLS );
// TODO: I need to get the boolean value with get("name") because, if it is
not given getBool() returns
// with a default of 'false' which is not very helpful if the default
should be 'true'
-// maybe a getBoolean("name", true) could be a better choise.
+// maybe a getBoolean("name", true) could be a better choice.
if (sNEEDCHECK == null)
{
sNEEDCHECK = "false";
diff --git a/main/qadevOOo/runner/convwatch/GraphicalTestArguments.java
b/main/qadevOOo/runner/convwatch/GraphicalTestArguments.java
index 216de2987e..0fdf442d37 100644
--- a/main/qadevOOo/runner/convwatch/GraphicalTestArguments.java
+++ b/main/qadevOOo/runner/convwatch/GraphicalTestArguments.java
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
package convwatch;
import com.sun.star.lang.XMultiServiceFactory;
@@ -33,8 +31,8 @@ import com.sun.star.uno.UnoRuntime;
/**
* This class object is more a Helper or Controller.
* It stores information like:
- * - How to create a document (with a OpenOffice.org method, or with MS Word,
or with OpenOffice.org as pdf)
- * - some more infos for OpenOffice.org method
+ * - How to create a document (with a OpenOffice method, or with MS Word, or
with OpenOffice as pdf)
+ * - some more info for OpenOffice method
* - a service factory pointer
* - if hidden mode should use
* - target name
@@ -44,7 +42,7 @@ import com.sun.star.uno.UnoRuntime;
* - how to handle .xml files, which in Microsoft could be Excel or Word
documents
*
* HOWTO USE:
- * For OOo,
+ * For AOO,
* create an GraphicalTestArguments with a set of TestParameters
* GraphicalTestArguments a = new GraphicalTestArguments(params);
*
@@ -78,7 +76,7 @@ public class GraphicalTestArguments
String m_sPrinterName = null;
- // Hidden = true hiddes a used OpenOffice.org, all code is executed in the
background
+ // Hidden = true hides a used OpenOffice, all code is executed in the
background
// This parameter is not used for RefType: msoffice
boolean m_bHidden = true;
@@ -148,7 +146,7 @@ public class GraphicalTestArguments
String sRECURSIVE = (String)param.get(
PropertyName.DOC_COMPARATOR_INCLUDE_SUBDIRS );
// TODO: I need to get the boolean value with get("name") because, if it is
not given getBool() returns
// with a default of 'false' which is not very helpful if the default
should be 'true'
-// maybe a getBoolean("name", true) could be a better choise.
+// maybe a getBoolean("name", true) could be a better choice.
if (sRECURSIVE == null)
{
sRECURSIVE = "true";
@@ -526,7 +524,7 @@ public class GraphicalTestArguments
}
/**
- * Helper function to get the buildid of the current used OpenOffice.org
+ * Helper function to get the buildid of the current used OpenOffice
* out of the AppExecutionCommand the build ID
*/
public String getBuildID()
@@ -654,7 +652,7 @@ public class GraphicalTestArguments
}
/*
- helper class for performance analyser features
+ helper class for performance analyzer features
*/
PerformanceContainer m_aPerformanceContainer = null;
public PerformanceContainer getPerformance()
diff --git a/main/qadevOOo/runner/graphical/ParameterHelper.java
b/main/qadevOOo/runner/graphical/ParameterHelper.java
index cb4ef76b7d..16a13f3fec 100644
--- a/main/qadevOOo/runner/graphical/ParameterHelper.java
+++ b/main/qadevOOo/runner/graphical/ParameterHelper.java
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
package graphical;
import com.sun.star.lang.XMultiServiceFactory;
@@ -29,8 +27,8 @@ import lib.TestParameters;
/**
* This class object is more a Helper or Controller.
* It stores information like:
- * - How to create a document (with a OpenOffice.org method, or with MS Word,
or with OpenOffice.org as pdf)
- * - some more infos for OpenOffice.org method
+ * - How to create a document (with a OpenOffice method, or with MS Word, or
with OpenOffice as pdf)
+ * - some more info for OpenOffice method
* - a service factory pointer
* - if hidden mode should use
* - target name
@@ -40,7 +38,7 @@ import lib.TestParameters;
* - how to handle .xml files, which in Microsoft could be Excel or Word
documents
*
* HOWTO USE:
- * For OOo,
+ * For AOO,
* create an ParameterHelper with a set of TestParameters
* ParameterHelper a = new ParameterHelper(params);
*
@@ -165,7 +163,7 @@ public class ParameterHelper
String sRECURSIVE = (String)getTestParameters().get(
PropertyName.DOC_COMPARATOR_INCLUDE_SUBDIRS );
// TODO: I need to get the boolean value with get("name") because, if it is
not given getBool() returns
// with a default of 'false' which is not very helpful if the default
should be 'true'
-// maybe a getBoolean("name", true) could be a better choise.
+// maybe a getBoolean("name", true) could be a better choice.
if (sRECURSIVE == null)
{
sRECURSIVE = "true";
@@ -220,7 +218,7 @@ public class ParameterHelper
PerformanceContainer m_aPerformanceContainer = null;
/**
- * helper class for performance analyser features
+ * helper class for performance analyzer features
* @return
*/
public PerformanceContainer getPerformance()
@@ -233,7 +231,7 @@ public class ParameterHelper
}
/**
- * Helper function to get the buildid of the current used OpenOffice.org
+ * Helper function to get the buildid of the current used OpenOffice
* out of the AppExecutionCommand the build ID
* @return
*/
@@ -272,7 +270,7 @@ public class ParameterHelper
return xMSF;
}
- // Hidden = true hiddes a used OpenOffice.org, all code is executed in the
background
+ // Hidden = true hides a used OpenOffice, all code is executed in the
background
// This parameter is not used for RefType: msoffice
// boolean m_bHidden = true;
diff --git a/main/sw/source/ui/dialog/ascfldlg.cxx
b/main/sw/source/ui/dialog/ascfldlg.cxx
index d1ed205a26..6e79d306f2 100644
--- a/main/sw/source/ui/dialog/ascfldlg.cxx
+++ b/main/sw/source/ui/dialog/ascfldlg.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
#ifdef SW_DLLIMPLEMENTATION
@@ -56,7 +54,6 @@
#include "vcl/metric.hxx"
-
using namespace ::com::sun::star;
const sal_Unicode cDialogExtraDataClose = '}';
@@ -67,7 +64,7 @@ const sal_uInt16 nDialogExtraDataLen = 11; //
12345678901
SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
SvStream* pStream )
: SfxModalDialog( pParent, SW_RES( DLG_ASCII_FILTER )),
- aFL( this, SW_RES( FL_1 )),
+ aFL( this, SW_RES( FL_1 )),
aCharSetFT( this, SW_RES( FT_CHARSET )),
aCharSetLB( this, SW_RES( LB_CHARSET )),
aFontFT( this, SW_RES( FT_FONT )),
@@ -175,8 +172,8 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent,
SwDocShell& rDocSh,
pPrt = new SfxPrinter( pSet );
bDelPrinter = sal_True;
}
-
-
+
+
// get the set of distinct available family names
std::set< String > aFontNames;
int nFontNames = pPrt->GetDevFontCount();
@@ -185,7 +182,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent,
SwDocShell& rDocSh,
FontInfo aInf( pPrt->GetDevFont( i ) );
aFontNames.insert( aInf.GetName() );
}
-
+
// insert to listbox
for( std::set< String >::const_iterator it =
aFontNames.begin();
it != aFontNames.end(); ++it )
@@ -222,7 +219,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent,
SwDocShell& rDocSh,
delete pPrt;
}
- // initialisiere Sprache
+ // initialize language
{
if( !aOpt.GetLanguage() )
{
@@ -285,7 +282,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent,
SwDocShell& rDocSh,
SetSizePixel( aSize );
}
- // initialisiere Zeichensatz
+ // initialize character set
aCharSetLB.FillFromTextEncodingTable( pStream != NULL );
aCharSetLB.SelectTextEncoding( aOpt.GetCharSet() );
@@ -433,7 +430,7 @@ IMPL_LINK( SwAsciiFilterDlg, CharSetSelHdl,
SvxTextEncodingBox*, pBox )
}
else
{
- // restore old user choise (not the automatic!)
+ // restore old user choice (not the automatic!)
aCRLF_RB.Check( aCRLF_RB.GetSavedValue() );
aCR_RB.Check( aCR_RB.GetSavedValue() );
aLF_RB.Check( aLF_RB.GetSavedValue() );
@@ -452,3 +449,5 @@ IMPL_LINK( SwAsciiFilterDlg, LineEndHdl, RadioButton*, pBtn
)
pBtn->SaveValue();
return 0;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vcl/source/window/winproc.cxx
b/main/vcl/source/window/winproc.cxx
index eb17e3055a..10e18a85c3 100644
--- a/main/vcl/source/window/winproc.cxx
+++ b/main/vcl/source/window/winproc.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
@@ -68,7 +66,6 @@ extern void MyOutputDebugString( char *s);
#endif
#endif
-
// =======================================================================
#define IMPL_MIN_NEEDSYSWIN 49
@@ -939,7 +936,7 @@ static Window* ImplGetKeyInputWindow( Window* pWindow )
return 0;
// We call also KeyInput if we haven't the focus, because on Unix
- // system this is often the case when a Lookup Choise Window has
+ // system this is often the case when a Lookup Choice Window has
// the focus - because this windows send the KeyInput directly to
// the window without resetting the focus
DBG_ASSERTWARNING( pChild == pSVData->maWinData.mpFocusWin,
@@ -1003,7 +1000,7 @@ static long ImplHandleKey( Window* pWindow, sal_uInt16
nSVEvent,
if ( nSVEvent == EVENT_KEYINPUT )
{
#ifdef DBG_UTIL
- // #105224# use Ctrl-Alt-Shift-D, Ctrl-Shift-D must be useable by app
+ // #105224# use Ctrl-Alt-Shift-D, Ctrl-Shift-D must be usable by app
if ( aKeyCode.IsShift() && aKeyCode.IsMod1() && (aKeyCode.IsMod2() ||
aKeyCode.IsMod3()) && (aKeyCode.GetCode() == KEY_D) )
{
DBGGUI_START();
@@ -1483,7 +1480,7 @@ static long ImplHandleWheelEvent( Window* pWindow, const
SalWheelMouseEvent& rEv
Point aMousePos( rEvt.mnX, rEvt.mnY );
sal_Bool bRet = sal_True;
- // first check any floating window ( e.g. drop down listboxes)
+ // first check any floating window (e.g. drop down listboxes)
bool bIsFloat = false;
Window *pMouseWindow = NULL;
if ( pSVData->maWinData.mpFirstFloat && !pSVData->maWinData.mpCaptureWin &&
@@ -1517,7 +1514,7 @@ static long ImplHandleWheelEvent( Window* pWindow, const
SalWheelMouseEvent& rEv
bRet = ImplCallWheelCommand( pMouseWindow, aRelMousePos, &aWheelData );
}
- // if the commad was not handled try the focus window
+ // if the command was not handled try the focus window
if ( bRet )
{
Window* pFocusWindow =
pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin;
@@ -1737,7 +1734,7 @@ IMPL_LINK( Window, ImplAsyncFocusHdl, void*, EMPTYARG )
// nichts machen
sal_Bool bHasFocus = ImplGetWindowImpl()->mpFrameData->mbHasFocus ||
ImplGetWindowImpl()->mpFrameData->mbSysObjFocus;
- // Dann die zeitverzoegerten Funktionen ausfuehren
+ // Dann die zeitverzögerten Funktionen ausführen
if ( bHasFocus )
{
// Alle FloatingFenster deaktiv zeichnen
@@ -1843,7 +1840,7 @@ static void ImplHandleGetFocus( Window* pWindow )
{
pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus = sal_True;
- // Focus-Events zeitverzoegert ausfuehren, damit bei SystemChildFenstern
+ // Focus-Events zeitverzögert ausführen, damit bei SystemChildFenstern
// nicht alles flackert, wenn diese den Focus bekommen
if ( !pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId )
{
@@ -1887,7 +1884,7 @@ static void ImplHandleLoseFocus( Window* pWindow )
pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus = sal_False;
- // Focus-Events zeitverzoegert ausfuehren, damit bei SystemChildFenstern
+ // Focus-Events zeitverzögert ausführen, damit bei SystemChildFenstern
// nicht alles flackert, wenn diese den Focus bekommen
bool bCallDirect = ImplGetSVData()->mbIsTestTool;
if ( !pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId )
@@ -2191,7 +2188,7 @@ static void ImplHandleInputLanguageChange( Window*
pWindow )
static void ImplHandleSalSettings( Window* pWindow, sal_uInt16 nEvent )
{
- // Application Notification werden nur fuer das erste Window ausgeloest
+ // Application Notification werden nur für das erste Window ausgelöst
ImplSVData* pSVData = ImplGetSVData();
if ( pWindow != pSVData->maWinData.mpFirstFrame )
return;
@@ -2614,3 +2611,5 @@ long ImplWindowFrameProc( Window* pWindow, SalFrame*
/*pFrame*/,
return nRet;
}
+
+/* vim: set noet sw=4 ts=4: */
