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 960b059  Fixed typos, removed whitespace
960b059 is described below

commit 960b059c8b1d7dc469c52856163d126e06ac8fea
Author: mseidel <msei...@apache.org>
AuthorDate: Sat Oct 3 20:21:43 2020 +0200

    Fixed typos, removed whitespace
    
    (cherry picked from commit 97c864ccfe6c563736c463d8df22c104e3b40fee)
---
 main/avmedia/source/framework/mediamisc.cxx        |  25 +++--
 main/avmedia/source/viewer/mediaevent_impl.cxx     |  10 +-
 main/avmedia/source/viewer/mediawindow.cxx         |  13 ++-
 .../avmedia/source/viewer/mediawindowbase_impl.cxx |  50 ++++-----
 .../desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx |  46 ++++----
 main/desktop/win32/source/guistdio/guistdio.inc    |  60 +++++-----
 main/desktop/win32/source/setup/setup.cpp          | 124 ++++++++++-----------
 7 files changed, 165 insertions(+), 163 deletions(-)

diff --git a/main/avmedia/source/framework/mediamisc.cxx 
b/main/avmedia/source/framework/mediamisc.cxx
index 1d51809..726e75a 100644
--- a/main/avmedia/source/framework/mediamisc.cxx
+++ b/main/avmedia/source/framework/mediamisc.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.
- * 
+ *
  *************************************************************/
 
 
@@ -29,16 +29,17 @@ namespace avmedia {
 
 ResMgr* GetResMgr()
 {
-    static ResMgr* pResMgr = NULL;
+       static ResMgr* pResMgr = NULL;
 
-    if( !pResMgr )
-    {
-        ByteString aResMgrName( "avmedia" );
+       if( !pResMgr )
+       {
+               ByteString aResMgrName( "avmedia" );
 
-        pResMgr = ResMgr::CreateResMgr(        aResMgrName.GetBuffer(), 
Application::GetSettings().GetUILocale() );
-    }
+               pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), 
Application::GetSettings().GetUILocale() );
+       }
 
-    return pResMgr;
+       return pResMgr;
 }
 
-} // namespace avemdia
+} // namespace avmedia
+
diff --git a/main/avmedia/source/viewer/mediaevent_impl.cxx 
b/main/avmedia/source/viewer/mediaevent_impl.cxx
index a5de07b..db0779b 100644
--- a/main/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/main/avmedia/source/viewer/mediaevent_impl.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.
- * 
+ *
  *************************************************************/
 
 
@@ -215,5 +215,5 @@ void SAL_CALL MediaEventListenersImpl::focusLost( const 
::com::sun::star::awt::F
 }
 
 } // namespace priv
-} // namespace avemdia
+} // namespace avmedia
 
diff --git a/main/avmedia/source/viewer/mediawindow.cxx 
b/main/avmedia/source/viewer/mediawindow.cxx
index fe2f1eb..3217c54 100644
--- a/main/avmedia/source/viewer/mediawindow.cxx
+++ b/main/avmedia/source/viewer/mediawindow.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.
- * 
+ *
  *************************************************************/
 
 
@@ -545,7 +545,7 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( 
const ::rtl::OUStrin
             xRet = xGrabber->grabFrame( fMediaTime );
         }
 
-        if( !xRet.is() && bAllowToCreateReplacementGraphic  )
+        if( !xRet.is() && bAllowToCreateReplacementGraphic )
         {
             awt::Size aPrefSize( xPlayer->getPreferredPlayerWindowSize() );
 
@@ -569,4 +569,5 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( 
const ::rtl::OUStrin
     return xRet;
 }
 
-} // namespace avemdia
+} // namespace avmdia
+
diff --git a/main/avmedia/source/viewer/mediawindowbase_impl.cxx 
b/main/avmedia/source/viewer/mediawindowbase_impl.cxx
index d8353d4..f21f0d7 100644
--- a/main/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/main/avmedia/source/viewer/mediawindowbase_impl.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,22 +7,22 @@
  * 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.
- * 
+ *
  *************************************************************/
 
 
 
 #include "mediawindowbase_impl.hxx"
-#include <avmedia/mediaitem.hxx> 
+#include <avmedia/mediaitem.hxx>
 #include "mediamisc.hxx"
 #include "mediawindow.hrc"
 #include <tools/urlobj.hxx>
@@ -110,7 +110,7 @@ uno::Reference< media::XPlayer > 
MediaWindowBaseImpl::createPlayer( const ::rtl:
             }
         }
     }
-    
+
     return xPlayer;
 }
 
