This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 3adbb62 Fixed typos, removed whitespace
3adbb62 is described below
commit 3adbb628d31cb9667e2201dae1256e0cfc623c0c
Author: mseidel <msei...@apache.org>
AuthorDate: Tue Dec 8 23:01:04 2020 +0100
Fixed typos, removed whitespace
(cherry picked from commit f30f79b7372056bdef90ae6368e7fa5ef14968ca)
---
main/sw/source/filter/ww1/w1struct.hxx | 18 +++---
main/ucb/source/core/provprox.cxx | 82 ++++++++++++------------
main/ucb/source/ucp/file/prov.cxx | 114 ++++++++++++++++-----------------
3 files changed, 107 insertions(+), 107 deletions(-)
diff --git a/main/sw/source/filter/ww1/w1struct.hxx
b/main/sw/source/filter/ww1/w1struct.hxx
index b946f56..f1881ad 100644
--- a/main/sw/source/filter/ww1/w1struct.hxx
+++ b/main/sw/source/filter/ww1/w1struct.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -717,7 +717,7 @@ struct W1_FLD ////////////////////////////////////////
FieldDescriptor
struct W1_PIC /////////////////////////////////////// PictureStructure
{
- SVBT32 lcb;// 0x0 number of bytes in the PIC structure plus size of
following picture data which may be a Window's metafile, a bitmap, or the
filename of a TIFF file.
+ SVBT32 lcb;// 0x0 number of bytes in the PIC structure plus size of
following picture data which may be a Windows metafile, a bitmap, or the
filename of a TIFF file.
sal_uLong lcbGet() {
return SVBT32ToUInt32(lcb); }
SVBT16 cbHeader;// 0x4 number of bytes in the PIC (to allow for future
expansion).
@@ -738,7 +738,7 @@ struct W1_PIC ///////////////////////////////////////
PictureStructure
return SVBT16ToShort(hMF); }
} mfp;
union W1_MFP_BMP {
- SVBT8 bm[14];// 0xe BITMAP(14 bytes) Window's bitmap
structure when PIC describes a BITMAP.
+ SVBT8 bm[14];// 0xe BITMAP(14 bytes) Windows bitmap
structure when PIC describes a BITMAP.
SVBT8 rcWinMF[14];// 0xe rc (rectangle - 8 bytes) rect
for window origin and extents when metafile is stored -- ignored if 0
} MFP_BMP;
SVBT16 dxaGoal;// 0x1c horizontal measurement in twips of the
rectangle the picture should be imaged within.
@@ -800,7 +800,7 @@ struct W1_PIC ///////////////////////////////////////
PictureStructure
// SVBT16 dyaOrigin;// 0x38 vertical offset of hand annotation
origin
// sal_uInt16 dyaOriginGet() {
// return SVBT16ToShort(dyaOrigin); }
- SVBT8 rgb;// 0x3a variable array of bytes containing Window's
metafile, bitmap or TIFF file filename.
+ SVBT8 rgb;// 0x3a variable array of bytes containing Windows
metafile, bitmap or TIFF file filename.
sal_uInt8* rgbGet() {
return rgb; }
};
@@ -900,10 +900,10 @@ struct W1_ANLV
////////////////////////////////////////////////////////
struct W1_ANLD ////////////////////////////////////////////////////////
{
W1_ANLV eAnlv;// 0
- SVBT8 fNumber1;// 0x10 number only 1 item per table cell
+ SVBT8 fNumber1;// 0x10 number only 1 item per table
cell
SVBT8 fNumberAcross;// 0x11 number across cells in table
rows(instead of down)
SVBT8 fRestartHdn;// 0x12 restart heading number on
section boundary
- SVBT8 fSpareX;// 0x13 unused( should be 0)
+ SVBT8 fSpareX;// 0x13 unused( should be 0)
sal_Char rgchAnld[32];// 0x14 characters displayed before/after
autonumber
};
diff --git a/main/ucb/source/core/provprox.cxx
b/main/ucb/source/core/provprox.cxx
index 188ba14..686a4ff 100644
--- a/main/ucb/source/core/provprox.cxx
+++ b/main/ucb/source/core/provprox.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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.
- *
+ *
*************************************************************/
@@ -70,9 +70,9 @@ XINTERFACE_IMPL_3( UcbContentProviderProxyFactory,
//=========================================================================
XTYPEPROVIDER_IMPL_3( UcbContentProviderProxyFactory,
- XTypeProvider,
+ XTypeProvider,
XServiceInfo,
- XContentProviderFactory );
+ XContentProviderFactory );
//=========================================================================
//
@@ -160,9 +160,9 @@ UcbContentProviderProxy::queryInterface( const Type & rType
)
if ( !aRet.hasValue() )
{
- // Get original provider an forward the call...
+ // Get original provider and forward the call...
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- Reference< XContentProvider > xProvider = getContentProvider();
+ Reference< XContentProvider > xProvider = getContentProvider();
if ( xProvider.is() )
aRet = xProvider->queryInterface( rType );
}
@@ -181,25 +181,25 @@ XTYPEPROVIDER_COMMON_IMPL( UcbContentProviderProxy );
//=========================================================================
Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes()
\
- throw( RuntimeException )
+ throw( RuntimeException )
{
- // Get original provider an forward the call...
- osl::Guard< osl::Mutex > aGuard( m_aMutex );
- Reference< XTypeProvider > xProvider( getContentProvider(), UNO_QUERY );
- if ( xProvider.is() )
- {
- return xProvider->getTypes();
- }
- else
- {
- static cppu::OTypeCollection collection(
- CPPU_TYPE_REF( XTypeProvider ),
- CPPU_TYPE_REF( XServiceInfo ),
- CPPU_TYPE_REF( XContentProvider ),
- CPPU_TYPE_REF( XParameterizedContentProvider ),
- CPPU_TYPE_REF( XContentProviderSupplier ) );
- return collection.getTypes();
- }
+ // Get original provider and forward the call...
+ osl::Guard< osl::Mutex > aGuard( m_aMutex );
+ Reference< XTypeProvider > xProvider( getContentProvider(), UNO_QUERY );
+ if ( xProvider.is() )
+ {
+ return xProvider->getTypes();
+ }
+ else
+ {
+ static cppu::OTypeCollection collection(
+ CPPU_TYPE_REF( XTypeProvider ),
+ CPPU_TYPE_REF( XServiceInfo ),
+ CPPU_TYPE_REF( XContentProvider ),
+ CPPU_TYPE_REF( XParameterizedContentProvider ),
+ CPPU_TYPE_REF( XContentProviderSupplier ) );
+ return collection.getTypes();
+ }
}
//=========================================================================
@@ -226,7 +226,7 @@ Reference< XContent > SAL_CALL
UcbContentProviderProxy::queryContent(
throw( IllegalIdentifierException,
RuntimeException )
{
- // Get original provider an forward the call...
+ // Get original provider and forward the call...
osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -244,15 +244,15 @@ sal_Int32 SAL_CALL
UcbContentProviderProxy::compareContentIds(
const Reference< XContentIdentifier
>& Id2 )
throw( RuntimeException )
{
- // Get original provider an forward the call...
+ // Get original provider and forward the call...
osl::Guard< osl::Mutex > aGuard( m_aMutex );
Reference< XContentProvider > xProvider = getContentProvider();
if ( xProvider.is() )
return xProvider->compareContentIds( Id1, Id2 );
-
- // OSL_ENSURE( sal_False,
- // "UcbContentProviderProxy::compareContentIds - No provider!" );
+
+ // OSL_ENSURE( sal_False,
+ // "UcbContentProviderProxy::compareContentIds - No provider!" );
// @@@ What else?
return 0;
@@ -310,7 +310,7 @@ UcbContentProviderProxy::deregisterInstance( const
OUString& Template,
{
try
{
- xParamProvider->deregisterInstance( Template, Arguments );
+ xParamProvider->deregisterInstance( Template,
Arguments );
}
catch ( IllegalIdentifierException const & )
{
@@ -343,15 +343,15 @@ UcbContentProviderProxy::getContentProvider()
m_xProvider
= Reference< XContentProvider >(
m_xSMgr->createInstance( m_aService ),
UNO_QUERY );
- if(m_aArguments.compareToAscii("NoConfig") == 0)
- {
- Reference<XInitialization> xInit(m_xProvider,UNO_QUERY);
- if(xInit.is()) {
- Sequence<Any> aArgs(1);
- aArgs[0] <<= m_aArguments;
- xInit->initialize(aArgs);
- }
- }
+ if(m_aArguments.compareToAscii("NoConfig") == 0)
+ {
+ Reference<XInitialization>
xInit(m_xProvider,UNO_QUERY);
+ if(xInit.is()) {
+ Sequence<Any> aArgs(1);
+ aArgs[0] <<= m_aArguments;
+ xInit->initialize(aArgs);
+ }
+ }
}
catch ( RuntimeException const & )
{
diff --git a/main/ucb/source/ucp/file/prov.cxx
b/main/ucb/source/ucp/file/prov.cxx
index 1a3f2be..dcfa11d 100644
--- a/main/ucb/source/ucp/file/prov.cxx
+++ b/main/ucb/source/ucp/file/prov.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.
- *
+ *
*************************************************************/
@@ -118,16 +118,16 @@ FileProvider::acquire(
void )
throw()
{
- OWeakObject::acquire();
+ OWeakObject::acquire();
}
void SAL_CALL
FileProvider::release(
void )
- throw()
+ throw()
{
- OWeakObject::release();
+ OWeakObject::release();
}
@@ -136,15 +136,15 @@ FileProvider::queryInterface(
const Type& rType )
throw( RuntimeException )
{
- Any aRet = cppu::queryInterface(
- rType,
- SAL_STATIC_CAST( XContentProvider*, this ),
- SAL_STATIC_CAST( XInitialization*, this ),
- SAL_STATIC_CAST( XContentIdentifierFactory*, this ),
- SAL_STATIC_CAST( XServiceInfo*, this ),
- SAL_STATIC_CAST( XTypeProvider*, this ),
- SAL_STATIC_CAST( XFileIdentifierConverter*,this ),
- SAL_STATIC_CAST( XPropertySet*, this ) );
+ Any aRet = cppu::queryInterface(
+ rType,
+ SAL_STATIC_CAST( XContentProvider*, this ),
+ SAL_STATIC_CAST( XInitialization*, this ),
+ SAL_STATIC_CAST( XContentIdentifierFactory*, this ),
+ SAL_STATIC_CAST( XServiceInfo*, this ),
+ SAL_STATIC_CAST( XTypeProvider*, this ),
+ SAL_STATIC_CAST( XFileIdentifierConverter*,this ),
+ SAL_STATIC_CAST( XPropertySet*, this ) );
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
@@ -153,25 +153,25 @@ FileProvider::queryInterface(
void SAL_CALL FileProvider::init()
{
- if( ! m_pMyShell )
- m_pMyShell = new shell( m_xMultiServiceFactory, this, sal_True );
+ if( ! m_pMyShell )
+ m_pMyShell = new shell( m_xMultiServiceFactory, this, sal_True
);
}
void SAL_CALL
-FileProvider::initialize(
- const Sequence< Any >& aArguments )
- throw (Exception, RuntimeException)
-{
- if( ! m_pMyShell ) {
- rtl::OUString config;
- if( aArguments.getLength() > 0 &&
- (aArguments[0] >>= config) &&
- config.compareToAscii("NoConfig") == 0 )
- m_pMyShell = new shell( m_xMultiServiceFactory, this, sal_False );
- else
- m_pMyShell = new shell( m_xMultiServiceFactory, this, sal_True );
- }
+FileProvider::initialize(
+ const Sequence< Any >& aArguments )
+ throw (Exception, RuntimeException)
+{
+ if( ! m_pMyShell ) {
+ rtl::OUString config;
+ if( aArguments.getLength() > 0 &&
+ (aArguments[0] >>= config) &&
+ config.compareToAscii("NoConfig") == 0 )
+ m_pMyShell = new shell( m_xMultiServiceFactory, this,
sal_False );
+ else
+ m_pMyShell = new shell( m_xMultiServiceFactory, this,
sal_True );
+ }
}
@@ -181,13 +181,13 @@ FileProvider::initialize(
XTYPEPROVIDER_IMPL_7( FileProvider,
- XTypeProvider,
- XServiceInfo,
- XInitialization,
- XContentIdentifierFactory,
+ XTypeProvider,
+ XServiceInfo,
+ XInitialization,
+ XContentIdentifierFactory,
XPropertySet,
- XFileIdentifierConverter,
- XContentProvider )
+ XFileIdentifierConverter,
+ XContentProvider )
////////////////////////////////////////////////////////////////////////////////
@@ -204,16 +204,16 @@ FileProvider::getImplementationName()
sal_Bool SAL_CALL
FileProvider::supportsService(
const rtl::OUString& ServiceName )
- throw( RuntimeException )
+ throw( RuntimeException )
{
- return ServiceName == rtl::OUString::createFromAscii(
"com.sun.star.ucb.FileContentProvider" );
+ return ServiceName == rtl::OUString::createFromAscii(
"com.sun.star.ucb.FileContentProvider" );
}
Sequence< rtl::OUString > SAL_CALL
FileProvider::getSupportedServiceNames(
void )
- throw( RuntimeException )
+ throw( RuntimeException )
{
return fileaccess::shell::getSupportedServiceNames_static();
}
@@ -276,15 +276,15 @@ FileProvider::queryContent(
throw( IllegalIdentifierException,
RuntimeException)
{
- init();
+ init();
rtl::OUString aUnc;
sal_Bool err = m_pMyShell->getUnqFromUrl(
xIdentifier->getContentIdentifier(),
aUnc );
- if( err )
+ if( err )
throw IllegalIdentifierException( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference<
uno::XInterface >() );
- return Reference< XContent >( new BaseContent( m_pMyShell,xIdentifier,aUnc
) );
+ return Reference< XContent >( new BaseContent(
m_pMyShell,xIdentifier,aUnc ) );
}
@@ -293,9 +293,9 @@ sal_Int32 SAL_CALL
FileProvider::compareContentIds(
const Reference< XContentIdentifier >& Id1,
const Reference< XContentIdentifier >& Id2 )
- throw( RuntimeException )
+ throw( RuntimeException )
{
- init();
+ init();
rtl::OUString aUrl1 = Id1->getContentIdentifier();
rtl::OUString aUrl2 = Id2->getContentIdentifier();
@@ -303,10 +303,10 @@ FileProvider::compareContentIds(
if ( 0 != iComp )
{
- rtl::OUString aPath1, aPath2;
+ rtl::OUString aPath1, aPath2;
- m_pMyShell->getUnqFromUrl( aUrl1, aPath1 );
- m_pMyShell->getUnqFromUrl( aUrl2, aPath2 );
+ m_pMyShell->getUnqFromUrl( aUrl1, aPath1 );
+ m_pMyShell->getUnqFromUrl( aUrl2, aPath2 );
osl::FileBase::RC error;
osl::DirectoryItem aItem1, aItem2;
@@ -328,7 +328,7 @@ FileProvider::compareContentIds(
{
iComp = aStatus1.getFileURL().compareTo(
aStatus2.getFileURL() );
-// Quick hack for Windows to threat all file systems as case insensitive
+// Quick hack for Windows to treat all file systems as case insensitive
#ifdef WNT
if ( 0 != iComp )
{
@@ -351,9 +351,9 @@ FileProvider::compareContentIds(
Reference< XContentIdentifier > SAL_CALL
FileProvider::createContentIdentifier(
const rtl::OUString& ContentId )
- throw( RuntimeException )
+ throw( RuntimeException )
{
- init();
+ init();
FileContentIdentifier* p = new FileContentIdentifier(
m_pMyShell,ContentId,false );
return Reference< XContentIdentifier >( p );
}
@@ -516,8 +516,8 @@ void SAL_CALL FileProvider::initProperties( void )
#else
m_FileSystemNotation = FileSystemNotation::UNKNOWN_NOTATION;
#endif
- osl::Security aSecurity;
- aSecurity.getHomeDir( m_HomeDirectory );
+ osl::Security aSecurity;
+ aSecurity.getHomeDir( m_HomeDirectory );
// static const sal_Int32 UNKNOWN_NOTATION = (sal_Int32)0;
// static const sal_Int32 UNIX_NOTATION = (sal_Int32)1;
@@ -646,7 +646,7 @@ FileProvider::getFileProviderLocality( const rtl::OUString&
BaseURL )
throw( RuntimeException )
{
// If the base URL is a 'file' URL, return 10 (very 'local'), otherwise
- // return -1 (missmatch). What is missing is a fast comparison to
ASCII,
+ // return -1 (mismatch). What is missing is a fast comparison to ASCII,
// ignoring case:
return BaseURL.getLength() >= 5
&& (BaseURL[0] == 'F' || BaseURL[0] == 'f')
@@ -664,15 +664,15 @@ rtl::OUString SAL_CALL
FileProvider::getFileURLFromSystemPath( const rtl::OUStri
rtl::OUString aNormalizedPath;
if ( osl::FileBase::getFileURLFromSystemPath(
SystemPath,aNormalizedPath ) != osl::FileBase::E_None )
return rtl::OUString();
-
- return aNormalizedPath;
+
+ return aNormalizedPath;
}
rtl::OUString SAL_CALL FileProvider::getSystemPathFromFileURL( const
rtl::OUString& URL )
throw( RuntimeException )
{
rtl::OUString aSystemPath;
- if (osl::FileBase::getSystemPathFromFileURL( URL,aSystemPath ) !=
osl::FileBase::E_None )
+ if (osl::FileBase::getSystemPathFromFileURL( URL,aSystemPath ) !=
osl::FileBase::E_None )
return rtl::OUString();
return aSystemPath;
