You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/10/30 17:26:10 UTC
(openoffice) branch trunk updated: Fixed typo (propably -> probably) and some more
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new ac9b9032c0 Fixed typo (propably -> probably) and some more
ac9b9032c0 is described below
commit ac9b9032c0ba643666508a330e8e50090eeb1d21
Author: mseidel <ms...@apache.org>
AuthorDate: Mon Oct 30 18:25:50 2023 +0100
Fixed typo (propably -> probably) and some more
---
main/sd/source/filter/sdpptwrp.cxx | 34 +++++++++++----------
main/sd/source/ui/view/ViewShellBase.cxx | 40 +++++++++++++------------
main/svl/source/numbers/zforlist.cxx | 43 +++++++++++++--------------
main/unotools/source/config/moduleoptions.cxx | 23 +++++++-------
4 files changed, 72 insertions(+), 68 deletions(-)
diff --git a/main/sd/source/filter/sdpptwrp.cxx b/main/sd/source/filter/sdpptwrp.cxx
index ae31ac7f6d..33f4e00a3d 100644
--- a/main/sd/source/filter/sdpptwrp.cxx
+++ b/main/sd/source/filter/sdpptwrp.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -48,12 +48,12 @@ using namespace ::com::sun::star::task;
using namespace ::com::sun::star::frame;
typedef sal_Bool ( __LOADONCALLAPI *ExportPPT )( const std::vector< com::sun::star::beans::PropertyValue >&, SvStorageRef&,
- Reference< XModel > &,
- Reference< XStatusIndicator > &,
- SvMemoryStream*, sal_uInt32 nCnvrtFlags );
+ Reference< XModel > &,
+ Reference< XStatusIndicator > &,
+ SvMemoryStream*, sal_uInt32 nCnvrtFlags );
typedef sal_Bool ( SAL_CALL *ImportPPT )( const ::rtl::OUString&, Sequence< PropertyValue >*,
- SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& );
+ SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& );
typedef sal_Bool ( __LOADONCALLAPI *SaveVBA )( SfxObjectShell&, SvMemoryStream*& );
@@ -71,7 +71,7 @@ SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal
SdPPTFilter::~SdPPTFilter()
{
- delete pBas; // deleting the compressed basic storage
+ delete pBas; // deleting the compressed basic storage
}
// -----------------------------------------------------------------------------
@@ -83,15 +83,15 @@ sal_Bool SdPPTFilter::Import()
if( !pStorage->GetError() )
{
/* check if there is a dualstorage, then the
- document is propably a PPT95 containing PPT97 */
+ document is probably a PPT95 containing PPT97 */
SvStorageRef xDualStorage;
String sDualStorage( RTL_CONSTASCII_USTRINGPARAM( "PP97_DUALSTORAGE" ) );
if ( pStorage->IsContained( sDualStorage ) )
{
- xDualStorage = pStorage->OpenSotStorage( sDualStorage, STREAM_STD_READ );
+ xDualStorage = pStorage->OpenSotStorage( sDualStorage, STREAM_STD_READ );
pStorage = xDualStorage;
}
- SvStream* pDocStream = pStorage->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM("PowerPoint Document") ), STREAM_STD_READ );
+ SvStream* pDocStream = pStorage->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM("PowerPoint Document") ), STREAM_STD_READ );
if( pDocStream )
{
pDocStream->SetVersion( pStorage->GetVersion() );
@@ -139,14 +139,14 @@ sal_Bool SdPPTFilter::Export()
{
if( mxModel.is() )
{
- SotStorageRef xStorRef = new SotStorage( mrMedium.GetOutStream(), sal_False );
+ SotStorageRef xStorRef = new SotStorage( mrMedium.GetOutStream(), sal_False );
ExportPPT PPTExport = reinterpret_cast<ExportPPT>(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("ExportPPT") ));
/* !!!
if ( pViewShell && pViewShell->GetView() )
pViewShell->GetView()->SdrEndTextEdit();
*/
- if( PPTExport && xStorRef.Is() )
+ if( PPTExport && xStorRef.Is() )
{
sal_uInt32 nCnvrtFlags = 0;
SvtFilterOptions* pFilterOptions = SvtFilterOptions::Get();
@@ -177,7 +177,7 @@ sal_Bool SdPPTFilter::Export()
aProperties.push_back( aProperty );
bRet = PPTExport( aProperties, xStorRef, mxModel, mxStatusIndicator, pBas, nCnvrtFlags );
- xStorRef->Commit();
+ xStorRef->Commit();
}
}
delete pLibrary;
@@ -194,7 +194,7 @@ void SdPPTFilter::PreSaveBasic()
if( pLibrary )
{
SaveVBA pSaveVBA= reinterpret_cast<SaveVBA>(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("SaveVBA") ));
- if( pSaveVBA )
+ if( pSaveVBA )
{
pSaveVBA( (SfxObjectShell&) mrDocShell, pBas );
}
@@ -202,3 +202,5 @@ void SdPPTFilter::PreSaveBasic()
}
}
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/view/ViewShellBase.cxx b/main/sd/source/ui/view/ViewShellBase.cxx
index 67e0bdaa66..6b44dfed2d 100644
--- a/main/sd/source/ui/view/ViewShellBase.cxx
+++ b/main/sd/source/ui/view/ViewShellBase.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -720,14 +720,14 @@ void ViewShellBase::Execute (SfxRequest& rRequest)
framework::FrameworkHelper::msLeftDrawPaneURL,
framework::FrameworkHelper::msSlideSorterURL);
break;
-
+
case SID_LEFT_PANE_IMPRESS:
mpImpl->SetPaneVisibility(
rRequest,
framework::FrameworkHelper::msLeftImpressPaneURL,
framework::FrameworkHelper::msSlideSorterURL);
break;
-
+
case SID_NORMAL_MULTI_PANE_GUI:
case SID_SLIDE_SORTER_MULTI_PANE_GUI:
case SID_DRAWINGMODE:
@@ -967,7 +967,7 @@ void ViewShellBase::UpdateBorder ( bool bForce /* = false */ )
bool bOuterResize ( ! GetDocShell()->IsInPlaceActive());
SvBorder aBorder (GetBorder(bOuterResize));
aBorder += pMainViewShell->GetBorder(bOuterResize);
-
+
if (bForce || (aBorder != aCurrentBorder))
{
SetBorderPixel (aBorder);
@@ -1043,7 +1043,7 @@ OUString ViewShellBase::GetInitialViewShellType (void)
break;
default:
- // The page kind is invalid. This is propably an
+ // The page kind is invalid. This is probably an
// error by the caller. We use the standard type to
// keep things going.
DBG_ASSERT(sal_False, "ViewShellBase::GetInitialViewShellType: invalid page kind");
@@ -1097,7 +1097,7 @@ const Rectangle& ViewShellBase::getClientRectangle (void) const
{
OSL_ASSERT(mpImpl.get()!=NULL);
OSL_ASSERT(mpImpl->mpUpdateLockManager.get()!=NULL);
-
+
return mpImpl->mpUpdateLockManager;
}
@@ -1108,7 +1108,7 @@ const Rectangle& ViewShellBase::getClientRectangle (void) const
{
OSL_ASSERT(mpImpl.get()!=NULL);
OSL_ASSERT(mpImpl->mpToolBarManager.get()!=NULL);
-
+
return mpImpl->mpToolBarManager;
}
@@ -1295,7 +1295,7 @@ void ViewShellBase::Implementation::ResizePixel (
// Forward the call to both the base class and the main stacked sub
// shell only when main sub shell exists.
ViewShell* pMainViewShell = mrBase.GetMainViewShell().get();
-
+
// Set the ViewTabBar temporarily to full size so that, when asked
// later, it can return its true height.
mrBase.SetWindow (mpViewWindow.get());
@@ -1318,7 +1318,7 @@ void ViewShellBase::Implementation::ResizePixel (
mpViewTabBar->GetTabControl()->SetPosSizePixel(
rOrigin, Size(rSize.Width(),aBaseBorder.Top()));
}
-
+
// The view window gets the remaining space.
Point aViewWindowPosition (
rOrigin.X()+aBaseBorder.Left(),
@@ -1327,7 +1327,7 @@ void ViewShellBase::Implementation::ResizePixel (
rSize.Width() - aBaseBorder.Left() - aBaseBorder.Right(),
rSize.Height() - aBaseBorder.Top() - aBaseBorder.Bottom());
mpViewWindow->SetPosSizePixel(aViewWindowPosition, aViewWindowSize);
-
+
maClientArea = Rectangle(Point(0,0), aViewWindowSize);
}
@@ -1349,7 +1349,7 @@ void ViewShellBase::Implementation::SetPaneVisibility (
xContext, rsPaneURL));
Reference<XResourceId> xViewId (ResourceId::createWithAnchorURL(
xContext, rsViewURL, rsPaneURL));
-
+
// Determine the new visibility state.
const SfxItemSet* pArguments = rRequest.GetArgs();
sal_Bool bShowChildWindow;
@@ -1367,10 +1367,10 @@ void ViewShellBase::Implementation::SetPaneVisibility (
xConfigurationController->getRequestedConfiguration());
if ( ! xConfiguration.is())
throw RuntimeException();
-
+
bShowChildWindow = ! xConfiguration->hasResource(xPaneId);
}
-
+
// Set the desired visibility state at the current configuration
// and update it accordingly.
Reference<XConfigurationController> xConfigurationController (
@@ -1431,7 +1431,7 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
xResourceId = ResourceId::create(
xContext, FrameworkHelper::msLeftImpressPaneURL);
break;
-
+
case SID_LEFT_PANE_DRAW:
xResourceId = ResourceId::create(
xContext, FrameworkHelper::msLeftDrawPaneURL);
@@ -1508,13 +1508,13 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
bState &= !bMasterPageMode;
break;
}
-
+
case SID_HANDOUTMODE:
// There is only the master page mode for the handout
// view so ignore the master page flag.
break;
}
-
+
// And finally set the state.
rSet.Put(SfxBoolItem(nItemId, bState));
@@ -1664,3 +1664,5 @@ void FocusForwardingWindow::Command (const CommandEvent& rEvent)
} // end of anonymouse namespace
} // end of namespace sd
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svl/source/numbers/zforlist.cxx b/main/svl/source/numbers/zforlist.cxx
index c355c796d0..1d9747d9bb 100644
--- a/main/svl/source/numbers/zforlist.cxx
+++ b/main/svl/source/numbers/zforlist.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -157,13 +157,13 @@ void SvNumberFormatterRegistry_Impl::ConfigurationChanged( utl::ConfigurationBro
SvNumberFormatterRegistry_Impl* SvNumberFormatter::pFormatterRegistry = NULL;
sal_Bool SvNumberFormatter::bCurrencyTableInitialized = sal_False;
-namespace
+namespace
{
- struct theCurrencyTable :
- public rtl::Static< NfCurrencyTable, theCurrencyTable > {};
+ struct theCurrencyTable :
+ public rtl::Static< NfCurrencyTable, theCurrencyTable > {};
- struct theLegacyOnlyCurrencyTable :
- public rtl::Static< NfCurrencyTable, theLegacyOnlyCurrencyTable > {};
+ struct theLegacyOnlyCurrencyTable :
+ public rtl::Static< NfCurrencyTable, theLegacyOnlyCurrencyTable > {};
}
sal_uInt16 SvNumberFormatter::nSystemCurrencyPosition = 0;
SV_IMPL_PTRARR( NfCurrencyTable, NfCurrencyEntry* );
@@ -593,13 +593,13 @@ sal_uInt32 SvNumberFormatter::GetIndexPuttingAndConverting( String & rString,
nKey = nOrig; // none available, maybe user-defined
else
nKey = GetFormatForLanguageIfBuiltIn( nOrig, SvtSysLocale().GetLanguage() );
-
+
if (nKey == nOrig)
{
// Not a builtin format, convert.
// The format code string may get modified and adapted to the real
// language and wouldn't match eSysLnge anymore, do that on a copy.
- String aTmp( rString);
+ String aTmp( rString);
rNewInserted = PutandConvertEntrySystem( aTmp, rCheckPos, rType,
nKey, eLnge, SvtSysLocale().GetLanguage());
if (rCheckPos > 0)
@@ -697,7 +697,7 @@ sal_Bool SvNumberFormatter::Load( SvStream& rStream )
sal_Bool bUserDefined = (nOffset > SV_MAX_ANZ_STANDARD_FORMATE);
//! HACK! ER 29.07.97 15:15
// SaveLang wurde bei SYSTEM nicht gespeichert sondern war auch SYSTEM,
- // erst ab 364i Unterscheidung moeglich
+ // erst ab 364i Unterscheidung möglich
sal_Bool bConversionHack;
if ( eLnge == LANGUAGE_SYSTEM )
{
@@ -1489,7 +1489,7 @@ void SvNumberFormatter::GetInputLineString(const double& fOutNumber,
|| eType == NUMBERFORMAT_SCIENTIFIC
|| eType == NUMBERFORMAT_FRACTION)
{
- if (eType != NUMBERFORMAT_PERCENT) // spaeter Sonderbehandlung %
+ if (eType != NUMBERFORMAT_PERCENT) // später Sonderbehandlung %
eType = NUMBERFORMAT_NUMBER;
ChangeStandardPrec(INPUTSTRING_PRECISION);
bPrecChanged = true;
@@ -1724,8 +1724,8 @@ sal_Bool SvNumberFormatter::GetPreviewString( const String& sFormatString,
GetOutputString( aNonConstPreview, nKey, sOutString, ppColor);
else
{
- // If the format is valid but not a text format and does not
- // include a text subformat, an empty string would result. Same as
+ // If the format is valid but not a text format and does not
+ // include a text subformat, an empty string would result. Same as
// in SvNumberFormatter::GetOutputString()
if (p_Entry->IsTextFormat() || p_Entry->HasTextFormat())
p_Entry->GetOutputString( aNonConstPreview, sOutString, ppColor);
@@ -2426,7 +2426,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, sal_Bool bLoadi
CLOffset + SetIndexTable( NF_DATE_SYS_DMMMYY, ZF_STANDARD_DATE+9 ),
SV_NUMBERFORMATTER_VERSION_NEWSTANDARD );
- //! Unfortunally TLOT intended only 10 builtin formats per category, more
+ //! Unfortunately TLOT intended only 10 builtin formats per category, more
//! would overwrite the next category (ZF_STANDARD_TIME) :-((
//! Therefore they are inserted with nNewExtended++ (which is also limited)
@@ -3297,7 +3297,7 @@ inline
if ( pFoundEntry )
return sal_False; // break loop
// even if there are more matching entries
- // this one is propably the one we are looking for
+ // this one is probably the one we are looking for
else
pFoundEntry = pData;
}
@@ -3326,7 +3326,7 @@ sal_Bool SvNumberFormatter::GetNewCurrencySymbolString( sal_uInt32 nFormat,
if ( ppEntry )
{
sal_Bool bFoundBank = sal_False;
- // we definiteley need an entry matching the format code string
+ // we definitely need an entry matching the format code string
const NfCurrencyEntry* pFoundEntry = GetCurrencyEntry(
bFoundBank, aSymbol, aExtension, pFormat->GetLanguage(),
sal_True );
@@ -4385,8 +4385,8 @@ sal_Char NfCurrencyEntry::GetEuroSymbol( rtl_TextEncoding eTextEncoding )
#elif OS2
return '\xD5';
#elif UNX
-// return '\xA4'; // #56121# 0xA4 waere korrekt fuer iso-8859-15
- return '\x80'; // aber Windoze-Code fuer die konvertierten TrueType-Fonts
+// return '\xA4'; // #56121# 0xA4 wäre korrekt für iso-8859-15
+ return '\x80'; // aber Windows-Code für die konvertierten TrueType-Fonts
#else
#error EuroSymbol is what?
return '\x80';
@@ -4395,5 +4395,4 @@ sal_Char NfCurrencyEntry::GetEuroSymbol( rtl_TextEncoding eTextEncoding )
return '\x80';
}
-
-
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/unotools/source/config/moduleoptions.cxx b/main/unotools/source/config/moduleoptions.cxx
index 82dfea23fc..4bf4874cc8 100644
--- a/main/unotools/source/config/moduleoptions.cxx
+++ b/main/unotools/source/config/moduleoptions.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -146,7 +146,7 @@ struct FactoryInfo
//---------------------------------------------------------------------------------------------------------
// returns list of properties, which has changed only!
- // We use given value of sNodeBase to build full qualified pathes ...
+ // We use given value of sNodeBase to build full qualified paths ...
// Last sign of it must be "/". Because we use it directly, without any additional things!
css::uno::Sequence< css::beans::PropertyValue > getChangedProperties( const ::rtl::OUString& sNodeBase )
{
@@ -526,7 +526,7 @@ void SvtModuleOptions_Impl::Notify( const css::uno::Sequence< ::rtl::OUString >&
@descr These method writes the changed values into the sub tree
and should always called in our destructor to guarantee consistency of config data.
- @attention We clear complete set in configuration first and write it completly new! So we don't must
+ @attention We clear complete set in configuration first and write it completely new! So we don't must
distinguish between existing, added or removed elements. Our internal cached values
are the only and right ones.
@@ -579,7 +579,7 @@ void SvtModuleOptions_Impl::Commit()
@descr These methods implement easy access to our internal values.
You give us right enum value to specify which module interest you ... we return right information.
- @attention Some poeple use any value as enum ... but we support in header specified values only!
+ @attention Some people use any value as enum ... but we support in header specified values only!
We use it directly as index in our internal list. If enum value isn't right - we crash with an
"index out of range"!!! Please use me right - otherwise there is no guarantee.
@@ -899,7 +899,7 @@ css::uno::Sequence< ::rtl::OUString > SvtModuleOptions_Impl::impl_ExpandSetNames
@descr Every factory has his own long and short name. So we can match right enum value for internal using.
@attention We change in/out parameter "eFactory" in every case! But you should use it only, if return value is sal_True!
- Algorithm: Set out-parameter to propably value ... and check the longname.
+ Algorithm: Set out-parameter to probably value ... and check the longname.
If it match with these factory - break operation and return true AND right set parameter.
Otherwise try next one and so on. If no factory was found return false. Out parameter eFactory
is set to last tried value but shouldn't be used! Because our return value is false!
@@ -994,7 +994,7 @@ sal_Bool SvtModuleOptions_Impl::ClassifyFactoryByName( const ::rtl::OUString& sN
*//*-*************************************************************************************************************/
void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< ::rtl::OUString >& lFactories )
{
- // Expand every set node name in lFactories to full qualified pathes to his properties
+ // Expand every set node name in lFactories to full qualified paths to his properties
// and get right values from configuration.
const css::uno::Sequence< ::rtl::OUString > lProperties = impl_ExpandSetNames( lFactories );
const css::uno::Sequence< css::uno::Any > lValues = GetProperties( lProperties );
@@ -1405,9 +1405,9 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByShortName(const ::
{
if (sName.equalsAscii("swriter"))
return E_WRITER;
- if (sName.equalsIgnoreAsciiCaseAscii("swriter/Web")) // sometimes they are registerd for swriter/web :-(
+ if (sName.equalsIgnoreAsciiCaseAscii("swriter/Web")) // sometimes they are registered for swriter/web :-(
return E_WRITERWEB;
- if (sName.equalsIgnoreAsciiCaseAscii("swriter/GlobalDocument")) // sometimes they are registerd for swriter/globaldocument :-(
+ if (sName.equalsIgnoreAsciiCaseAscii("swriter/GlobalDocument")) // sometimes they are registered for swriter/globaldocument :-(
return E_WRITERGLOBAL;
if (sName.equalsAscii("scalc"))
return E_CALC;
@@ -1591,3 +1591,4 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByModel(const css::u
return aModule;
}
+/* vim: set noet sw=4 ts=4: */