@@ -121,21 +121,21 @@ void MediaWindowBaseImpl::setURL( const ::rtl::OUString& 
rURL )
     if( rURL != getURL() )
     {
         INetURLObject aURL( maFileURL = rURL );
-        
+
         if( mxPlayer.is() )
             mxPlayer->stop();
-    
+
         if( mxPlayerWindow.is() )
         {
             mxPlayerWindow->setVisible( false );
             mxPlayerWindow.clear();
         }
-    
+
         mxPlayer.clear();
-        
+
         if( aURL.GetProtocol() != INET_PROT_NOT_VALID )
             maFileURL = aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
-            
+
         mxPlayer = createPlayer( maFileURL, mbIsMediaWindowJavaBased );
         onURLChanged();
     }
@@ -148,7 +148,7 @@ void MediaWindowBaseImpl::onURLChanged()
 }
 
 // ---------------------------------------------------------------------
-        
+
 const ::rtl::OUString& MediaWindowBaseImpl::getURL() const
 {
     return maFileURL;
@@ -206,9 +206,9 @@ void MediaWindowBaseImpl::cleanUp()
     uno::Reference< lang::XComponent > xComponent( mxPlayer, uno::UNO_QUERY );
     if( xComponent.is() ) // this stops the player
         xComponent->dispose();
-    
+
     mxPlayer.clear();
-        
+
     mpMediaWindow = NULL;
 }
 
@@ -363,7 +363,7 @@ void MediaWindowBaseImpl::setVolumeDB( sal_Int16 nVolumeDB )
 }
 
 // ---------------------------------------------------------------------
-            
+
 sal_Int16 MediaWindowBaseImpl::getVolumeDB() const
 {
     return( mxPlayer.is() ? mxPlayer->getVolumeDB() : 0 );
@@ -377,7 +377,7 @@ void MediaWindowBaseImpl::updateMediaItem( MediaItem& rItem 
) const
         rItem.setState( ( getRate() > 1.0 ) ? MEDIASTATE_PLAYFFW : 
MEDIASTATE_PLAY );
     else
         rItem.setState( ( 0.0 == getMediaTime() ) ? MEDIASTATE_STOP : 
MEDIASTATE_PAUSE );
-    
+
     rItem.setDuration( getDuration() );
     rItem.setTime( getMediaTime() );
     rItem.setLoop( isPlaybackLoop() );
@@ -393,26 +393,26 @@ void MediaWindowBaseImpl::executeMediaItem( const 
MediaItem& rItem )
 {
     const sal_uInt32 nMaskSet = rItem.getMaskSet();
 
-    // set URL first 
+    // set URL first
     if( nMaskSet & AVMEDIA_SETMASK_URL )
         setURL( rItem.getURL() );
-    
+
     // set different states next
     if( nMaskSet & AVMEDIA_SETMASK_TIME )
         setMediaTime( ::std::min( rItem.getTime(), getDuration() ) );
-    
+
     if( nMaskSet & AVMEDIA_SETMASK_LOOP )
         setPlaybackLoop( rItem.isLoop() );
 
     if( nMaskSet & AVMEDIA_SETMASK_MUTE )
         setMute( rItem.isMute() );
-    
+
     if( nMaskSet & AVMEDIA_SETMASK_VOLUMEDB )
         setVolumeDB( rItem.getVolumeDB() );
 
     if( nMaskSet & AVMEDIA_SETMASK_ZOOM )
         setZoom( rItem.getZoom() );
-        
+
     // set play state at last
     if( nMaskSet & AVMEDIA_SETMASK_STATE )
     {
@@ -421,9 +421,9 @@ void MediaWindowBaseImpl::executeMediaItem( const 
MediaItem& rItem )
             case( MEDIASTATE_PLAY ):
             case( MEDIASTATE_PLAYFFW ):
             {
-/*              
+/*
                 const double fNewRate = ( ( MEDIASTATE_PLAYFFW == 
rItem.getState() ) ? AVMEDIA_FFW_PLAYRATE : 1.0 );
-                
+
                 if( getRate() != fNewRate )
                     setRate( fNewRate );
 */
@@ -438,7 +438,7 @@ void MediaWindowBaseImpl::executeMediaItem( const 
MediaItem& rItem )
                     stop();
             }
             break;
-                        
+
             case( MEDIASTATE_STOP ):
             {
                 if( isPlaying() )
@@ -454,4 +454,4 @@ void MediaWindowBaseImpl::executeMediaItem( const 
MediaItem& rItem )
 }
 
 } // namespace priv
-} // namespace avemdia
+} // namespace avmedia
diff --git a/main/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx 
b/main/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 8ea1e8b..e289002 100644
--- a/main/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/main/desktop/source/pkgchk/unopkg/unopkg_cmdenv.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.
- * 
+ *
  *************************************************************/
 
 
