diff options
229 files changed, 584 insertions, 584 deletions
diff --git a/apple_remote/source/AppleRemote.m b/apple_remote/source/AppleRemote.m index d72997d2e04e..120297e25519 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 77320ea9b5fe..6a59c1f61442 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 ba09e76c910d..6a460430c168 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 19d52a8cbc8f..ff85d10bd49e 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 328bbcf72a9c..422c0dde799c 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 ff6109ee0c9c..c136e95c61b3 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 dc4c77788aba..f0ea5d13d0f3 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 70f24ddd5d9b..1e3c4932d1f6 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 e9c6551aed60..362fb8974ece 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 e7da44f59fb7..837371076507 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 549ea76fa2f9..e9975408ed46 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 a49dea6b5849..ae700d48c8b1 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 0d46ddb4d42d..dc485622e60d 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 4c3fd3c31c22..8f7b0cdb8146 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 ed579afb1e32..66fc1d2691d2 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 b23e254cda5c..cf319c42f09e 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 33ceb123cbba..5e51ae933235 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 909ad9473945..e9b289f4d8d6 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 b4b3940a8b73..025441cc2cb4 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 cb6ea9f3416d..f177b0b04cf4 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 c8942b6049bb..9caca6e7d23a 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 f3feec1209f0..a87a2ef9d919 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 23f0d249e16a..23b34edc269e 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 1860b39c1874..1973e05bab22 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 6ea2399335bd..cac36dca3bee 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 06be798a46e1..ddfbc364a724 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 d563ef0d1c09..b6346aa9b794 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 a49fed9edddb..d9041f9503db 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 20a4882dd42f..b32855ab2258 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 ce6596aa0f63..d14306d80976 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 34c43a9a2459..4324cb6226ae 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 c73116790dc0..75158834218c 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 60802e64697c..a5ed2a2ca8e6 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 66398509f465..2030b3c20a6e 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 0adc5f6a51db..e2cf55c67fdc 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 63393d1531ff..3f4bb2a9c7cd 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 d8c7e76db897..5bd09ae8499a 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 fb3bbf162da1..6e72732adebf 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 e9437fe5fbd8..de0e7b544131 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 f8460aae8362..2b361135da8d 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 f4ea999c3c8d..0ca9a4975bd2 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 3c735c7deaea..b0226c83f1a4 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 9f3649827541..eebf87c88df4 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 aa3aff2a6b0f..fed903410b0e 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 ce3515100fe3..312a7caae482 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 de53c5e49ad9..6861d1b63f92 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 709e121f6846..d487a15aabed 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 c58be0b2e2f5..bdf4f4bd22d5 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 8fb4412abaa0..f4251c3c1c1c 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 e28b88a3b54a..7305c488a477 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 745b781dd27d..69d90adec6eb 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 a5668536157f..76a6b1a6b5ee 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 4f85d65791ae..38226a8a61bd 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 52c29b9e0329..f19f69826e52 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 1f7963725fea..109bddeb28bc 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 0b26720bfd20..672f67fa620d 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 fa3c506c13c7..a17e1dc5416d 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 f6e06837c417..cfc91589c4dc 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 94f6c32cda6e..26f60cb93d68 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 cb50a0628c69..f5a65759200f 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 6cc93c36efec..7735ea59d41d 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 40d875c2b51e..395c9943b7a3 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 57dc4a2fe768..c2d6ac9b7b54 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 c291e42bc81c..5322e6b275e5 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 de1f68ff9435..cefbe4e96065 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 f5bda1baeb92..1467f9b05977 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 a1065ce6945d..f8c78193eb7b 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 d42e23593f37..29874615c0ae 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 1641efd19523..3fff17d34392 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 4734eb2eb27a..b2e2dd0563ae 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 5b1059c0d513..d8d5451bce02 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 91c8f3d4850d..c45841e5e3af 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 6226a832de06..a52565ad9012 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 e244c3622e4f..e59950920ded 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 def743378216..8641936aa57a 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 f1399e0b88f1..c404a9591158 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 93cffa1a17b4..9cd81aa1552f 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 00baeec9b8d5..c83445010efa 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 13756f868198..da5b909b128b 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 24a5f6315edb..27b84b69e13a 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 da234960977e..f3721ca13e07 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 6f05fe95426a..3232bd22c0b1 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 60883e754ee3..8ea001fe0e19 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 173b7b585643..a11aa1ca1e77 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 16c73dbc3215..18c97ae2e14f 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 46a8a211531c..91784e5d91f8 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 05564f974a79..6386e615951d 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 3e1431544049..137acd6abe53 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 8e432e8cf7d7..e37a6de39248 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 bc4ddb6b6dbd..939f359dcad9 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 c77082333a8f..2e59189c4e1e 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 aced75f63bec..2cca0c2831a4 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 de8f44ca2c10..968a75048ebd 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 @@ +** the blob of data that it corresponds to. In a table record, all serial +** types are stored at the start of the record, and the blobs of data at +** the end. Hence these functions allow the caller to handle the -+** serial-type and data blob seperately. ++** serial-type and data blob separately. +** +** The following table describes the various storage classes for data: +** @@ -88072,7 +88072,7 @@ + /* Drop all SQLITE_MASTER table and index entries that refer to the + ** table. The program name loops through the master table and deletes + ** every row that refers to a table of the same name as the one being -+ ** dropped. Triggers are handled seperately because a trigger can be ++ ** dropped. Triggers are handled separately because a trigger can be + ** created in the temp database that refers to a table in another + ** database. + */ diff --git a/libxmlsec/xmlsec1-noverify.patch b/libxmlsec/xmlsec1-noverify.patch index c51540caa2aa..d483cb85bbc7 100644 --- a/libxmlsec/xmlsec1-noverify.patch +++ b/libxmlsec/xmlsec1-noverify.patch @@ -8,7 +8,7 @@ - return(cert); - } + /* JL: OpenOffice.org implements its own certificate verification routine. -+ The goal is to seperate validation of the signature ++ The goal is to separate validation of the signature + and the certificate. For example, OOo could show that the document signature is valid, + but the certificate could not be verified. If we do not prevent the verification of + the certificate by libxmlsec and the verification fails, then the XML signature will not be @@ -36,7 +36,7 @@ + + /* + JL: OpenOffice.org implements its own certificate verification routine. -+ The goal is to seperate validation of the signature ++ The goal is to separate validation of the signature + and the certificate. For example, OOo could show that the document signature is valid, + but the certificate could not be verified. If we do not prevent the verification of + the certificate by libxmlsec and the verification fails, then the XML signature may not be diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index e567d64b755f..5a9526f86df4 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -169,7 +169,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales() aSuppLocales[k++] = aTmp; } - //! For each dictionary and each locale we need a seperate entry. + //! For each dictionary and each locale we need a separate entry. //! If this results in more than one dictionary per locale than (for now) //! it is undefined which dictionary gets used. //! In the future the implementation should support using several dictionaries diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index b1a799f5fd57..2e4e7e6305b9 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -169,7 +169,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales() aSuppLocales[k++] = aTmp; } - //! For each dictionary and each locale we need a seperate entry. + //! For each dictionary and each locale we need a separate entry. //! If this results in more than one dictionary per locale than (for now) //! it is undefined which dictionary gets used. //! In the future the implementation should support using several dictionaries diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index b09b950e6e56..69bc07bff183 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -191,7 +191,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales() aSuppLocales[k++] = aTmp; } - //! For each dictionary and each locale we need a seperate entry. + //! For each dictionary and each locale we need a separate entry. //! If this results in more than one dictionary per locale than (for now) //! it is undefined which dictionary gets used. //! In the future the implementation should support using several dictionaries diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 2f20fc4d1770..2adeb65f987e 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -1311,8 +1311,8 @@ void LngSvcMgr::SetCfgServiceLists( SpellCheckerDispatcher &rSpellDsp ) if (pValues[i] >>= aSvcImplNames) { String aLocaleStr( pNames[i] ); - xub_StrLen nSeperatorPos = aLocaleStr.SearchBackward( sal_Unicode( '/' ) ); - aLocaleStr = aLocaleStr.Copy( nSeperatorPos + 1 ); + xub_StrLen nSeparatorPos = aLocaleStr.SearchBackward( sal_Unicode( '/' ) ); + aLocaleStr = aLocaleStr.Copy( nSeparatorPos + 1 ); rSpellDsp.SetServiceList( LanguageTag(aLocaleStr).getLocale(), aSvcImplNames ); } } @@ -1353,8 +1353,8 @@ void LngSvcMgr::SetCfgServiceLists( GrammarCheckingIterator &rGrammarDsp ) aSvcImplNames.realloc(1); String aLocaleStr( pNames[i] ); - xub_StrLen nSeperatorPos = aLocaleStr.SearchBackward( sal_Unicode( '/' ) ); - aLocaleStr = aLocaleStr.Copy( nSeperatorPos + 1 ); + xub_StrLen nSeparatorPos = aLocaleStr.SearchBackward( sal_Unicode( '/' ) ); + aLocaleStr = aLocaleStr.Copy( nSeparatorPos + 1 ); rGrammarDsp.SetServiceList( LanguageTag(aLocaleStr).getLocale(), aSvcImplNames ); } } @@ -1395,8 +1395,8 @@ void LngSvcMgr::SetCfgServiceLists( HyphenatorDispatcher &rHyphDsp ) aSvcImplNames.realloc(1); String aLocaleStr( pNames[i] ); - xub_StrLen nSeperatorPos = aLocaleStr.SearchBackward( sal_Unicode( '/' ) ); - aLocaleStr = aLocaleStr.Copy( nSeperatorPos + 1 ); + xub_StrLen nSeparatorPos = aLocaleStr.SearchBackward( sal_Unicode( '/' ) ); + aLocaleStr = aLocaleStr.Copy( nSeparatorPos + 1 ); rHyphDsp.SetServiceList( LanguageTag(aLocaleStr).getLocale(), aSvcImplNames ); } } @@ -1433,8 +1433,8 @@ void LngSvcMgr::SetCfgServiceLists( ThesaurusDispatcher &rThesDsp ) if (pValues[i] >>= aSvcImplNames) { String aLocaleStr( pNames[i] ); - xub_StrLen nSeperatorPos = aLocaleStr.SearchBackward( sal_Unicode( '/' ) ); - aLocaleStr = aLocaleStr.Copy( nSeperatorPos + 1 ); + xub_StrLen nSeparatorPos = aLocaleStr.SearchBackward( sal_Unicode( '/' ) ); + aLocaleStr = aLocaleStr.Copy( nSeparatorPos + 1 ); rThesDsp.SetServiceList( LanguageTag(aLocaleStr).getLocale(), aSvcImplNames ); } } diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx b/lotuswordpro/source/filter/lwpfootnote.cxx index 9e2d143ca728..db1f1dfb7291 100644 --- a/lotuswordpro/source/filter/lwpfootnote.cxx +++ b/lotuswordpro/source/filter/lwpfootnote.cxx @@ -425,7 +425,7 @@ void LwpFootnoteNumberOptions::Read(LwpObjectStream *pObjStrm) } /** - * @descr Read footnote seperator options information + * @descr Read footnote separator options information */ void LwpFootnoteSeparatorOptions::Read(LwpObjectStream *pObjStrm) { diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index ca367182fed7..0818f3f3bc8b 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -1592,7 +1592,7 @@ XFColumns* LwpLayout::GetXFColumns() boost::scoped_ptr<XFColumnSep> pColumnSep(GetColumnSep()); if(pColumnSep) { - pColumns->SetSeperator(*pColumnSep); + pColumns->SetSeparator(*pColumnSep); } //set column count and column gap diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx index 097155f4649a..1d51d0dc00a6 100644 --- a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx @@ -128,10 +128,10 @@ void XFColumnSep::ToXml(IXFStream *pStrm) pStrm->EndElement( A2OUSTR("style:column-sep") ); } -void XFColumns::SetSeperator(XFColumnSep& aSeperator) +void XFColumns::SetSeparator(XFColumnSep& aSeparator) { - m_aSeperator = aSeperator; - m_nFlag |= XFCOLUMNS_FLAG_SEPERATOR; + m_aSeparator = aSeparator; + m_nFlag |= XFCOLUMNS_FLAG_SEPARATOR; } void XFColumns::AddColumn(XFColumn& column) @@ -163,9 +163,9 @@ void XFColumns::ToXml(IXFStream *pStrm) pStrm->StartElement( A2OUSTR("style:columns") ); - if( m_nFlag&XFCOLUMNS_FLAG_SEPERATOR ) //column-sep: + if( m_nFlag&XFCOLUMNS_FLAG_SEPARATOR ) //column-sep: { - m_aSeperator.ToXml(pStrm); + m_aSeparator.ToXml(pStrm); } if(!(m_nFlag&XFCOLUMNS_FLAG_GAP) ) diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx index 2a4e634e5755..0af64f4df5ef 100644 --- a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx @@ -64,7 +64,7 @@ #include "xfcolor.hxx" #include <vector> -#define XFCOLUMNS_FLAG_SEPERATOR 0X00000001 +#define XFCOLUMNS_FLAG_SEPARATOR 0X00000001 #define XFCOLUMNS_FLAG_GAP 0X00000010 /** @@ -142,7 +142,7 @@ public: m_fGap = 0; } public: - void SetSeperator(XFColumnSep& aSeperator); + void SetSeparator(XFColumnSep& aSeparator); void SetGap(double fGap); void SetCount(sal_uInt16 nCount); void AddColumn(XFColumn& column); @@ -153,7 +153,7 @@ private: sal_uInt16 m_nCount; double m_fGap; std::vector<XFColumn> m_aColumns; - XFColumnSep m_aSeperator; + XFColumnSep m_aSeparator; }; diff --git a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx index cd514da8c673..2742fed1de4e 100644 --- a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx +++ b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx @@ -74,7 +74,7 @@ public: void SetNumberIncrement(sal_Int32 increment); - void SetSeperator(sal_Int32 increment, OUString seperator); + void SetSeparator(sal_Int32 increment, OUString separator); void SetNumberFormat(OUString numfmt = A2OUSTR("1")); @@ -127,10 +127,10 @@ inline void XFLineNumberConfig::SetNumberIncrement(sal_Int32 increment) m_nIncrement = increment; } -inline void XFLineNumberConfig::SetSeperator(sal_Int32 increment, OUString seperator) +inline void XFLineNumberConfig::SetSeparator(sal_Int32 increment, OUString separator) { m_nSepIncrement = increment; - m_strSeparator = seperator; + m_strSeparator = separator; } inline void XFLineNumberConfig::SetNumberFormat(OUString numfmt) diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx index 357925cac8d4..e7e4763b6132 100644 --- a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx +++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx @@ -137,7 +137,7 @@ private: XFHeaderStyle *m_pHeaderStyle; XFFooterStyle *m_pFooterStyle; - //seperator: + //separator: enumXFAlignType m_eSepAlign; double m_fSepWidth; XFColor m_aSepColor; diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java index 29ee77fd47e0..435577e46da5 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java @@ -26,8 +26,8 @@ public class BasicTag { public static final String COLON_TAG = ":";
public static final String COMMA_TAG = ",";
public static final String DOT_TAG = ".";
- public static final String NULL_SEPERATE_TAG = " \t";
- public static final String SEPERATE_TAG = "|";
+ public static final String NULL_SEPARATE_TAG = " \t";
+ public static final String SEPARATE_TAG = "|";
public static final String UNDERLINE_TAG = "_";
public static final String INC_TAG = "+";
public static final String DEC_TAG = "-";
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java index 47dec3afbbc7..2524aaec8978 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java @@ -466,7 +466,7 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener, if (m_bDead) return null; } - // Resolve any request seperatly by using own "dispatch()" method. + // Resolve any request separately by using own "dispatch()" method. // Note: Don't pack return list if "null" objects occure! int nCount = lDescriptor.length; com.sun.star.frame.XDispatch[] lDispatcher = new com.sun.star.frame.XDispatch[nCount]; diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java index f4a5c5f7487f..17c117f43cba 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java @@ -43,7 +43,7 @@ import java.lang.String; /** * Implement a view to show status information * of currently loaded document of a document view. - * It use seperate listener threads to get this information + * It use separate listener threads to get this information * and actualize it automaticly if frame broadcast changes of * his contained document. * Threads are neccessary to prevent this view against deadlocks. diff --git a/odk/examples/DevelopersGuide/Text/TextDocuments.java b/odk/examples/DevelopersGuide/Text/TextDocuments.java index 0762a47a3ef4..b981e231a738 100644 --- a/odk/examples/DevelopersGuide/Text/TextDocuments.java +++ b/odk/examples/DevelopersGuide/Text/TextDocuments.java @@ -915,14 +915,14 @@ public class TextDocuments { // Make sure that the autotext group contains at least one block if ( aBlockNames.length > 0 ) { - // Split the current cell vertically into two seperate cells + // Split the current cell vertically into two separate cells xTableCursor.splitRange ( (short) 1, false ); // Put the cursor in the newly created right hand cell // and select it xTableCursor.goRight ( (short) 1, false ); - // Split this cell horizontally to make a seperate cell + // Split this cell horizontally to make a separate cell // for each Autotext block if ( ( aBlockNames.length -1 ) > 0 ) xTableCursor.splitRange ( diff --git a/odk/source/com/sun/star/lib/loader/InstallationFinder.java b/odk/source/com/sun/star/lib/loader/InstallationFinder.java index 087b716a159c..e307996ff643 100644 --- a/odk/source/com/sun/star/lib/loader/InstallationFinder.java +++ b/odk/source/com/sun/star/lib/loader/InstallationFinder.java @@ -303,7 +303,7 @@ final class InstallationFinder { return null; } - // empty standard error stream in a seperate thread + // empty standard error stream in a separate thread StreamGobbler gobbler = new StreamGobbler( proc.getErrorStream() ); gobbler.start(); diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index f0cf017f8d48..161d1d91682d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -5441,10 +5441,10 @@ <info> <desc>Contains settings for word counting</desc> </info> - <prop oor:name="AdditionalSeperators" oor:type="xs:string" oor:nillable="false"> + <prop oor:name="AdditionalSeparators" oor:type="xs:string" oor:nillable="false"> <info> - <desc>configures additional word seperators for word counting</desc> - <label>Additional Word Seperators</label> + <desc>configures additional word separators for word counting</desc> + <label>Additional Word Separators</label> </info> <value>—–</value> </prop> diff --git a/oovbaapi/ooo/vba/XCollectionBase.idl b/oovbaapi/ooo/vba/XCollectionBase.idl index cbedf1f9fe99..29ecfa01c0f7 100644 --- a/oovbaapi/ooo/vba/XCollectionBase.idl +++ b/oovbaapi/ooo/vba/XCollectionBase.idl @@ -36,7 +36,7 @@ module ooo { module vba { The various VBA collection objects expect a specific number of arguments in the "Item" method, therefore this method is not part of this base interface - but has to be specified seperately in every derived interface. + but has to be specified separately in every derived interface. */ interface XCollectionBase { diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index d865f91930d6..d6623c069f0a 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -854,7 +854,7 @@ sal_Int32 VMLExport::StartShape() /* #i13885# When the object is actively being edited, that text is not set into - the objects normal text object, but lives in a seperate object. + the objects normal text object, but lives in a separate object. */ if (pTxtObj->IsTextEditActive()) { diff --git a/qadevOOo/runner/helper/BuildEnvTools.java b/qadevOOo/runner/helper/BuildEnvTools.java index 7e74aa1be1f4..b35d14cb3f1c 100644 --- a/qadevOOo/runner/helper/BuildEnvTools.java +++ b/qadevOOo/runner/helper/BuildEnvTools.java @@ -149,17 +149,17 @@ public class BuildEnvTools { String[] cmdLines = null; log.println("prepare command for platform " + mPlatform); - String seperator = ""; + String separator = ""; if (mPlatform.equals(PropertyName.WNTMSCI)) { - seperator = mCygwin ? ";" : "^"; + separator = mCygwin ? ";" : "^"; } else { - seperator = ";"; + separator = ";"; } String command = ""; for (int i = 0; i < commands.length; i++) { if (i != 0) { - command += seperator; + command += separator; } command += commands[i]; } diff --git a/rhino/OfficeScriptInfo.java b/rhino/OfficeScriptInfo.java index cb65f336cf21..c55bed085a43 100644 --- a/rhino/OfficeScriptInfo.java +++ b/rhino/OfficeScriptInfo.java @@ -61,7 +61,7 @@ public class OfficeScriptInfo if ( info.closeCallback != null ) { System.out.println("** In removeSFScriptInfo have callback for " + key ); - info.closeCallback.run(); // really need to do this in seperate thread???? + info.closeCallback.run(); // really need to do this in separate thread???? } } } diff --git a/ridljar/com/sun/star/uno/ITypeDescription.java b/ridljar/com/sun/star/uno/ITypeDescription.java index 85014454e253..98f2d0824062 100644 --- a/ridljar/com/sun/star/uno/ITypeDescription.java +++ b/ridljar/com/sun/star/uno/ITypeDescription.java @@ -149,7 +149,7 @@ public interface ITypeDescription { * names <var>M<sub>1</sub></var>, ..., <var>M<sub>n</sub></var> followed by * a simple name <var>S</var>, the corresponding type name consists of the * same sequence of module names and simple name, with <code>"."</code> - * seperating the individual elements.</p> + * separating the individual elements.</p> * * @return the type name. */ diff --git a/sal/qa/helper/gcov/deprecated.txt b/sal/qa/helper/gcov/deprecated.txt index 9370ef14fd7d..a851c751b161 100644 --- a/sal/qa/helper/gcov/deprecated.txt +++ b/sal/qa/helper/gcov/deprecated.txt @@ -54,7 +54,7 @@ # B. untested functions: # functions need Client/Server model and blocking mode of transmission. some of the functions -# can not run through on testshl2 env while the same code can run successfully in normal seperate +# can not run through on testshl2 env while the same code can run successfully in normal separate # files. # 1) in DatagramSocket class: # osl_receiveFromSocket; diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index b84e70894589..a2e2501d1a0a 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -280,7 +280,7 @@ inline sal_Bool t_compareTime( TimeValue *m_aEndTime, TimeValue *m_aStartTime, inline sal_Bool compareFileName( const ::rtl::OUString & ustr1, const ::rtl::OUString & ustr2 ) { sal_Bool bOk; -//on Windows, the seperatar is '\', so here change to '/', then compare +//on Windows, the separator is '\', so here change to '/', then compare #if defined (WNT ) ::rtl::OUString ustr1new,ustr2new; sal_Unicode reverseSlash = (sal_Unicode)'\\'; @@ -327,7 +327,7 @@ inline sal_Bool isURL( const ::rtl::OUString pathname ) return ( ( pathname.indexOf( aPreURL ) == 0 ) ? sal_True : sal_False ); } -/** concat two part to form a URL or system path, add PATH_SEPERATOR between them if necessary, add "file:///" to beginning if necessary. +/** concat two part to form a URL or system path, add PATH_SEPARATOR between them if necessary, add "file:///" to beginning if necessary. */ inline void concatURL( ::rtl::OUString & pathname1, const ::rtl::OUString & pathname2 ) { diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h index c16f20f25a5a..281002bba0f3 100644 --- a/sal/qa/osl/file/osl_File_Const.h +++ b/sal/qa/osl/file/osl_File_Const.h @@ -54,8 +54,8 @@ const sal_Char pBuffer_Blank[] = ""; // TEST_PLATFORM for test platform initial, // TEST_PLATFORM_ROOT for root dir in comrresponding platform, // TEST_PLATFORM_TEMP for temp dir in comrresponding platform, -// PATH_LIST_DELIMITER for seperator of path list in comrresponding platform, -// PATH_SEPERATOR for seperator in URL or system path in comrresponding platform, +// PATH_LIST_DELIMITER for separator of path list in comrresponding platform, +// PATH_SEPARATOR for separator in URL or system path in comrresponding platform, // PATH_MAX/MAX_PATH for max path length in comrresponding platform, //------------------------------------------------------------------------ @@ -89,7 +89,7 @@ const sal_Char pBuffer_Blank[] = ""; # define TEST_PLATFORM_ROOT "/" # define TEST_PLATFORM_TEMP "tmp" # define PATH_LIST_DELIMITER ":" -# define PATH_SEPERATOR "/" +# define PATH_SEPARATOR "/" #endif #if (defined WNT ) // Windows @@ -102,7 +102,7 @@ const sal_Char pBuffer_Blank[] = ""; # define TEST_PLATFORM_ROOT "c:/" # define TEST_PLATFORM_TEMP "temp" # define PATH_LIST_DELIMITER ";" -# define PATH_SEPERATOR "/" +# define PATH_SEPARATOR "/" #endif @@ -123,7 +123,7 @@ const sal_Char pBuffer_Blank[] = ""; // OS independent file definition //------------------------------------------------------------------------ OSLTEST_DECLARE( NullURL, "" ); -OSLTEST_DECLARE( SlashURL, PATH_SEPERATOR ); +OSLTEST_DECLARE( SlashURL, PATH_SEPARATOR ); OSLTEST_DECLARE( PreURL, FILE_PREFIX ); OSLTEST_DECLARE( RootURL, FILE_PREFIX TEST_PLATFORM ); diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index 6b88e10fbc51..33a8257d23a6 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -270,7 +270,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer, return; } - // the sign is processed seperatly + // the sign is processed separately if( nMeasure < 0 ) { nMeasure = -nMeasure; diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index 678bdb41c521..cf8c980f669f 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -107,7 +107,7 @@ public: OUString& rString, const OUString& rNewStr, sal_Bool bAppendStr, - sal_Unicode cSeperator = ' '); + sal_Unicode cSeparator = ' '); static sal_Int32 IndexOf( const OUString& rString, @@ -122,14 +122,14 @@ public: static sal_Int32 GetTokenCount( const OUString& rString, - sal_Unicode cSeperator = ' ', + sal_Unicode cSeparator = ' ', sal_Unicode cQuote = '\''); static void GetTokenByOffset( OUString& rToken, const OUString& rString, sal_Int32& nOffset, - sal_Unicode cSeperator = ' ', + sal_Unicode cSeparator = ' ', sal_Unicode cQuote = '\''); static void AppendTableName( @@ -144,7 +144,7 @@ public: const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, - sal_Unicode cSeperator = ' ', + sal_Unicode cSeparator = ' ', sal_Unicode cQuote = '\''); static sal_Bool GetRangeFromString( ScRange& rRange, @@ -152,14 +152,14 @@ public: const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, - sal_Unicode cSeperator = ' ', + sal_Unicode cSeparator = ' ', sal_Unicode cQuote = '\''); static sal_Bool GetRangeListFromString( ScRangeList& rRangeList, const OUString& rRangeListStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator = ' ', + sal_Unicode cSeparator = ' ', sal_Unicode cQuote = '\''); static sal_Bool GetAreaFromString( @@ -168,7 +168,7 @@ public: const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, - sal_Unicode cSeperator = ' ', + sal_Unicode cSeparator = ' ', sal_Unicode cQuote = '\''); // String to Range API @@ -178,7 +178,7 @@ public: const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, - sal_Unicode cSeperator = ' ', + sal_Unicode cSeparator = ' ', sal_Unicode cQuote = '\''); static sal_Bool GetRangeFromString( ::com::sun::star::table::CellRangeAddress& rRange, @@ -186,14 +186,14 @@ public: const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, - sal_Unicode cSeperator = ' ', + sal_Unicode cSeparator = ' ', sal_Unicode cQuote = '\''); static sal_Bool GetRangeListFromString( ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRangeSeq, const OUString& rRangeListStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator = ' ', + sal_Unicode cSeparator = ' ', sal_Unicode cQuote = '\''); // Range to String core @@ -202,7 +202,7 @@ public: const ScAddress& rAddress, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator = ' ', + sal_Unicode cSeparator = ' ', sal_Bool bAppendStr = false, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); static void GetStringFromRange( @@ -210,7 +210,7 @@ public: const ScRange& rRange, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator = ' ', + sal_Unicode cSeparator = ' ', sal_Bool bAppendStr = false, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); static void GetStringFromRangeList( @@ -218,7 +218,7 @@ public: const ScRangeList* pRangeList, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator = ' ', + sal_Unicode cSeparator = ' ', sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D)); static void GetStringFromArea( @@ -226,7 +226,7 @@ public: const ScArea& rArea, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator = ' ', + sal_Unicode cSeparator = ' ', sal_Bool bAppendStr = false, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); @@ -236,7 +236,7 @@ public: const ::com::sun::star::table::CellAddress& rAddress, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator = ' ', + sal_Unicode cSeparator = ' ', sal_Bool bAppendStr = false, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); static void GetStringFromRange( @@ -244,7 +244,7 @@ public: const ::com::sun::star::table::CellRangeAddress& rRange, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator = ' ', + sal_Unicode cSeparator = ' ', sal_Bool bAppendStr = false, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); static void GetStringFromRangeList( @@ -252,7 +252,7 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRangeSeq, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator = ' ', + sal_Unicode cSeparator = ' ', sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); // XML Range to Calc Range diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index e318466319b4..054c61f1b605 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -348,14 +348,14 @@ void ScRangeStringConverter::AssignString( OUString& rString, const OUString& rNewStr, sal_Bool bAppendStr, - sal_Unicode cSeperator) + sal_Unicode cSeparator) { if( bAppendStr ) { if( !rNewStr.isEmpty() ) { if( !rString.isEmpty() ) - rString += OUString(cSeperator); + rString += OUString(cSeparator); rString += rNewStr; } } @@ -407,7 +407,7 @@ void ScRangeStringConverter::GetTokenByOffset( OUString& rToken, const OUString& rString, sal_Int32& nOffset, - sal_Unicode cSeperator, + sal_Unicode cSeparator, sal_Unicode cQuote) { sal_Int32 nLength = rString.getLength(); @@ -418,12 +418,12 @@ void ScRangeStringConverter::GetTokenByOffset( } else { - sal_Int32 nTokenEnd = IndexOf( rString, cSeperator, nOffset, cQuote ); + sal_Int32 nTokenEnd = IndexOf( rString, cSeparator, nOffset, cQuote ); if( nTokenEnd < 0 ) nTokenEnd = nLength; rToken = rString.copy( nOffset, nTokenEnd - nOffset ); - sal_Int32 nNextBegin = IndexOfDifferent( rString, cSeperator, nTokenEnd ); + sal_Int32 nNextBegin = IndexOfDifferent( rString, cSeparator, nTokenEnd ); nOffset = (nNextBegin < 0) ? nLength : nNextBegin; } } @@ -436,14 +436,14 @@ void ScRangeStringConverter::AppendTableName(OUStringBuffer& rBuf, const OUStrin rBuf.append(aQuotedTab); } -sal_Int32 ScRangeStringConverter::GetTokenCount( const OUString& rString, sal_Unicode cSeperator, sal_Unicode cQuote ) +sal_Int32 ScRangeStringConverter::GetTokenCount( const OUString& rString, sal_Unicode cSeparator, sal_Unicode cQuote ) { OUString sToken; sal_Int32 nCount = 0; sal_Int32 nOffset = 0; while( nOffset >= 0 ) { - GetTokenByOffset( sToken, rString, nOffset, cQuote, cSeperator ); + GetTokenByOffset( sToken, rString, nOffset, cQuote, cSeparator ); if( nOffset >= 0 ) nCount++; } @@ -458,11 +458,11 @@ sal_Bool ScRangeStringConverter::GetAddressFromString( const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, - sal_Unicode cSeperator, + sal_Unicode cSeparator, sal_Unicode cQuote ) { OUString sToken; - GetTokenByOffset( sToken, rAddressStr, nOffset, cSeperator, cQuote ); + GetTokenByOffset( sToken, rAddressStr, nOffset, cSeparator, cQuote ); if( nOffset >= 0 ) { if ((rAddress.Parse( sToken, const_cast<ScDocument*>(pDocument), eConv ) & SCA_VALID) == SCA_VALID) @@ -480,12 +480,12 @@ sal_Bool ScRangeStringConverter::GetRangeFromString( const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, - sal_Unicode cSeperator, + sal_Unicode cSeparator, sal_Unicode cQuote ) { OUString sToken; sal_Bool bResult(false); - GetTokenByOffset( sToken, rRangeStr, nOffset, cSeperator, cQuote ); + GetTokenByOffset( sToken, rRangeStr, nOffset, cSeparator, cQuote ); if( nOffset >= 0 ) { sal_Int32 nIndex = IndexOf( sToken, ':', 0, cQuote ); @@ -544,7 +544,7 @@ sal_Bool ScRangeStringConverter::GetRangeListFromString( const OUString& rRangeListStr, const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator, + sal_Unicode cSeparator, sal_Unicode cQuote ) { sal_Bool bRet = sal_True; @@ -554,7 +554,7 @@ sal_Bool ScRangeStringConverter::GetRangeListFromString( { ScRange* pRange = new ScRange; if ( - GetRangeFromString( *pRange, rRangeListStr, pDocument, eConv, nOffset, cSeperator, cQuote ) && + GetRangeFromString( *pRange, rRangeListStr, pDocument, eConv, nOffset, cSeparator, cQuote ) && (nOffset >= 0) ) { @@ -579,12 +579,12 @@ sal_Bool ScRangeStringConverter::GetAreaFromString( const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, - sal_Unicode cSeperator, + sal_Unicode cSeparator, sal_Unicode cQuote ) { ScRange aScRange; sal_Bool bResult(false); - if( GetRangeFromString( aScRange, rRangeStr, pDocument, eConv, nOffset, cSeperator, cQuote ) && (nOffset >= 0) ) + if( GetRangeFromString( aScRange, rRangeStr, pDocument, eConv, nOffset, cSeparator, cQuote ) && (nOffset >= 0) ) { rArea.nTab = aScRange.aStart.Tab(); rArea.nColStart = aScRange.aStart.Col(); @@ -605,12 +605,12 @@ sal_Bool ScRangeStringConverter::GetAddressFromString( const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, - sal_Unicode cSeperator, + sal_Unicode cSeparator, sal_Unicode cQuote ) { ScAddress aScAddress; sal_Bool bResult(false); - if( GetAddressFromString( aScAddress, rAddressStr, pDocument, eConv, nOffset, cSeperator, cQuote ) && (nOffset >= 0) ) + if( GetAddressFromString( aScAddress, rAddressStr, pDocument, eConv, nOffset, cSeparator, cQuote ) && (nOffset >= 0) ) { ScUnoConversion::FillApiAddress( rAddress, aScAddress ); bResult = sal_True; @@ -624,12 +624,12 @@ sal_Bool ScRangeStringConverter::GetRangeFromString( const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, - sal_Unicode cSeperator, + sal_Unicode cSeparator, sal_Unicode cQuote ) { ScRange aScRange; sal_Bool bResult(false); - if( GetRangeFromString( aScRange, rRangeStr, pDocument, eConv, nOffset, cSeperator, cQuote ) && (nOffset >= 0) ) + if( GetRangeFromString( aScRange, rRangeStr, pDocument, eConv, nOffset, cSeparator, cQuote ) && (nOffset >= 0) ) { ScUnoConversion::FillApiRange( rRange, aScRange ); bResult = sal_True; @@ -642,7 +642,7 @@ sal_Bool ScRangeStringConverter::GetRangeListFromString( const OUString& rRangeListStr, const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator, + sal_Unicode cSeparator, sal_Unicode cQuote ) { sal_Bool bRet = sal_True; @@ -651,7 +651,7 @@ sal_Bool ScRangeStringConverter::GetRangeListFromString( sal_Int32 nOffset = 0; while( nOffset >= 0 ) { - if( GetRangeFromString( aRange, rRangeListStr, pDocument, eConv, nOffset, cSeperator, cQuote ) && (nOffset >= 0) ) + if( GetRangeFromString( aRange, rRangeListStr, pDocument, eConv, nOffset, cSeparator, cQuote ) && (nOffset >= 0) ) { rRangeSeq.realloc( rRangeSeq.getLength() + 1 ); rRangeSeq[ rRangeSeq.getLength() - 1 ] = aRange; @@ -670,7 +670,7 @@ void ScRangeStringConverter::GetStringFromAddress( const ScAddress& rAddress, const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator, + sal_Unicode cSeparator, sal_Bool bAppendStr, sal_uInt16 nFormatFlags ) { @@ -678,7 +678,7 @@ void ScRangeStringConverter::GetStringFromAddress( { String sAddress; rAddress.Format( sAddress, nFormatFlags, (ScDocument*) pDocument, eConv ); - AssignString( rString, sAddress, bAppendStr, cSeperator ); + AssignString( rString, sAddress, bAppendStr, cSeparator ); } } @@ -687,7 +687,7 @@ void ScRangeStringConverter::GetStringFromRange( const ScRange& rRange, const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator, + sal_Unicode cSeparator, sal_Bool bAppendStr, sal_uInt16 nFormatFlags ) { @@ -702,7 +702,7 @@ void ScRangeStringConverter::GetStringFromRange( OUString sOUStartAddress( sStartAddress ); sOUStartAddress += OUString(':'); sOUStartAddress += OUString( sEndAddress ); - AssignString( rString, sOUStartAddress, bAppendStr, cSeperator ); + AssignString( rString, sOUStartAddress, bAppendStr, cSeparator ); } } @@ -711,7 +711,7 @@ void ScRangeStringConverter::GetStringFromRangeList( const ScRangeList* pRangeList, const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator, + sal_Unicode cSeparator, sal_uInt16 nFormatFlags ) { OUString sRangeListStr; @@ -721,7 +721,7 @@ void ScRangeStringConverter::GetStringFromRangeList( { const ScRange* pRange = (*pRangeList)[nIndex]; if( pRange ) - GetStringFromRange( sRangeListStr, *pRange, pDocument, eConv, cSeperator, sal_True, nFormatFlags ); + GetStringFromRange( sRangeListStr, *pRange, pDocument, eConv, cSeparator, sal_True, nFormatFlags ); } } rString = sRangeListStr; @@ -735,12 +735,12 @@ void ScRangeStringConverter::GetStringFromArea( const ScArea& rArea, const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator, + sal_Unicode cSeparator, sal_Bool bAppendStr, sal_uInt16 nFormatFlags ) { ScRange aRange( rArea.nColStart, rArea.nRowStart, rArea.nTab, rArea.nColEnd, rArea.nRowEnd, rArea.nTab ); - GetStringFromRange( rString, aRange, pDocument, eConv, cSeperator, bAppendStr, nFormatFlags ); + GetStringFromRange( rString, aRange, pDocument, eConv, cSeparator, bAppendStr, nFormatFlags ); } @@ -751,12 +751,12 @@ void ScRangeStringConverter::GetStringFromAddress( const table::CellAddress& rAddress, const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator, + sal_Unicode cSeparator, sal_Bool bAppendStr, sal_uInt16 nFormatFlags ) { ScAddress aScAddress( static_cast<SCCOL>(rAddress.Column), static_cast<SCROW>(rAddress.Row), rAddress.Sheet ); - GetStringFromAddress( rString, aScAddress, pDocument, eConv, cSeperator, bAppendStr, nFormatFlags ); + GetStringFromAddress( rString, aScAddress, pDocument, eConv, cSeparator, bAppendStr, nFormatFlags ); } void ScRangeStringConverter::GetStringFromRange( @@ -764,13 +764,13 @@ void ScRangeStringConverter::GetStringFromRange( const table::CellRangeAddress& rRange, const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator, + sal_Unicode cSeparator, sal_Bool bAppendStr, sal_uInt16 nFormatFlags ) { ScRange aScRange( static_cast<SCCOL>(rRange.StartColumn), static_cast<SCROW>(rRange.StartRow), rRange.Sheet, static_cast<SCCOL>(rRange.EndColumn), static_cast<SCROW>(rRange.EndRow), rRange.Sheet ); - GetStringFromRange( rString, aScRange, pDocument, eConv, cSeperator, bAppendStr, nFormatFlags ); + GetStringFromRange( rString, aScRange, pDocument, eConv, cSeparator, bAppendStr, nFormatFlags ); } void ScRangeStringConverter::GetStringFromRangeList( @@ -778,7 +778,7 @@ void ScRangeStringConverter::GetStringFromRangeList( const uno::Sequence< table::CellRangeAddress >& rRangeSeq, const ScDocument* pDocument, FormulaGrammar::AddressConvention eConv, - sal_Unicode cSeperator, + sal_Unicode cSeparator, sal_uInt16 nFormatFlags ) { OUString sRangeListStr; @@ -786,7 +786,7 @@ void ScRangeStringConverter::GetStringFromRangeList( for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ ) { const table::CellRangeAddress& rRange = rRangeSeq[ nIndex ]; - GetStringFromRange( sRangeListStr, rRange, pDocument, eConv, cSeperator, sal_True, nFormatFlags ); + GetStringFromRange( sRangeListStr, rRange, pDocument, eConv, cSeparator, sal_True, nFormatFlags ); } rString = sRangeListStr; } diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index d17cda9148b9..2b56456bd6a2 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1542,7 +1542,7 @@ FormulaToken* ScTokenArray::AddRawToken( const ScRawToken& r ) } // Utility function to ensure that there is strict alternation of values and -// seperators. +// separators. static bool checkArraySep( bool & bPrevWasSep, bool bNewVal ) { diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index f13d801599ae..13c62fe16826 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -103,9 +103,9 @@ using ::com::sun::star::uno::UNO_QUERY; // #TODO is this defined somewhere else? #if ( defined UNX ) //unix -#define FILE_PATH_SEPERATOR "/" +#define FILE_PATH_SEPARATOR "/" #else // windows -#define FILE_PATH_SEPERATOR "\\" +#define FILE_PATH_SEPARATOR "\\" #endif // ============================================================================ @@ -942,7 +942,7 @@ ScVbaApplication::getTemplatesPath() throw (uno::RuntimeException) OUString SAL_CALL ScVbaApplication::getPathSeparator() throw (uno::RuntimeException) { - static OUString sPathSep( FILE_PATH_SEPERATOR ); + static OUString sPathSep( FILE_PATH_SEPARATOR ); return sPathSep; } diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 852fefadb30c..e40aab41c8e7 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -612,7 +612,7 @@ typedef ::std::vector< CellPos > vCellPos; // #FIXME - QUICK // we could probably could and should modify CellsEnumeration below -// to handle rows and columns ( but I do this seperately for now +// to handle rows and columns ( but I do this separately for now // and.. this class only handles singe areas ( does it have to handle // multi area ranges?? ) class ColumnsRowEnumeration: public CellsEnumeration_BASE diff --git a/sd/res/webview/common.inc b/sd/res/webview/common.inc index de95c771b2c8..8a26d7f7a134 100644 --- a/sd/res/webview/common.inc +++ b/sd/res/webview/common.inc @@ -35,7 +35,7 @@ FILE_LINE_DELIMITER = vbCRLF '/** ' * Get data from file using a given separator. ' */ -function File_getDataVirtual( sFilename, sServerPath, sSeperator ) +function File_getDataVirtual( sFilename, sServerPath, sSeparator ) call Err.Clear() Dim aFSObject, sServerFileName @@ -47,8 +47,8 @@ function File_getDataVirtual( sFilename, sServerPath, sSeperator ) if Err.Number = 0 then File_getDataVirtual = File_read( sServerFileName ) If Not IsNull(File_getDataVirtual) Then - File_getDataVirtual = Replace( File_getDataVirtual, FILE_LINE_DELIMITER, sSeperator) - File_getDataVirtual = Split( File_getDataVirtual, sSeperator) + File_getDataVirtual = Replace( File_getDataVirtual, FILE_LINE_DELIMITER, sSeparator) + File_getDataVirtual = Split( File_getDataVirtual, sSeparator) End If end if end function diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 1e23fd970384..fcb7896f7368 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -382,7 +382,7 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const if( pPage ) { aRealStyle = pPage->GetLayoutName(); - // cut after seperator string + // cut after separator string if( aRealStyle.indexOf(aSep) >= 0) { @@ -474,7 +474,7 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const SdStyleSheet* pPseudoStyle = NULL; OUString aSep( SD_LT_SEPARATOR ); OUString aStyleName(aName); - // without layout name and seperator + // without layout name and separator if( aStyleName.indexOf(aSep) >=0 ) { diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index e686b3e20e01..31cf222e00bb 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -183,10 +183,10 @@ CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBas mpPBMoveUp = new PushButton( this, SdResId( PB_MOVE_UP ) ); mpPBMoveDown = new PushButton( this, SdResId( PB_MOVE_DOWN ) ); mpFTChangeOrder = new FixedText( this, SdResId( FT_CHANGE_ORDER ) ); - mpFLSeperator1 = new FixedLine( this, SdResId( FL_SEPERATOR1 ) ); + mpFLSeparator1 = new FixedLine( this, SdResId( FL_SEPARATOR1 ) ); mpPBPlay = new PushButton( this, SdResId( PB_PLAY ) ); mpPBSlideShow = new PushButton( this, SdResId( PB_SLIDE_SHOW ) ); - mpFLSeperator2 = new FixedLine( this, SdResId( FL_SEPERATOR2 ) ); + mpFLSeparator2 = new FixedLine( this, SdResId( FL_SEPARATOR2 ) ); mpCBAutoPreview = new CheckBox( this, SdResId( CB_AUTOPREVIEW ) ); maStrProperty = mpFTProperty->GetText(); @@ -269,10 +269,10 @@ CustomAnimationPane::~CustomAnimationPane() delete mpFTChangeOrder; delete mpPBMoveUp; delete mpPBMoveDown; - delete mpFLSeperator1; + delete mpFLSeparator1; delete mpPBPlay; delete mpPBSlideShow; - delete mpFLSeperator2; + delete mpFLSeparator2; delete mpCBAutoPreview; } @@ -517,11 +517,11 @@ void CustomAnimationPane::updateLayout() aCursor = Point( aOffset.X(), aPaneSize.Height() - mpCBAutoPreview->GetSizePixel().Height() - aOffset.Y() ); mpCBAutoPreview->SetPosPixel( aCursor ); - // place the seperator 2 fixed line - aCursor.Y() -= /* aOffset.Y() + */ mpFLSeperator2->GetSizePixel().Height(); - aSize = mpFLSeperator2->GetSizePixel(); + // place the separator 2 fixed line + aCursor.Y() -= /* aOffset.Y() + */ mpFLSeparator2->GetSizePixel().Height(); + aSize = mpFLSeparator2->GetSizePixel(); aSize.Width() = aPaneSize.Width() - 2 * aOffset.X(); - mpFLSeperator2->SetPosSizePixel( aCursor, aSize ); + mpFLSeparator2->SetPosSizePixel( aCursor, aSize ); // next, layout and place the play and slide show buttons aCtrlSize = mpPBSlideShow->GetSizePixel(); @@ -547,12 +547,12 @@ void CustomAnimationPane::updateLayout() mpPBSlideShow->SetPosSizePixel( aCursor, aCtrlSize ); } - // place the seperator 1 fixed line + // place the separator 1 fixed line aCursor.X() = aOffset.X(); - aCursor.Y() -= /* aOffset.Y() + */ mpFLSeperator1->GetSizePixel().Height(); - aSize = mpFLSeperator1->GetSizePixel(); + aCursor.Y() -= /* aOffset.Y() + */ mpFLSeparator1->GetSizePixel().Height(); + aSize = mpFLSeparator1->GetSizePixel(); aSize.Width() = aPaneSize.Width() - 2 * aOffset.X(); - mpFLSeperator1->SetPosSizePixel( aCursor, aSize ); + mpFLSeparator1->SetPosSizePixel( aCursor, aSize ); // place the move down button aSize = mpPBMoveDown->GetSizePixel(); @@ -710,10 +710,10 @@ void CustomAnimationPane::updateControls() mpFTChangeOrder->Enable( mxView.is() ); mpPBMoveUp->Enable( mxView.is() ); mpPBMoveDown->Enable( mxView.is() ); - mpFLSeperator1->Enable( mxView.is() ); + mpFLSeparator1->Enable( mxView.is() ); mpPBPlay->Enable( mxView.is() ); mpPBSlideShow->Enable( mxView.is() ); - mpFLSeperator2->Enable( mxView.is() ); + mpFLSeparator2->Enable( mxView.is() ); mpCBAutoPreview->Enable( mxView.is() ); if( !mxView.is() ) diff --git a/sd/source/ui/animations/CustomAnimationPane.hrc b/sd/source/ui/animations/CustomAnimationPane.hrc index 37ea204488f4..d5e840d8a789 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hrc +++ b/sd/source/ui/animations/CustomAnimationPane.hrc @@ -43,10 +43,10 @@ #define FT_CHANGE_ORDER 15 #define PB_MOVE_UP 16 #define PB_MOVE_DOWN 17 -#define FL_SEPERATOR1 18 +#define FL_SEPARATOR1 18 #define PB_PLAY 19 #define PB_SLIDE_SHOW 20 -#define FL_SEPERATOR2 21 +#define FL_SEPARATOR2 21 #define CB_AUTOPREVIEW 22 #endif // _SD_CUSTOMANIMATIONPANE_HXX diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index dec861a6423d..9e4d5c514da2 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -138,10 +138,10 @@ private: FixedText* mpFTChangeOrder; PushButton* mpPBMoveUp; PushButton* mpPBMoveDown; - FixedLine* mpFLSeperator1; + FixedLine* mpFLSeparator1; PushButton* mpPBPlay; PushButton* mpPBSlideShow; - FixedLine* mpFLSeperator2; + FixedLine* mpFLSeparator2; CheckBox* mpCBAutoPreview; String maStrModify; diff --git a/sd/source/ui/animations/CustomAnimationPane.src b/sd/source/ui/animations/CustomAnimationPane.src index f997da7cd410..4e6a6e12943e 100644 --- a/sd/source/ui/animations/CustomAnimationPane.src +++ b/sd/source/ui/animations/CustomAnimationPane.src @@ -177,7 +177,7 @@ Control DLG_CUSTOMANIMATIONPANE Size = MAP_APPFONT( 16, 14 ); }; - FixedLine FL_SEPERATOR1 + FixedLine FL_SEPARATOR1 { OutputSize = TRUE; Size = MAP_APPFONT( 8, 8 ); @@ -201,7 +201,7 @@ Control DLG_CUSTOMANIMATIONPANE Text [ en-US ] = "S~lide Show"; }; - FixedLine FL_SEPERATOR2 + FixedLine FL_SEPARATOR2 { Size = MAP_APPFONT( 8, 8 ); }; diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 14c4f0701cf6..09272d3dbeec 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -957,7 +957,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) // several objects: group the clones else if (nMarkCount > 1) { - // take objects seperately + // take objects separately if( bAllObjects ) { for( sal_uLong nObject= 0; nObject < nMarkCount; nObject++ ) diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index 11f0653445c9..55696f634dfa 100644 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx @@ -37,7 +37,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 AccessibleViewForwarder : public IAccessibleViewForwarder diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 1f5f70f6b9df..3a49cb7f7008 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -56,7 +56,7 @@ public: @param pPage The page pointer can in some situations not be detected from rxPage, e.g. after undo of page deletion. Therefore supply it - seperately. + separately. @param nIndex This index is displayed in the view as page number. It is not necessaryily the page index (not even when you add or subtract 1 diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 91dadc05807c..7191956d18b5 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -631,7 +631,7 @@ void SlideSorterViewShell::WriteFrameViewData (void) mpFrameView->SetSelectedPage((pActualPage->GetPageNum()- 1) / 2); // else // The slide sorter is not expected to switch the current page - // other then by double clicks. That is handled seperatly. + // other then by double clicks. That is handled separately. } else { diff --git a/sd/source/ui/toolpanel/ControlContainer.cxx b/sd/source/ui/toolpanel/ControlContainer.cxx index 5ee7280ad980..25c3cf30ce67 100644 --- a/sd/source/ui/toolpanel/ControlContainer.cxx +++ b/sd/source/ui/toolpanel/ControlContainer.cxx @@ -122,7 +122,7 @@ void ControlContainer::SetExpansionState ( // control then that is always expanded. do { - // Ignore a call with an invalid index. (The seperate comparison + // Ignore a call with an invalid index. (The separate comparison // with -1 is not strictly necessary but it is here just in // case.) if (nIndex>=GetControlCount() || nIndex==(sal_uInt32)-1) diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index bb427ce30c74..578561a3fa27 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -112,7 +112,7 @@ private: list the current list and clears the current list. Each shell belongs to one group. Different groups can be modified - seperately. + separately. */ class ToolBarShellList { diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index a732e475ca5e..804d8cdadedd 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -69,7 +69,7 @@ void DrawViewShell::MakeVisible(const Rectangle& rRect, ::Window& rWin) // smaller than the visible area, the user-defined zoom was // changed. This was decided to be a bug for 6.x, thus I developed a // version which instead handles X/Y bigger/smaller and visibility - // questions seperately. The new behaviour is triggered with the + // questions separately. The new behaviour is triggered with the // bZoomAllowed parameter which for old behaviour should be set to // sal_True. I looked at all uses of MakeVisible() in the application // and found no valid reason for really changing the zoom factor, thus I diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 3fc73f07be01..1083a85956a4 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -432,8 +432,8 @@ void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& r if( !aDlg.Execute() ) { sFile = aDlg.GetPath(); - sFile += ::sfx2::cTokenSeperator; - sFile += ::sfx2::cTokenSeperator; + sFile += ::sfx2::cTokenSeparator; + sFile += ::sfx2::cTokenSeparator; sFile += aDlg.GetCurrentFilter(); if ( aEndEditLink.IsSet() ) @@ -535,8 +535,8 @@ IMPL_LINK( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg ) { String sURL( _pFileDlg->GetPath() ); sFile = sURL; - sFile += ::sfx2::cTokenSeperator; - sFile += ::sfx2::cTokenSeperator; + sFile += ::sfx2::cTokenSeparator; + sFile += ::sfx2::cTokenSeparator; sFile += impl_getFilter( sURL ); } } diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index d5e6451f77d2..61483de27cf2 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -237,8 +237,8 @@ bool LinkManager::GetDisplayNames( const SvBaseLink * pLink, case OBJECT_CLIENT_OLE: { sal_Int32 nPos = 0; - String sFile( sLNm.GetToken( 0, ::sfx2::cTokenSeperator, nPos ) ); - String sRange( sLNm.GetToken( 0, ::sfx2::cTokenSeperator, nPos ) ); + String sFile( sLNm.GetToken( 0, ::sfx2::cTokenSeparator, nPos ) ); + String sRange( sLNm.GetToken( 0, ::sfx2::cTokenSeparator, nPos ) ); if( pFile ) *pFile = sFile; @@ -262,8 +262,8 @@ bool LinkManager::GetDisplayNames( const SvBaseLink * pLink, { sal_Int32 nTmp = 0; String sCmd( sLNm ); - String sServer( sCmd.GetToken( 0, cTokenSeperator, nTmp ) ); - String sTopic( sCmd.GetToken( 0, cTokenSeperator, nTmp ) ); + String sServer( sCmd.GetToken( 0, cTokenSeparator, nTmp ) ); + String sTopic( sCmd.GetToken( 0, cTokenSeparator, nTmp ) ); if( pType ) *pType = sServer; @@ -395,7 +395,7 @@ void MakeLnkName( String& rName, const String* pType, const String& rFile, if( pType ) { rName = comphelper::string::strip(*pType, ' '); - rName += cTokenSeperator; + rName += cTokenSeparator; } else if( rName.Len() ) rName.Erase(); @@ -403,12 +403,12 @@ void MakeLnkName( String& rName, const String* pType, const String& rFile, rName += rFile; rName = comphelper::string::strip(rName, ' '); - rName += cTokenSeperator; + rName += cTokenSeparator; rName = comphelper::string::strip(rName, ' '); rName += rLink; if( pFilter ) { - rName += cTokenSeperator; + rName += cTokenSeparator; rName += *pFilter; rName = comphelper::string::strip(rName, ' '); } @@ -474,11 +474,11 @@ bool LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink, return false; String sCmd( rFileNm ); - sCmd += ::sfx2::cTokenSeperator; + sCmd += ::sfx2::cTokenSeparator; if( pRange ) sCmd += *pRange; if( pFilterNm ) - ( sCmd += ::sfx2::cTokenSeperator ) += *pFilterNm; + ( sCmd += ::sfx2::cTokenSeparator ) += *pFilterNm; return InsertLink( &rLink, nFileType, sfx2::LINKUPDATE_ONCALL, &sCmd ); } @@ -492,14 +492,14 @@ bool LinkManager::InsertFileLink( OUStringBuffer aBuf; aBuf.append(rFileNm); - aBuf.append(sfx2::cTokenSeperator); + aBuf.append(sfx2::cTokenSeparator); if (pRange) aBuf.append(*pRange); if (pFilterNm) { - aBuf.append(sfx2::cTokenSeperator); + aBuf.append(sfx2::cTokenSeparator); aBuf.append(*pFilterNm); } diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index c3c2f39155e4..7fd8c789418d 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -603,7 +603,7 @@ static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt ) String sNm( rLinkName ); sal_Int32 nTokenPos = 0; - OUString sService( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); + OUString sService( sNm.GetToken( 0, cTokenSeparator, nTokenPos ) ); DdeServices& rSvc = DdeService::GetServices(); for (DdeServices::iterator aI = rSvc.begin(); aI != rSvc.end(); ++aI) @@ -612,7 +612,7 @@ static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt ) if( pService->GetName() == sService ) { // then we search for the Topic - OUString sTopic( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); + OUString sTopic( sNm.GetToken( 0, cTokenSeparator, nTokenPos ) ); if( pItemStt ) *pItemStt = nTokenPos; diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 8c83031c8acf..8d9a70c744b3 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -891,10 +891,10 @@ const SfxFilter* SfxFilterMatcherIter::Next() /*--------------------------------------------------------------- helper to build own formated string from given stringlist by - using given seperator + using given separator ---------------------------------------------------------------*/ OUString implc_convertStringlistToString( const uno::Sequence< OUString >& lList , - const sal_Unicode& cSeperator, + const sal_Unicode& cSeparator, const OUString& sPrefix ) { OUStringBuffer sString ( 1000 ) ; @@ -909,7 +909,7 @@ OUString implc_convertStringlistToString( const uno::Sequence< OUString >& lList sString.append( lList[nItem] ); if( nItem+1<nCount ) { - sString.append( cSeperator ); + sString.append( cSeparator ); } } return sString.makeStringAndClear(); diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 4987d07dd9cf..5cae6dfa6740 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -1165,7 +1165,7 @@ namespace sfx2 ::std::list< FilterGroup >::iterator pIter = aAllFilters.begin(); ++pIter; ::std::for_each( - pIter, // first filter group was handled seperately, see above + pIter, // first filter group was handled separately, see above aAllFilters.end(), AppendFilterGroup( _rxFilterManager, &_rFileDlgImpl ) ); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 4459a2e796de..173bc5be8d83 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2019,7 +2019,7 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *) if ( pStyle->IsUsed() ) // pStyle is in use in the document? { - if (bUsedStyle) // add a seperator for the second and later styles + if (bUsedStyle) // add a separator for the second and later styles aMsg += ", "; aMsg += aTemplName; bUsedStyle = 1; diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 85ddf0d3c366..e55276bb44c3 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -675,7 +675,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& // real file on disk automaticly if it die - bt we have to share it with // some other sources ... e.g. the ImplUCBPrintWatcher). // And we put the name of this temp file to the descriptor instead - // of the URL. The URL we save for later using seperatly. + // of the URL. The URL we save for later using separately. // Execution of the print job will be done later by executing // a slot ... pUCBPrintTempFile = new ::utl::TempFile(); diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx index f4118032dc41..a1bd731befb9 100644 --- a/starmath/inc/parse.hxx +++ b/starmath/inc/parse.hxx @@ -199,7 +199,7 @@ class SmParser // map of used symbols (used to reduce file size by exporting only actually used symbols) std::set< OUString > m_aUsedSymbols; - //! locale where '.' is decimal seperator! + //! locale where '.' is decimal separator! ::com::sun::star::lang::Locale m_aDotLoc; // declare copy-constructor and assignment-operator private diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx index a96010956f55..3f7434fac8c6 100644 --- a/starmath/inc/toolbox.hxx +++ b/starmath/inc/toolbox.hxx @@ -33,7 +33,7 @@ class SmToolBoxWindow : public SfxFloatingWindow protected: ToolBox aToolBoxCat; - FixedLine aToolBoxCat_Delim; // to visualy seperate the catalog part + FixedLine aToolBoxCat_Delim; // to visualy separate the catalog part ToolBox *pToolBoxCmd; ToolBox *vToolBoxCategories[NUM_TBX_CATEGORIES]; ImageList *aImageLists [NUM_TBX_CATEGORIES + 1]; /* regular */ diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx index fe1625fc8c04..d864c458cff6 100644 --- a/starmath/inc/visitors.hxx +++ b/starmath/inc/visitors.hxx @@ -272,7 +272,7 @@ public: private: /** Visit a selectable pNode * Can be used to handle pNodes that can be selected, that doesn't have more SmCaretPos' - * than 0 and 1 inside them. SmTextNode should be handle seperately! + * than 0 and 1 inside them. SmTextNode should be handle separately! * Also note that pNodes such as SmBinVerNode cannot be selected, don't this method for * it. */ diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index 654809d26221..35fb1efafca4 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -927,7 +927,7 @@ void SmXMLExport::ExportSubSupScript(const SmNode *pNode, int nLevel) } } - //Seperator element between suffix and prefix sub/sup pairs + //Separator element between suffix and prefix sub/sup pairs { SvXMLElementExport aPrescripts(*this, XML_NAMESPACE_MATH, XML_MPRESCRIPTS, sal_True,sal_True); diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 8a73c1a604b3..8b958a144a42 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -1281,7 +1281,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector, } - HandleMatrixSeperator(nMatrixRows,nMatrixCols, + HandleMatrixSeparator(nMatrixRows,nMatrixCols, nCurCol,nCurRow); switch (nSelector) @@ -1681,7 +1681,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector, //symbols that follow some of these //records. Foo Data. - /*In matrices and piles we cannot seperate equation + /*In matrices and piles we cannot separate equation *lines with the newline keyword*/ if (nMatrixCols==0) newline++; @@ -1704,13 +1704,13 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector, if (xfLMOVE(nTag)) HandleNudge(); nRet = HandlePile(nSetAlign,nLevel,nSelector,nVariation); - HandleMatrixSeperator(nMatrixRows,nMatrixCols,nCurCol,nCurRow); + HandleMatrixSeparator(nMatrixRows,nMatrixCols,nCurCol,nCurRow); break; case MATRIX: if (xfLMOVE(nTag)) HandleNudge(); nRet = HandleMatrix(nLevel,nSelector,nVariation); - HandleMatrixSeperator(nMatrixRows,nMatrixCols,nCurCol,nCurRow); + HandleMatrixSeparator(nMatrixRows,nMatrixCols,nCurCol,nCurRow); break; case EMBEL: if (xfLMOVE(nTag)) @@ -1778,10 +1778,10 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector, *with fiddley logic to see if we are in a matrix or a pile or neither Note we cannot tell until after the event that this is the last entry - of a pile, so we must strip the last seperator of a pile after this + of a pile, so we must strip the last separator of a pile after this is detected in the PILE handler */ -void MathType::HandleMatrixSeperator(int nMatrixRows,int nMatrixCols, +void MathType::HandleMatrixSeparator(int nMatrixRows,int nMatrixCols, int &rCurCol,int &rCurRow) { if (nMatrixRows!=0) diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx index 68ca70cf6291..0d3e298ea66f 100644 --- a/starmath/source/mathtype.hxx +++ b/starmath/source/mathtype.hxx @@ -91,7 +91,7 @@ private: int HandlePile(int &rSetAlign,int nLevel,sal_uInt8 nSelector, sal_uInt8 nVariation); int HandleMatrix(int nLevel,sal_uInt8 nSelector,sal_uInt8 nVariarion); - void HandleMatrixSeperator(int nMatrixRows,int nMatrixCols,int &rCurCol, + void HandleMatrixSeparator(int nMatrixRows,int nMatrixCols,int &rCurCol, int &rCurRow); int HandleTemplate(int nLevel,sal_uInt8 &rSelector,sal_uInt8 &rVariation, xub_StrLen &rLastTemplateBracket); diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index 047a414efb96..e0c72822f305 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -2550,7 +2550,7 @@ void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) // norm distance from which the following two are calcutated const int nNormDist = 3 * GetFont().GetSize().Height(); - // define horizontal and vertical minimal distances that seperate + // define horizontal and vertical minimal distances that separate // the elements long nHorDist = nNormDist * rFormat.GetDistance(DIS_MATRIXCOL) / 100L, nVerDist = nNormDist * rFormat.GetDistance(DIS_MATRIXROW) / 100L; diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 10ec0f1f5b0d..603165d52596 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1420,7 +1420,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt ) } rUDEvt.GetDevice()->SetFont( aOldFont ); - DrawEntry( rUDEvt, sal_False, sal_False); // draw seperator + DrawEntry( rUDEvt, sal_False, sal_False); // draw separator } else { diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 682866ad20db..9273c42b669e 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -83,7 +83,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 @@ -157,7 +157,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/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 87bf59e6bda5..441aef6d42fa 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -161,7 +161,7 @@ void DescriptionGenerator::AddProperty (const OUString& sPropertyName, && xState->getPropertyState(sPropertyName)!=beans::PropertyState_DEFAULT_VALUE) if (mxSet.is()) { - // Append a seperator from previous Properties. + // Append a separator from previous Properties. if ( ! mbIsFirstProperty) msDescription.append (sal_Unicode (',')); else diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 681d1c62ba92..9eeff086e14b 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -2019,14 +2019,14 @@ void BrokenRecoveryDialog::impl_askForSavePath() String aPreview = LoadCrashFile( GetPreviewURL() ); ErrorRepSendDialog *pMainDlg = (ErrorRepSendDialog *)_pParent; - String aSeperator = OUString( "\r\n\r\n================\r\n\r\n" ); + String aSeparator = OUString( "\r\n\r\n================\r\n\r\n" ); String aContent = pMainDlg->GetDocType(); if ( aContent.Len() > 0 ) - aContent += aSeperator; + aContent += aSeparator; aContent += pMainDlg->GetUsing(); if ( aContent.Len() > 0 ) - aContent += aSeperator; + aContent += aSeparator; aContent += aPreview; maContentML.SetText( aContent ); diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 98c156761e89..187e070e8da8 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -169,7 +169,7 @@ SW_DLLPUBLIC Size GetGraphicSizeTwip( const Graphic&, OutputDevice* pOutDev ); // Separator for jumps to different content types in document. -const sal_Unicode cMarkSeperator = '|'; +const sal_Unicode cMarkSeparator = '|'; extern const sal_Char* pMarkToTable; // Strings are extern const sal_Char* pMarkToFrame; // in Init.cxx. extern const sal_Char* pMarkToRegion; diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index e8639a6f2118..249f8385bc07 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -639,7 +639,7 @@ void SwDocTest::testSwScanner() aDocStat.Reset(); //But default configuration should, msword-alike treak emdash - //and endash as word seperators for word-counting + //and endash as word separators for word-counting m_pDoc->AppendTxtNode(*aPaM.GetPoint()); m_pDoc->InsertString(aPaM, sTemplate.replace('X', 0x2013)); pTxtNode = aPaM.GetNode()->GetTxtNode(); diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index c21e6bc76562..cb6ec35fc33e 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -271,7 +271,7 @@ sal_uInt8 SwPaM::Find( const SearchOptions& rSearchOpt, sal_Bool bSearchInNotes /* #i80135# */ // if there are SwPostItFields inside our current node text, we - // split the text into seperate pieces and search for text inside + // split the text into separate pieces and search for text inside // the pieces as well as inside the fields const SwpHints *pHts = ((SwTxtNode*)pNode)->GetpSwpHints(); diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx index 226d6bb8352f..ebc0d10f1e75 100644 --- a/sw/source/core/doc/docchart.cxx +++ b/sw/source/core/doc/docchart.cxx @@ -63,11 +63,11 @@ bool SwTable::IsTblComplexForChart( const String& rSelection ) const if( '<' == sBox.GetChar( 0 ) ) sBox.Erase( 0, 1 ); if( '>' == sBox.GetChar( sBox.Len()-1 ) ) sBox.Erase( sBox.Len()-1 ); - xub_StrLen nSeperator = sBox.Search( ':' ); - OSL_ENSURE( STRING_NOTFOUND != nSeperator, "no valid selection" ); + xub_StrLen nSeparator = sBox.Search( ':' ); + OSL_ENSURE( STRING_NOTFOUND != nSeparator, "no valid selection" ); - pSttBox = GetTblBox( sBox.Copy( 0, nSeperator )); - pEndBox = GetTblBox( sBox.Copy( nSeperator+1 )); + pSttBox = GetTblBox( sBox.Copy( 0, nSeparator )); + pEndBox = GetTblBox( sBox.Copy( nSeparator+1 )); } else { diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx index ae7437fc14f5..502ed342eae5 100644 --- a/sw/source/core/doc/docdde.cxx +++ b/sw/source/core/doc/docdde.cxx @@ -297,7 +297,7 @@ bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam, INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8 )); - xub_StrLen nPos = sItem.Search( cMarkSeperator ); + xub_StrLen nPos = sItem.Search( cMarkSeparator ); const CharClass& rCC = GetAppCharClass(); diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 1f36b91e8a9b..f169ae5a5172 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -1343,7 +1343,7 @@ void sw_JoinText( SwPaM& rPam, sal_Bool bJoinPrev ) ::_RestoreCntntIdx( pDoc, aBkmkArr, aIdx.GetIndex() ); // If the passed PaM is not in the Crsr ring, - // treat it seperately (e.g. when it's being called from AutoFormat) + // treat it separately (e.g. when it's being called from AutoFormat) if( pOldTxtNd == rPam.GetBound( sal_True ).nContent.GetIdxReg() ) rPam.GetBound( sal_True ) = aAlphaPos; if( pOldTxtNd == rPam.GetBound( sal_False ).nContent.GetIdxReg() ) diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 65222e7ee41d..a78a59289742 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -332,7 +332,7 @@ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB ) case RES_SETEXPFLD: case RES_HIDDENTXTFLD: case RES_HIDDENPARAFLD: - // Expression fields are treated seperately + // Expression fields are treated separately if( !pNewHt ) break; default: @@ -1226,7 +1226,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds ) { const SwFieldType* pFldType; - // process seperately: + // process separately: for( n = mpFldTypes->size(); n; ) switch( ( pFldType = (*mpFldTypes)[ --n ] )->Which() ) { diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 702156faad7c..49a36da82d3b 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -634,7 +634,7 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet, // TextAttributes with an end never expand their range if ( !bCharAttr && !bOtherAttr ) { - // CharFmt and URL attributes are treated seperately! + // CharFmt and URL attributes are treated separately! // TEST_TEMP ToDo: AutoFmt! SfxItemSet aTxtSet( pDoc->GetAttrPool(), RES_TXTATR_REFMARK, RES_TXTATR_TOXMARK, @@ -2086,7 +2086,7 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc, bNotifyLayout = true; } - // the header and footer attributes are copied seperately + // the header and footer attributes are copied separately // the content sections have to be copied in their entirety { SfxItemSet aAttrSet( rSrcDesc.GetMaster().GetAttrSet() ); @@ -2383,7 +2383,7 @@ void SwDoc::SetTxtFmtCollByAutoFmt( const SwPosition& rPos, sal_uInt16 nPoolId, { SfxItemSet aTmp( *pTNd->GetpSwAttrSet() ); aTmp.Differentiate( *pSet ); - // we handle the adjust item seperately + // we handle the adjust item separately const SfxPoolItem* pItem; if( SFX_ITEM_SET == pTNd->GetpSwAttrSet()->GetItemState( RES_PARATR_ADJUST, sal_False, &pItem )) diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx index cf32b50adbcf..2f3306f8f82b 100644 --- a/sw/source/core/doc/ftnidx.cxx +++ b/sw/source/core/doc/ftnidx.cxx @@ -52,7 +52,7 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt ) const SwFtnInfo& rFtnInfo = pDoc->GetFtnInfo(); // For normal foot notes we treat per-chapter and per-document numbering - // seperately. For Endnotes we only have per-document numbering. + // separately. For Endnotes we only have per-document numbering. if( FTNNUM_CHAPTER == rFtnInfo.eNum ) { const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds(); diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 38a558849628..9c389f1b906a 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -679,8 +679,8 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData, ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo()); // The LinkFileName could only consist of separators - String sCompareString = OUString(sfx2::cTokenSeperator); - sCompareString += sfx2::cTokenSeperator; + String sCompareString = OUString(sfx2::cTokenSeparator); + sCompareString += sfx2::cTokenSeparator; const bool bUpdate = (!pSection->IsLinkType() && rNewData.IsLinkType()) || (rNewData.GetLinkFileName().Len() diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index b6f27f068fca..90f371cdf831 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -815,7 +815,7 @@ const SwTxtNode* SwNode::FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const ->GetAttrOutlineLevel() - 1 ) --nPos; - if( !nPos ) // Get seperately when 0 + if( !nPos ) // Get separately when 0 pRet = rONds[0]->GetTxtNode(); } } diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 56239af0f94f..54c3e589505d 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -560,8 +560,8 @@ const String& SwSection::GetLinkFileName() const m_RefLink->GetLinkManager()->GetDisplayNames( m_RefLink, 0, &sTmp, &sRange, &sFilter )) { - ( sTmp += sfx2::cTokenSeperator ) += sFilter; - ( sTmp += sfx2::cTokenSeperator ) += sRange; + ( sTmp += sfx2::cTokenSeparator ) += sFilter; + ( sTmp += sfx2::cTokenSeparator ) += sRange; } else if( GetFmt() && !GetFmt()->GetSectionNode() ) { @@ -1636,11 +1636,11 @@ void SwSection::CreateLink( LinkCreateType eCreateType ) case FILE_LINK_SECTION: { pLnk->SetContentType( FORMAT_FILE ); - String sFltr( sCmd.GetToken( 1, sfx2::cTokenSeperator ) ); - String sRange( sCmd.GetToken( 2, sfx2::cTokenSeperator ) ); + String sFltr( sCmd.GetToken( 1, sfx2::cTokenSeparator ) ); + String sRange( sCmd.GetToken( 2, sfx2::cTokenSeparator ) ); pFmt->GetDoc()->GetLinkManager().InsertFileLink( *pLnk, static_cast<sal_uInt16>(m_Data.GetType()), - sCmd.GetToken( 0, sfx2::cTokenSeperator ), + sCmd.GetToken( 0, sfx2::cTokenSeparator ), ( sFltr.Len() ? &sFltr : 0 ), ( sRange.Len() ? &sRange : 0 ) ); } diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index b2ebf5ec8d2d..e8a553ba552d 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -2051,7 +2051,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos ) bFirstSent = sal_True; default: if( !( rAppCC.isLetterNumeric( *pTxt, nPos ) - || '/' == cChar )) // '/' should not be a word seperator (e.g. '1/2' needs to be handled as one word for replacement) + || '/' == cChar )) // '/' should not be a word separator (e.g. '1/2' needs to be handled as one word for replacement) { --nPos; // ++nPos von dem for ungueltig machen ! ++bBreak; diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index 5f79e3c7823a..a6d048ed7206 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -338,7 +338,7 @@ bool SwDDEFieldType::QueryValue( uno::Any& rVal, sal_uInt16 nWhichId ) const OSL_FAIL("illegal property"); } if( nPart ) - rVal <<= OUString(GetCmd().GetToken(nPart-1, sfx2::cTokenSeperator)); + rVal <<= OUString(GetCmd().GetToken(nPart-1, sfx2::cTokenSeparator)); return true; } @@ -368,9 +368,9 @@ bool SwDDEFieldType::PutValue( const uno::Any& rVal, sal_uInt16 nWhichId ) if( nPart ) { String sTmp, sCmd( GetCmd() ); - while(3 > comphelper::string::getTokenCount(sCmd, sfx2::cTokenSeperator)) - sCmd += sfx2::cTokenSeperator; - sCmd.SetToken( nPart-1, sfx2::cTokenSeperator, ::GetString( rVal, sTmp ) ); + while(3 > comphelper::string::getTokenCount(sCmd, sfx2::cTokenSeparator)) + sCmd += sfx2::cTokenSeparator; + sCmd.SetToken( nPart-1, sfx2::cTokenSeparator, ::GetString( rVal, sTmp ) ); SetCmd( sCmd ); } return true; diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 5a1eea594187..5cedf29e600d 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -586,8 +586,8 @@ bool SwGrfNode::GetFileFilterNms( String* pFileNm, String* pFilterNm ) const if( refLink->GetLinkManager()->GetDisplayNames( refLink, &sApp, &sTopic, &sItem ) ) { - ( *pFileNm = sApp ) += sfx2::cTokenSeperator; - ( *pFileNm += sTopic ) += sfx2::cTokenSeperator; + ( *pFileNm = sApp ) += sfx2::cTokenSeparator; + ( *pFileNm += sTopic ) += sfx2::cTokenSeparator; *pFileNm += sItem; pFilterNm->AssignAscii( RTL_CONSTASCII_STRINGPARAM( "DDE" )); bRet = true; @@ -654,8 +654,8 @@ void SwGrfNode::InsertLink( const String& rGrfName, const String& rFltName ) { sal_Int32 nTmp = 0; String sApp, sTopic, sItem; - sApp = rGrfName.GetToken( 0, sfx2::cTokenSeperator, nTmp ); - sTopic = rGrfName.GetToken( 0, sfx2::cTokenSeperator, nTmp ); + sApp = rGrfName.GetToken( 0, sfx2::cTokenSeparator, nTmp ); + sTopic = rGrfName.GetToken( 0, sfx2::cTokenSeparator, nTmp ); sItem = rGrfName.Copy( nTmp ); pIDLA->GetLinkManager().InsertDDELink( refLink, sApp, sTopic, sItem ); diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index 106ef4741f91..22e7091e00d4 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -685,7 +685,7 @@ String SwTOXPara::GetURL() const SwFrmFmt* pFly = pNd->GetFlyFmt(); if( pFly ) { - (( aTxt = '#' ) += pFly->GetName() ) += cMarkSeperator; + (( aTxt = '#' ) += pFly->GetName() ) += cMarkSeparator; const sal_Char* pStr; switch( eType ) { @@ -746,7 +746,7 @@ String SwTOXTable::GetURL() const aTxt = ((SwTableNode*)pNd)->GetTable().GetFrmFmt()->GetName(); if( aTxt.Len() ) { - ( aTxt.Insert( '#', 0 ) += cMarkSeperator ). + ( aTxt.Insert( '#', 0 ) += cMarkSeparator ). AppendAscii( pMarkToTable ); } } diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 45f5c7288baa..e1c282452d80 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -665,7 +665,7 @@ SwScanner::SwScanner( const SwTxtNode& rNd, const OUString& rTxt, //additional ones can be added in under tools->options if (nWordType == i18n::WordType::WORD_COUNT) { - OUString sDashes = officecfg::Office::Writer::WordCount::AdditionalSeperators::get(); + OUString sDashes = officecfg::Office::Writer::WordCount::AdditionalSeparators::get(); OUStringBuffer aBuf(aPreDashReplacementText); for (sal_Int32 i = nStartPos; i < nEndPos; ++i) { diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index f75ad8ec88ad..a3793d26a3d5 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -555,7 +555,7 @@ SwTableNode* SwNodes::UndoTableToText( sal_uLong nSttNd, sal_uLong nEndNd, if( USHRT_MAX != pSave->m_nCntnt ) { - // split at ContentPosition, delete previous char (= seperator) + // split at ContentPosition, delete previous char (= separator) OSL_ENSURE( pTxtNd, "Where is my TextNode?" ); SwIndex aCntPos( pTxtNd, pSave->m_nCntnt - 1 ); diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 14484459e1ea..363c45c4efc1 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -788,7 +788,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData } aDataLen[oi] = nL; - // check that there is no other seperate sequence of data + // check that there is no other separate sequence of data // to be found because that is not supported while (ii < iiEnd) { diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 53a3de7ebb79..9d0e282212a3 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -689,10 +689,10 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName, { String sTmp; if(!sParam1.Len()) - (sParam1 = sfx2::cTokenSeperator) - += sfx2::cTokenSeperator; + (sParam1 = sfx2::cTokenSeparator) + += sfx2::cTokenSeparator; - sParam1.SetToken( nPart, sfx2::cTokenSeperator, + sParam1.SetToken( nPart, sfx2::cTokenSeparator, ::GetString( rValue, sTmp )); } else if(3 == nPart) @@ -871,7 +871,7 @@ uno::Any SwXFieldMaster::getPropertyValue(const OUString& rPropertyName) rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_DDE_COMMAND_ELEMENT)) ? 2 : rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_IS_AUTOMATIC_UPDATE)) ? 3 : USHRT_MAX; if(nPart < 3 ) - pStr = &(sStr = sParam1.GetToken(nPart, sfx2::cTokenSeperator)); + pStr = &(sStr = sParam1.GetToken(nPart, sfx2::cTokenSeparator)); else if(3 == nPart) aRet.setValue(&bParam1, ::getBooleanCppuType()); } diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 4ea1fcf9e464..749b53d823af 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -337,9 +337,9 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) SwSectionData aSect(eType, pDoc->GetUniqueSectionName(&tmp)); aSect.SetCondition(m_pImpl->m_pProps->m_sCondition); OUStringBuffer sLinkNameBuf(m_pImpl->m_pProps->m_sLinkFileName); - sLinkNameBuf.append(sfx2::cTokenSeperator); + sLinkNameBuf.append(sfx2::cTokenSeparator); sLinkNameBuf.append(m_pImpl->m_pProps->m_sSectionFilter); - sLinkNameBuf.append(sfx2::cTokenSeperator); + sLinkNameBuf.append(sfx2::cTokenSeparator); sLinkNameBuf.append(m_pImpl->m_pProps->m_sSectionRegion); aSect.SetLinkFileName(sLinkNameBuf.makeStringAndClear()); @@ -623,14 +623,14 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, if (!m_pProps->m_bDDE) { OUStringBuffer buf; - buf.append(sfx2::cTokenSeperator); - buf.append(sfx2::cTokenSeperator); + buf.append(sfx2::cTokenSeparator); + buf.append(sfx2::cTokenSeparator); m_pProps->m_sLinkFileName = buf.makeStringAndClear(); m_pProps->m_bDDE = true; } String sLinkFileName(m_pProps->m_sLinkFileName); sLinkFileName.SetToken(pEntry->nWID - WID_SECT_DDE_TYPE, - sfx2::cTokenSeperator, sTmp); + sfx2::cTokenSeparator, sTmp); m_pProps->m_sLinkFileName = sLinkFileName; } else @@ -638,12 +638,12 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, String sLinkFileName(pSectionData->GetLinkFileName()); if (pSectionData->GetType() != DDE_LINK_SECTION) { - sLinkFileName = sfx2::cTokenSeperator; - sLinkFileName += sfx2::cTokenSeperator; + sLinkFileName = sfx2::cTokenSeparator; + sLinkFileName += sfx2::cTokenSeparator; pSectionData->SetType(DDE_LINK_SECTION); } sLinkFileName.SetToken(pEntry->nWID - WID_SECT_DDE_TYPE, - sfx2::cTokenSeperator, sTmp); + sfx2::cTokenSeparator, sTmp); pSectionData->SetLinkFileName(sLinkFileName); } } @@ -694,12 +694,12 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, ->GetURLObject(), aLink.FileURL, URIHelper::GetMaybeFileHdl())); } - sFileNameBuf.append(sfx2::cTokenSeperator); + sFileNameBuf.append(sfx2::cTokenSeparator); sFileNameBuf.append(aLink.FilterName); - sFileNameBuf.append(sfx2::cTokenSeperator); + sFileNameBuf.append(sfx2::cTokenSeparator); sFileNameBuf.append( pSectionData->GetLinkFileName().GetToken(2, - sfx2::cTokenSeperator)); + sfx2::cTokenSeparator)); const OUString sFileName( sFileNameBuf.makeStringAndClear()); pSectionData->SetLinkFileName(sFileName); @@ -727,11 +727,11 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, pSectionData->SetType(FILE_LINK_SECTION); } String sSectLink(pSectionData->GetLinkFileName()); - while (3 < comphelper::string::getTokenCount(sSectLink, sfx2::cTokenSeperator)) + while (3 < comphelper::string::getTokenCount(sSectLink, sfx2::cTokenSeparator)) { - sSectLink += sfx2::cTokenSeperator; + sSectLink += sfx2::cTokenSeparator; } - sSectLink.SetToken(2, sfx2::cTokenSeperator, sLink); + sSectLink.SetToken(2, sfx2::cTokenSeparator, sLink); pSectionData->SetLinkFileName(sSectLink); if (sSectLink.Len() < 3) { @@ -1019,7 +1019,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, } sal_Int32 nDummy(0); sRet = sRet.getToken(pEntry->nWID - WID_SECT_DDE_TYPE, - sfx2::cTokenSeperator, nDummy); + sfx2::cTokenSeparator, nDummy); pRet[nProperty] <<= sRet; } break; @@ -1050,9 +1050,9 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, OUString sRet( pSect->GetLinkFileName() ); sal_Int32 nIndex(0); aLink.FileURL = - sRet.getToken(0, sfx2::cTokenSeperator, nIndex); + sRet.getToken(0, sfx2::cTokenSeparator, nIndex); aLink.FilterName = - sRet.getToken(0, sfx2::cTokenSeperator, nIndex); + sRet.getToken(0, sfx2::cTokenSeparator, nIndex); } pRet[nProperty] <<= aLink; } @@ -1067,7 +1067,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, else if (FILE_LINK_SECTION == pSect->GetType()) { sRet = pSect->GetLinkFileName().GetToken(2, - sfx2::cTokenSeperator); + sfx2::cTokenSeparator); } pRet[nProperty] <<= sRet; } diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 47426ef81804..b7fdd6f7d9e4 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -1770,7 +1770,7 @@ void SwHTMLWriter::AddLinkTarget( const String& rURL ) sal_Unicode c = rURL.GetChar( --nPos ); switch( c ) { - case cMarkSeperator: + case cMarkSeparator: bFound = sal_True; break; case '%': @@ -1804,7 +1804,7 @@ void SwHTMLWriter::AddLinkTarget( const String& rURL ) if( bEncoded ) { aURL.Erase( nPos, 2 ); - aURL.SetChar( nPos-1, cMarkSeperator ); + aURL.SetChar( nPos-1, cMarkSeparator ); } aImplicitMarks.insert( aURL ); } @@ -1827,7 +1827,7 @@ void SwHTMLWriter::AddLinkTarget( const String& rURL ) if( bEncoded ) { aURL.Erase( nPos, 2 ); - aURL.SetChar( nPos-1, cMarkSeperator ); + aURL.SetChar( nPos-1, cMarkSeparator ); } aOutlineMarks.insert( aOutlineMarks.begin()+nIns, new String( aURL ) ); } diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 97caf18c790f..de89a5926d0c 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -1118,7 +1118,7 @@ ANCHOR_SETEVENT: String sDecoded( INetURLObject::decode( aName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 )); - xub_StrLen nPos = sDecoded.SearchBackward( cMarkSeperator ); + xub_StrLen nPos = sDecoded.SearchBackward( cMarkSeparator ); if( STRING_NOTFOUND != nPos ) { String sCmp(comphelper::string::remove(sDecoded.Copy(nPos+1), ' ')); diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 82a4b800ec4f..b9e76dac8df5 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -287,7 +287,7 @@ void SwHTMLParser::NewDivision( int nToken ) else { aURL = URIHelper::SmartRel2Abs(INetURLObject( sBaseURL ), aHRef.Copy( 0, nPos ), Link(), false ); - aURL += sfx2::cTokenSeperator; + aURL += sfx2::cTokenSeparator; if( STRING_NOTFOUND == nPos2 ) { aURL += aHRef.Copy( nPos+1 ); @@ -295,7 +295,7 @@ void SwHTMLParser::NewDivision( int nToken ) else { aURL += aHRef.Copy( nPos+1, nPos2 - (nPos+1) ); - aURL += sfx2::cTokenSeperator; + aURL += sfx2::cTokenSeparator; aURL += String(rtl::Uri::decode( aHRef.Copy( nPos2+1 ), rtl_UriDecodeWithCharset, RTL_TEXTENCODING_ISO_8859_1 )); diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 3f0f679aa3ee..a4c84813929e 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -370,7 +370,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, eJumpTo = JUMPTO_MARK; xub_StrLen nLastPos, nPos = 0; while( STRING_NOTFOUND != ( nLastPos = - sJmpMark.Search( cMarkSeperator, nPos + 1 )) ) + sJmpMark.Search( cMarkSeparator, nPos + 1 )) ) nPos = nLastPos; String sCmp; diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 8042027d5086..58b747897507 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -548,9 +548,9 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, rHTMLWrt.Strm() << sOut.makeStringAndClear().getStr(); const String& aFName = rSection.GetLinkFileName(); - String aURL( aFName.GetToken(0,sfx2::cTokenSeperator) ); - String aFilter( aFName.GetToken(1,sfx2::cTokenSeperator) ); - String aSection( aFName.GetToken(2,sfx2::cTokenSeperator) ); + String aURL( aFName.GetToken(0,sfx2::cTokenSeparator) ); + String aFilter( aFName.GetToken(1,sfx2::cTokenSeparator) ); + String aSection( aFName.GetToken(2,sfx2::cTokenSeparator) ); String aEncURL( URIHelper::simpleNormalizedMakeRelative(rHTMLWrt.GetBaseURL(), aURL ) ); sal_Unicode cDelim = 255U; @@ -1076,7 +1076,7 @@ void SwHTMLWriter::OutImplicitMark( const String& rMark, if( rMark.Len() && !aImplicitMarks.empty() ) { String sMark( rMark ); - sMark.Append( cMarkSeperator ); + sMark.Append( cMarkSeparator ); sMark.AppendAscii( pMarkType ); if( 0 != aImplicitMarks.erase( sMark ) ) { @@ -1089,7 +1089,7 @@ void SwHTMLWriter::OutImplicitMark( const String& rMark, void SwHTMLWriter::OutHyperlinkHRefValue( const String& rURL ) { String sURL( rURL ); - xub_StrLen nPos = sURL.SearchBackward( cMarkSeperator ); + xub_StrLen nPos = sURL.SearchBackward( cMarkSeparator ); if( STRING_NOTFOUND != nPos ) { String sCmp(comphelper::string::remove(sURL.Copy(nPos+1), ' ')); diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index dc9c1b627ca0..1b4cafd6b2fe 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -501,7 +501,7 @@ sal_Int32 RtfSdrExport::StartShape() /* #i13885# When the object is actively being edited, that text is not set into - the objects normal text object, but lives in a seperate object. + the objects normal text object, but lives in a separate object. */ if (pTxtObj->IsTextEditActive()) { diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 059299b66f3f..52bfba74b687 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -764,7 +764,7 @@ namespace sw Word has the simple concept of a drawing object either in the foreground and in the background. We have an additional complexity - that form components live in a seperate layer, which seems + that form components live in a separate layer, which seems unnecessarily complicated. So in the winword filter we set the object's layer through this class with either SendObjectToHell for the bottom layer and SendObjectToHeaven for the top and we don't diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index 7d4444ebfeab..af662eda04e7 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -107,7 +107,7 @@ namespace myImplHelpers /* SwTxtFmtColl and SwCharFmt are quite distinct types and how they are gotten is also distinct, but the algorithm to match word's eqivalents into - them is the same, so we put the different stuff into two seperate helper + them is the same, so we put the different stuff into two separate helper implementations and a core template that uses the helpers that uses the same algorithm to do the work. We'll make the helpers specializations of a non existing template so I can let the compiler figure out the right one diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 6cbd5abf673f..5e7add30c33f 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1097,7 +1097,7 @@ void WW8Export::WriteSdrTextObj(const SdrObject& rObj, sal_uInt8 nTyp) /* #i13885# When the object is actively being edited, that text is not set into - the objects normal text object, but lives in a seperate object. + the objects normal text object, but lives in a separate object. */ if (pTxtObj->IsTextEditActive()) { diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 182c51423410..83bd7943ce02 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -764,7 +764,7 @@ bool AttributeOutputBase::AnalyzeURL( const String& rUrl, const String& /*rTarge { sMark = BookmarkToWriter( rUrl.Copy(1) ); - xub_StrLen nPos = sMark.SearchBackward( cMarkSeperator ); + xub_StrLen nPos = sMark.SearchBackward( cMarkSeparator ); String sRefType(comphelper::string::remove(sMark.Copy(nPos+1), ' ')); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index af5c55f63a2c..b3e652234e01 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2853,7 +2853,7 @@ void MSWordExportBase::AddLinkTarget(const String& rURL) return; String aURL( BookmarkToWriter( rURL.Copy( 1 ) ) ); - xub_StrLen nPos = aURL.SearchBackward( cMarkSeperator ); + xub_StrLen nPos = aURL.SearchBackward( cMarkSeparator ); if( nPos < 2 ) return; diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index cc5d4026ec4c..d2dae7ce0599 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -3262,7 +3262,7 @@ void WW8AttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines ) sal_Unicode cEnd = rTwoLines.GetEndBracket(); /* - As per usual we have problems. We can have seperate left and right brackets + As per usual we have problems. We can have separate left and right brackets in OOo, it doesn't appear that you can in word. Also in word there appear to only be a limited number of possibilities, we can use pretty much anything. @@ -4780,9 +4780,9 @@ void SwWW8WrTabu::Add(const SvxTabStop & rTS, long nAdjustment) break; case SVX_TAB_ADJUST_DECIMAL: /* - Theres nothing we can do btw the decimal seperator has been + Theres nothing we can do btw the decimal separator has been customized, but if you think different remember that different - locales have different seperators, i.e. german is a , while english + locales have different separators, i.e. german is a , while english is a . */ nPara = 3; diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index f1b7244531bb..3aebdf56ba85 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -603,7 +603,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp, Save and create new plcxman for this drawing object, of the type that will include the para end mark inside a paragraph property range, as drawing boxes have real paragraph marks as part of their text, while - normal writer has seperate nodes for each paragraph and so has no actual + normal writer has separate nodes for each paragraph and so has no actual paragraph mark as part of the paragraph text. */ WW8ReaderSave aSave(this); @@ -1757,7 +1757,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj, bool bBrushItemOk = false; sal_uInt8 nTrans = 0; - //Seperate transparency + //Separate transparency eState = rOldSet.GetItemState(XATTR_FILLTRANSPARENCE, true, &pItem); if (eState == SFX_ITEM_SET) { diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx index 558a3dbc3ed1..fc3c8c9147e0 100644 --- a/sw/source/filter/ww8/ww8graf.hxx +++ b/sw/source/filter/ww8/ww8graf.hxx @@ -75,7 +75,7 @@ public: const SvxMSDffShapeOrders *pShapeOrders); void InsertTextLayerObject(SdrObject* pObject); /* - cmc: We should have have seperate ZOrder classes for 95- and 97+ and + cmc: We should have have separate ZOrder classes for 95- and 97+ and instantiate the appropriate one at run time. */ void InsertDrawingObject(SdrObject* pObj, short nWwHeight); diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 97be94e3e607..4dd903e15087 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -720,7 +720,7 @@ public: bool IsNotProtected() const { return maSep.fUnlocked != 0; } bool IsVertical() const; sal_Int16 NoCols() const { return maSep.ccolM1 + 1; } - sal_Int32 StandardColSeperation() const { return maSep.dxaColumns; } + sal_Int32 StandardColSeparation() const { return maSep.dxaColumns; } bool HasTitlePage() const { return maSep.fTitlePage ? true : false; } sal_uInt16 PageStartAt() const { return maSep.pgnStart; } bool PageRestartNo() const { return maSep.fPgnRestart ? true : false; } diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 6a8836bb5dd6..81841d556083 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -466,7 +466,7 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd, /* #i1140# If I have a table and apply a style to one of its frames that should cause - a paragraph that its applied to it to only exist as a seperate floating + a paragraph that its applied to it to only exist as a separate floating frame, then the behavour depends on which cell that it has been applied to. If its the first cell of a row then the whole table row jumps into the new frame, if its not then then the paragraph attributes are applied diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 7650a0dd58d1..8cfdeed55d18 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -397,7 +397,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*) } //e.g. inserting bookmark around field result, so we need to put - //it around the entire writer field, as we don't have the seperation + //it around the entire writer field, as we don't have the separation //of field and field result of word, see #i16941# SwPosition aStart(*pPaM->GetPoint()); if (!maFieldStack.empty()) @@ -2482,8 +2482,8 @@ eF_ResT SwWW8ImplReader::Read_F_IncludeText( WW8FieldDesc* /*pF*/, String& rStr { // Bereich aus Quelle ( kein Switch ) ? ConvertUFName(aBook); - aPara += sfx2::cTokenSeperator; - aPara += sfx2::cTokenSeperator; + aPara += sfx2::cTokenSeparator; + aPara += sfx2::cTokenSeparator; aPara += aBook; } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 4b39be0a25e9..78733af81e0c 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -335,7 +335,7 @@ bool wwSectionManager::SetCols(SwFrmFmt &rFmt, const wwSection &rSection, SwFmtCol aCol; // Create SwFmtCol //sprmSDxaColumns - Default distance is 1.25 cm - sal_Int32 nColSpace = rSection.StandardColSeperation(); + sal_Int32 nColSpace = rSection.StandardColSeparation(); const SEPr& rSep = rSection.maSep; diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 5afa08fc2c30..2c150cf7fd6d 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -4761,7 +4761,7 @@ void WW8PLCFMan::AdvNoSprm(short nIdx, bool bStart) { /* For the case of a piece table we slave the piece table attribute iterator - to the piece table and access it through that only. They are two seperate + to the piece table and access it through that only. They are two separate structures, but act together as one logical one. The attributes only go to the next entry when the piece changes */ @@ -6427,9 +6427,9 @@ WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop ) /* cmc 23/02/2000: This dop.grpfIhdt has a bit set for each special - footnote *and endnote!!* seperator,continuation seperator, and + footnote *and endnote!!* separator,continuation separator, and continuation notice entry, the documentation does not mention the - endnote seperators, the documentation also gets the index numbers + endnote separators, the documentation also gets the index numbers backwards when specifiying which bits to test. The bottom six bits of this value must be tested and skipped over. Each section's grpfIhdt is then tested for the existence of the appropriate headers diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index a7bce2873a7f..0f0f012b9dbc 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -45,7 +45,7 @@ #include "swddetbl.hxx" #include <ndole.hxx> #include <xmloff/nmspmap.hxx> -#include <sfx2/linkmgr.hxx> // for cTokenSeperator +#include <sfx2/linkmgr.hxx> // for cTokenSeparator #include "unotbl.hxx" #include "xmltexte.hxx" #include "xmlexp.hxx" @@ -1136,11 +1136,11 @@ void SwXMLExport::ExportTable( const SwTableNode& rTblNd ) // DDE command const String sCmd = pDDEFldType->GetCmd(); AddAttribute( XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION, - sCmd.GetToken(0, sfx2::cTokenSeperator) ); + sCmd.GetToken(0, sfx2::cTokenSeparator) ); AddAttribute( XML_NAMESPACE_OFFICE, XML_DDE_ITEM, - sCmd.GetToken(1, sfx2::cTokenSeperator) ); + sCmd.GetToken(1, sfx2::cTokenSeparator) ); AddAttribute( XML_NAMESPACE_OFFICE, XML_DDE_TOPIC, - sCmd.GetToken(2, sfx2::cTokenSeperator) ); + sCmd.GetToken(2, sfx2::cTokenSeparator) ); // auto update if (pDDEFldType->GetType() == sfx2::LINKUPDATE_ALWAYS) diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index d30cccf8e3e6..5a367cd49bd5 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -1204,9 +1204,9 @@ static SwDDEFieldType* lcl_GetDDEFieldType(SwXMLDDETableContext_Impl* pContext, { // make command string String sCommand(pContext->GetDDEApplication()); - sCommand += sfx2::cTokenSeperator; + sCommand += sfx2::cTokenSeparator; sCommand += String(pContext->GetDDEItem()); - sCommand += sfx2::cTokenSeperator; + sCommand += sfx2::cTokenSeparator; sCommand += String(pContext->GetDDETopic()); sal_uInt16 nType = static_cast< sal_uInt16 >(pContext->GetIsAutomaticUpdate() ? sfx2::LINKUPDATE_ALWAYS diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index 5972421d0321..ded62a81dc49 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -337,8 +337,8 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel) SwSectionData aSect(FILE_LINK_SECTION, pSh->GetUniqueSectionName()); OUStringBuffer sLinkName; - sLinkName.append(sfx2::cTokenSeperator); - sLinkName.append(sfx2::cTokenSeperator); + sLinkName.append(sfx2::cTokenSeparator); + sLinkName.append(sfx2::cTokenSeparator); sLinkName.append(MASTER_LABEL); aSect.SetLinkFileName(sLinkName.makeStringAndClear()); aSect.SetProtectFlag(true); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index ebbd90dfd221..80aab9802306 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -209,7 +209,7 @@ sal_Bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) { boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create()); - officecfg::Office::Writer::WordCount::AdditionalSeperators::set(aWordCountED.GetText(), batch); + officecfg::Office::Writer::WordCount::AdditionalSeparators::set(aWordCountED.GetText(), batch); batch->commit(); bRet = sal_True; } @@ -310,7 +310,7 @@ void SwLoadOptPage::Reset( const SfxItemSet& rSet) } aUseCharUnit.SaveValue(); - aWordCountED.SetText(officecfg::Office::Writer::WordCount::AdditionalSeperators::get()); + aWordCountED.SetText(officecfg::Office::Writer::WordCount::AdditionalSeparators::get()); aWordCountED.SaveValue(); } diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx index 790b5f512f36..678a8fadb508 100644 --- a/sw/source/ui/dialog/regionsw.cxx +++ b/sw/source/ui/dialog/regionsw.cxx @@ -158,13 +158,13 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq) if(aFile.Len() || aSub.Len()) { - String sLinkFileName = OUString(sfx2::cTokenSeperator); - sLinkFileName += sfx2::cTokenSeperator; - sLinkFileName.SetToken(0, sfx2::cTokenSeperator,aFile); + String sLinkFileName = OUString(sfx2::cTokenSeparator); + sLinkFileName += sfx2::cTokenSeparator; + sLinkFileName.SetToken(0, sfx2::cTokenSeparator,aFile); if(SFX_ITEM_SET == pSet->GetItemState(FN_PARAM_2, sal_True, &pItem)) - sLinkFileName.SetToken(1, sfx2::cTokenSeperator, + sLinkFileName.SetToken(1, sfx2::cTokenSeparator, ((const SfxStringItem *)pItem)->GetValue()); sLinkFileName += aSub; diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index f04ef1e35d71..eb0117df9c15 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -215,15 +215,15 @@ void SectRepr::SetFile( const String& rFile ) INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 )); String sOldFileName( m_SectionData.GetLinkFileName() ); - String sSub( sOldFileName.GetToken( 2, sfx2::cTokenSeperator ) ); + String sSub( sOldFileName.GetToken( 2, sfx2::cTokenSeparator ) ); if( rFile.Len() || sSub.Len() ) { - sNewFile += sfx2::cTokenSeperator; + sNewFile += sfx2::cTokenSeparator; if( rFile.Len() ) // Filter only with FileName - sNewFile += sOldFileName.GetToken( 1, sfx2::cTokenSeperator ); + sNewFile += sOldFileName.GetToken( 1, sfx2::cTokenSeparator ); - sNewFile += sfx2::cTokenSeperator; + sNewFile += sfx2::cTokenSeparator; sNewFile += sSub; } @@ -244,14 +244,14 @@ void SectRepr::SetFilter( const String& rFilter ) { String sNewFile; String sOldFileName( m_SectionData.GetLinkFileName() ); - String sFile( sOldFileName.GetToken( 0, sfx2::cTokenSeperator ) ); - String sSub( sOldFileName.GetToken( 2, sfx2::cTokenSeperator ) ); + String sFile( sOldFileName.GetToken( 0, sfx2::cTokenSeparator ) ); + String sSub( sOldFileName.GetToken( 2, sfx2::cTokenSeparator ) ); if( sFile.Len() ) - (((( sNewFile = sFile ) += sfx2::cTokenSeperator ) += rFilter ) - += sfx2::cTokenSeperator ) += sSub; + (((( sNewFile = sFile ) += sfx2::cTokenSeparator ) += rFilter ) + += sfx2::cTokenSeparator ) += sSub; else if( sSub.Len() ) - (( sNewFile = sfx2::cTokenSeperator ) += sfx2::cTokenSeperator ) += sSub; + (( sNewFile = sfx2::cTokenSeparator ) += sfx2::cTokenSeparator ) += sSub; m_SectionData.SetLinkFileName( sNewFile ); @@ -265,12 +265,12 @@ void SectRepr::SetSubRegion(const String& rSubRegion) { String sNewFile; String sOldFileName( m_SectionData.GetLinkFileName() ); - String sFilter( sOldFileName.GetToken( 1, sfx2::cTokenSeperator ) ); - sOldFileName = sOldFileName.GetToken( 0, sfx2::cTokenSeperator ); + String sFilter( sOldFileName.GetToken( 1, sfx2::cTokenSeparator ) ); + sOldFileName = sOldFileName.GetToken( 0, sfx2::cTokenSeparator ); if( rSubRegion.Len() || sOldFileName.Len() ) - (((( sNewFile = sOldFileName ) += sfx2::cTokenSeperator ) += sFilter ) - += sfx2::cTokenSeperator ) += rSubRegion; + (((( sNewFile = sOldFileName ) += sfx2::cTokenSeparator ) += sFilter ) + += sfx2::cTokenSeparator ) += rSubRegion; m_SectionData.SetLinkFileName( sNewFile ); @@ -292,12 +292,12 @@ String SectRepr::GetFile() const { if (DDE_LINK_SECTION == m_SectionData.GetType()) { - sal_uInt16 n = sLinkFile.SearchAndReplace( sfx2::cTokenSeperator, ' ' ); - sLinkFile.SearchAndReplace( sfx2::cTokenSeperator, ' ', n ); + sal_uInt16 n = sLinkFile.SearchAndReplace( sfx2::cTokenSeparator, ' ' ); + sLinkFile.SearchAndReplace( sfx2::cTokenSeparator, ' ', n ); } else sLinkFile = INetURLObject::decode( sLinkFile.GetToken( 0, - sfx2::cTokenSeperator ), + sfx2::cTokenSeparator ), INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ); @@ -310,7 +310,7 @@ String SectRepr::GetSubRegion() const { String sLinkFile( m_SectionData.GetLinkFileName() ); if( sLinkFile.Len() ) - sLinkFile = sLinkFile.GetToken( 2, sfx2::cTokenSeperator ); + sLinkFile = sLinkFile.GetToken( 2, sfx2::cTokenSeparator ); return sLinkFile; } @@ -1173,8 +1173,8 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit ) while( STRING_NOTFOUND != (nPos = sLink.SearchAscii( " ", nPos )) ) sLink.Erase( nPos--, 1 ); - nPos = sLink.SearchAndReplace( ' ', sfx2::cTokenSeperator ); - sLink.SearchAndReplace( ' ', sfx2::cTokenSeperator, nPos ); + nPos = sLink.SearchAndReplace( ' ', sfx2::cTokenSeparator ); + sLink.SearchAndReplace( ' ', sfx2::cTokenSeparator, nPos ); pSectRepr->GetSectionData().SetLinkFileName( sLink ); pSectRepr->GetSectionData().SetType( DDE_LINK_SECTION ); @@ -1526,9 +1526,9 @@ short SwInsertSectionTabDialog::Ok() m_pSectionData->IsEditInReadonlyFlag())); String sLinkFileName( m_pSectionData->GetLinkFileName() ); - aRequest.AppendItem(SfxStringItem( FN_PARAM_1, sLinkFileName.GetToken( 0, sfx2::cTokenSeperator ))); - aRequest.AppendItem(SfxStringItem( FN_PARAM_2, sLinkFileName.GetToken( 1, sfx2::cTokenSeperator ))); - aRequest.AppendItem(SfxStringItem( FN_PARAM_3, sLinkFileName.GetToken( 2, sfx2::cTokenSeperator ))); + aRequest.AppendItem(SfxStringItem( FN_PARAM_1, sLinkFileName.GetToken( 0, sfx2::cTokenSeparator ))); + aRequest.AppendItem(SfxStringItem( FN_PARAM_2, sLinkFileName.GetToken( 1, sfx2::cTokenSeparator ))); + aRequest.AppendItem(SfxStringItem( FN_PARAM_3, sLinkFileName.GetToken( 2, sfx2::cTokenSeparator ))); aRequest.Done(); } return nRet; @@ -1652,8 +1652,8 @@ sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& ) while( STRING_NOTFOUND != (nPos = aLinkFile.SearchAscii( " ", nPos )) ) aLinkFile.Erase( nPos--, 1 ); - nPos = aLinkFile.SearchAndReplace( ' ', sfx2::cTokenSeperator ); - aLinkFile.SearchAndReplace( ' ', sfx2::cTokenSeperator, nPos ); + nPos = aLinkFile.SearchAndReplace( ' ', sfx2::cTokenSeparator ); + aLinkFile.SearchAndReplace( ' ', sfx2::cTokenSeparator, nPos ); } else { @@ -1668,9 +1668,9 @@ sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& ) aSection.SetLinkFilePassword( m_sFilePasswd ); } - aLinkFile += sfx2::cTokenSeperator; + aLinkFile += sfx2::cTokenSeparator; aLinkFile += m_sFilterName; - aLinkFile += sfx2::cTokenSeperator; + aLinkFile += sfx2::cTokenSeparator; aLinkFile += sSubRegion; } diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 0cebc02b1702..39526b997a93 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2290,7 +2290,7 @@ KEYINPUT_CHECKTABLE_INSDEL: (m_aInBuffer.Len() || !rSh.IsSttPara() || !rSh.IsEndPara() )) { // insert a blank ahead of the character. this ends up - // between the expanded text and the new "non-word-seperator". + // between the expanded text and the new "non-word-separator". m_aInBuffer += ' '; } diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index db7a10e04f9a..2b028864b4d2 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -163,7 +163,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS); //#i63832# remove the link target type - xub_StrLen nFound = sTxt.Search(cMarkSeperator); + xub_StrLen nFound = sTxt.Search(cMarkSeparator); if( nFound != STRING_NOTFOUND && (++nFound) < sTxt.Len() ) { String sSuffix( sTxt.Copy(nFound) ); diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 2934718a2158..439c36d98368 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -869,7 +869,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam ) return sal_False; switch(rData.nTypeId) - { // ATTENTION this field is inserted by a seperate dialog + { // ATTENTION this field is inserted by a separate dialog case TYP_POSTITFLD: { SwPostItFieldType* pType = (SwPostItFieldType*)pCurShell->GetFldType(0, RES_POSTITFLD); @@ -1027,8 +1027,8 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam ) //JP 28.08.95: DDE-Topics/-Items can have blanks in their names! // That's not yet considered here. String sCmd( rData.sPar2 ); - sal_uInt16 nTmpPos = sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator ); - sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); + sal_uInt16 nTmpPos = sCmd.SearchAndReplace( ' ', sfx2::cTokenSeparator ); + sCmd.SearchAndReplace( ' ', sfx2::cTokenSeparator, nTmpPos ); SwDDEFieldType aType( rData.sPar1, sCmd, (sal_uInt16) nFormatId ); SwDDEFieldType* pTyp = (SwDDEFieldType*) pCurShell->InsertFldType( aType ); @@ -1457,8 +1457,8 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat, { // DDE-Topics/-Items can have blanks in their names! // That's not yet considered here! - sal_uInt16 nTmpPos = sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator ); - sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); + sal_uInt16 nTmpPos = sPar2.SearchAndReplace( ' ', sfx2::cTokenSeparator ); + sPar2.SearchAndReplace( ' ', sfx2::cTokenSeparator, nTmpPos ); break; } diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 7ef720a8fdea..70f80d2175e6 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -439,8 +439,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) //JP 28.08.95: DDE-Topics/-Items can have blanks in their names! // That's not considered here yet String sCmd( pType->GetCmd() ); - sal_uInt16 nTmpPos = sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ' ); - sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ', nTmpPos ); + sal_uInt16 nTmpPos = sCmd.SearchAndReplace( sfx2::cTokenSeparator, ' ' ); + sCmd.SearchAndReplace( sfx2::cTokenSeparator, ' ', nTmpPos ); aValueED.SetText( sCmd ); aFormatLB.SelectEntryPos(pType->GetType()); @@ -1025,8 +1025,8 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) { // DDE-Topics/-Items can have blanks in their names! // That's not being considered here yet. - sal_uInt16 nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator ); - sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); + sal_uInt16 nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeparator ); + sValue.SearchAndReplace( ' ', sfx2::cTokenSeparator, nTmpPos ); ((SwDDEFieldType*)pType)->SetCmd(sValue); ((SwDDEFieldType*)pType)->SetType((sal_uInt16)nFormat); } @@ -1063,8 +1063,8 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) { // DDE-Topics/-Items can have blanks in their names! // That's not being considered here yet. - sal_uInt16 nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator ); - sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); + sal_uInt16 nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeparator ); + sValue.SearchAndReplace( ' ', sfx2::cTokenSeparator, nTmpPos ); SwDDEFieldType aType(sName, sValue, (sal_uInt16)nFormat); aSelectionLB.InsertEntry(sName); diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx index 4e009c3fa300..097067adcc08 100644 --- a/sw/source/ui/frmdlg/colex.cxx +++ b/sw/source/ui/frmdlg/colex.cxx @@ -355,7 +355,7 @@ void SwColumnOnlyExample::Paint( const Rectangle& /*rRect*/ ) SetFillColor( aGrayColor ); - //column seperator? + //column separator? long nLength = aLogSize.Height() - 2 * aTL.Y(); Point aUp( aTL ); Point aDown( aTL.X(), nLength ); diff --git a/sw/source/ui/frmdlg/colmgr.cxx b/sw/source/ui/frmdlg/colmgr.cxx index ec6d11e07857..9710f0e8ddd2 100644 --- a/sw/source/ui/frmdlg/colmgr.cxx +++ b/sw/source/ui/frmdlg/colmgr.cxx @@ -80,7 +80,7 @@ void SwColMgr::SetGutterWidth(sal_uInt16 nGutterWidth, sal_uInt16 nPos ) } /*------------------------------------------------------------------------ - Description: height seperation line + Description: height separation line ------------------------------------------------------------------------*/ short SwColMgr::GetLineHeightPercent() const { diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index c7b2f0b75d9b..b7bb316fa2d8 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -99,7 +99,7 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) : get(m_pFormatText, "numbering_label"); get(m_pFormatBox, "numbering"); get(m_pNumberingSeparatorFT, "num_separator"); - get(m_pNumberingSeparatorED, "num_seperator_edit"); + get(m_pNumberingSeparatorED, "num_separator_edit"); get(m_pSepText, "separator_label"); get(m_pSepEdit, "separator_edit"); get(m_pPosText, "position_label"); diff --git a/sw/source/ui/inc/hyp.hxx b/sw/source/ui/inc/hyp.hxx index 9795648b1202..95ccf5cda737 100644 --- a/sw/source/ui/inc/hyp.hxx +++ b/sw/source/ui/inc/hyp.hxx @@ -34,8 +34,8 @@ private: Link aOldLnk; sal_uInt16 nPageCount; // page count for progress view sal_uInt16 nPageStart; // 1st checked page - sal_Bool bInSelection : 1; // seperating selected text - sal_Bool bAutomatic : 1; // insert seperators without further inquiry + sal_Bool bInSelection : 1; // separating selected text + sal_Bool bAutomatic : 1; // insert separators without further inquiry sal_Bool bInfoBox : 1; // display info-box when ending protected: diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 26876d6a0bb9..58aa46a96bf4 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -1869,10 +1869,10 @@ bool SwView::JumpToSwMark( const String& rMark ) INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8 )); - xub_StrLen nLastPos, nPos = sMark.Search( cMarkSeperator ); + xub_StrLen nLastPos, nPos = sMark.Search( cMarkSeparator ); if( STRING_NOTFOUND != nPos ) while( STRING_NOTFOUND != ( nLastPos = - sMark.Search( cMarkSeperator, nPos + 1 )) ) + sMark.Search( cMarkSeparator, nPos + 1 )) ) nPos = nLastPos; IDocumentMarkAccess::const_iterator_t ppMark; diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 0d995dd55694..8b9a05358330 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -1639,7 +1639,7 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer, sUrl += sEntry; if(rToken.Len()) { - sUrl += cMarkSeperator; + sUrl += cMarkSeparator; sUrl += rToken; } } diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index 26dd383a071e..5bc1f08cc714 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -467,7 +467,7 @@ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) if (pItem && SV_ITEM_ID_LBOXSTRING == pItem->GetType()) { const SwSection* pSect = pCont->GetSection(); - String sEntry = pSect->GetLinkFileName().GetToken(0, sfx2::cTokenSeperator); + String sEntry = pSect->GetLinkFileName().GetToken(0, sfx2::cTokenSeparator); if(!pSect->IsConnectFlag()) sEntry.Insert(aContextStrings[ST_BROKEN_LINK - ST_GLOBAL_CONTEXT_FIRST], 0 ); Point aEntryPos = GetEntryPosition( pEntry ); @@ -1157,7 +1157,7 @@ sal_Bool SwGlobalTree::Update(sal_Bool bHard) void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) { String sFileName(pCont->GetSection()->GetLinkFileName().GetToken(0, - sfx2::cTokenSeperator)); + sfx2::cTokenSeparator)); bool bFound = false; const SfxObjectShell* pCurr = SfxObjectShell::GetFirst(); while( !bFound && pCurr ) @@ -1299,7 +1299,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* _pContent, const Sequen aFileUrl.SetSmartURL( sFileName ); String sSectionName(String(aFileUrl.GetLastName( INetURLObject::DECODE_UNAMBIGUOUS)).GetToken(0, - sfx2::cTokenSeperator)); + sfx2::cTokenSeparator)); sal_uInt16 nSectCount = rSh.GetSectionFmtCount(); String sTempSectionName(sSectionName); sal_uInt16 nAddNumber = 0; @@ -1361,9 +1361,9 @@ IMPL_LINK( SwGlobalTree, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg ) { SfxMedium* pMed = pMedList->at( i ); String sFileName = pMed->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); - sFileName += sfx2::cTokenSeperator; + sFileName += sfx2::cTokenSeparator; sFileName += pMed->GetFilter()->GetFilterName(); - sFileName += sfx2::cTokenSeperator; + sFileName += sfx2::cTokenSeparator; pFileNames[nPos++] = sFileName; } delete pMedList; diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx index 00c9d2dee7f0..f0d2855d9ed5 100644 --- a/sw/source/ui/wrtsh/wrtsh2.cxx +++ b/sw/source/ui/wrtsh/wrtsh2.cxx @@ -436,8 +436,8 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk, { SwSectionData aSection( FILE_LINK_SECTION, GetUniqueSectionName( 0 ) ); String aLinkFile( rBkmk.GetURL().GetToken(0, '#') ); - aLinkFile += sfx2::cTokenSeperator; - aLinkFile += sfx2::cTokenSeperator; + aLinkFile += sfx2::cTokenSeparator; + aLinkFile += sfx2::cTokenSeparator; aLinkFile += rBkmk.GetURL().GetToken(1, '#'); aSection.SetLinkFileName( aLinkFile ); aSection.SetProtectFlag( true ); diff --git a/sw/source/ui/wrtsh/wrtsh4.cxx b/sw/source/ui/wrtsh/wrtsh4.cxx index 26026e1ead10..6966e45c4fda 100644 --- a/sw/source/ui/wrtsh/wrtsh4.cxx +++ b/sw/source/ui/wrtsh/wrtsh4.cxx @@ -44,8 +44,8 @@ bool SwWrtShell::_SttWrd() return true; } -// The end of a word is the follow of seperator to nonseperator. -// The end of a word is also the sequence of wordseperators to +// The end of a word is the follow of separator to nonseparator. +// The end of a word is also the sequence of wordseparators to // punctuation marks. // The end of a paragraph is also the end of a word. diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui b/sw/uiconfig/swriter/ui/insertcaption.ui index 22ef9b9d8e16..a6e43b3af0ea 100644 --- a/sw/uiconfig/swriter/ui/insertcaption.ui +++ b/sw/uiconfig/swriter/ui/insertcaption.ui @@ -180,7 +180,7 @@ <property name="halign">start</property> <property name="label" translatable="yes">Numbering separator</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">num_seperator_edit</property> + <property name="mnemonic_widget">num_separator_edit</property> </object> <packing> <property name="left_attach">0</property> @@ -190,7 +190,7 @@ </packing> </child> <child> - <object class="GtkEntry" id="num_seperator_edit"> + <object class="GtkEntry" id="num_separator_edit"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/sysui/desktop/share/create_mime_xml.pl b/sysui/desktop/share/create_mime_xml.pl index bda127c3c8ae..e8d7abb553da 100755 --- a/sysui/desktop/share/create_mime_xml.pl +++ b/sysui/desktop/share/create_mime_xml.pl @@ -22,7 +22,7 @@ $basedir = dirname($0); $productname = 'LibreOffice'; $mimedir = $basedir.'/../mimetypes'; -$FS= ' '; # field seperator (space) - for documents.ulf +$FS= ' '; # field separator (space) - for documents.ulf $, = "\n"; # set output field separator (newline) $\ = "\n"; # set output record separator (newline) diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java index 8d54cd66fb85..5b56ec874bb4 100644 --- a/toolkit/test/accessibility/AccessibilityTreeModel.java +++ b/toolkit/test/accessibility/AccessibilityTreeModel.java @@ -415,7 +415,7 @@ public class AccessibilityTreeModel /** - * broadcast a tree event in a seperate Thread + * broadcast a tree event in a separate Thread * must override fire method */ class EventRunner implements Runnable diff --git a/udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl b/udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl index 92e45bf5daec..55a210013b3f 100644 --- a/udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl +++ b/udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl @@ -63,7 +63,7 @@ published interface XStarBasicLibraryInfo: com::sun::star::uno::XInterface /** returns an URL describing the location where the library is stored if the library - is stored seperately (for example not in the main XML file but in a + is stored separately (for example not in the main XML file but in a special library format file), an empty string otherwise. This information can be useful to optimize the access to the library, e.g., for loading on demand. diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index b6e755adaef4..f1cf83d0def8 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -91,7 +91,7 @@ class SvtCmdOptions // The while-loop starts with pointer on internal member list lSetupEntries, change to // lUserEntries then and stop after that with NULL! // Separator entries will be packed in another way then normal entries! We define - // special strings "sEmpty" and "sSeperator" to perform too ... + // special strings "sEmpty" and "sSeparator" to perform too ... Sequence< OUString > GetList() const { sal_Int32 nCount = (sal_Int32)m_aCommandHashMap.size(); diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx index d5b5e7028812..acd93acaf800 100644 --- a/unotools/source/config/dynamicmenuoptions.cxx +++ b/unotools/source/config/dynamicmenuoptions.cxx @@ -96,7 +96,7 @@ class SvtDynMenu public: // append setup written menu entry // Don't touch name of entry. It was defined by setup and must be the same everytime! - // Look for double menu entries here too ... may be some seperator items are supeflous ... + // Look for double menu entries here too ... may be some separator items are supeflous ... void AppendSetupEntry( const SvtDynMenuEntry& rEntry ) { if( @@ -111,7 +111,7 @@ class SvtDynMenu // append user specific menu entry // We must find unique name for it by using special prefix // and next count of user setted entries! - // Look for double menu entries here too ... may be some seperator items are supeflous ... + // Look for double menu entries here too ... may be some separator items are supeflous ... void AppendUserEntry( SvtDynMenuEntry& rEntry ) { if( @@ -138,7 +138,7 @@ class SvtDynMenu // The while-loop starts with pointer on internal member list lSetupEntries, change to // lUserEntries then and stop after that with NULL! // Separator entries will be packed in another way then normal entries! We define - // special strings "sEmpty" and "sSeperator" to perform too ... + // special strings "sEmpty" and "sSeparator" to perform too ... Sequence< Sequence< PropertyValue > > GetList() const { sal_Int32 nSetupCount = (sal_Int32)lSetupEntries.size(); @@ -146,7 +146,7 @@ class SvtDynMenu sal_Int32 nStep = 0; Sequence< PropertyValue > lProperties ( PROPERTYCOUNT ); Sequence< Sequence< PropertyValue > > lResult ( nSetupCount+nUserCount ); - OUString sSeperator ( "private:separator" ); + OUString sSeparator ( "private:separator" ); OUString sEmpty ; const vector< SvtDynMenuEntry >* pList = &lSetupEntries; @@ -161,9 +161,9 @@ class SvtDynMenu pItem!=pList->end() ; ++pItem ) { - if( pItem->sURL == sSeperator ) + if( pItem->sURL == sSeparator ) { - lProperties[OFFSET_URL ].Value <<= sSeperator ; + lProperties[OFFSET_URL ].Value <<= sSeparator ; lProperties[OFFSET_TITLE ].Value <<= sEmpty ; lProperties[OFFSET_IMAGEIDENTIFIER ].Value <<= sEmpty ; lProperties[OFFSET_TARGETNAME ].Value <<= sEmpty ; diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 64efdaa1b57f..8e5cfc69e875 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -52,7 +52,7 @@ NAMELIST[ PROPERTYHANDLE_xxx ] => VALUELIST[ PROPERTYHANDLE_xxx ] *//*-*************************************************************************************************************/ #define ROOTNODE_FACTORIES OUString("Setup/Office/Factories" ) -#define PATHSEPERATOR OUString("/" ) +#define PATHSEPARATOR OUString("/" ) // Attention: The property "ooSetupFactoryEmptyDocumentURL" is read from configuration but not used! There is // special code that uses hard coded strings to return them. @@ -467,7 +467,7 @@ void SvtModuleOptions_Impl::Commit() // These path is used to build full qualified property names .... // See pInfo->getChangedProperties() for further information - sBasePath = PATHSEPERATOR + pInfo->getFactory() + PATHSEPERATOR; + sBasePath = PATHSEPARATOR + pInfo->getFactory() + PATHSEPARATOR; const css::uno::Sequence< css::beans::PropertyValue > lChangedProperties = pInfo->getChangedProperties ( sBasePath ); const css::beans::PropertyValue* pChangedProperties = lChangedProperties.getConstArray(); @@ -772,12 +772,12 @@ css::uno::Sequence< OUString > SvtModuleOptions_Impl::impl_ExpandSetNames( const for( sal_Int32 nName=0; nName<nCount; ++nName ) { - pPropNames[nPropStart+PROPERTYHANDLE_SHORTNAME ] = lSetNames[nName] + PATHSEPERATOR + PROPERTYNAME_SHORTNAME ; - pPropNames[nPropStart+PROPERTYHANDLE_TEMPLATEFILE ] = lSetNames[nName] + PATHSEPERATOR + PROPERTYNAME_TEMPLATEFILE ; - pPropNames[nPropStart+PROPERTYHANDLE_WINDOWATTRIBUTES] = lSetNames[nName] + PATHSEPERATOR + PROPERTYNAME_WINDOWATTRIBUTES; - pPropNames[nPropStart+PROPERTYHANDLE_EMPTYDOCUMENTURL] = lSetNames[nName] + PATHSEPERATOR + PROPERTYNAME_EMPTYDOCUMENTURL; - pPropNames[nPropStart+PROPERTYHANDLE_DEFAULTFILTER ] = lSetNames[nName] + PATHSEPERATOR + PROPERTYNAME_DEFAULTFILTER ; - pPropNames[nPropStart+PROPERTYHANDLE_ICON ] = lSetNames[nName] + PATHSEPERATOR + PROPERTYNAME_ICON ; + pPropNames[nPropStart+PROPERTYHANDLE_SHORTNAME ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_SHORTNAME ; + pPropNames[nPropStart+PROPERTYHANDLE_TEMPLATEFILE ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_TEMPLATEFILE ; + pPropNames[nPropStart+PROPERTYHANDLE_WINDOWATTRIBUTES] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_WINDOWATTRIBUTES; + pPropNames[nPropStart+PROPERTYHANDLE_EMPTYDOCUMENTURL] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_EMPTYDOCUMENTURL; + pPropNames[nPropStart+PROPERTYHANDLE_DEFAULTFILTER ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_DEFAULTFILTER ; + pPropNames[nPropStart+PROPERTYHANDLE_ICON ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_ICON ; nPropStart += PROPERTYCOUNT; } @@ -954,7 +954,7 @@ void SvtModuleOptions_Impl::MakeReadonlyStatesAvailable() { OUStringBuffer sPath(256); sPath.append(lFactories[i] ); - sPath.append(PATHSEPERATOR ); + sPath.append(PATHSEPARATOR ); sPath.append(PROPERTYNAME_DEFAULTFILTER); lFactories[i] = sPath.makeStringAndClear(); diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 5b149a061a47..ad33c97cb9a1 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -203,7 +203,7 @@ ImplRegion* ImplRectilinearPolygonToBands (const PolyPolygon& rPolyPoly) OSL_ASSERT(aStart.X() == aEnd.X()); // Sort y-coordinates to simplify the algorithm and store the - // direction seperately. The direction is calculated as it is + // direction separately. The direction is calculated as it is // in other places (but seems to be the wrong way.) const long nTop (::std::min(aStart.Y(), aEnd.Y())); const long nBottom (::std::max(aStart.Y(), aEnd.Y())); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index dfb22398ed4b..3950596733c8 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -5009,7 +5009,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) } } - // #82968# notify event listeners for mouse and key events seperately and + // #82968# notify event listeners for mouse and key events separately and // not in PreNotify ( as for focus listeners ) // this allows for procesing those events internally first and pass it to // the toolkit later diff --git a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py index e59620bfb482..2a74597b8c10 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py +++ b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py @@ -751,7 +751,7 @@ class Topics(object): We hold the format of the last row, because one might wish to give it a special format, other than the one on the bottom of each topic. The left and right borders of the whole table are, on the other side, - part of the topics rows format, and need not be preserved seperateley. + part of the topics rows format, and need not be preserved separateley. ''' table = None lastRowFormat = [] diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java index 366fde2e4ac4..864c41cfc686 100644 --- a/wizards/com/sun/star/wizards/common/NumericalHelper.java +++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java @@ -1438,7 +1438,7 @@ public class NumericalHelper /* converison idea: every digit is written with a maximum of two * different roman symbols, using three in total, e.g. CC, CD, * DCC, CM for the hundreds (meaning 200, 400, 700 and 900). - * So every digit is converted seperately with regard to the + * So every digit is converted separately with regard to the * special cases 4 and 9. */ int symbolIndex = 0; diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index bc72b6a93b24..2f895934ba19 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -754,7 +754,7 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal ) { //this strings contains the definition of the level //the level number is marked as %n - //these numbers can be mixed randomly toghether with seperators pre- and suffixes + //these numbers can be mixed randomly toghether with separators pre- and suffixes //the Writer supports only a number of upper levels to show, separators is always a dot //and each level can have a prefix and a suffix if(pCurrentLvl.get()) diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 6c247711cbc0..0026161f3f12 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -450,8 +450,8 @@ sal_Bool SvXMLUnitConverter::convertDateTime( double& fDateTime, } -SvXMLTokenEnumerator::SvXMLTokenEnumerator( const OUString& rString, sal_Unicode cSeperator /* = sal_Unicode(' ') */ ) -: maTokenString( rString ), mnNextTokenPos(0), mcSeperator( cSeperator ) +SvXMLTokenEnumerator::SvXMLTokenEnumerator( const OUString& rString, sal_Unicode cSeparator /* = sal_Unicode(' ') */ ) +: maTokenString( rString ), mnNextTokenPos(0), mcSeparator( cSeparator ) { } @@ -460,7 +460,7 @@ sal_Bool SvXMLTokenEnumerator::getNextToken( OUString& rToken ) if( -1 == mnNextTokenPos ) return sal_False; - int nTokenEndPos = maTokenString.indexOf( mcSeperator, mnNextTokenPos ); + int nTokenEndPos = maTokenString.indexOf( mcSeparator, mnNextTokenPos ); if( nTokenEndPos != -1 ) { rToken = maTokenString.copy( mnNextTokenPos, diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index 651533c785b8..b710adefa8f7 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -257,7 +257,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) Reference< XCellRange > xCellRange( xPropSet, UNO_QUERY_THROW ); for ( sal_Int32 nColumn = 0; nColumn < nColumnCount; ++nColumn ) { - // get current cell, remarks row index is 0, because we get the range for each row seperate + // get current cell, remarks row index is 0, because we get the range for each row separate Reference< XPropertySet > xCellSet( xCellRange->getCellByPosition(nColumn, 0), UNO_QUERY_THROW ); // get style @@ -358,7 +358,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) for ( sal_Int32 columnIndex = 0; columnIndex < columnCount; columnIndex++ ) { - // get current cell, remarks row index is 0, because we get the range for each row seperate + // get current cell, remarks row index is 0, because we get the range for each row separate Reference< XCell > xCell( xCellRange->getCellByPosition(columnIndex, 0), UNO_QUERY_THROW ); // use XMergeableCell interface from offapi diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 647aeff463df..3b5933be9e2f 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -2141,7 +2141,7 @@ void XMLTextParagraphExport::exportParagraph( { // For the auto styles, the multi property set helper is only used // if hard attributes are existing. Therfor, it seems to be a better - // strategy to have the TextSection property seperate, because otherwise + // strategy to have the TextSection property separate, because otherwise // we always retrieve the style names even if they are not required. if( bAutoStyles ) { |