[Libreoffice-commits] core.git: 2 commits - apple_remote/source basegfx/source basic/source bean/test bridges/inc bridges/test chart2/source codemaker/source config_host.mk.in connectivity/source cui/source dbaccess/source desktop/source drawinglayer/source dtrans/source editeng/source embeddedobj/test extensions/qa extensions/source external/wine filter/source framework/inc framework/source i18npool/source idlc/inc include/comphelper include/framework include/jvmfwk include/rtl include/sal include/sfx2 include/svx include/unotools include/xmloff jurt/workbench jvmfwk/plugins libmariadb/mariadb-trunk-40.patch libxmlsec/xmlsec1-noverify.patch lingucomponent/source linguistic/source lotuswordpro/source nlpsolver/ThirdParty odk/examples odk/source officecfg/registry oovbaapi/ooo oox/source qadevOOo/runner rhino/OfficeScriptInfo.java ridljar/com sal/qa sax/source sc/inc sc/source sd/res sd/source sfx2/source starmath/inc starmath/source svtools/source svx/source sw/inc sw/qa sw/source sw/uico nfig sysui/desktop toolkit/test udkapi/com unotools/source vcl/source wizards/com writerfilter/source xmloff/source
Tor Lillqvist
tml at iki.fi
Wed May 15 01:15:13 PDT 2013
apple_remote/source/AppleRemote.m | 4
apple_remote/source/MultiClickRemoteBehavior.h | 2
basegfx/source/polygon/b2dpolygonclipper.cxx | 2
basic/source/runtime/methods.cxx | 2
basic/source/sbx/sbxcurr.cxx | 6
basic/source/sbx/sbxscan.cxx | 2
basic/source/sbx/sbxvalue.cxx | 4
bean/test/makefile.mk | 4
bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx | 2
bridges/test/java_uno/acquire/makefile.mk | 10 -
bridges/test/java_uno/any/makefile.mk | 10 -
bridges/test/java_uno/equals/makefile.mk | 8 -
bridges/test/java_uno/nativethreadpool/makefile.mk | 4
chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx | 2
chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc | 2
chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx | 2
chart2/source/controller/dialogs/tp_3D_SceneAppearance.src | 8 -
chart2/source/view/axes/MinimumAndMaximumSupplier.cxx | 4
chart2/source/view/charttypes/AreaChart.cxx | 2
chart2/source/view/charttypes/AreaChart.hxx | 2
chart2/source/view/charttypes/BarChart.cxx | 4
chart2/source/view/charttypes/BubbleChart.cxx | 2
chart2/source/view/charttypes/BubbleChart.hxx | 2
chart2/source/view/charttypes/CandleStickChart.cxx | 2
chart2/source/view/charttypes/CandleStickChart.hxx | 2
chart2/source/view/charttypes/PieChart.cxx | 2
chart2/source/view/charttypes/PieChart.hxx | 2
chart2/source/view/charttypes/VSeriesPlotter.cxx | 14 +-
chart2/source/view/inc/MinimumAndMaximumSupplier.hxx | 4
chart2/source/view/inc/VSeriesPlotter.hxx | 6
codemaker/source/codemaker/global.cxx | 6
config_host.mk.in | 2
connectivity/source/drivers/evoab2/NDriver.hxx | 2
connectivity/source/drivers/flat/ETable.cxx | 2
connectivity/source/parse/sqlnode.cxx | 4
cui/source/inc/numpages.hxx | 2
cui/source/tabpages/numpages.cxx | 4
dbaccess/source/ui/dlg/generalpage.cxx | 2
desktop/source/app/app.cxx | 4
desktop/source/migration/migration.cxx | 6
drawinglayer/source/processor3d/geometry2dextractor.cxx | 2
dtrans/source/test/test_dtrans.cxx | 6
editeng/source/misc/svxacorr.cxx | 2
embeddedobj/test/Container1/makefile.mk | 8 -
extensions/qa/complex/extensions/makefile.mk | 8 -
extensions/qa/integration/extensions/makefile.mk | 2
extensions/source/ole/oleobjw.cxx | 2
external/wine/include/vssym32.h | 2
filter/source/config/cache/filtercache.cxx | 6
filter/source/config/cache/filtercache.hxx | 2
filter/source/config/tools/split/FCFGSplit.cfg | 4
filter/source/config/tools/split/FCFGSplit.java | 30 ++--
filter/source/config/tools/split/SplitterData.java | 4
filter/source/flash/swfwriter1.cxx | 10 -
framework/inc/classes/protocolhandlercache.hxx | 2
framework/inc/helper/mischelper.hxx | 2
framework/inc/helper/tagwindowasmodified.hxx | 2
framework/inc/jobs/joburl.hxx | 6
framework/inc/queries.h | 24 +--
framework/inc/services/logindialog.hxx | 2
framework/source/accelerators/presethandler.cxx | 10 -
framework/source/accelerators/storageholder.cxx | 26 +--
framework/source/constant/containerquery.cxx | 4
framework/source/fwe/classes/framelistanalyzer.cxx | 2
framework/source/fwi/classes/protocolhandlercache.cxx | 4
framework/source/inc/constant/containerquery.hxx | 4
framework/source/inc/loadenv/loadenv.hxx | 2
framework/source/jobs/joburl.cxx | 8 -
framework/source/services/frame.cxx | 2
framework/source/services/pathsettings.cxx | 2
framework/source/uielement/langselectionstatusbarcontroller.cxx | 2
i18npool/source/breakiterator/data/line.txt | 2
idlc/inc/idlc/astdeclaration.hxx | 2
include/comphelper/string.hxx | 8 -
include/framework/addonsoptions.hxx | 2
include/jvmfwk/framework.h | 2
include/rtl/string.h | 2
include/rtl/string.hxx | 2
include/rtl/ustring.hxx | 2
include/sal/log-areas.dox | 1
include/sfx2/linkmgr.hxx | 2
include/svx/AccessibleShapeTreeInfo.hxx | 2
include/svx/ChildrenManager.hxx | 4
include/svx/IAccessibleViewForwarder.hxx | 2
include/unotools/cmdoptions.hxx | 2
include/unotools/compatibility.hxx | 2
include/unotools/dynamicmenuoptions.hxx | 2
include/unotools/fontcvt.hxx | 4
include/unotools/historyoptions.hxx | 2
include/xmloff/txtparae.hxx | 2
include/xmloff/xmluconv.hxx | 4
jurt/workbench/com/sun/star/comp/urlresolver/makefile.mk | 2
jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 2
libmariadb/mariadb-trunk-40.patch | 8 -
libxmlsec/xmlsec1-noverify.patch | 4
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 2
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 2
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 2
linguistic/source/lngsvcmgr.cxx | 16 +-
lotuswordpro/source/filter/lwpfootnote.cxx | 2
lotuswordpro/source/filter/lwplayout.cxx | 2
lotuswordpro/source/filter/xfilter/xfcolumns.cxx | 10 -
lotuswordpro/source/filter/xfilter/xfcolumns.hxx | 6
lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx | 6
lotuswordpro/source/filter/xfilter/xfpagemaster.hxx | 2
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java | 4
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java | 2
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java | 2
odk/examples/DevelopersGuide/Text/TextDocuments.java | 4
odk/source/com/sun/star/lib/loader/InstallationFinder.java | 2
officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 6
oovbaapi/ooo/vba/XCollectionBase.idl | 2
oox/source/export/vmlexport.cxx | 2
qadevOOo/runner/helper/BuildEnvTools.java | 8 -
rhino/OfficeScriptInfo.java | 2
ridljar/com/sun/star/uno/ITypeDescription.java | 2
sal/qa/helper/gcov/deprecated.txt | 2
sal/qa/osl/file/osl_File.cxx | 4
sal/qa/osl/file/osl_File_Const.h | 10 -
sax/source/tools/converter.cxx | 2
sc/inc/rangeutl.hxx | 34 ++--
sc/source/core/tool/rangeutl.cxx | 70 +++++-----
sc/source/core/tool/token.cxx | 2
sc/source/ui/vba/vbaapplication.cxx | 6
sc/source/ui/vba/vbarange.cxx | 2
sd/res/webview/common.inc | 6
sd/source/core/stlsheet.cxx | 4
sd/source/ui/animations/CustomAnimationPane.cxx | 28 ++--
sd/source/ui/animations/CustomAnimationPane.hrc | 4
sd/source/ui/animations/CustomAnimationPane.hxx | 4
sd/source/ui/animations/CustomAnimationPane.src | 4
sd/source/ui/dlg/animobjs.cxx | 2
sd/source/ui/inc/AccessibleViewForwarder.hxx | 2
sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx | 2
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 2
sd/source/ui/toolpanel/ControlContainer.cxx | 2
sd/source/ui/view/ToolBarManager.cxx | 2
sd/source/ui/view/drviewsh.cxx | 2
sfx2/source/appl/fileobj.cxx | 8 -
sfx2/source/appl/linkmgr2.cxx | 22 +--
sfx2/source/appl/lnkbase2.cxx | 4
sfx2/source/bastyp/fltfnc.cxx | 6
sfx2/source/dialog/filtergrouping.cxx | 2
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/doc/printhelper.cxx | 2
starmath/inc/parse.hxx | 2
starmath/inc/toolbox.hxx | 2
starmath/inc/visitors.hxx | 2
starmath/source/mathmlexport.cxx | 2
starmath/source/mathtype.cxx | 12 -
starmath/source/mathtype.hxx | 2
starmath/source/node.cxx | 2
svtools/source/control/ctrlbox.cxx | 2
svx/source/accessibility/ChildrenManagerImpl.hxx | 4
svx/source/accessibility/DescriptionGenerator.cxx | 2
svx/source/dialog/docrecovery.cxx | 6
sw/inc/swtypes.hxx | 2
sw/qa/core/uwriter.cxx | 2
sw/source/core/crsr/findtxt.cxx | 2
sw/source/core/doc/docchart.cxx | 8 -
sw/source/core/doc/docdde.cxx | 2
sw/source/core/doc/docedt.cxx | 2
sw/source/core/doc/docfld.cxx | 4
sw/source/core/doc/docfmt.cxx | 6
sw/source/core/doc/ftnidx.cxx | 2
sw/source/core/docnode/ndsect.cxx | 4
sw/source/core/docnode/node.cxx | 2
sw/source/core/docnode/section.cxx | 10 -
sw/source/core/edit/autofmt.cxx | 2
sw/source/core/fields/ddefld.cxx | 8 -
sw/source/core/graphic/ndgrf.cxx | 8 -
sw/source/core/tox/txmsrt.cxx | 4
sw/source/core/txtnode/txtedt.cxx | 2
sw/source/core/undo/untbl.cxx | 2
sw/source/core/unocore/unochart.cxx | 2
sw/source/core/unocore/unofield.cxx | 8 -
sw/source/core/unocore/unosect.cxx | 36 ++---
sw/source/filter/html/htmlfly.cxx | 6
sw/source/filter/html/htmlgrin.cxx | 2
sw/source/filter/html/htmlsect.cxx | 4
sw/source/filter/html/swhtml.cxx | 2
sw/source/filter/html/wrthtml.cxx | 10 -
sw/source/filter/ww8/rtfsdrexport.cxx | 2
sw/source/filter/ww8/writerhelper.hxx | 2
sw/source/filter/ww8/writerwordglue.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 2
sw/source/filter/ww8/wrtw8nds.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 2
sw/source/filter/ww8/ww8atr.cxx | 6
sw/source/filter/ww8/ww8graf.cxx | 4
sw/source/filter/ww8/ww8graf.hxx | 2
sw/source/filter/ww8/ww8par.hxx | 2
sw/source/filter/ww8/ww8par2.cxx | 2
sw/source/filter/ww8/ww8par5.cxx | 6
sw/source/filter/ww8/ww8par6.cxx | 2
sw/source/filter/ww8/ww8scan.cxx | 6
sw/source/filter/xml/xmltble.cxx | 8 -
sw/source/filter/xml/xmltbli.cxx | 4
sw/source/ui/app/applab.cxx | 4
sw/source/ui/config/optload.cxx | 4
sw/source/ui/dialog/regionsw.cxx | 8 -
sw/source/ui/dialog/uiregionsw.cxx | 52 +++----
sw/source/ui/docvw/edtwin.cxx | 2
sw/source/ui/docvw/edtwin2.cxx | 2
sw/source/ui/fldui/fldmgr.cxx | 10 -
sw/source/ui/fldui/fldvar.cxx | 12 -
sw/source/ui/frmdlg/colex.cxx | 2
sw/source/ui/frmdlg/colmgr.cxx | 2
sw/source/ui/frmdlg/cption.cxx | 2
sw/source/ui/inc/hyp.hxx | 4
sw/source/ui/uiview/view2.cxx | 4
sw/source/ui/utlui/content.cxx | 2
sw/source/ui/utlui/glbltree.cxx | 10 -
sw/source/ui/wrtsh/wrtsh2.cxx | 4
sw/source/ui/wrtsh/wrtsh4.cxx | 4
sw/uiconfig/swriter/ui/insertcaption.ui | 4
sysui/desktop/share/create_mime_xml.pl | 2
toolkit/test/accessibility/AccessibilityTreeModel.java | 2
udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl | 2
unotools/source/config/cmdoptions.cxx | 2
unotools/source/config/dynamicmenuoptions.cxx | 12 -
unotools/source/config/moduleoptions.cxx | 18 +-
vcl/source/gdi/region.cxx | 2
vcl/source/window/window.cxx | 2
wizards/com/sun/star/wizards/agenda/AgendaDocument.py | 2
wizards/com/sun/star/wizards/common/NumericalHelper.java | 2
writerfilter/source/dmapper/NumberingManager.cxx | 2
xmloff/source/core/xmluconv.cxx | 6
xmloff/source/table/XMLTableExport.cxx | 4
xmloff/source/text/txtparae.cxx | 2
230 files changed, 585 insertions(+), 584 deletions(-)
New commits:
commit afeabb04605c3280326e78a4dee3511f21710604
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed May 15 10:49:31 2013 +0300
Add vcl.harfbuzz.layout
Change-Id: I51e39660967e0f7b3c7f6108a43c6dcdd41757a2
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index a570731..ead3c68 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -269,6 +269,7 @@ certain functionality.
@li @c vcl.fonts - font-specific code
@li @c vcl.gdi - the GDI part of VCL, devices, bitmaps, etc.
@li @c vcl.gtk - Gtk+ 2/3 plugin
+ at li @c vcl.harfbuzz.layout
@li @c vcl.headless - bitmap-based backend
@li @c vcl.kde - KDE
@li @c vcl.kde4 - KDE4
commit cb6d67c21f11811c5bc023b9565c1c1b1f4081fa
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed May 15 10:42:04 2013 +0300
Spelling "separate" (etc) correctly is hard
diff --git a/apple_remote/source/AppleRemote.m b/apple_remote/source/AppleRemote.m
index d72997d..120297e 100644
--- a/apple_remote/source/AppleRemote.m
+++ b/apple_remote/source/AppleRemote.m
@@ -70,14 +70,14 @@ const char* AppleRemoteDeviceName = "AppleIRController";
- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {
if (pressedDown == NO && event == kRemoteButtonMenu_Hold) {
- // There is no seperate event for pressed down on menu hold. We are simulating that event here
+ // There is no separate event for pressed down on menu hold. We are simulating that event here
[super sendRemoteButtonEvent:event pressedDown:YES];
}
[super sendRemoteButtonEvent:event pressedDown:pressedDown];
if (pressedDown && (event == kRemoteButtonRight || event == kRemoteButtonLeft || event == kRemoteButtonPlay || event == kRemoteButtonMenu || event == kRemoteButtonPlay_Hold)) {
- // There is no seperate event when the button is being released. We are simulating that event here
+ // There is no separate event when the button is being released. We are simulating that event here
[super sendRemoteButtonEvent:event pressedDown:NO];
}
}
diff --git a/apple_remote/source/MultiClickRemoteBehavior.h b/apple_remote/source/MultiClickRemoteBehavior.h
index 77320ea..6a59c1f 100644
--- a/apple_remote/source/MultiClickRemoteBehavior.h
+++ b/apple_remote/source/MultiClickRemoteBehavior.h
@@ -61,7 +61,7 @@
// Simulating hold events does deactivate sending of individual requests for pressed down/released.
// Instead special hold events are being triggered when the user is pressing and holding a button for a small period.
-// Simulation is activated only for those buttons and remote control that do not have a seperate event already
+// Simulation is activated only for those buttons and remote control that do not have a separate event already
- (BOOL) simulateHoldEvent;
- (void) setSimulateHoldEvent: (BOOL) value;
diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx
index ba09e76..6a46043 100644
--- a/basegfx/source/polygon/b2dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b2dpolygonclipper.cxx
@@ -736,7 +736,7 @@ namespace basegfx
if(nIndex > 1)
{
- // consume vertices until a single seperate triangle has been visited.
+ // consume vertices until a single separate triangle has been visited.
if(!((nIndex+1)%3))
{
// if any of the last three vertices was outside
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 19d52a8..ff85d10 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3448,7 +3448,7 @@ RTLFUNC(Shell)
sal_Int32 nLen = aCmdLine.getLength();
// #55735 if there are parameters, they have to be separated
- // #72471 also seperate the single parameters
+ // #72471 also separate the single parameters
std::list<String> aTokenList;
OUString aToken;
sal_Int32 i = 0;
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index 328bbcf..422c0dd 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -54,8 +54,8 @@ static OUString ImpCurrencyToString( const sal_Int64 &rVal )
#ifdef MAYBEFUTURE
if ( initialLen > 5 )
{
- sal_Int32 nThouSeperators = ( initialLen - 5 ) / 3;
- nCapacity += nThouSeperators;
+ sal_Int32 nThouSeparators = ( initialLen - 5 ) / 3;
+ nCapacity += nThouSeparators;
}
#endif
}
@@ -158,7 +158,7 @@ static sal_Int64 ImpStringToCurrency( const OUString &rStr )
OUString sTmp( rStr.trim() );
const sal_Unicode* p = sTmp.getStr();
- // normalise string number by removeing thousands & decimal point seperators
+ // normalise string number by removeing thousands & decimal point separators
OUStringBuffer sNormalisedNumString( sTmp.getLength() + nFractDigit );
if ( *p == '-' || *p == '+' )
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index ff6109e..c136e95 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -506,7 +506,7 @@ static sal_uInt16 printfmtnum( double nNum, OUString& rRes, const OUString& rWFm
short nPrec = 0; // number of positions after decimal point
short nWidth = 0; // number range completely
short nLen; // length of converted number
- bool bPoint = false; // true: with 1000 seperators
+ bool bPoint = false; // true: with 1000 separators
bool bTrail = false; // true, if following minus
bool bSign = false; // true: always with leading sign
bool bNeg = false; // true: number is negative
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index dc4c777..f0ea5d1 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -578,7 +578,7 @@ sal_Bool SbxValue::Put( const SbxValues& rVal )
// Method to execute a pretreatment of the strings at special types.
// In particular necessary for BASIC-IDE, so that
// the output in the Watch-Window can be writen back with PutStringExt,
-// if Float were declared with ',' as the decimal seperator or BOOl
+// if Float were declared with ',' as the decimal separator or BOOl
// explicit with "TRUE" or "FALSE".
// Implementation in ImpConvStringExt (SBXSCAN.CXX)
sal_Bool SbxValue::PutStringExt( const OUString& r )
@@ -715,7 +715,7 @@ sal_Bool SbxValue::IsFixed() const
// A variable is numeric, if it is EMPTY or realy numeric
// or if it contains a complete convertible String
-// #41692, implement it for RTL and Basic-Core seperably
+// #41692, implement it for RTL and Basic-Core separately
sal_Bool SbxValue::IsNumeric() const
{
return ImpIsNumeric( /*bOnlyIntntl*/false );
diff --git a/bean/test/makefile.mk b/bean/test/makefile.mk
index 70f24dd..1e3c493 100644
--- a/bean/test/makefile.mk
+++ b/bean/test/makefile.mk
@@ -33,8 +33,8 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
MAXLINELENGTH = 100000
-OFFICE_CLASSPATH_TMP:=$(foreach,i,$(JARFILES) $(office)$/program$/classes$/$(i)$(PATH_SEPERATOR))
-OFFICE_CLASSPATH=$(OFFICE_CLASSPATH_TMP:t"")$(PATH_SEPERATOR)$(CLASSDIR)
+OFFICE_CLASSPATH_TMP:=$(foreach,i,$(JARFILES) $(office)$/program$/classes$/$(i)$(PATH_SEPARATOR))
+OFFICE_CLASSPATH=$(OFFICE_CLASSPATH_TMP:t"")$(PATH_SEPARATOR)$(CLASSDIR)
OOOBEAN_OPTIONS=-Dcom.sun.star.officebean.Options=--norestore
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index e9c6551..362fb89 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
@@ -60,7 +60,7 @@ public:
void * start;
#ifdef USE_DOUBLE_MMAP
- /** When seperately mmapping the block for writing and executing
+ /** When separately mmapping the block for writing and executing
exec points to the same memory as start, except start is used
exclusively for writing and exec for executing
*/
diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk
index e7da44f..8373710 100644
--- a/bridges/test/java_uno/acquire/makefile.mk
+++ b/bridges/test/java_uno/acquire/makefile.mk
@@ -56,7 +56,7 @@ GIVE_EXEC_RIGHTS = chmod +x
EXEC_CLASSPATH_TMP = $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)
EXEC_CLASSPATH = \
- $(strip $(subst,!,$(PATH_SEPERATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
+ $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
$(BIN)$/$(TARGET).rdb: types.idl
- rm $@
@@ -79,16 +79,16 @@ TEST_JAVAUNO_ACQUIRE_UNO_URL := \
$(BIN)$/testacquire-java-client:
echo java -classpath \
- ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)\
-..$/class$/java_uno.jar$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
+ ..$/class$/test$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)\
+..$/class$/java_uno.jar$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \
test.javauno.acquire.TestAcquire client \
$(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
$(GIVE_EXEC_RIGHTS) $@
$(BIN)$/testacquire-java-server:
echo java -classpath \
- ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)\
-..$/class$/java_uno.jar$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
+ ..$/class$/test$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)\
+..$/class$/java_uno.jar$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \
test.javauno.acquire.TestAcquire server \
$(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
$(GIVE_EXEC_RIGHTS) $@
diff --git a/bridges/test/java_uno/any/makefile.mk b/bridges/test/java_uno/any/makefile.mk
index 549ea76..e997540 100644
--- a/bridges/test/java_uno/any/makefile.mk
+++ b/bridges/test/java_uno/any/makefile.mk
@@ -39,13 +39,13 @@ JAVAFILES = \
.IF "$(XCLASSPATH)" == ""
XCLASSPATH := $(CLASSDIR)$/test
.ELSE
-XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPERATOR)$(CLASSDIR)$/test
+XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPARATOR)$(CLASSDIR)$/test
.ENDIF
EXEC_CLASSPATH_TMP = \
- $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR)$(XCLASSPATH)
+ $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(PATH_SEPARATOR)$(XCLASSPATH)
EXEC_CLASSPATH = \
- $(strip $(subst,!,$(PATH_SEPERATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
+ $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
JARFILES = juh.jar jurt.jar ridl.jar
JAVACLASSFILES = \
@@ -96,14 +96,14 @@ ALLTAR : \
$(OUT)$/bin$/TestRemote : $(JAVACLASSFILES)
-rm -f $@
- echo java -classpath ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
+ echo java -classpath ..$/class$/test$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \
test.java_uno.anytest.TestRemote > $@
$(GIVE_EXEC_RIGHTS) $@
$(OUT)$/bin$/TestJni : $(JAVACLASSFILES)
-rm -f $@
echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \
- .$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
+ .$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \
-Djava.library.path=..$/lib test.java_uno.anytest.TestJni >> $@
$(GIVE_EXEC_RIGHTS) $@
diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk
index a49dea6..ae700d4 100644
--- a/bridges/test/java_uno/equals/makefile.mk
+++ b/bridges/test/java_uno/equals/makefile.mk
@@ -30,7 +30,7 @@ ENABLE_EXCEPTIONS = TRUE
.IF "$(XCLASSPATH)" == ""
XCLASSPATH := $(CLASSDIR)$/test
.ELSE
-XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPERATOR)$(CLASSDIR)$/test
+XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPARATOR)$(CLASSDIR)$/test
.ENDIF
DLLPRE = # no leading "lib" on .so files
@@ -59,7 +59,7 @@ GIVE_EXEC_RIGHTS = chmod +x
EXEC_CLASSPATH_TMP = $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)
EXEC_CLASSPATH = \
- $(strip $(subst,!,$(PATH_SEPERATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
+ $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
$(MISC)$/$(TARGET).rdb: types.idl
- rm $@
@@ -74,8 +74,8 @@ $(SLOFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET).rdb
$(BIN)$/testequals: $(BIN)$/testequals_services.rdb
echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \
- ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)\
-..$/class$/java_uno.jar$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
+ ..$/class$/test$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)\
+..$/class$/java_uno.jar$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \
test.java_uno.equals.TestEquals $(SOLARBINDIR)$/types.rdb \
testequals_services.rdb > $@
$(GIVE_EXEC_RIGHTS) $@
diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk
index 0d46ddb..dc48562 100644
--- a/bridges/test/java_uno/nativethreadpool/makefile.mk
+++ b/bridges/test/java_uno/nativethreadpool/makefile.mk
@@ -59,7 +59,7 @@ ALLTAR: test
EXEC_CLASSPATH_TMP = $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)
EXEC_CLASSPATH = \
- $(strip $(subst,!,$(PATH_SEPERATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
+ $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
$(MISC)$/$(TARGET)$/types.rdb: types.idl
- rm $@
@@ -105,7 +105,7 @@ test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).uno.jar $(BIN)$/$(TARGET).rdb
-l $(SHL2TARGETN) -ro $(BIN)$/$(TARGET).rdb \
-u 'uno:socket,host=localhost,port=3830;urp;test' --singleaccept &
+ $(AUGMENT_LIBRARY_PATH) OO_JAVA_PROPERTIES='RuntimeLib=$(JVM_LIB_URL)' \
- CLASSPATH=$(EXEC_CLASSPATH)$(PATH_SEPERATOR)$(BIN)$/$(TARGET).uno.jar \
+ CLASSPATH=$(EXEC_CLASSPATH)$(PATH_SEPARATOR)$(BIN)$/$(TARGET).uno.jar \
uno -c test.javauno.nativethreadpool.client -l $(SHL1TARGETN) \
-ro $(BIN)$/$(TARGET).rdb \
-env:URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR)
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 4c3fd3c..8f7b0cd 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -99,7 +99,7 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage(
, m_xChartModel ( xChartModel )
, m_aFT_Scheme ( this, SchResId( FT_SCHEME ) )
, m_aLB_Scheme ( this, SchResId( LB_SCHEME ) )
- , m_aFL_Seperator ( this, SchResId( FL_SEPERATOR ) )
+ , m_aFL_Separator ( this, SchResId( FL_SEPARATOR ) )
, m_aCB_Shading ( this, SchResId( CB_SHADING ) )
, m_aCB_ObjectLines ( this, SchResId( CB_OBJECTLINES ) )
, m_aCB_RoundedEdge ( this, SchResId( CB_ROUNDEDEDGE ) )
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc
index ed579af..66fc1d2 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc
@@ -24,7 +24,7 @@
#define CB_SHADING 2
#define CB_ROUNDEDEDGE 3
-#define FL_SEPERATOR 1
+#define FL_SEPARATOR 1
#define LB_SCHEME 2
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
index b23e254..cf319c4 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
@@ -70,7 +70,7 @@ private:
FixedText m_aFT_Scheme;
ListBox m_aLB_Scheme;
- FixedLine m_aFL_Seperator;
+ FixedLine m_aFL_Separator;
CheckBox m_aCB_Shading;
CheckBox m_aCB_ObjectLines;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src
index 33ceb12..5e51ae9 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src
@@ -33,9 +33,9 @@
#define POS_X_2 POS_X_1+WIDTH_FT+4
#define POS_Y_SCHEME 8
-#define POS_Y_SEPERATOR (POS_Y_SCHEME+13)
+#define POS_Y_SEPARATOR (POS_Y_SCHEME+13)
-#define POS_Y_SHADING (POS_Y_SEPERATOR+16)
+#define POS_Y_SHADING (POS_Y_SEPARATOR+16)
#define POS_Y_OBJECTLINES (POS_Y_SHADING+16)
#define POS_Y_ROUNDEDEDGE (POS_Y_OBJECTLINES+16)
@@ -63,9 +63,9 @@ TabPage TP_3D_SCENEAPPEARANCE
Pos = MAP_APPFONT ( POS_X_2 , POS_Y_SCHEME-2 ) ;
Size = MAP_APPFONT ( WIDTH_LB , HEIGHT_LB ) ;
};
- FixedLine FL_SEPERATOR
+ FixedLine FL_SEPARATOR
{
- Pos = MAP_APPFONT ( POS_X_0 , POS_Y_SEPERATOR ) ;
+ Pos = MAP_APPFONT ( POS_X_0 , POS_Y_SEPARATOR ) ;
Size = MAP_APPFONT ( WIDTH_FL , HEIGHT_FL ) ;
};
diff --git a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
index 909ad94..e9b289f 100644
--- a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
+++ b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
@@ -175,11 +175,11 @@ bool MergedMinimumAndMaximumSupplier::isExpandNarrowValuesTowardZero( sal_Int32
return false;
}
-bool MergedMinimumAndMaximumSupplier::isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex )
+bool MergedMinimumAndMaximumSupplier::isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex )
{
// should not be called
for( MinimumAndMaximumSupplierSet::iterator aIt = begin(), aEnd = end(); aIt != aEnd; ++aIt )
- if( (*aIt)->isSeperateStackingForDifferentSigns( nDimensionIndex ) )
+ if( (*aIt)->isSeparateStackingForDifferentSigns( nDimensionIndex ) )
return true;
return false;
}
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index b4b3940..025441c 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -129,7 +129,7 @@ bool AreaChart::isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex )
VSeriesPlotter::isExpandIfValuesCloseToBorder( nDimensionIndex );
}
-bool AreaChart::isSeperateStackingForDifferentSigns( sal_Int32 /*nDimensionIndex*/ )
+bool AreaChart::isSeparateStackingForDifferentSigns( sal_Int32 /*nDimensionIndex*/ )
{
// no separate stacking in all types of line/area charts
return false;
diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx
index cb6ea9f..f177b0b 100644
--- a/chart2/source/view/charttypes/AreaChart.hxx
+++ b/chart2/source/view/charttypes/AreaChart.hxx
@@ -58,7 +58,7 @@ public:
//-------------------------------------------------------------------------
virtual double getMaximumX();
virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex );
- virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex );
+ virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex );
//-------------------------------------------------------------------------
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index c8942b6..9caca6e 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -470,7 +470,7 @@ void BarChart::createShapes()
double fMinimumY = 0.0, fMaximumY = 0.0;
aXSlotIter->calculateYMinAndMaxForCategory( nPointIndex
- , isSeperateStackingForDifferentSigns( 1 ), fMinimumY, fMaximumY, nAttachedAxisIndex );
+ , isSeparateStackingForDifferentSigns( 1 ), fMinimumY, fMaximumY, nAttachedAxisIndex );
if( !::rtl::math::isNan( fMaximumY ) && fMaximumY > 0)
aLogicYSumMap[nAttachedAxisIndex] += fMaximumY;
@@ -513,7 +513,7 @@ void BarChart::createShapes()
double fMinimumY = 0.0, fMaximumY = 0.0;
aXSlotIter->calculateYMinAndMaxForCategory( nPointIndex
- , isSeperateStackingForDifferentSigns( 1 ), fMinimumY, fMaximumY, nAttachedAxisIndex );
+ , isSeparateStackingForDifferentSigns( 1 ), fMinimumY, fMaximumY, nAttachedAxisIndex );
double fLogicPositiveYSum = 0.0;
if( !::rtl::math::isNan( fMaximumY ) )
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index f3feec1..a87a2ef 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -154,7 +154,7 @@ bool BubbleChart::isExpandIfValuesCloseToBorder( sal_Int32 /*nDimensionIndex*/ )
return true;
}
-bool BubbleChart::isSeperateStackingForDifferentSigns( sal_Int32 /*nDimensionIndex*/ )
+bool BubbleChart::isSeparateStackingForDifferentSigns( sal_Int32 /*nDimensionIndex*/ )
{
return false;
}
diff --git a/chart2/source/view/charttypes/BubbleChart.hxx b/chart2/source/view/charttypes/BubbleChart.hxx
index 23f0d24..23b34ed 100644
--- a/chart2/source/view/charttypes/BubbleChart.hxx
+++ b/chart2/source/view/charttypes/BubbleChart.hxx
@@ -49,7 +49,7 @@ public:
// MinimumAndMaximumSupplier
//-------------------------------------------------------------------------
virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex );
- virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex );
+ virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex );
//-------------------------------------------------------------------------
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index 1860b39..1973e05 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -63,7 +63,7 @@ CandleStickChart::~CandleStickChart()
// MinimumAndMaximumSupplier
//-------------------------------------------------------------------------
-bool CandleStickChart::isSeperateStackingForDifferentSigns( sal_Int32 /* nDimensionIndex */ )
+bool CandleStickChart::isSeparateStackingForDifferentSigns( sal_Int32 /* nDimensionIndex */ )
{
return false;
}
diff --git a/chart2/source/view/charttypes/CandleStickChart.hxx b/chart2/source/view/charttypes/CandleStickChart.hxx
index 6ea2399..cac36dc 100644
--- a/chart2/source/view/charttypes/CandleStickChart.hxx
+++ b/chart2/source/view/charttypes/CandleStickChart.hxx
@@ -47,7 +47,7 @@ public:
//-------------------------------------------------------------------------
// MinimumAndMaximumSupplier
//-------------------------------------------------------------------------
- virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex );
+ virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex );
//-------------------------------------------------------------------------
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 06be798..ddfbc36 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -306,7 +306,7 @@ bool PieChart::isExpandNarrowValuesTowardZero( sal_Int32 /* nDimensionIndex */ )
return false;
}
-bool PieChart::isSeperateStackingForDifferentSigns( sal_Int32 /* nDimensionIndex */ )
+bool PieChart::isSeparateStackingForDifferentSigns( sal_Int32 /* nDimensionIndex */ )
{
return false;
}
diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx
index d563ef0..b6346aa 100644
--- a/chart2/source/view/charttypes/PieChart.hxx
+++ b/chart2/source/view/charttypes/PieChart.hxx
@@ -62,7 +62,7 @@ public:
virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex );
virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex );
virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex );
- virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex );
+ virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex );
//-------------------------------------------------------------------------
//-------------------------------------------------------------------------
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index a49fed9..d9041f9 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1267,7 +1267,7 @@ double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, s
rXSlots[nN].calculateYMinAndMaxForCategoryRange(
static_cast<sal_Int32>(fMinimumX-1.0) //first category (index 0) matches with real number 1.0
, static_cast<sal_Int32>(fMaximumX-1.0) //first category (index 0) matches with real number 1.0
- , isSeperateStackingForDifferentSigns( 1 )
+ , isSeparateStackingForDifferentSigns( 1 )
, fLocalMinimum, fLocalMaximum, nAxisIndex );
if(fMaximum<fLocalMaximum)
fMaximum=fLocalMaximum;
@@ -1301,7 +1301,7 @@ double VSeriesPlotter::getMaximumYInRange( double fMinimumX, double fMaximumX, s
rXSlots[nN].calculateYMinAndMaxForCategoryRange(
static_cast<sal_Int32>(fMinimumX-1.0) //first category (index 0) matches with real number 1.0
, static_cast<sal_Int32>(fMaximumX-1.0) //first category (index 0) matches with real number 1.0
- , isSeperateStackingForDifferentSigns( 1 )
+ , isSeparateStackingForDifferentSigns( 1 )
, fLocalMinimum, fLocalMaximum, nAxisIndex );
if(fMaximum<fLocalMaximum)
fMaximum=fLocalMaximum;
@@ -1362,7 +1362,7 @@ bool VSeriesPlotter::isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex )
return nDimensionIndex == 1;
}
-bool VSeriesPlotter::isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex )
+bool VSeriesPlotter::isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex )
{
// default implementation: only for Y axis
return nDimensionIndex == 1;
@@ -1704,7 +1704,7 @@ void VDataSeriesGroup::getMinimumAndMaximiumYInContinuousXRange(
}
void VDataSeriesGroup::calculateYMinAndMaxForCategory( sal_Int32 nCategoryIndex
- , bool bSeperateStackingForDifferentSigns
+ , bool bSeparateStackingForDifferentSigns
, double& rfMinimumY, double& rfMaximumY, sal_Int32 nAxisIndex )
{
::rtl::math::setInf(&rfMinimumY, false);
@@ -1733,7 +1733,7 @@ void VDataSeriesGroup::calculateYMinAndMaxForCategory( sal_Int32 nCategoryIndex
::std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin();
::std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end();
- if( bSeperateStackingForDifferentSigns )
+ if( bSeparateStackingForDifferentSigns )
{
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
@@ -1795,7 +1795,7 @@ void VDataSeriesGroup::calculateYMinAndMaxForCategory( sal_Int32 nCategoryIndex
void VDataSeriesGroup::calculateYMinAndMaxForCategoryRange(
sal_Int32 nStartCategoryIndex, sal_Int32 nEndCategoryIndex
- , bool bSeperateStackingForDifferentSigns
+ , bool bSeparateStackingForDifferentSigns
, double& rfMinimumY, double& rfMaximumY, sal_Int32 nAxisIndex )
{
//@todo maybe cache these values
@@ -1813,7 +1813,7 @@ void VDataSeriesGroup::calculateYMinAndMaxForCategoryRange(
double fMaximumY; ::rtl::math::setNan(&fMaximumY);
this->calculateYMinAndMaxForCategory( nCatIndex
- , bSeperateStackingForDifferentSigns, fMinimumY, fMaximumY, nAxisIndex );
+ , bSeparateStackingForDifferentSigns, fMinimumY, fMaximumY, nAxisIndex );
if(rfMinimumY > fMinimumY)
rfMinimumY = fMinimumY;
diff --git a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx
index 20a4882..b32855a 100644
--- a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx
+++ b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx
@@ -51,7 +51,7 @@ public:
virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) = 0;
virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ) = 0;
virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ) = 0;
- virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) = 0;
+ virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) = 0;
//return a constant out of ::com::sun::star::chart::TimeUnit that allows to display the smallest distance between occuring dates
virtual long calculateTimeResolutionOnXAxis() = 0;
@@ -83,7 +83,7 @@ public:
virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex );
virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex );
virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex );
- virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex );
+ virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex );
virtual long calculateTimeResolutionOnXAxis();
virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate );
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index ce6596a..d14306d 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -92,10 +92,10 @@ public:
void getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, double& rfMaxY, double fMinX, double fMaxX, sal_Int32 nAxisIndex ) const;
void calculateYMinAndMaxForCategory( sal_Int32 nCategoryIndex
- , bool bSeperateStackingForDifferentSigns
+ , bool bSeparateStackingForDifferentSigns
, double& rfMinimumY, double& rfMaximumY, sal_Int32 nAxisIndex );
void calculateYMinAndMaxForCategoryRange( sal_Int32 nStartCategoryIndex, sal_Int32 nEndCategoryIndex
- , bool bSeperateStackingForDifferentSigns
+ , bool bSeparateStackingForDifferentSigns
, double& rfMinimumY, double& rfMaximumY, sal_Int32 nAxisIndex );
::std::vector< VDataSeries* > m_aSeriesVector;
@@ -174,7 +174,7 @@ public:
virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex );
virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex );
virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex );
- virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex );
+ virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex );
virtual long calculateTimeResolutionOnXAxis();
virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate );
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index 34c43a9a..4324cb6 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -86,14 +86,14 @@ OString createFileNameFromType( const OString& destination,
length += prefix.getLength() + type.getLength() + postfix.getLength();
- sal_Bool withSeperator = sal_False;
+ sal_Bool withSeparator = sal_False;
if (destination.getStr()[destination.getLength()] != '\\' &&
destination.getStr()[destination.getLength()] != '/' &&
type.getStr()[0] != '\\' &&
type.getStr()[0] != '/')
{
length++;
- withSeperator = sal_True;
+ withSeparator = sal_True;
}
OStringBuffer fileNameBuf(length);
@@ -103,7 +103,7 @@ OString createFileNameFromType( const OString& destination,
else
fileNameBuf.append(destination.getStr(), destination.getLength());
- if (withSeperator)
+ if (withSeparator)
fileNameBuf.append("/", 1);
OString tmpStr(type);
diff --git a/config_host.mk.in b/config_host.mk.in
index c731167..7515883 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -387,7 +387,7 @@ export OUTDIR=@OUTDIR@
export OUTDIR_FOR_BUILD=@OUTDIR_FOR_BUILD@
export OUTPATH=@OUTPATH@
export PATH=@LO_PATH@
-export PATH_SEPERATOR=@P_SEP@
+export PATH_SEPARATOR=@P_SEP@
export PERL=@PERL@
export PKGFORMAT=@PKGFORMAT@
export PKGMK=@PKGMK@
diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx
index 60802e6..a5ed2a2 100644
--- a/connectivity/source/drivers/evoab2/NDriver.hxx
+++ b/connectivity/source/drivers/evoab2/NDriver.hxx
@@ -28,7 +28,7 @@
#include <osl/module.h>
#define EVOAB_EVOLUTION_SCHEMA "evolution"
-/*In Future, when seperate schema is required for ldap, groupwise*/
+/*In Future, when separate schema is required for ldap, groupwise*/
#define EVOAB_LDAP_SCHEMA "ldap"
#define EVOAB_GWISE_SCHEMA "groupwise"
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 6639850..2030b3c 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -682,7 +682,7 @@ sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sal
const sal_Unicode cChar = aStr.GetChar(j);
if (cDecimalDelimiter && cChar == cDecimalDelimiter)
aBuf.append('.');
- else if ( cChar == '.' ) // special case, if decimal seperator isn't '.' we have to put the string after it
+ else if ( cChar == '.' ) // special case, if decimal separator isn't '.' we have to put the string after it
continue;
else if (cThousandDelimiter && cChar == cThousandDelimiter)
{
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 0adc5f6..e2cf55c 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -910,7 +910,7 @@ OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType,OSQLParseNode*& pLiteral)
case DataType::FLOAT:
case DataType::REAL:
case DataType::DOUBLE:
- // kill thousand seperators if any
+ // kill thousand separators if any
killThousandSeparator(pReturn);
break;
case DataType::CHAR:
@@ -932,7 +932,7 @@ OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType,OSQLParseNode*& pLiteral)
case DataType::FLOAT:
case DataType::REAL:
case DataType::DOUBLE:
- // kill thousand seperators if any
+ // kill thousand separators if any
killThousandSeparator(pReturn);
break;
case DataType::CHAR:
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 63393d1..3f4bb2a 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -256,7 +256,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
ListBox* m_pFmtLB;
- FixedText* m_pSeperatorFT;
+ FixedText* m_pSeparatorFT;
FixedText* m_pPrefixFT;
Edit* m_pPrefixED;
FixedText* m_pSuffixFT;
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index d8c7e76..5bd09ae 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1071,7 +1071,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
get(m_pLevelLB, "levellb");
get(m_pFmtLB, "numfmtlb");
- get(m_pSeperatorFT, "separator");
+ get(m_pSeparatorFT, "separator");
get(m_pPrefixFT, "prefixft");
get(m_pPrefixED, "prefix");
get(m_pSuffixFT, "suffixft");
@@ -1590,7 +1590,7 @@ void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 nType, sal_Bool )
sal_Bool bBitmap = (nType == SHOW_BITMAP);
sal_Bool bEnableBitmap = (nType == SHOW_BITMAP);
sal_Bool bNumeric = !(bBitmap||bBullet);
- m_pSeperatorFT->Show(bNumeric);
+ m_pSeparatorFT->Show(bNumeric);
m_pPrefixFT->Show(bNumeric);
m_pPrefixED->Show(bNumeric);
m_pSuffixFT->Show(bNumeric);
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index fb3bbf1..6e72732 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -260,7 +260,7 @@ namespace dbaui
}
// For the databaseWizard we only have one entry for the MySQL Database,
- // because we have a seperate tabpage to retrieve the respective datasource type
+ // because we have a separate tabpage to retrieve the respective datasource type
// ( ::dbaccess::DST_MYSQL_ODBC || ::dbaccess::DST_MYSQL_JDBC). Therefore we use ::dbaccess::DST_MYSQL_JDBC as a temporary
// representative for all MySQl databases)
// Also, embedded databases (embedded HSQL, at the moment), are not to appear in the list of
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index e9437fe..de0e7b5 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2607,11 +2607,11 @@ String GetURL_Impl(
return rName;
}
- // Add path seperator to these directory and make given URL (rName) absolute by using of current working directory
+ // Add path separator to these directory and make given URL (rName) absolute by using of current working directory
// Attention: "setFinalSlash()" is necessary for calling "smartRel2Abs()"!!!
// Otherwhise last part will be ignored and wrong result will be returned!!!
// "smartRel2Abs()" interpret given URL as file not as path. So he truncate last element to get the base path ...
- // But if we add a seperator - he doesn't do it anymore.
+ // But if we add a separator - he doesn't do it anymore.
INetURLObject aObj;
if (cwdUrl) {
aObj.SetURL(*cwdUrl);
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index f8460aa..2b36113 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -1073,7 +1073,7 @@ void MigrationImpl::compareOldAndNewConfig(const OUString& sParent,
const uno::Reference< container::XIndexContainer >& xIndexNew,
const OUString& sResourceURL)
{
- const OUString MENU_SEPERATOR(" | ");
+ const OUString MENU_SEPARATOR(" | ");
::std::vector< MigrationItem > vOldItems;
::std::vector< MigrationItem > vNewItems;
@@ -1127,7 +1127,7 @@ void MigrationImpl::compareOldAndNewConfig(const OUString& sParent,
{
OUString sName;
if (!sParent.isEmpty())
- sName = sParent + MENU_SEPERATOR + it->m_sCommandURL;
+ sName = sParent + MENU_SEPARATOR + it->m_sCommandURL;
else
sName = it->m_sCommandURL;
compareOldAndNewConfig(sName, it->m_xPopupMenu, pFound->m_xPopupMenu, sResourceURL);
@@ -1159,7 +1159,7 @@ void MigrationImpl::compareOldAndNewConfig(const OUString& sParent,
{
OUString sName;
if (!sParent.isEmpty())
- sName = sParent + MENU_SEPERATOR + it->m_sCommandURL;
+ sName = sParent + MENU_SEPARATOR + it->m_sCommandURL;
else
sName = it->m_sCommandURL;
compareOldAndNewConfig(sName, pFound->m_xPopupMenu, it->m_xPopupMenu, sResourceURL);
diff --git a/drawinglayer/source/processor3d/geometry2dextractor.cxx b/drawinglayer/source/processor3d/geometry2dextractor.cxx
index f4ea999..0ca9a49 100644
--- a/drawinglayer/source/processor3d/geometry2dextractor.cxx
+++ b/drawinglayer/source/processor3d/geometry2dextractor.cxx
@@ -131,7 +131,7 @@ namespace drawinglayer
}
case PRIMITIVE3D_ID_SHADOWPRIMITIVE3D :
{
- // accept but ignore labels and shadow; these should be extracted seperately
+ // accept but ignore labels and shadow; these should be extracted separately
break;
}
default :
diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx
index 3c735c7..b0226c8 100644
--- a/dtrans/source/test/test_dtrans.cxx
+++ b/dtrans/source/test/test_dtrans.cxx
@@ -39,9 +39,9 @@
//------------------------------------------------------------------------
#ifdef UNX
-#define PATH_SEPERATOR '/'
+#define PATH_SEPARATOR '/'
#else
-#define PATH_SEPERATOR '\\'
+#define PATH_SEPARATOR '\\'
#endif
#define ENSURE( a, b ) if( !a ) { fprintf( stderr, b "\n" ); exit( -1 ); }
@@ -304,7 +304,7 @@ int SAL_CALL main( int argc, const char* argv[] )
// check command line parameters
//------------------------------------------------------------------
- if ( NULL == ( app = strrchr( argv[0], PATH_SEPERATOR ) ) )
+ if ( NULL == ( app = strrchr( argv[0], PATH_SEPARATOR ) ) )
app = argv[0];
else
app++;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 9f36498..eebf87c 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -359,7 +359,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const String& rTxt,
if( rCC.isLetterNumeric( rTxt, nEndPos - 1 ))
break;
- // Is the word a compounded word seperated by delimiters?
+ // Is the word a compounded word separated by delimiters?
// If so, keep track of all delimiters so each constituent
// word can be checked for two initial capital letters.
xub_StrLen n = 0;
diff --git a/embeddedobj/test/Container1/makefile.mk b/embeddedobj/test/Container1/makefile.mk
index aa3aff2..fed9034 100644
--- a/embeddedobj/test/Container1/makefile.mk
+++ b/embeddedobj/test/Container1/makefile.mk
@@ -25,9 +25,9 @@ PACKAGE = embeddedobj$/test
.INCLUDE: settings.mk
# EXEC_CLASSPATH_TMP = \
-# $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR)
+# $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(PATH_SEPARATOR)
# EXEC_CLASSPATH = \
-# $(strip $(subst,!,$(PATH_SEPERATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
+# $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
#----- compile .java files -----------------------------------------
@@ -66,11 +66,11 @@ JavaStorageTestExample : $(CLASSFILES)
# echo $(EXEC_CLASSPATH)
run: $(CLASSFILES)
- +set PATH=$(PATH)$(PATH_SEPERATOR)$(JDK14PATH)$/jre$/bin && \
+ +set PATH=$(PATH)$(PATH_SEPARATOR)$(JDK14PATH)$/jre$/bin && \
java -classpath "$(OUT)$/class;$(OUT)$/lib;$(OUT)$/bin;$(JDK14PATH)$/jre$/bin;$(JDK14PATH)$/jre$/lib;$(CLASSPATH)" embeddedobj.test.EmbedContFrame
debug: $(CLASSFILES)
- +set PATH=$(PATH)$(PATH_SEPERATOR)$(JDK14PATH)$/jre$/bin && \
+ +set PATH=$(PATH)$(PATH_SEPARATOR)$(JDK14PATH)$/jre$/bin && \
jdb -classpath "$(OUT)$/class;$(OUT)$/lib;$(OUT)$/bin;$(CLASSPATH)" embeddedobj.test.EmbedContFrame
clean :
diff --git a/extensions/qa/complex/extensions/makefile.mk b/extensions/qa/complex/extensions/makefile.mk
index ce35151..312a7ca 100644
--- a/extensions/qa/complex/extensions/makefile.mk
+++ b/extensions/qa/complex/extensions/makefile.mk
@@ -38,9 +38,9 @@ EXTRAJARFILES = $(OOO_JUNIT_JAR)
.IF "$(OS)"=="WNT"
-command_seperator=&&
+command_separator=&&
.ELSE
-command_seperator=;
+command_separator=;
.ENDIF
@@ -81,8 +81,8 @@ RESLIB2SRSFILES=$(RES2FILELIST)
ALLTAR : copy_resources javatest
copy_resources: $(RESLIB1TARGETN) $(RESLIB2TARGETN)
- $(foreach,i,$(RESLIB1TARGETN) $(COPY) $i $(i:s/de/invalid/:s/_A_//) $(command_seperator)) echo
- $(foreach,i,$(RESLIB2TARGETN) $(COPY) $i $(i:s/en-US/invalid/:s/_B_//) $(command_seperator)) echo
+ $(foreach,i,$(RESLIB1TARGETN) $(COPY) $i $(i:s/de/invalid/:s/_A_//) $(command_separator)) echo
+ $(foreach,i,$(RESLIB2TARGETN) $(COPY) $i $(i:s/en-US/invalid/:s/_B_//) $(command_separator)) echo
.END
diff --git a/extensions/qa/integration/extensions/makefile.mk b/extensions/qa/integration/extensions/makefile.mk
index de53c5e..6861d1b 100644
--- a/extensions/qa/integration/extensions/makefile.mk
+++ b/extensions/qa/integration/extensions/makefile.mk
@@ -53,7 +53,7 @@ JARCOMPRESS = TRUE
.ENDIF
# classpath and argument list
-RUNNER_CLASSPATH = -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPERATOR)$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/ConnectivityTools.jar
+RUNNER_CLASSPATH = -cp $(CLASSPATH)$(PATH_SEPARATOR)$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPARATOR)$(CLASSPATH)$(PATH_SEPARATOR)$(SOLARBINDIR)$/ConnectivityTools.jar
RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex -cs $(RUNNER_CONNECTION_STRING)
# --- Targets ------------------------------------------------------
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 709e121..d487a15 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -149,7 +149,7 @@ Any IUnknownWrapper_Impl::queryInterface(const Type& t)
return Any();
// XDirectInvocation seems to be an oracle replacement for XAutomationInvocation, however it is flawed esecially wrt. assumptions about whether to invoke a
// Put or Get property, the implementation code has no business guessing that, it's up to the caller to decide that. Worse XDirectInvocation duplicates lots of code.
- // XAutomationInvocation provides seperate calls for put& get
+ // XAutomationInvocation provides separate calls for put& get
// properties. Note: Currently the basic runtime doesn't call put properties directly, it should... after all the basic runtime should know whether it is calling a put or get property.
// For the moment for ease of merging we will let the XDirectInvoke and XAuthomationInvocation interfaces stay side by side ( and for the momemnt at least I would prefer the basic
// runtime to call XAutomationInvocation instead of XDirectInvoke
diff --git a/external/wine/include/vssym32.h b/external/wine/include/vssym32.h
index c58be0b..bdf4f4b 100644
--- a/external/wine/include/vssym32.h
+++ b/external/wine/include/vssym32.h
@@ -666,7 +666,7 @@ static const WCHAR VSCLASS_MENUBAND[] = {'M','E','N','U','B','A','N','D',0};
enum MENUBANDPARTS {
MDP_NEWAPPBUTTON = 1,
- MDP_SEPERATOR = 2,
+ MDP_SEPARATOR = 2,
};
enum MENUBANDSTATES {
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 8fb4412..f4251c3 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1364,7 +1364,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
::osl::ResettableMutexGuard aLock(m_aLock);
// Attention: Detect services are part of the standard set!
- // So there is no need to handle it seperatly.
+ // So there is no need to handle it separately.
// ------------------------------------------
// a) The standard set of config value is needed.
@@ -2340,13 +2340,13 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe
OUStringList FilterCache::impl_tokenizeString(const OUString& sData ,
- sal_Unicode cSeperator)
+ sal_Unicode cSeparator)
{
OUStringList lData ;
sal_Int32 nToken = 0;
do
{
- OUString sToken = sData.getToken(0, cSeperator, nToken);
+ OUString sToken = sData.getToken(0, cSeparator, nToken);
lData.push_back(sToken);
}
while(nToken >= 0);
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index e28b88a..7305c48 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -1001,7 +1001,7 @@ class FilterCache : public BaseLock
/** TODO */
OUStringList impl_tokenizeString(const OUString& sData ,
- sal_Unicode cSeperator);
+ sal_Unicode cSeparator);
//---------------------------------------
diff --git a/filter/source/config/tools/split/FCFGSplit.cfg b/filter/source/config/tools/split/FCFGSplit.cfg
index 745b781..69d90ad 100644
--- a/filter/source/config/tools/split/FCFGSplit.cfg
+++ b/filter/source/config/tools/split/FCFGSplit.cfg
@@ -68,7 +68,7 @@ subdir_contenthandlers = contenthandlers
# Enable/Disable grouping of filter fragments and using
# of specialized sub directories.
#------------------------------------------------------
-seperate_filters_by_module = false
+separate_filters_by_module = false
#------------------------------------------------------
# The following defines specify system directories
@@ -76,7 +76,7 @@ seperate_filters_by_module = false
# Every of these sub dir willl be used to generate
# groups of filter fragments there.
# Note: These sub directories are used only if
-# "seperate_filters_by_module" is set to true!
+# "separate_filters_by_module" is set to true!
#------------------------------------------------------
subdir_module_swriter = swriter
subdir_module_sweb = sweb
diff --git a/filter/source/config/tools/split/FCFGSplit.java b/filter/source/config/tools/split/FCFGSplit.java
index a566853..76a6b1a 100644
--- a/filter/source/config/tools/split/FCFGSplit.java
+++ b/filter/source/config/tools/split/FCFGSplit.java
@@ -73,7 +73,7 @@ public class FCFGSplit
private static final java.lang.String CFGKEY_SUBDIR_FRAMELOADERS = "subdir_frameloaders" ;
private static final java.lang.String CFGKEY_SUBDIR_CONTENTHANDLERS = "subdir_contenthandlers" ;
- private static final java.lang.String CFGKEY_SEPERATE_FILTERS_BY_MODULE = "seperate_filters_by_module" ;
+ private static final java.lang.String CFGKEY_SEPARATE_FILTERS_BY_MODULE = "separate_filters_by_module" ;
private static final java.lang.String CFGKEY_SUBDIR_MODULE_SWRITER = "subdir_module_swriter" ;
private static final java.lang.String CFGKEY_SUBDIR_MODULE_SWEB = "subdir_module_sweb" ;
@@ -115,7 +115,7 @@ public class FCFGSplit
private static final java.lang.String DEFAULT_SUBDIR_FRAMELOADERS = "FrameLoaders" ;
private static final java.lang.String DEFAULT_SUBDIR_CONTENTHANDLERS = "ContentHandlers" ;
- private static final java.lang.String DEFAULT_SEPERATE_FILTERS_BY_MODULE = "false" ;
+ private static final java.lang.String DEFAULT_SEPARATE_FILTERS_BY_MODULE = "false" ;
private static final java.lang.String DEFAULT_SUBDIR_MODULE_SWRITER = "SWriter" ;
private static final java.lang.String DEFAULT_SUBDIR_MODULE_SWEB = "SWeb" ;
@@ -179,51 +179,51 @@ public class FCFGSplit
/** enable/disable generating of filter groups - separated by
* application modules. */
- private static boolean m_bSeperateFiltersByModule;
+ private static boolean m_bSeparateFiltersByModule;
/** specify the sub directory to generate filter groups
* for the module writer. Will be used only,
- * if m_bSeperateFiltersByModule is set to TRUE.*/
+ * if m_bSeparateFiltersByModule is set to TRUE.*/
private static java.lang.String m_sSubDirModuleSWriter;
/** specify the sub directory to generate filter groups
* for the module writer/web. Will be used only,
- * if m_bSeperateFiltersByModule is set to TRUE.*/
+ * if m_bSeparateFiltersByModule is set to TRUE.*/
private static java.lang.String m_sSubDirModuleSWeb;
/** specify the sub directory to generate filter groups
* for the module writer/global. Will be used only,
- * if m_bSeperateFiltersByModule is set to TRUE.*/
+ * if m_bSeparateFiltersByModule is set to TRUE.*/
private static java.lang.String m_sSubDirModuleSGlobal;
/** specify the sub directory to generate filter groups
* for the module calc. Will be used only,
- * if m_bSeperateFiltersByModule is set to TRUE.*/
+ * if m_bSeparateFiltersByModule is set to TRUE.*/
private static java.lang.String m_sSubDirModuleSCalc;
/** specify the sub directory to generate filter groups
* for the module draw. Will be used only,
- * if m_bSeperateFiltersByModule is set to TRUE.*/
+ * if m_bSeparateFiltersByModule is set to TRUE.*/
private static java.lang.String m_sSubDirModuleSDraw;
/** specify the sub directory to generate filter groups
* for the module impress. Will be used only,
- * if m_bSeperateFiltersByModule is set to TRUE.*/
+ * if m_bSeparateFiltersByModule is set to TRUE.*/
private static java.lang.String m_sSubDirModuleSImpress;
/** specify the sub directory to generate filter groups
* for the module math. Will be used only,
- * if m_bSeperateFiltersByModule is set to TRUE.*/
+ * if m_bSeparateFiltersByModule is set to TRUE.*/
private static java.lang.String m_sSubDirModuleSMath;
/** specify the sub directory to generate filter groups
* for the module chart. Will be used only,
- * if m_bSeperateFiltersByModule is set to TRUE.*/
+ * if m_bSeparateFiltersByModule is set to TRUE.*/
private static java.lang.String m_sSubDirModuleSChart;
/** specify the sub directory to generate filter groups
* for unknown modules - e.g. the graphic filters.
- * Will be used only, if m_bSeperateFiltersByModule
+ * Will be used only, if m_bSeparateFiltersByModule
* is set to TRUE.*/
private static java.lang.String m_sSubDirModuleOthers;
@@ -376,7 +376,7 @@ public class FCFGSplit
aDataSet.m_aCache = aCache ;
aDataSet.m_nFormat = m_nOutFormat ;
aDataSet.m_sEncoding = m_sOutEncoding ;
- aDataSet.m_bSeperateFiltersByModule = m_bSeperateFiltersByModule;
+ aDataSet.m_bSeparateFiltersByModule = m_bSeparateFiltersByModule;
aDataSet.m_sFragmentExtension = m_sFragmentExtension ;
aDataSet.m_aOutDir = aOutDir ;
@@ -386,7 +386,7 @@ public class FCFGSplit
aDataSet.m_aFragmentDirFrameLoaders = new java.io.File(aOutDir, m_sSubDirFrameLoaders );
aDataSet.m_aFragmentDirContentHandlers = new java.io.File(aOutDir, m_sSubDirContentHandlers);
- if (m_bSeperateFiltersByModule)
+ if (m_bSeparateFiltersByModule)
{
aDataSet.m_aFragmentDirModuleSWriter = new java.io.File(aDataSet.m_aFragmentDirFilters, m_sSubDirModuleSWriter );
aDataSet.m_aFragmentDirModuleSWeb = new java.io.File(aDataSet.m_aFragmentDirFilters, m_sSubDirModuleSWeb );
@@ -500,7 +500,7 @@ public class FCFGSplit
m_sSubDirModuleSChart = aCfg.getProperty(CFGKEY_SUBDIR_MODULE_SCHART , DEFAULT_SUBDIR_MODULE_SCHART );
m_sSubDirModuleOthers = aCfg.getProperty(CFGKEY_SUBDIR_MODULE_OTHERS , DEFAULT_SUBDIR_MODULE_OTHERS );
- m_bSeperateFiltersByModule = new java.lang.Boolean(aCfg.getProperty(CFGKEY_SEPERATE_FILTERS_BY_MODULE , DEFAULT_SEPERATE_FILTERS_BY_MODULE )).booleanValue();
+ m_bSeparateFiltersByModule = new java.lang.Boolean(aCfg.getProperty(CFGKEY_SEPARATE_FILTERS_BY_MODULE , DEFAULT_SEPARATE_FILTERS_BY_MODULE )).booleanValue();
m_bCreateCombineFilterFlag = new java.lang.Boolean(aCfg.getProperty(CFGKEY_CREATE_COMBINE_FILTER_FLAG , DEFAULT_CREATE_COMBINE_FILTER_FLAG )).booleanValue();
m_bRemoveFilterFlagBrowserPreferred = new java.lang.Boolean(aCfg.getProperty(CFGKEY_REMOVE_FILTER_FLAG_BROWSERPREFERRED, DEFAULT_REMOVE_FILTER_FLAG_BROWSERPREFERRED)).booleanValue();
m_bRemoveFilterFlagPreferred = new java.lang.Boolean(aCfg.getProperty(CFGKEY_REMOVE_FILTER_FLAG_PREFERRED , DEFAULT_REMOVE_FILTER_FLAG_PREFERRED )).booleanValue();
diff --git a/filter/source/config/tools/split/SplitterData.java b/filter/source/config/tools/split/SplitterData.java
index 4f85d65..38226a8 100644
--- a/filter/source/config/tools/split/SplitterData.java
+++ b/filter/source/config/tools/split/SplitterData.java
@@ -58,11 +58,11 @@ public class SplitterData
public java.io.File m_aFragmentDirContentHandlers;
/** enable/disable grouping of filters by its application modules. */
- public boolean m_bSeperateFiltersByModule;
+ public boolean m_bSeparateFiltersByModule;
/** directories to group all filter fragments ... if requested.
* Must be relative to "m_aOutDir/m_aFragmentDirFilters" and
- * will be used only, if "m_bSeperateFiltersByModule" is set to true. */
+ * will be used only, if "m_bSeparateFiltersByModule" is set to true. */
public java.io.File m_aFragmentDirModuleSWriter;
public java.io.File m_aFragmentDirModuleSWeb;
public java.io.File m_aFragmentDirModuleSGlobal;
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 52c29b9..f19f698 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -727,9 +727,9 @@ void Writer::Impl_writeText( const Point& rPos, const String& rText, const sal_I
}
// -----------------------------------------------------------------------------
-// AS: Because JPEGs require the alpha channel provided seperately (JPEG does not
-// natively support alpha channel, but SWF lets you provide it seperately), we
-// extract the alpha channel into a seperate array here.
+// AS: Because JPEGs require the alpha channel provided separately (JPEG does not
+// natively support alpha channel, but SWF lets you provide it separately), we
+// extract the alpha channel into a separate array here.
void getBitmapData( const BitmapEx& aBmpEx, sal_uInt8*& tgadata, sal_uInt8*& tgaAlphadata, sal_uInt32& nWidth, sal_uInt32& nHeight )
{
if( !aBmpEx.IsEmpty() )
@@ -830,7 +830,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali
#endif
// AS: SWF files let you provide an Alpha mask for JPEG images, but we have
- // to ZLIB compress the alpha channel seperately.
+ // to ZLIB compress the alpha channel separately.
uLong alpha_compressed_size = 0;
sal_uInt8 *pAlphaCompressed = NULL;
if (bmpSource.IsAlpha() || bmpSource.IsTransparent())
@@ -1004,7 +1004,7 @@ void Writer::Impl_writeBmp( sal_uInt16 nBitmapId, sal_uInt32 width, sal_uInt32 h
void Writer::Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal_uInt32 nJpgDataLength, sal_uInt8 *pAlphaCompressed, sal_uInt32 alpha_compressed_size )
{
- // AS: Go through the actuall JPEG bits, seperating out the
+ // AS: Go through the actuall JPEG bits, separating out the
// header fields from the actual image fields. Fields are
// identifed by 0xFFXX where XX is the field type. Both
// the header and the image need start and stop (D8 and D9),
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index 1f79637..109bdde 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -34,7 +34,7 @@ namespace framework{
#define PACKAGENAME_PROTOCOLHANDLER DECLARE_ASCII("Office.ProtocolHandler" ) /// name of our configuration package
-#define CFG_PATH_SEPERATOR DECLARE_ASCII("/" ) /// separator for configuration paths
+#define CFG_PATH_SEPARATOR DECLARE_ASCII("/" ) /// separator for configuration paths
#define SETNAME_HANDLER DECLARE_ASCII("HandlerSet" ) /// name of configuration set inside package
#define PROPERTY_PROTOCOLS DECLARE_ASCII("Protocols" ) /// properties of a protocol handler
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 0b26720..672f67f 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -65,7 +65,7 @@ enum LangMenuIDs
MID_LANG_SEL_RESET,
MID_LANG_SEL_MORE,
- MID_LANG_PARA_SEPERATOR,
+ MID_LANG_PARA_SEPARATOR,
MID_LANG_PARA_STRING,
MID_LANG_PARA_1,
diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx
index fa3c506..a17e1dc 100644
--- a/framework/inc/helper/tagwindowasmodified.hxx
+++ b/framework/inc/helper/tagwindowasmodified.hxx
@@ -39,7 +39,7 @@ namespace framework{
/*-************************************************************************************************************//**
@short listen for modify events on model and tag frame container window so it can react accordingly
- @descr Used e.g. by our MAC port where such state is shown seperately on some controls of the
+ @descr Used e.g. by our MAC port where such state is shown separately on some controls of the
title bar.
@base ThreadHelpBase
diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx
index f6e0683..cfc9158 100644
--- a/framework/inc/jobs/joburl.hxx
+++ b/framework/inc/jobs/joburl.hxx
@@ -43,15 +43,15 @@ namespace framework{
#define JOBURL_SERVICE_STR "service="
#define JOBURL_SERVICE_LEN 8
-#define JOBURL_PART_SEPERATOR ';'
-#define JOBURL_PARTARGS_SEPERATOR ','
+#define JOBURL_PART_SEPARATOR ';'
+#define JOBURL_PARTARGS_SEPARATOR ','
//_______________________________________
/**
@short can be used to parse, validate and work with job URL's
@descr Job URLs are specified by the following syntax:
vnd.sun.star.job:{[event=<name>]|[alias=<name>]|[service=<name>]}
- This class can analyze this structure and seperate it into his different parts.
+ This class can analyze this structure and separate it into his different parts.
After doing that these parts are accessible by the methods of this class.
*/
class JobURL : private ThreadHelpBase
diff --git a/framework/inc/queries.h b/framework/inc/queries.h
index 94f6c32..26f60cb 100644
--- a/framework/inc/queries.h
+++ b/framework/inc/queries.h
@@ -60,8 +60,8 @@ namespace framework{
default_first set default filter on top of return list false
case_sensitive compare "sort_prop" case sensitive false
*//*-*************************************************************************************************************/
-#define SEPERATOR_QUERYPARAM ((sal_Unicode)':')
-#define SEPERATOR_QUERYPARAMVALUE ((sal_Unicode)'=')
+#define SEPARATOR_QUERYPARAM ((sal_Unicode)':')
+#define SEPARATOR_QUERYPARAMVALUE ((sal_Unicode)'=')
#define QUERYPARAM_IFLAGS DECLARE_ASCII("iflags" )
#define QUERYPARAM_EFLAGS DECLARE_ASCII("eflags" )
@@ -112,11 +112,11 @@ class QueryBuilder
//---------------------------------------------------------------------------------------------------------
void addParam( const OUString& sParam, const OUString& sValue = OUString() )
{
- m_sParams.append( SEPERATOR_QUERYPARAM );
+ m_sParams.append( SEPARATOR_QUERYPARAM );
m_sParams.append( sParam );
if( sValue.getLength() > 0 )
{
- m_sParams.append( SEPERATOR_QUERYPARAMVALUE );
+ m_sParams.append( SEPARATOR_QUERYPARAMVALUE );
m_sParams.append( sValue );
}
}
@@ -236,7 +236,7 @@ class QueryAnalyzer
// Try to find base of it and safe it for faster access as enum value!
sal_Int32 nToken = 0;
OUString sParam;
- OUString sBase = sNewQuery.getToken( 0, SEPERATOR_QUERYPARAM, nToken );
+ OUString sBase = sNewQuery.getToken( 0, SEPARATOR_QUERYPARAM, nToken );
if (sBase.equalsIgnoreAsciiCase(BASE_QUERY_ALL))
m_eQuery = E_ALL;
@@ -262,7 +262,7 @@ class QueryAnalyzer
// Try to get additional parameters ...
while( nToken >= 0 )
{
- sParam = sNewQuery.getToken( 0, SEPERATOR_QUERYPARAM, nToken );
+ sParam = sNewQuery.getToken( 0, SEPARATOR_QUERYPARAM, nToken );
// "default_first"
if( sParam.startsWith( QUERYPARAM_DEFAULT_FIRST ) )
{
@@ -287,30 +287,30 @@ class QueryAnalyzer
else if( sParam.startsWith( QUERYPARAM_IFLAGS ) )
{
sal_Int32 nSubToken = 0;
- sParam.getToken( 0, SEPERATOR_QUERYPARAMVALUE, nSubToken );
+ sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken );
if( nSubToken > 0 )
{
- m_nIFlags = sParam.getToken( 0, SEPERATOR_QUERYPARAMVALUE, nSubToken ).toInt32();
+ m_nIFlags = sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken ).toInt32();
}
}
// "eflags=<mask>"
else if( sParam.startsWith( QUERYPARAM_EFLAGS ) )
{
sal_Int32 nSubToken = 0;
- sParam.getToken( 0, SEPERATOR_QUERYPARAMVALUE, nSubToken );
+ sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken );
if( nSubToken > 0 )
{
- m_nEFlags = sParam.getToken( 0, SEPERATOR_QUERYPARAMVALUE, nSubToken ).toInt32();
+ m_nEFlags = sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken ).toInt32();
}
}
// "sort_prop=<[name,uiname]>"
else if( sParam.startsWith( QUERYPARAM_SORT_PROP ) )
{
sal_Int32 nSubToken = 0;
- sParam.getToken( 0, SEPERATOR_QUERYPARAMVALUE, nSubToken );
+ sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken );
if( nSubToken > 0 )
{
- OUString sParamValue = sParam.getToken( 0, SEPERATOR_QUERYPARAMVALUE, nSubToken );
+ OUString sParamValue = sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken );
if( sParamValue.startsWith( QUERYPARAMVALUE_SORT_PROP_NAME ) )
m_eSortProp = E_NAME;
else if( sParamValue.startsWith( QUERYPARAMVALUE_SORT_PROP_UINAME ) )
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index cb50a06..f5a6575 100644
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -57,7 +57,7 @@ namespace framework{
#error "name of login profile unknown!"
#endif
-#define UNCPATHSEPERATOR sal_Unicode(0x002F)
+#define UNCPATHSEPARATOR sal_Unicode(0x002F)
// Use follow keys in follow order.
// [Global]
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 6cc93c3..7735ea5 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -50,7 +50,7 @@
#define FILE_EXTENSION DECLARE_ASCII(".xml")
-#define PATH_SEPERATOR DECLARE_ASCII("/")
+#define PATH_SEPARATOR DECLARE_ASCII("/")
static const ::sal_Int32 ID_CORRUPT_UICONFIG_SHARE = 1;
static const ::sal_Int32 ID_CORRUPT_UICONFIG_USER = 2;
@@ -423,7 +423,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
case E_GLOBAL :
{
sRelPathBuf.append(SUBSTORAGE_GLOBAL);
- sRelPathBuf.append(PATH_SEPERATOR );
+ sRelPathBuf.append(PATH_SEPARATOR );
sRelPathBuf.append(sResource );
sRelPathShare = sRelPathBuf.makeStringAndClear();
sRelPathUser = sRelPathShare;
@@ -436,9 +436,9 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
case E_MODULES :
{
sRelPathBuf.append(SUBSTORAGE_MODULES);
- sRelPathBuf.append(PATH_SEPERATOR );
+ sRelPathBuf.append(PATH_SEPARATOR );
sRelPathBuf.append(sModule );
- sRelPathBuf.append(PATH_SEPERATOR );
+ sRelPathBuf.append(PATH_SEPARATOR );
sRelPathBuf.append(sResource );
sRelPathShare = sRelPathBuf.makeStringAndClear();
sRelPathUser = sRelPathShare;
@@ -846,7 +846,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat
// Otherwhise we have no acc config at all, which can make other trouble.
OUString sLocalizedPath;
sLocalizedPath = sPath;
- sLocalizedPath += PATH_SEPERATOR;
+ sLocalizedPath += PATH_SEPARATOR;
if (pLocaleFolder != lSubFolders.end())
sLocalizedPath += *pLocaleFolder;
else
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index 40d875c..395c994 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -40,9 +40,9 @@
#include <com/sun/star/io/XSeekable.hpp>
-#define PATH_SEPERATOR_ASCII "/"
-#define PATH_SEPERATOR_UNICODE ((sal_Unicode)'/')
-#define PATH_SEPERATOR OUString(PATH_SEPERATOR_ASCII)
+#define PATH_SEPARATOR_ASCII "/"
+#define PATH_SEPARATOR_UNICODE ((sal_Unicode)'/')
+#define PATH_SEPARATOR OUString(PATH_SEPARATOR_ASCII)
namespace framework
@@ -125,7 +125,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri
const OUString& sChild = *pIt;
OUString sCheckPath (sRelPath);
sCheckPath += sChild;
- sCheckPath += PATH_SEPERATOR;
+ sCheckPath += PATH_SEPARATOR;
// SAFE -> ------------------------------
aReadLock.lock();
@@ -177,7 +177,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri
xParent = xChild;
sRelPath += sChild;
- sRelPath += PATH_SEPERATOR;
+ sRelPath += PATH_SEPARATOR;
}
// TODO think about return last storage as working storage ... but dont caching it inside this holder!
@@ -206,7 +206,7 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sP
const OUString& sChild = *pIt;
OUString sCheckPath (sRelPath);
sCheckPath += sChild;
- sCheckPath += PATH_SEPERATOR;
+ sCheckPath += PATH_SEPARATOR;
TPath2StorageInfo::iterator pCheck = m_lStorages.find(sCheckPath);
if (pCheck == m_lStorages.end())
@@ -221,7 +221,7 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sP
lStoragesOfPath.push_back(rInfo.Storage);
sRelPath += sChild;
- sRelPath += PATH_SEPERATOR;
+ sRelPath += PATH_SEPARATOR;
}
aReadLock.unlock();
@@ -276,7 +276,7 @@ void StorageHolder::closePath(const OUString& rPath)
{
OUString sCurrentRelPath = sParentPath;
sCurrentRelPath += *pIt1;
- sCurrentRelPath += PATH_SEPERATOR;
+ sCurrentRelPath += PATH_SEPARATOR;
*pIt1 = sCurrentRelPath;
sParentPath = sCurrentRelPath;
}
@@ -438,7 +438,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons
for (i=0; i<c-1; ++i)
{
sParentPath += lFolders[i];
- sParentPath += PATH_SEPERATOR;
+ sParentPath += PATH_SEPARATOR;
}
TPath2StorageInfo::const_iterator pParent = m_lStorages.find(sParentPath);
@@ -554,7 +554,7 @@ OUString StorageHolder::impl_st_normPath(const OUString& sPath)
OUString sNormedPath = sPath;
// "/bla" => "bla" && "/" => "" (!)
- if (sNormedPath.indexOf(PATH_SEPERATOR) == 0)
+ if (sNormedPath.indexOf(PATH_SEPARATOR) == 0)
sNormedPath += sNormedPath.copy(1);
// "/" => "" || "" => "" ?
@@ -562,8 +562,8 @@ OUString StorageHolder::impl_st_normPath(const OUString& sPath)
return OUString();
// "bla" => "bla/"
- if (sNormedPath.lastIndexOf(PATH_SEPERATOR) != (sNormedPath.getLength()-1))
- sNormedPath += PATH_SEPERATOR;
+ if (sNormedPath.lastIndexOf(PATH_SEPARATOR) != (sNormedPath.getLength()-1))
+ sNormedPath += PATH_SEPARATOR;
return sNormedPath;
}
@@ -575,7 +575,7 @@ OUStringList StorageHolder::impl_st_parsePath(const OUString& sPath)
sal_Int32 i = 0;
while (true)
{
- OUString sToken = sPath.getToken(0, PATH_SEPERATOR_UNICODE, i);
+ OUString sToken = sPath.getToken(0, PATH_SEPARATOR_UNICODE, i);
if (i < 0)
break;
lToken.push_back(sToken);
diff --git a/framework/source/constant/containerquery.cxx b/framework/source/constant/containerquery.cxx
index 57dc4a2..c2d6ac9 100644
--- a/framework/source/constant/containerquery.cxx
+++ b/framework/source/constant/containerquery.cxx
@@ -23,8 +23,8 @@
namespace framework{
namespace constant{
-const sal_Unicode ContainerQuery::SEPERATOR_PARAM = (sal_Unicode)':';
-const sal_Unicode ContainerQuery::SEPERATOR_VALUE = (sal_Unicode)'=';
+const sal_Unicode ContainerQuery::SEPARATOR_PARAM = (sal_Unicode)':';
+const sal_Unicode ContainerQuery::SEPARATOR_VALUE = (sal_Unicode)'=';
} // namespace constant
} // namespace framework
diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx
index c291e42..5322e6b 100644
--- a/framework/source/fwe/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -66,7 +66,7 @@ FrameListAnalyzer::~FrameListAnalyzer()
In case the request was "CloseWin" these splitted lists can be used too, to decide if the last window
or document was closed. Then we have to initialize the backing window ...
Last but not least we must know something about our special help frame. It must be handled
- seperatly. And last but not least - the backing component frame must be detected too.
+ separately. And last but not least - the backing component frame must be detected too.
*/
void FrameListAnalyzer::impl_analyze()
diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx
index de1f68f..cefbe4e 100644
--- a/framework/source/fwi/classes/protocolhandlercache.cxx
+++ b/framework/source/fwi/classes/protocolhandlercache.cxx
@@ -235,9 +235,9 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler ,
for( nSource=0; nSource<nSourceCount; ++nSource )
{
OUStringBuffer sPath( SETNAME_HANDLER );
- sPath.append(CFG_PATH_SEPERATOR);
+ sPath.append(CFG_PATH_SEPARATOR);
sPath.append(lNames[nSource]);
- sPath.append(CFG_PATH_SEPERATOR);
+ sPath.append(CFG_PATH_SEPARATOR);
sPath.append(PROPERTY_PROTOCOLS);
lFullNames[nTarget] = sPath.makeStringAndClear();
diff --git a/framework/source/inc/constant/containerquery.hxx b/framework/source/inc/constant/containerquery.hxx
index f5bda1b..1467f9b 100644
--- a/framework/source/inc/constant/containerquery.hxx
+++ b/framework/source/inc/constant/containerquery.hxx
@@ -29,8 +29,8 @@ struct ContainerQuery
{
public:
- static const sal_Unicode SEPERATOR_PARAM;
- static const sal_Unicode SEPERATOR_VALUE;
+ static const sal_Unicode SEPARATOR_PARAM;
+ static const sal_Unicode SEPARATOR_VALUE;
};
} // namespace constant
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index a1065ce..f8c7819 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -532,7 +532,7 @@ private:
throw(LoadEnvException, css::uno::RuntimeException);
/** @short because showing of a frame is needed more then once ...
- it's implemented as an seperate method .-)
+ it's implemented as an separate method .-)
@descr Note: Showing of a frame is bound to a special feature ...
a) If we recycle any existing frame, we must bring it to front.
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index d42e235..2987461 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -55,8 +55,8 @@ JobURL::JobURL( /*IN*/ const OUString& sURL )
sal_Int32 t = JOBURL_PROTOCOL_LEN;
do
{
- // seperate all token of "{[event=<name>],[alias=<name>],[service=<name>]}"
- OUString sToken = sURL.getToken(0, JOBURL_PART_SEPERATOR, t);
+ // separate all token of "{[event=<name>],[alias=<name>],[service=<name>]}"
+ OUString sToken = sURL.getToken(0, JOBURL_PART_SEPARATOR, t);
OUString sPartValue ;
OUString sPartArguments;
@@ -294,8 +294,8 @@ void JobURL::impldbg_checkIt()
JobURL::impldbg_checkURL("vnd.sun.star.job:service=;" , E_UNKNOWN, "" , "" , "" , NULL, NULL, NULL);
// check combinations
- // Note: No additional spaces or tabs are allowed after a seperator occurred.
- // Tab and spaces before a seperator will be used as value!
+ // Note: No additional spaces or tabs are allowed after a separator occurred.
+ // Tab and spaces before a separator will be used as value!
JobURL::impldbg_checkURL("vnd.sun.star.job:event=onMyEvent;alias=myAlias;service=css.Service" , E_EVENT | E_ALIAS | E_SERVICE , "onMyEvent", "myAlias", "css.Service" , NULL, NULL, NULL);
JobURL::impldbg_checkURL("vnd.sun.star.job:service=css.Service;alias=myAlias" , E_ALIAS | E_SERVICE , "" , "myAlias", "css.Service" , NULL, NULL, NULL);
JobURL::impldbg_checkURL("vnd.sun.star.job:service=css.Service ;alias=myAlias" , E_ALIAS | E_SERVICE , "" , "myAlias", "css.Service ", NULL, NULL, NULL);
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 1641efd..3fff17d 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -3136,7 +3136,7 @@ void Frame::impl_checkMenuCloser()
// -----------------------------
// b)
// There is no other frame ... means no other document frame. The help module
- // will be handled seperatly and must(!) be ignored here ... excepting weself includes the help.
+ // will be handled separately and must(!) be ignored here ... excepting weself includes the help.
else if (
(aAnalyzer.m_lOtherVisibleFrames.getLength()==0) &&
(!aAnalyzer.m_bReferenceIsHelp ) &&
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 4734eb2..b2e2dd0 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -51,7 +51,7 @@
#define CFGPROP_WRITEPATH OUString("WritePath")
/*
- 0 : old style "Template" string using ";" as seperator
+ 0 : old style "Template" string using ";" as separator
1 : internal paths "Template_internal" string list
2 : user paths "Template_user" string list
3 : write path "Template_write" string
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 5b1059c..d8d5451 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -238,7 +238,7 @@ throw (::com::sun::star::uno::RuntimeException)
subPopupMenu->insertItem( MID_LANG_PARA_MORE, String( FwkResId( STR_LANGSTATUS_MORE )), 0, MID_LANG_PARA_MORE );
// add last two entries to main menu
- xPopupMenu->insertSeparator( MID_LANG_PARA_SEPERATOR );
+ xPopupMenu->insertSeparator( MID_LANG_PARA_SEPARATOR );
xPopupMenu->insertItem( MID_LANG_PARA_STRING, String( FwkResId( STR_SET_LANGUAGE_FOR_PARAGRAPH )), 0, MID_LANG_PARA_STRING );
xPopupMenu->setPopupMenu( MID_LANG_PARA_STRING, subPopupMenu );
diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt
index 91c8f3d..c45841e 100644
--- a/i18npool/source/breakiterator/data/line.txt
+++ b/i18npool/source/breakiterator/data/line.txt
@@ -72,7 +72,7 @@ $HY = [:LineBreak = Hyphen:];
$H2 = [:LineBreak = H2:];
$H3 = [:LineBreak = H3:];
$ID = [[:LineBreak = Ideographic:] - [\ufe30]];
-$IN = [:LineBreak = Inseperable:];
+$IN = [:LineBreak = Inseparable:];
$IS = [[:LineBreak = Infix_Numeric:] [\ufe30]];
$JL = [:LineBreak = JL:];
$JV = [:LineBreak = JV:];
diff --git a/idlc/inc/idlc/astdeclaration.hxx b/idlc/inc/idlc/astdeclaration.hxx
index 6226a83..a52565a 100644
--- a/idlc/inc/idlc/astdeclaration.hxx
+++ b/idlc/inc/idlc/astdeclaration.hxx
@@ -123,7 +123,7 @@ public:
protected:
OString m_localName;
OString m_scopedName; // full qualified name
- OString m_fullName; // full qualified name with '/' as seperator
+ OString m_fullName; // full qualified name with '/' as separator
AstScope* m_pScope;
NodeType m_nodeType;
sal_Bool m_bImported; // imported ?
diff --git a/include/comphelper/string.hxx b/include/comphelper/string.hxx
index e244c36..e599509 100644
--- a/include/comphelper/string.hxx
+++ b/include/comphelper/string.hxx
@@ -151,7 +151,7 @@ COMPHELPER_DLLPUBLIC OUString strip(const OUString &rIn,
@param rIn the input OString
@param nToken the number of the token to return
- @param cTok the character which seperate the tokens.
+ @param cTok the character which separate the tokens.
@return the token if token is negative or doesn't exist an empty token
is returned
*/
@@ -167,7 +167,7 @@ inline OString getToken(const OString &rIn,
@param rIn the input OUString
@param nToken the number of the token to return
- @param cTok the character which seperate the tokens.
+ @param cTok the character which separate the tokens.
@return the token if token is negative or doesn't exist an empty token
is returned
*/
@@ -180,7 +180,7 @@ inline OUString getToken(const OUString &rIn,
/** Returns number of tokens in an OUString
@param rIn the input OString
- @param cTok the character which seperate the tokens.
+ @param cTok the character which separate the tokens.
@return the number of tokens
*/
COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const OString &rIn, sal_Char cTok);
@@ -188,7 +188,7 @@ COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const OString &rIn, sal_Char cTok);
/** Returns number of tokens in an OUString
@param rIn the input OUString
- @param cTok the character which seperate the tokens.
+ @param cTok the character which separate the tokens.
@return the number of tokens
*/
COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const OUString &rIn, sal_Unicode cTok);
diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx
index def7433..8641936 100644
--- a/include/framework/addonsoptions.hxx
+++ b/include/framework/addonsoptions.hxx
@@ -33,7 +33,7 @@
/*-************************************************************************************************************//**
@descr The method GetAddonsMenu() returns a list of property values.
- Use follow defines to seperate values by names.
+ Use follow defines to separate values by names.
*//*-*************************************************************************************************************/
#define ADDONSMENUITEM_STRING_URL "URL"
#define ADDONSMENUITEM_STRING_TITLE "Title"
diff --git a/include/jvmfwk/framework.h b/include/jvmfwk/framework.h
index f1399e0..c404a95 100644
--- a/include/jvmfwk/framework.h
+++ b/include/jvmfwk/framework.h
@@ -107,7 +107,7 @@ extern "C" {
-env:UNO_JAVA_JFW_PLUGIN=file:\\solver\\bin\\libsunjavaplugin.dll -register ....
</p>
<p>Additionall parameters for the Java VM can be provided. For every parameter
- a seperate bootstrap parameter must be specified. The names are
+ a separate bootstrap parameter must be specified. The names are
<code>UNO_JAVA_JFW_PARAMETER_X</code>, where X is 1,2, .. n. For example:</p>
<p>
regcomp -env:UNO_JAVA_JFW_PARAMETER_1=-Xdebug
diff --git a/include/rtl/string.h b/include/rtl/string.h
index 93cffa1..9cd81aa 100644
--- a/include/rtl/string.h
+++ b/include/rtl/string.h
@@ -1246,7 +1246,7 @@ SAL_DLLPUBLIC void SAL_CALL rtl_string_newTrim(
the number of the token to return, starting at index.
@param cTok
- the character that seperates the tokens.
+ the character that separates the tokens.
@param idx
the position at which searching for the token starts. Must not be greater
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 00baeec..c834450 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -1270,7 +1270,7 @@ public:
while ( nIndex >= 0 );
@param token the number of the token to return.
- @param cTok the character which seperate the tokens.
+ @param cTok the character which separate the tokens.
@param index the position at which the token is searched in the
string.
The index must not be greater thanthe length of the
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 13756f8..da5b909 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -1733,7 +1733,7 @@ public:
while ( nIndex >= 0 );
@param token the number of the token to return
- @param cTok the character which seperate the tokens.
+ @param cTok the character which separate the tokens.
@param index the position at which the token is searched in the
string.
The index must not be greater than the length of the
diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx
index 24a5f63..27b84b6 100644
--- a/include/sfx2/linkmgr.hxx
+++ b/include/sfx2/linkmgr.hxx
@@ -177,7 +177,7 @@ private:
// Separator in the link name for the DDE-/File-/Graphics- links
// (only those who need to construct a SvLinkName)
-const sal_Unicode cTokenSeperator = 0xFFFF;
+const sal_Unicode cTokenSeparator = 0xFFFF;
// create a string for the SvLinkName. For:
// - DDE the first 3 Strings, (Server, Topic, Item)
diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx
index da23496..f3721ca 100644
--- a/include/svx/AccessibleShapeTreeInfo.hxx
+++ b/include/svx/AccessibleShapeTreeInfo.hxx
@@ -39,7 +39,7 @@ namespace accessibility {
<ul>
<li>The model broadcaster is used for getting notified about shape
changes. Using this broadcaster makes in unnecessary to register at
- each shape seperately.</li>
+ each shape separately.</li>
<li>The view forwarder is responsible for transformation between
coordinate systems and for providing the visible area both with respect
to a specific window.</li>
diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx
index 6f05fe9..3232bd2 100644
--- a/include/svx/ChildrenManager.hxx
+++ b/include/svx/ChildrenManager.hxx
@@ -76,7 +76,7 @@ public:
/** Create a children manager, which manages the children of the given
parent. The parent is used for creating accessible objects. The
list of shapes for which to create those objects is not derived from
- the parent and has to be provided seperately by calling one of the
+ the parent and has to be provided separately by calling one of the
update methods.
@param rxParent
The parent of the accessible objects which will be created
@@ -129,7 +129,7 @@ public:
/** Update the child manager. Take care of a modified set of children
and modified visible area. This method can optimize the update
- process with respect seperate updates of a modified children list
+ process with respect separate updates of a modified children list
and visible area.
@param bCreateNewObjectsOnDemand
If </true> then accessible objects associated with the visible
diff --git a/include/svx/IAccessibleViewForwarder.hxx b/include/svx/IAccessibleViewForwarder.hxx
index 60883e7..8ea001f 100644
--- a/include/svx/IAccessibleViewForwarder.hxx
+++ b/include/svx/IAccessibleViewForwarder.hxx
@@ -47,7 +47,7 @@ namespace accessibility {
@attention
Note, that modifications of the underlying view that lead to
different transformations between internal and screen coordinates or
- change the validity of the forwarder have to be signaled seperately.
+ change the validity of the forwarder have to be signaled separately.
*/
class IAccessibleViewForwarder
{
diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx
index 173b7b5..a11aa1c 100644
--- a/include/unotools/cmdoptions.hxx
+++ b/include/unotools/cmdoptions.hxx
@@ -29,7 +29,7 @@
/*-************************************************************************************************************//**
@descr The method GetList() returns a list of property values.
- Use follow defines to seperate values by names.
+ Use follow defines to separate values by names.
*//*-*************************************************************************************************************/
/*-************************************************************************************************************//**
diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx
index 16c73db..18c97ae 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -47,7 +47,7 @@ enum CompatibilityOptions
/*-************************************************************************************************************//**
@descr The method GetList() returns a list of property values.
- Use follow defines to seperate values by names.
+ Use follow defines to separate values by names.
*//*-*************************************************************************************************************/
#define COMPATIBILITY_PROPERTYNAME_NAME OUString( "Name" )
#define COMPATIBILITY_PROPERTYNAME_MODULE OUString( "Module" )
diff --git a/include/unotools/dynamicmenuoptions.hxx b/include/unotools/dynamicmenuoptions.hxx
index 46a8a21..91784e5 100644
--- a/include/unotools/dynamicmenuoptions.hxx
+++ b/include/unotools/dynamicmenuoptions.hxx
@@ -28,7 +28,7 @@
/*-************************************************************************************************************//**
@descr The method GetList() returns a list of property values.
- Use follow defines to seperate values by names.
+ Use follow defines to separate values by names.
*//*-*************************************************************************************************************/
#define DYNAMICMENU_PROPERTYNAME_URL OUString("URL")
#define DYNAMICMENU_PROPERTYNAME_TITLE OUString("Title")
diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx
index 05564f9..6386e61 100644
--- a/include/unotools/fontcvt.hxx
+++ b/include/unotools/fontcvt.hxx
@@ -54,8 +54,8 @@ public:
//the string that can be converted to the same symbol font and returns the
//name of that font. rIndex is modified to the last index that was
//converted. Typically you call if continously until rIndex ==
- //rString.Len() and handle each section as seperate 8bit strings using
- //seperate fonts. Will return an empty string for a continous section
+ //rString.Len() and handle each section as separate 8bit strings using
+ //separate fonts. Will return an empty string for a continous section
//that has no possible mapping.
virtual String ConvertString(String &rString, xub_StrLen &rIndex) = 0;
virtual ~StarSymbolToMSMultiFont() {}
diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index 3e14315..137acd6 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -29,7 +29,7 @@
/*-************************************************************************************************************//**
@descr The method GetList() returns a list of property values.
- Use follow defines to seperate values by names.
+ Use follow defines to separate values by names.
*//*-*************************************************************************************************************/
#define HISTORY_PROPERTYNAME_URL OUString("URL")
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 8e432e8..e37a6de 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -550,7 +550,7 @@ public:
/// Record tracked changes for this particular XText
/// (empty reference stop recording)
/// This should be used if tracked changes for e.g. footers are to
- /// be exported seperately via the exportTrackedChanges(sal_Bool,
+ /// be exported separately via the exportTrackedChanges(sal_Bool,
/// Reference<XText>) method.
void recordTrackedChangesForXText(
const ::com::sun::star::uno::Reference <
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index bc4ddb6b..939f359 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -60,10 +60,10 @@ class XMLOFF_DLLPUBLIC SvXMLTokenEnumerator
private:
const OUString& maTokenString;
sal_Int32 mnNextTokenPos;
- sal_Unicode mcSeperator;
+ sal_Unicode mcSeparator;
public:
- SvXMLTokenEnumerator( const OUString& rString, sal_Unicode cSeperator = sal_Unicode(' ') );
+ SvXMLTokenEnumerator( const OUString& rString, sal_Unicode cSeparator = sal_Unicode(' ') );
sal_Bool getNextToken( OUString& rToken );
};
diff --git a/jurt/workbench/com/sun/star/comp/urlresolver/makefile.mk b/jurt/workbench/com/sun/star/comp/urlresolver/makefile.mk
index c770823..2e59189 100644
--- a/jurt/workbench/com/sun/star/comp/urlresolver/makefile.mk
+++ b/jurt/workbench/com/sun/star/comp/urlresolver/makefile.mk
@@ -32,7 +32,7 @@ JARFILES := ridl.jar juh.jar
.IF "$(XCLASSPATH)" == ""
XCLASSPATH := $(CLASSDIR)
.ELSE
-XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPERATOR)$(CLASSDIR)
+XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPARATOR)$(CLASSDIR)
.ENDIF
CLASSDIR !:= $(CLASSDIR)$/workbench
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index aced75f..2cca0c2 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -86,7 +86,7 @@ bool SunVersion::init(const char *szVersion)
else if (
! (nPartPos == 0) // prevents: ".4.1", "..1", part must start with digit
&& (
- //seperators after maintainance (1.4.1_01, 1.4.1-beta, or1.4.1
+ //separators after maintainance (1.4.1_01, 1.4.1-beta, or1.4.1
((pCur == pEnd || *pCur == '_' || *pCur == '-') && (nPart == 2 ))
||
//separators between major-minor and minor-maintainance
diff --git a/libmariadb/mariadb-trunk-40.patch b/libmariadb/mariadb-trunk-40.patch
index de8f44c..968a750 100644
--- a/libmariadb/mariadb-trunk-40.patch
+++ b/libmariadb/mariadb-trunk-40.patch
@@ -41460,7 +41460,7 @@
+ int sz; /* Bytes of memory required to allocate the new cache */
+
+ /*
-+ ** The seperateCache variable is true if each PCache has its own private
++ ** The separateCache variable is true if each PCache has its own private
+ ** PGroup. In other words, separateCache is true for mode (1) where no
+ ** mutexing is required.
+ **
@@ -47573,7 +47573,7 @@
+** page is initialized to all zeros.
+**
+** If noContent is true, it means that we do not care about the contents
-+** of the page. This occurs in two seperate scenarios:
++** of the page. This occurs in two separate scenarios:
+**
+** a) When reading a free-list leaf page from the database, and
+**
@@ -66368,7 +66368,7 @@
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list