@@ -86,8 +86,8 @@ class CommandEnvironmentImpl
 
     void update_( Any const & Status ) throw (RuntimeException);
        void printLicense(const OUString & sName,const OUString& sLicense,
-                      bool & accept, bool & decline); 
-    
+                      bool & accept, bool & decline);
+
 public:
     virtual ~CommandEnvironmentImpl();
     CommandEnvironmentImpl(
@@ -95,7 +95,7 @@ public:
         OUString const & log_file,
         bool option_force_overwrite,
         bool option_verbose);
-    
+
     // XCommandEnvironment
     virtual Reference< task::XInteractionHandler > SAL_CALL
     getInteractionHandler() throw (RuntimeException);
@@ -106,7 +106,7 @@ public:
     virtual void SAL_CALL handle(
         Reference< task::XInteractionRequest > const & xRequest )
         throw (RuntimeException);
-    
+
     // XProgressHandler
     virtual void SAL_CALL push( Any const & Status ) throw (RuntimeException);
     virtual void SAL_CALL update( Any const & Status ) throw 
(RuntimeException);
@@ -166,21 +166,21 @@ void CommandEnvironmentImpl::printLicense(
        OUString sY = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_Y, *pResMgr));
        OUString sNO = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_NO, *pResMgr));
        OUString sN = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_N, *pResMgr));
-    
+
     OUString sNewLine(RTL_CONSTASCII_USTRINGPARAM("\n"));
-    
+
     dp_misc::writeConsole(sNewLine + sNewLine + s1 + sNewLine + sNewLine);
     dp_misc::writeConsole(sLicense + sNewLine + sNewLine);
     dp_misc::writeConsole(s2 + sNewLine);
     dp_misc::writeConsole(s3);
-       
+
        //the user may enter "yes" or "no", we compare in a case insensitive way
        Reference< css::i18n::XCollator > xCollator(
                m_xComponentContext->getServiceManager()
                        ->createInstanceWithContext(
                                
OUSTR("com.sun.star.i18n.Collator"),m_xComponentContext),
                        UNO_QUERY_THROW );
-       xCollator->loadDefaultCollator(OfficeLocale::get(), 
+       xCollator->loadDefaultCollator(OfficeLocale::get(),
                css::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE);
 
        do
@@ -229,13 +229,13 @@ void CommandEnvironmentImpl::handle(
 {
     Any request( xRequest->getRequest() );
     OSL_ASSERT( request.getValueTypeClass() == TypeClass_EXCEPTION );
-    dp_misc::TRACE(OUSTR("[unopkg_cmdenv.cxx] incoming request:\n") 
+    dp_misc::TRACE(OUSTR("[unopkg_cmdenv.cxx] incoming request:\n")
         + ::comphelper::anyToString(request) + OUSTR("\n\n"));
-    
+
     // selections:
     bool approve = false;
     bool abort = false;
-    
+
     lang::WrappedTargetException wtExc;
        deployment::LicenseException licExc;
     deployment::InstallException instExc;
@@ -268,7 +268,7 @@ void CommandEnvironmentImpl::handle(
             request = wtExc.TargetException;
         }
         else {
-            // handable deployment error signalled, e.g.
+            // handable deployment error signaled, e.g.
             // bundle item registration failed, notify as warning:
             update_( wtExc.TargetException );
         }
@@ -277,9 +277,9 @@ void CommandEnvironmentImpl::handle(
        {
         printLicense(licExc.ExtensionName, licExc.Text, approve, abort);
        }
-       else if (request >>= instExc)
+       else if (request >>= instExc)
        {
-               //Only if the unopgk was started with gui + extension then we 
user is asked.
+               //Only if the unopgk was started with gui + extension then the 
user is asked.
         //In console mode there is no asking.
                approve = true;
        }
@@ -301,16 +301,16 @@ void CommandEnvironmentImpl::handle(
         else
             return; // unknown request => no selection at all
     }
-    
+
     //In case of a user declining a license abort is true but this is intended,
     //therefore no logging
-    if (abort && m_option_verbose && !bLicenseException) 
-    { 
+    if (abort && m_option_verbose && !bLicenseException)
+    {
         OUString msg = ::comphelper::anyToString(request);
         dp_misc::writeConsoleError(
             OUSTR("\nERROR: ") + msg + OUSTR("\n"));
     }
-    
+
     // select:
     Sequence< Reference<task::XInteractionContinuation> > conts(
         xRequest->getContinuations() );
@@ -330,7 +330,7 @@ void CommandEnvironmentImpl::handle(
         else if (abort) {
             Reference<task::XInteractionAbort> xInteractionAbort(
                 pConts[ pos ], UNO_QUERY );
-            if (xInteractionAbort.is()) {           
+            if (xInteractionAbort.is()) {
                 xInteractionAbort->select();
                 break;
             }
diff --git a/main/desktop/win32/source/guistdio/guistdio.inc 
b/main/desktop/win32/source/guistdio/guistdio.inc
index cb290e9..fb7a250 100644
--- a/main/desktop/win32/source/guistdio/guistdio.inc
+++ b/main/desktop/win32/source/guistdio/guistdio.inc
@@ -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.
- * 
+ *
  *************************************************************/
 
 
@@ -53,12 +53,12 @@ DWORD passOutputToConsole(HANDLE readPipe, HANDLE console)
        //Indicates that we read an odd number of bytes. That is, we only read 
half of the last
        //wchar_t
        bool bIncompleteWchar = false;
-       //fprintf, fwprintf will both send char data without the terminating 
zero. 
+       //fprintf, fwprintf will both send char data without the terminating 
zero.
        //fwprintf converts the unicode string first.
-       //We expect here to receive unicode without the terminating zero. 
-       //unopkg and the extension manager code MUST 
+       //We expect here to receive unicode without the terminating zero.
+       //unopkg and the extension manager code MUST
        //use dp_misc::writeConsole instead of using fprintf, etc.
-       
+
        DWORD dwToRead = sizeof(aBuffer);
        BYTE * pBuffer = aBuffer;
        while ( ReadFile( hReadPipe, pBuffer, dwToRead, &dwRead, NULL ) )
@@ -68,32 +68,32 @@ DWORD passOutputToConsole(HANDLE readPipe, HANDLE console)
                //that one byte.
                if (bIncompleteWchar)
                        dwRead++;
-               //We must make sure that only complete wchar_t|s are written. 
WriteConsolse takes
+               //We must make sure that only complete wchar_t|s are written. 
WriteConsole takes
                //the number of wchar_t|s as argument. ReadFile, however, reads 
bytes.
                bIncompleteWchar = dwRead % 2 ? true : false;
                if (bIncompleteWchar)
                {
                        //To test this case, give aBuffer a small odd size, 
e.g. aBuffer[3]
                        //The last byte, which is the incomplete wchar_t (half 
of it), will not be written.
-                       fSuccess = WriteConsoleW( console, aBuffer, 
+                       fSuccess = WriteConsoleW( console, aBuffer,
                                (dwRead - 1) / 2, &dwWritten, NULL );
-                       
-                       //Move the last byte to the front of the buffer, so 
that it is the start of the 
+
+                       //Move the last byte to the front of the buffer, so 
that it is the start of the
                        //next string
                        aBuffer[0] = aBuffer[dwRead - 1];
-                       
+
                        //Make sure that ReadFile does not overwrite the first 
byte the next time
                        dwToRead = sizeof(aBuffer) - 1;
                        pBuffer = aBuffer + 1;
-                       
+
                }
                else
                {       //We have read an even number of bytes. Therefore, we 
do not put the last incomplete
-                       //wchar_t at the front of the buffer. We will use the 
complete buffer the next time 
+                       //wchar_t at the front of the buffer. We will use the 
complete buffer the next time
                        //when ReadFile is called.
                        dwToRead = sizeof(aBuffer);
                        pBuffer = aBuffer;
-                       fSuccess = WriteConsoleW( console, 
+                       fSuccess = WriteConsoleW( console,
                                aBuffer, dwRead / 2, &dwWritten, NULL );
                }
        }
@@ -177,12 +177,12 @@ DWORD WINAPI InputThread( LPVOID pParam )
     char * mbBuff = new char[cNewLine];
     WideCharToMultiByte(
         GetConsoleCP(), 0, L"\r\n", 2, mbBuff, cNewLine, NULL, NULL);
-    
+
     const size_t dwBufferSize = 256;
     char* readBuf = (char*) malloc(dwBufferSize);
     int readAll = 0;
     size_t curBufSize = dwBufferSize;
-    
+
     while ( ReadFile( GetStdHandle( STD_INPUT_HANDLE ),
                       readBuf + readAll,
                       curBufSize - readAll, &dwRead, NULL ) )
@@ -195,11 +195,11 @@ DWORD WINAPI InputThread( LPVOID pParam )
             curBufSize *= 2;
             readBuf = (char *) realloc(readBuf, curBufSize);
         }
-        
-        //If the buffer was filled completely then 
+
+        //If the buffer was filled completely then
         //there could be more input coming. But if we read from the console
         //and the console input fits exactly in the buffer, then the next
-        //ReadFile would block until the users presses return, etc.
+        //ReadFile would block until the user presses return, etc.
         //Therefor we check if last character is a new line.
         //To test this, set dwBufferSize to 4 and enter "no". This should 
produce
         //4 bytes with most code pages.
@@ -219,7 +219,7 @@ DWORD WINAPI InputThread( LPVOID pParam )
         //Do the conversion.
         MultiByteToWideChar(
             GetConsoleCP(), MB_PRECOMPOSED, readBuf, readAll, wideBuf, 
sizeWBuf);
-        
+
         BOOL   fSuccess;
                DWORD   dwWritten;
         fSuccess = WriteFile( hWritePipe, wideBuf, sizeWBuf * 2, &dwWritten, 
NULL );
@@ -273,7 +273,7 @@ DWORD WINAPI WaitForUIThread( LPVOID pParam )
 HANDLE hTargetProcess = INVALID_HANDLE_VALUE;
 
 BOOL WINAPI CtrlBreakHandler(
-  DWORD   //  control signal type
+  DWORD   // control signal type
 )
 {
        TerminateProcess( hTargetProcess, 255 );
@@ -302,7 +302,7 @@ int _tmain( int, _TCHAR ** )
        // Create an output pipe where the write end is inheritable
 
        HANDLE  hOutputRead, hOutputWrite;
-       
+
        if ( CreatePipe( &hOutputRead, &hOutputWrite, NULL, 0 ) )
        {
                HANDLE  hTemp;
@@ -317,7 +317,7 @@ int _tmain( int, _TCHAR ** )
        // Create an error pipe where the write end is inheritable
 
        HANDLE  hErrorRead, hErrorWrite;
-       
+
        if ( CreatePipe( &hErrorRead, &hErrorWrite, NULL, 0 ) )
        {
                HANDLE  hTemp;
@@ -397,7 +397,7 @@ int _tmain( int, _TCHAR ** )
                HANDLE  hWaitForUIThread = CreateThread( NULL, 0, 
WaitForUIThread, (LPVOID)aProcessInfo.hProcess, 0, &dwWaitForUIThreadId );
 
                DWORD   dwWaitResult;
-               HANDLE  hObjects[] = 
+               HANDLE  hObjects[] =
                        {
                                hTargetProcess,
                                hWaitForUIThread,
@@ -405,9 +405,9 @@ int _tmain( int, _TCHAR ** )
                                hErrorThread
                        };
 
- #ifdef UNOPKG       
-        dwWaitResult = WaitForMultipleObjects( elementsof(hObjects), hObjects, 
TRUE, INFINITE );
- #else        
+ #ifdef UNOPKG
+               dwWaitResult = WaitForMultipleObjects( elementsof(hObjects), 
hObjects, TRUE, INFINITE );
+ #else
                bool    bDetach = false;
                int             nOpenPipes = 2;
                do
@@ -429,7 +429,7 @@ int _tmain( int, _TCHAR ** )
                                break;
                        }
                } while( !bDetach );
-            
+
 #endif
 
                CloseHandle( hOutputThread );
diff --git a/main/desktop/win32/source/setup/setup.cpp 
b/main/desktop/win32/source/setup/setup.cpp
index 3e8e807..01aeb76 100644
--- a/main/desktop/win32/source/setup/setup.cpp
+++ b/main/desktop/win32/source/setup/setup.cpp
@@ -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.
- * 
+ *
  *************************************************************/
 
 
@@ -170,7 +170,7 @@ SetupAppX::~SetupAppX()
     tm *pTime = localtime( &aTime );   // Convert time to struct tm form
 
     Log( TEXT( "End: %s\n\r\n\r\n" ), _tasctime( pTime ) );
-    
+
     if ( m_pLogFile ) fclose( m_pLogFile );
 
     if ( m_pTmpName )
@@ -221,16 +221,16 @@ boolean SetupAppX::Initialize( HINSTANCE hInst )
 
     m_hMapFile = CreateFileMapping(
                  INVALID_HANDLE_VALUE,      // use paging file
-                 NULL,                      // default security 
+                 NULL,                      // default security
                  PAGE_READWRITE,            // read/write access
-                 0,                         // max. object size 
-                 sizeof( int ),             // buffer size  
+                 0,                         // max. object size
+                 sizeof( int ),             // buffer size
                  sMemMapName );
     if ( m_hMapFile )
     {
         m_pMSIErrorCode = (int*) MapViewOfFile( m_hMapFile,  // handle to map 
object
                         FILE_MAP_ALL_ACCESS,   // read/write permission
-                        0,                   
+                        0,
                         0,
                         sizeof( int ) );
         if ( m_pMSIErrorCode )
@@ -243,7 +243,7 @@ boolean SetupAppX::Initialize( HINSTANCE hInst )
 
     Log( TEXT("Starting: %s\r\n"), m_pModuleFile );
     Log( TEXT(" CommandLine=<%s>\r\n"), m_pCmdLine );
-    
+
     if ( m_bQuiet )
         Log( TEXT(" Using quiet install mode\r\n") );
 
@@ -282,7 +282,7 @@ boolean SetupAppX::GetProfileSection( LPCTSTR pFileName, 
LPCTSTR pSection,
     if ( !nRet )
     {
         SetError( WIN::GetLastError() );
-    
+
         TCHAR sBuf[80];
         StringCchPrintf( sBuf, 80, TEXT("ERROR: GetPrivateProfileSection(): 
GetLastError returned %u\r\n"), GetError() );
         Log( sBuf );
@@ -339,7 +339,7 @@ boolean SetupAppX::ReadProfile()
                 LPTSTR pValue = 0;
 
                 pCurLine += GetNameValue( pCurLine, &pName, &pValue );
-                
+
                 if ( lstrcmpi( TEXT( "database" ), pName ) == 0 )
                 {
                     m_pDatabase = pValue;
@@ -405,7 +405,7 @@ boolean SetupAppX::ReadProfile()
                 pCurLine += nNext;
                 delete [] pValue;
             }
-            
+
             m_ppLanguageList = new LanguageDataX*[ m_nLanguageCount ];
 
             for ( int i=0; i < m_nLanguageCount; i++ )
@@ -415,7 +415,7 @@ boolean SetupAppX::ReadProfile()
                     m_nLanguageCount = i;
                     break;
                 }
-                
+
                 pCurLine += GetNameValue( pCurLine, &pName, &pValue );
                 m_ppLanguageList[ i ] = new LanguageDataX( pValue );
                 Log( TEXT( "    Language = %s\r\n" ), pValue );
@@ -426,7 +426,7 @@ boolean SetupAppX::ReadProfile()
                 delete [] pValue;
             }
         }
-        
+
         if ( pRetBuf )
             delete [] pRetBuf;
     }
@@ -474,16 +474,16 @@ boolean SetupAppX::GetPatches()
             *pFilePart = '\0';
         StringCchCopy( pBaseDir, nPatternLen, pPattern );
         StringCchCat( pPattern, nPatternLen, TEXT("*.msp") );
-    
+
         WIN32_FIND_DATA aFindFileData;
-    
+
         HANDLE hFindPatches = FindFirstFile( pPattern, &aFindFileData );
-    
+
         if ( hFindPatches != INVALID_HANDLE_VALUE )
         {
             if ( ! IsPatchInstalled( pBaseDir, aFindFileData.cFileName ) )
                 AddFileToPatchList( pBaseDir, aFindFileData.cFileName );
-    
+
             while ( FindNextFile( hFindPatches, &aFindFileData ) )
             {
                 if ( ! IsPatchInstalled( pBaseDir, aFindFileData.cFileName ) )
@@ -499,15 +499,15 @@ boolean SetupAppX::GetPatches()
 
     delete [] pPattern;
     delete [] pBaseDir;
- 
+
     return bRet;
 }
 
 //--------------------------------------------------------------------------
 boolean SetupAppX::GetPathToFile( TCHAR* pFileName, TCHAR** pPath )
 {
-    // generate the path to the file =  szModuleFile + FileName
-    //   note: FileName is a relative path
+    // generate the path to the file = szModuleFile + FileName
+    // note: FileName is a relative path
 
     boolean bRet = true;
 
@@ -533,17 +533,17 @@ boolean SetupAppX::GetPathToFile( TCHAR* pFileName, 
TCHAR** pPath )
 
         // normalize the path
         int nReturn = GetFullPathName( pTempPath, nPath, *pPath, &pFilePart );
-        
+
         if ( nReturn > nPath )
         {
             // try again, with larger buffer
             delete [] (*pPath);
             nPath = nReturn;
             *pPath = new TCHAR[ nPath ];
-            
+
             nReturn = GetFullPathName( pTempPath, nPath, *pPath, &pFilePart );
         }
-        
+
         if ( 0 == nReturn )
         {
             // error -- invalid path
@@ -577,13 +577,13 @@ int SetupAppX::GetNameValue( TCHAR* pLine, TCHAR** pName, 
TCHAR** pValue )
     if ( nRet == 1 )
         return nRet;
 
-    LPTSTR  pChar = pLine;
-    LPTSTR  pLast = NULL;
-    
+    LPTSTR pChar = pLine;
+    LPTSTR pLast = NULL;
+
     // Skip leading spaces.
     while (' ' == *pChar || '\t' == *pChar)
         pChar = CharNext( pChar );
-    
+
     *pName = pChar;
 
     // look for the end of the name
@@ -619,7 +619,7 @@ boolean SetupAppX::ChooseLanguage( long& rLanguage )
 
     if ( m_bQuiet )
         return true;
-    
+
     // When there are none or only one language, there is nothing
     // to do here
     if ( m_nLanguageCount > 1 )
@@ -628,7 +628,7 @@ boolean SetupAppX::ChooseLanguage( long& rLanguage )
 
         LANGID nUserDefLang = GetUserDefaultLangID();
         LANGID nSysDefLang = GetSystemDefaultLangID();
-        
+
         int nUserPrimary = PRIMARYLANGID( nUserDefLang );
         int nSysPrimary = PRIMARYLANGID( nSysDefLang );
 
@@ -703,7 +703,7 @@ HMODULE SetupAppX::LoadMsiLibrary()
 {
     HMODULE hMsi = NULL;
     HKEY    hInstKey = NULL;
-    
+
     // find registered location of Msi.dll
     if ( ERROR_SUCCESS == RegOpenKeyEx( HKEY_LOCAL_MACHINE, sInstKey, 0, 
KEY_READ, &hInstKey ) )
     {
@@ -736,7 +736,7 @@ HMODULE SetupAppX::LoadMsiLibrary()
             }
         }
     }
-    
+
     if ( !hMsi ) // use the default location
     {
         hMsi = LoadLibrary( sMsiDll );
@@ -752,7 +752,7 @@ LPCTSTR SetupAppX::GetPathToMSI()
     HKEY    hInstKey = NULL;
     TCHAR  *sMsiFolder = new TCHAR[ MAX_PATH + 1 ];
     DWORD   nMsiFolderSize = MAX_PATH + 1;
-    
+
     sMsiFolder[0] = '\0';
 
     // find registered location of Msi.dll
@@ -775,7 +775,7 @@ LPCTSTR SetupAppX::GetPathToMSI()
         if ( ERROR_SUCCESS != nRet || dwType != REG_SZ || nMsiFolderSize == 0 )
             sMsiFolder[0] = '\0';
     }
-    
+
     if ( sMsiFolder[0] == '\0' ) // use the default location
     {
         Log( TEXT( "  Could not find path to msiexec.exe in registry" ) );
@@ -820,22 +820,22 @@ LPCTSTR SetupAppX::GetPathToMSI()
 boolean SetupAppX::LaunchInstaller( LPCTSTR pParam )
 {
     LPCTSTR sMsiPath = GetPathToMSI();
-    
+
     if ( !sMsiPath )
     {
         Log( TEXT( "ERROR: msiexec not found!" ) );
         SetError( ERROR_FILE_NOT_FOUND );
         return false;
     }
-    
+
     STARTUPINFO         aSUI;
     PROCESS_INFORMATION aPI;
 
     Log( TEXT( " Will install using <%s>\r\n" ), sMsiPath );
-    Log( TEXT( "   Prameters are: %s\r\n" ), pParam );
+    Log( TEXT( "   Parameters are: %s\r\n" ), pParam );
 
     OutputDebugStringFormat( TEXT( " Will install using <%s>\r\n" ), sMsiPath 
);
-    OutputDebugStringFormat( TEXT( "   Prameters are: %s\r\n" ), pParam );
+    OutputDebugStringFormat( TEXT( "   Parameters are: %s\r\n" ), pParam );
 
     ZeroMemory( (void*)&aPI, sizeof( PROCESS_INFORMATION ) );
     ZeroMemory( (void*)&aSUI, sizeof( STARTUPINFO ) );
@@ -945,9 +945,9 @@ boolean SetupAppX::Install( long nLanguage )
         nParLen += lstrlen( PARAM_MINOR_UPGRADE );
     else
         nParLen += lstrlen( PARAM_PACKAGE );
-    
+
     nParLen += lstrlen( pDataBasePath ) + 3;        // two quotes, one null
-    
+
     if ( NeedReboot() )
         nParLen += lstrlen( PARAM_REBOOT );
 
@@ -1051,7 +1051,7 @@ void SetupAppX::DisplayError( UINT nErr ) const
                                 break;
         case ERROR_OUTOFMEMORY: WIN::LoadString( m_hInst, IDS_OUTOFMEM, 
sError, MAX_TEXT_LENGTH );
                                 break;
-        case ERROR_INSTALL_USEREXIT: 
+        case ERROR_INSTALL_USEREXIT:
                                 WIN::LoadString( m_hInst, IDS_USER_CANCELLED, 
sError, MAX_TEXT_LENGTH );
                                 break;
         case ERROR_INSTALL_ALREADY_RUNNING: // 1618
@@ -1166,11 +1166,11 @@ boolean SetupAppX::CheckVersion()
     else
     {
         PFnDllGetVersion pDllGetVersion = (PFnDllGetVersion) GetProcAddress( 
hMsi, MSIAPI_DllGetVersion );
-        
+
         if ( pDllGetVersion )
         {
             DLLVERSIONINFO aInfo;
-            
+
             aInfo.cbSize = sizeof( DLLVERSIONINFO );
             if ( NOERROR == pDllGetVersion( &aInfo ) )
             {
@@ -1196,7 +1196,7 @@ boolean SetupAppX::CheckVersion()
                     Log( TEXT("Warning: Patching not supported! MSI-Version 
<%s>\r\n"), pMsiVersion );
             }
         }
-        
+
         FreeLibrary( hMsi );
     }
 
@@ -1235,8 +1235,8 @@ boolean SetupAppX::CheckForUpgrade()
 
     if ( m_pProductVersion && ( _tcslen( m_pProductVersion ) > 0 ) )
     {
-        TCHAR  *sProductVersion = new TCHAR[ MAX_PATH + 1 ];
-        DWORD   nSize = MAX_PATH + 1;
+        TCHAR *sProductVersion = new TCHAR[ MAX_PATH + 1 ];
+        DWORD  nSize = MAX_PATH + 1;
 
         sProductVersion[0] = '\0';
 
@@ -1459,16 +1459,16 @@ DWORD SetupAppX::GetNextArgument( LPCTSTR pStr, LPTSTR 
*pArg, LPTSTR *pNext,
             nCount += 1;
         }
     }
-    
+
     if ( pArg )
     {
         *pArg = new TCHAR[ nCount ];
         StringCchCopyN ( *pArg, nCount, pFirst, nCount-1 );
     }
-    
+
     if ( pNext )
         *pNext = CharNext( pChar );
-    
+
     return ERROR_SUCCESS;
 }
 
@@ -1558,7 +1558,7 @@ boolean SetupAppX::GetCmdLineParameters( LPTSTR *pCmdLine 
)
                         m_pLogFile = _tfopen( pFileName, TEXT( "ab" ) );
                     else
                         m_pLogFile = _tfopen( pFileName, TEXT( "wb" ) );
-                    
+
                     delete [] pFileName;
                 }
             }
@@ -1655,7 +1655,7 @@ boolean SetupAppX::IsAdmin()
 
     PSID aPsidAdmin;
     SID_IDENTIFIER_AUTHORITY aAuthority = SECURITY_NT_AUTHORITY;
-    
+
     if ( !AllocateAndInitializeSid( &aAuthority, 2, 
SECURITY_BUILTIN_DOMAIN_RID,
                                     DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0,
                                     &aPsidAdmin ) )
@@ -1663,10 +1663,10 @@ boolean SetupAppX::IsAdmin()
 
     BOOL bIsAdmin = FALSE;
 
-    if ( GetOSVersion() >= 5 ) 
+    if ( GetOSVersion() >= 5 )
     {
         HMODULE hAdvapi32 = LoadLibrary( ADVAPI32_DLL );
-        
+
         if ( !hAdvapi32 )
             bIsAdmin = FALSE;
         else
@@ -1704,7 +1704,7 @@ boolean SetupAppX::IsAdmin()
             }
 
             WIN::CloseHandle( hAccessToken );
-            
+
             if ( bSuccess )
             {
                 PTOKEN_GROUPS pGroups = (PTOKEN_GROUPS)(UCHAR*) szInfoBuffer;
@@ -1717,11 +1717,11 @@ boolean SetupAppX::IsAdmin()
                     }
                 }
             }
-            
+
             delete [] szInfoBuffer;
         }
     }
-    
+
     WIN::FreeSid( aPsidAdmin );
 
     return bIsAdmin ? true : false;
@@ -1737,7 +1737,7 @@ LPTSTR SetupAppX::CopyIniFile( LPCTSTR pIniFile )
         Log( TEXT( "ERROR: Could not create temp file\n" ) );
         return NULL;
     }
-    
+
     FILE *pOut  = _tfopen( m_pTmpName, TEXT( "wb" ) );
     FILE *pIn   = _tfopen( pIniFile, TEXT( "rb" ) );
 
@@ -1761,7 +1761,7 @@ LPTSTR SetupAppX::CopyIniFile( LPCTSTR pIniFile )
 
     if ( pOut ) fclose( pOut );
     if ( pIn ) fclose( pIn );
-    
+
     return m_pTmpName;
 }
 
@@ -1769,7 +1769,7 @@ LPTSTR SetupAppX::CopyIniFile( LPCTSTR pIniFile )
 void SetupAppX::ConvertNewline( LPTSTR pText ) const
 {
     int i=0;
-    
+
     while ( pText[i] != 0 )
     {
         if ( ( pText[i] == '\\' ) && ( pText[i+1] == 'n' ) )
@@ -1789,8 +1789,8 @@ LPTSTR SetupAppX::SetProdToAppTitle( LPCTSTR pProdName )
     if ( !pProdName ) return m_pAppTitle;
 
     LPTSTR pAppProdTitle = new TCHAR[ MAX_STR_CAPTION ];
-           pAppProdTitle[0]  = '\0';
-    
+           pAppProdTitle[0] = '\0';
+
     WIN::LoadString( m_hInst, IDS_APP_PROD_TITLE, pAppProdTitle, 
MAX_STR_CAPTION );
 
     int nAppLen = lstrlen( pAppProdTitle );

Reply via email to