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 d8bbce4c4f Fixed typos, cleanup
d8bbce4c4f is described below
commit d8bbce4c4f5fc0c8332f6f7257752f66016a74db
Author: mseidel <msei...@apache.org>
AuthorDate: Thu Apr 3 17:37:02 2025 +0200
Fixed typos, cleanup
(cherry picked from commit 4b37ad1dfdb632c9569e6bc39c06e6648a12a803)
---
main/extensions/source/scanner/sane.cxx | 138 +++----
main/sal/inc/osl/process.h | 287 +++++++------
.../ui/sidebar/MasterPageContainerProviders.cxx | 444 ++++++++++-----------
main/svx/inc/svx/fontwork.hxx | 25 +-
main/svx/source/dialog/fontwork.cxx | 4 +-
main/vos/inc/vos/process.hxx | 20 +-
6 files changed, 435 insertions(+), 483 deletions(-)
diff --git a/main/extensions/source/scanner/sane.cxx
b/main/extensions/source/scanner/sane.cxx
index 4e8826d28a..fa55f02f82 100644
--- a/main/extensions/source/scanner/sane.cxx
+++ b/main/extensions/source/scanner/sane.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,20 +7,18 @@
* 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.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
#include <cstdarg>
@@ -49,7 +47,7 @@ inline void dbg_msg( const char* pString, ... )
vfprintf( stderr, pString, ap );
va_end( ap );
#else
- (void)pString;
+ (void)pString;
#endif
}
@@ -86,7 +84,7 @@ inline void dbg_msg( const char* pString, ... )
else
int Sane::nRefCount = 0;
-oslModule Sane::pSaneLib = 0;
+oslModule Sane::pSaneLib = 0;
SANE_Int Sane::nVersion = 0;
SANE_Device** Sane::ppDevices = 0;
int Sane::nDevices = 0;
@@ -117,14 +115,14 @@ static sal_Bool bSaneSymbolLoadFailed = sal_False;
inline oslGenericFunction Sane::LoadSymbol( const char* pSymbolname )
{
- oslGenericFunction pFunction = osl_getAsciiFunctionSymbol( pSaneLib,
pSymbolname );
+ oslGenericFunction pFunction = osl_getAsciiFunctionSymbol( pSaneLib,
pSymbolname );
if( ! pFunction )
{
fprintf( stderr, "Could not load symbol %s\n",
pSymbolname );
bSaneSymbolLoadFailed = sal_True;
}
- return pFunction;
+ return pFunction;
}
SANE_Status Sane::ControlOption( int nOption, SANE_Action nAction,
@@ -182,20 +180,20 @@ Sane::~Sane()
void Sane::Init()
{
- ::rtl::OUString sSaneLibName( ::rtl::OUString::createFromAscii( "libsane"
SAL_DLLEXTENSION ) );
- pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY );
- if( ! pSaneLib )
- {
- sSaneLibName = ::rtl::OUString::createFromAscii( "libsane"
SAL_DLLEXTENSION ".1" );
- pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY );
- }
- // try reasonable places that might not be in the library search path
+ ::rtl::OUString sSaneLibName( ::rtl::OUString::createFromAscii(
"libsane" SAL_DLLEXTENSION ) );
+ pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY );
+ if( ! pSaneLib )
+ {
+ sSaneLibName = ::rtl::OUString::createFromAscii( "libsane"
SAL_DLLEXTENSION ".1" );
+ pSaneLib = osl_loadModule( sSaneLibName.pData,
SAL_LOADMODULE_LAZY );
+ }
+ // try reasonable places that might not be in the library search path
if( ! pSaneLib )
- {
- ::rtl::OUString sSaneLibSystemPath( ::rtl::OUString::createFromAscii(
"/usr/local/lib/libsane" SAL_DLLEXTENSION ) );
- osl_getFileURLFromSystemPath( sSaneLibSystemPath.pData,
&sSaneLibName.pData );
- pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY );
- }
+ {
+ ::rtl::OUString sSaneLibSystemPath(
::rtl::OUString::createFromAscii( "/usr/local/lib/libsane" SAL_DLLEXTENSION ) );
+ osl_getFileURLFromSystemPath( sSaneLibSystemPath.pData,
&sSaneLibName.pData );
+ pSaneLib = osl_loadModule( sSaneLibName.pData,
SAL_LOADMODULE_LAZY );
+ }
if( pSaneLib )
{
@@ -256,7 +254,7 @@ void Sane::DeInit()
if( pSaneLib )
{
p_exit();
- osl_unloadModule( pSaneLib );
+ osl_unloadModule( pSaneLib );
pSaneLib = 0;
}
}
@@ -284,7 +282,7 @@ void Sane::ReloadOptions()
mnOptions = pOptions[ 0 ];
if( (size_t)pZero->size > sizeof( SANE_Word ) )
- fprintf( stderr, "driver returned numer of options with larger
size tha SANE_Word !!!\n" );
+ fprintf( stderr, "driver returned number of options with larger
size than SANE_Word !!!\n" );
if( mppOptions )
delete [] mppOptions;
mppOptions = (const SANE_Option_Descriptor**)new
SANE_Option_Descriptor*[ mnOptions ];
@@ -569,34 +567,34 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap )
if( ! maHandle )
return sal_False;
- int nWidthMM = 0;
- int nHeightMM = 0;
- double fTLx, fTLy, fBRx, fBRy, fResl = 0.0;
- int nOption;
- if( ( nOption = GetOptionByName( "tl-x" ) ) != -1 &&
- GetOptionValue( nOption, fTLx, 0 ) &&
- GetOptionUnit( nOption ) == SANE_UNIT_MM )
- {
- if( ( nOption = GetOptionByName( "br-x" ) ) != -1 &&
- GetOptionValue( nOption, fBRx, 0 ) &&
- GetOptionUnit( nOption ) == SANE_UNIT_MM )
- {
- nWidthMM = (int)fabs(fBRx - fTLx);
- }
- }
- if( ( nOption = GetOptionByName( "tl-y" ) ) != -1 &&
- GetOptionValue( nOption, fTLy, 0 ) &&
- GetOptionUnit( nOption ) == SANE_UNIT_MM )
- {
- if( ( nOption = GetOptionByName( "br-y" ) ) != -1 &&
- GetOptionValue( nOption, fBRy, 0 ) &&
- GetOptionUnit( nOption ) == SANE_UNIT_MM )
- {
- nHeightMM = (int)fabs(fBRy - fTLy);
- }
- }
- if( ( nOption = GetOptionByName( "resolution" ) ) != -1 )
- GetOptionValue( nOption, fResl );
+ int nWidthMM = 0;
+ int nHeightMM = 0;
+ double fTLx, fTLy, fBRx, fBRy, fResl = 0.0;
+ int nOption;
+ if( ( nOption = GetOptionByName( "tl-x" ) ) != -1 &&
+ GetOptionValue( nOption, fTLx, 0 )
&&
+ GetOptionUnit( nOption ) == SANE_UNIT_MM )
+ {
+ if( ( nOption = GetOptionByName( "br-x" ) ) != -1 &&
+ GetOptionValue( nOption, fBRx, 0 )
&&
+ GetOptionUnit( nOption ) == SANE_UNIT_MM )
+ {
+ nWidthMM = (int)fabs(fBRx - fTLx);
+ }
+ }
+ if( ( nOption = GetOptionByName( "tl-y" ) ) != -1 &&
+ GetOptionValue( nOption, fTLy, 0 )
&&
+ GetOptionUnit( nOption ) == SANE_UNIT_MM )
+ {
+ if( ( nOption = GetOptionByName( "br-y" ) ) != -1 &&
+ GetOptionValue( nOption, fBRy, 0 )
&&
+ GetOptionUnit( nOption ) == SANE_UNIT_MM )
+ {
+ nHeightMM = (int)fabs(fBRy - fTLy);
+ }
+ }
+ if( ( nOption = GetOptionByName( "resolution" ) ) != -1 )
+ GetOptionValue( nOption, fResl );
sal_uInt8* pBuffer = NULL;
@@ -641,7 +639,7 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap )
if (nStatus != SANE_STATUS_GOOD ||
aParams.bytes_per_line == 0)
{
bSuccess = sal_False;
- break;
+ break;
}
#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
const char* ppFormats[] = { "SANE_FRAME_GRAY",
"SANE_FRAME_RGB",
@@ -728,7 +726,7 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap )
tv.tv_sec = 5;
tv.tv_usec = 0;
if( select( fd+1, &fdset, NULL, NULL,
&tv ) == 0 )
- fprintf( stderr, "Timout on
sane_read descriptor\n" );
+ fprintf( stderr, "Timeout on
sane_read descriptor\n" );
}
nLen = 0;
nStatus = p_read( maHandle, pBuffer,
BYTE_BUFFER_SIZE, &nLen );
@@ -754,12 +752,12 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap )
sal_uInt32 nHeight = (sal_uInt32) (nFrameLength /
aParams.bytes_per_line);
if( ! bWidthSet )
{
- if( ! fResl )
- fResl = 300; // if all else fails that's a good guess
- if( ! nWidthMM )
- nWidthMM = (int)(((double)nWidth / fResl) * 25.4);
- if( ! nHeightMM )
- nHeightMM = (int)(((double)nHeight / fResl) * 25.4);
+ if( ! fResl )
+ fResl = 300; // if all else fails
that's a good guess
+ if( ! nWidthMM )
+ nWidthMM = (int)(((double)nWidth /
fResl) * 25.4);
+ if( ! nHeightMM )
+ nHeightMM = (int)(((double)nHeight /
fResl) * 25.4);
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "set dimensions to (%d, %d)
Pixel, (%d, %d) mm, resolution is %lg\n", (int)nWidth, (int)nHeight,
(int)nWidthMM, (int)nHeightMM, fResl );
#endif
@@ -767,9 +765,9 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap )
aConverter.Seek( 18 );
aConverter << (sal_uInt32)nWidth;
aConverter << (sal_uInt32)nHeight;
- aConverter.Seek( 38 );
- aConverter << (sal_uInt32)(1000*nWidth/nWidthMM);
- aConverter << (sal_uInt32)(1000*nHeight/nHeightMM);
+ aConverter.Seek( 38 );
+ aConverter <<
(sal_uInt32)(1000*nWidth/nWidthMM);
+ aConverter <<
(sal_uInt32)(1000*nHeight/nHeightMM);
bWidthSet = sal_True;
}
aConverter.Seek(60);
@@ -858,9 +856,9 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap )
aConverter <<
nValue;
aConverter.SeekRel( 2 );
break;
- case SANE_FRAME_GRAY:
- case SANE_FRAME_RGB:
- break;
+ case SANE_FRAME_GRAY:
+ case SANE_FRAME_RGB:
+ break;
}
}
}
@@ -983,8 +981,8 @@ String Sane::GetOptionUnitName( int n )
{
String aText;
SANE_Unit nUnit = mppOptions[n]->unit;
- size_t nUnitAsSize = (size_t)nUnit;
- if (nUnitAsSize >= sizeof(ppUnits)/sizeof(ppUnits[0]))
+ size_t nUnitAsSize = (size_t)nUnit;
+ if (nUnitAsSize >= sizeof(ppUnits)/sizeof(ppUnits[0]))
aText = String::CreateFromAscii( "[unknown units]" );
else
aText = String( ppUnits[ nUnit ], gsl_getSystemTextEncoding() );
@@ -998,3 +996,5 @@ sal_Bool Sane::ActivateButtonOption( int n )
return sal_False;
return sal_True;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sal/inc/osl/process.h b/main/sal/inc/osl/process.h
index deaa15555a..485d004155 100644
--- a/main/sal/inc/osl/process.h
+++ b/main/sal/inc/osl/process.h
@@ -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,21 +7,18 @@
* 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.
- *
+ *
*************************************************************/
-
-
-
#ifndef _OSL_PROCESS_H_
#define _OSL_PROCESS_H_
@@ -62,26 +59,26 @@ typedef sal_uInt32 oslProcessIdentifier;
typedef sal_uInt32 oslProcessExitCode;
typedef enum {
- osl_Process_E_None, /* no error */
- osl_Process_E_NotFound, /* image not found */
- osl_Process_E_TimedOut, /* timout occurred */
- osl_Process_E_NoPermission, /* permission denied */
- osl_Process_E_Unknown, /* unknown error */
- osl_Process_E_InvalidError, /* unmapped error */
+ osl_Process_E_None, /* no error */
+ osl_Process_E_NotFound, /* image not found */
+ osl_Process_E_TimedOut, /* timeout occurred */
+ osl_Process_E_NoPermission, /* permission denied */
+ osl_Process_E_Unknown, /* unknown error */
+ osl_Process_E_InvalidError, /* unmapped error */
osl_Process_E_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
} oslProcessError;
typedef enum {
- osl_Process_TypeNone, /* no descriptor */
- osl_Process_TypeSocket, /* socket */
- osl_Process_TypeFile, /* file */
- osl_Process_TypePipe, /* pipe */
+ osl_Process_TypeNone, /* no descriptor */
+ osl_Process_TypeSocket, /* socket */
+ osl_Process_TypeFile, /* file */
+ osl_Process_TypePipe, /* pipe */
osl_Process_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
} oslDescriptorType;
typedef sal_Int32 oslDescriptorFlag;
-#define osl_Process_DFNONE 0x0000
-#define osl_Process_DFWAIT 0x0001
+#define osl_Process_DFNONE 0x0000
+#define osl_Process_DFWAIT 0x0001
#ifdef SAL_W32
# pragma pack(push, 8)
@@ -90,13 +87,13 @@ typedef sal_Int32 oslDescriptorFlag;
#endif
typedef struct {
- sal_uInt32 Size;
- oslProcessData Fields;
- oslProcessIdentifier Ident;
- oslProcessExitCode Code;
- TimeValue UserTime;
- TimeValue SystemTime;
- sal_uInt32 HeapUsage;
+ sal_uInt32 Size;
+ oslProcessData Fields;
+ oslProcessIdentifier Ident;
+ oslProcessExitCode Code;
+ TimeValue UserTime;
+ TimeValue SystemTime;
+ sal_uInt32 HeapUsage;
} oslProcessInfo;
#if defined( SAL_W32) || defined(SAL_OS2)
@@ -108,56 +105,56 @@ typedef struct {
@see osl_executeProcess
@see osl_terminateProcess
@see osl_freeProcessHandle
- @see osl_getProcessInfo
+ @see osl_getProcessInfo
@see osl_joinProcess
*/
typedef void* oslProcess;
/** Execute a process.
- Executes the program image provided in strImageName in a new process.
-
- @param ustrImageName
- [in] The file URL of the executable to be started.
- Can be NULL in this case the file URL of the executable must be the first
element
- in ustrArguments.
-
+ Executes the program image provided in strImageName in a new process.
+
+ @param ustrImageName
+ [in] The file URL of the executable to be started.
+ Can be NULL in this case the file URL of the executable must be the
first element
+ in ustrArguments.
+
@param ustrArguments
- [in] An array of argument strings. Can be NULL if strImageName is not
NULL.
- If strImageName is NULL it is expected that the first element contains
+ [in] An array of argument strings. Can be NULL if strImageName is not
NULL.
+ If strImageName is NULL it is expected that the first element contains
the file URL of the executable to start.
-
- @param nArguments
- [in] The number of arguments provided. If this number is 0 strArguments
will be ignored.
-
+
+ @param nArguments
+ [in] The number of arguments provided. If this number is 0 strArguments
will be ignored.
+
@param Options
[in] A combination of int-constants to describe the mode of execution.
-
+
@param Security
- [in] The user and his rights for which the process is started. May be
NULL in which case
+ [in] The user and his rights for which the process is started. May be
NULL in which case
the process will be started in the context of the current user.
-
- @param ustrDirectory
- [in] The file URL of the working directory of the new process. If the
specified directory
- does not exist or is inaccessible the working directory of the newly
created process
- is undefined. If this parameter is NULL or the caller provides an empty
string the
+
+ @param ustrDirectory
+ [in] The file URL of the working directory of the new process. If the
specified directory
+ does not exist or is inaccessible the working directory of the newly
created process
+ is undefined. If this parameter is NULL or the caller provides an empty
string the
new process will have the same current working directory as the calling
process.
-
+
@param ustrEnviroments
- [in] An array of strings describing environment variables that should
be merged into the
+ [in] An array of strings describing environment variables that should
be merged into the
environment of the new process. Each string has to be in the form
"variable=value".
- This parameter can be NULL in which case the new process gets the same
environment
- as the parent process.
-
- @param nEnvironmentVars
- [in] The number of environment variables to set.
-
+ This parameter can be NULL in which case the new process gets the same
environment
+ as the parent process.
+
+ @param nEnvironmentVars
+ [in] The number of environment variables to set.
+
@param pProcess
- [out] Pointer to a oslProcess variable, which receives the handle of
the newly created process.
- This parameter must not be NULL.
+ [out] Pointer to a oslProcess variable, which receives the handle of
the newly created process.
+ This parameter must not be NULL.
- @return
- <dl>
+ @return
+ <dl>
<dt>osl_Process_E_None</dt>
<dd>on success</dd>
<dt>osl_Process_E_NotFound</dt>
@@ -167,82 +164,82 @@ typedef void* oslProcess;
<dt>osl_Process_E_Unknown</dt>
<dd>if arbitrary other errors occur</dd>
</dl>
-
+
@see oslProcessOption
@see osl_executeProcess_WithRedirectedIO
@see osl_freeProcessHandle
@see osl_loginUser
*/
oslProcessError SAL_CALL osl_executeProcess(
- rtl_uString* ustrImageName,
+ rtl_uString* ustrImageName,
rtl_uString* ustrArguments[],
- sal_uInt32 nArguments,
+ sal_uInt32 nArguments,
oslProcessOption Options,
oslSecurity Security,
rtl_uString* ustrDirectory,
rtl_uString* ustrEnvironments[],
- sal_uInt32 nEnvironmentVars,
+ sal_uInt32 nEnvironmentVars,
oslProcess* pProcess);
/** Execute a process and redirect child process standard IO.
- @param ustrImageName
- [in] The file URL of the executable to be started.
- Can be NULL in this case the file URL of the executable must be the first
element
- in ustrArguments.
-
+ @param ustrImageName
+ [in] The file URL of the executable to be started.
+ Can be NULL in this case the file URL of the executable must be the
first element
+ in ustrArguments.
+
@param ustrArguments
- [in] An array of argument strings. Can be NULL if strImageName is not
NULL.
- If strImageName is NULL it is expected that the first element contains
+ [in] An array of argument strings. Can be NULL if strImageName is not
NULL.
+ If strImageName is NULL it is expected that the first element contains
the file URL of the executable to start.
-
- @param nArguments
- [in] The number of arguments provided. If this number is 0 strArguments
will be ignored.
-
+
+ @param nArguments
+ [in] The number of arguments provided. If this number is 0 strArguments
will be ignored.
+
@param Options
[in] A combination of int-constants to describe the mode of execution.
-
+
@param Security
- [in] The user and his rights for which the process is started. May be
NULL in which case
+ [in] The user and his rights for which the process is started. May be
NULL in which case
the process will be started in the context of the current user.
-
- @param ustrDirectory
- [in] The file URL of the working directory of the new process. If the
specified directory
- does not exist or is inaccessible the working directory of the newly
created process
- is undefined. If this parameter is NULL or the caller provides an empty
string the
+
+ @param ustrDirectory
+ [in] The file URL of the working directory of the new process. If the
specified directory
+ does not exist or is inaccessible the working directory of the newly
created process
+ is undefined. If this parameter is NULL or the caller provides an empty
string the
new process will have the same current working directory as the calling
process.
-
+
@param ustrEnviroments
- [in] An array of strings describing environment variables that should
be merged into the
+ [in] An array of strings describing environment variables that should
be merged into the
environment of the new process. Each string has to be in the form
"variable=value".
- This parameter can be NULL in which case the new process gets the same
environment
- as the parent process.
-
- @param nEnvironmentVars
- [in] The number of environment variables to set.
-
+ This parameter can be NULL in which case the new process gets the same
environment
+ as the parent process.
+
+ @param nEnvironmentVars
+ [in] The number of environment variables to set.
+
@param pProcess
- [out] Pointer to a oslProcess variable, which receives the handle of
the newly created process.
+ [out] Pointer to a oslProcess variable, which receives the handle of
the newly created process.
This parameter must not be NULL.
-
+
@param pChildInputWrite
- [in] Pointer to a oslFileHandle variable that receives the handle which
can be used to write
- to the child process standard input device. The returned handle is not
random accessible.
+ [in] Pointer to a oslFileHandle variable that receives the handle which
can be used to write
+ to the child process standard input device. The returned handle is not
random accessible.
The handle has to be closed with osl_closeFile if no longer used. This
parameter can be NULL.
-
+
@param pChildOutputRead
- [in] Pointer to a oslFileHandle variable that receives the handle which
can be used to read from
- the child process standard output device. The returned handle is not
random accessible.
- The Handle has to be closed with osl_closeFile if no longer used. This
parameter can be NULL.
-
+ [in] Pointer to a oslFileHandle variable that receives the handle which
can be used to read from
+ the child process standard output device. The returned handle is not
random accessible.
+ The Handle has to be closed with osl_closeFile if no longer used. This
parameter can be NULL.
+
@param pChildErrorRead
- [in] Pointer to a oslFileHandle variable that receives the handle which
can be used to read from
- the child process standard error device. The returned handle is not
random accessible.
+ [in] Pointer to a oslFileHandle variable that receives the handle which
can be used to read from
+ the child process standard error device. The returned handle is not
random accessible.
The Handle has to be closed with osl_closeFile if no longer used. This
parameter can be NULL.
-
+
@return
- <dl>
+ <dl>
<dt>osl_Process_E_None</dt>
<dd>on success</dd>
<dt>osl_Process_E_NotFound</dt>
@@ -251,8 +248,8 @@ oslProcessError SAL_CALL osl_executeProcess(
<dd>if invalid parameters will be detected</dd>
<dt>osl_Process_E_Unknown</dt>
<dd>if arbitrary other errors occur</dd>
- </dl>
-
+ </dl>
+
@see oslProcessOption
@see osl_executeProcess
@see osl_freeProcessHandle
@@ -260,34 +257,34 @@ oslProcessError SAL_CALL osl_executeProcess(
@see osl_closeFile
*/
oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
- rtl_uString* strImageName,
+ rtl_uString* strImageName,
rtl_uString* ustrArguments[],
- sal_uInt32 nArguments,
+ sal_uInt32 nArguments,
oslProcessOption Options,
oslSecurity Security,
rtl_uString* ustrDirectory,
rtl_uString* ustrEnvironments[],
- sal_uInt32 nEnvironmentVars,
+ sal_uInt32 nEnvironmentVars,
oslProcess* pProcess,
oslFileHandle* pChildInputWrite,
oslFileHandle* pChildOutputRead,
oslFileHandle* pChildErrorRead);
/** Terminate a process
- @param Process [in] the handle of the process to be terminated
+ @param Process [in] the handle of the process to be terminated
- @see osl_executeProcess
- @see osl_getProcess
- @see osl_joinProcess
+ @see osl_executeProcess
+ @see osl_getProcess
+ @see osl_joinProcess
*/
oslProcessError SAL_CALL osl_terminateProcess(oslProcess Process);
/** @deprecated
- Retrieve the process handle of a process identifier
- @param Ident [in] a process identifier
+ Retrieve the process handle of a process identifier
+ @param Ident [in] a process identifier
- @return the process handle on success, NULL in all other cases
+ @return the process handle on success, NULL in all other cases
*/
oslProcess SAL_CALL osl_getProcess(oslProcessIdentifier Ident);
@@ -298,7 +295,7 @@ oslProcess SAL_CALL osl_getProcess(oslProcessIdentifier
Ident);
void SAL_CALL osl_freeProcessHandle(oslProcess Process);
-/** Wait for completation of the specified childprocess.
+/** Wait for completion of the specified childprocess.
@param Process [in]
@return ols_Process_E_None
@see osl_executeProcess
@@ -306,21 +303,21 @@ void SAL_CALL osl_freeProcessHandle(oslProcess Process);
oslProcessError SAL_CALL osl_joinProcess(oslProcess Process);
/** Wait with a timeout for the completion of the specified child
- process.
+ process.
- @param Process [in]
- A process identifier.
+ @param Process [in]
+ A process identifier.
- @param pTimeout [in]
- A timeout value or NULL for infinite waiting.
+ @param pTimeout [in]
+ A timeout value or NULL for infinite waiting.
The unit of resolution is second.
- @return
- osl_Process_E_None on success
- osl_Process_E_TimedOut waiting for the child process timed out
- osl_Process_E_Unknown an error occurred or the parameter are invalid
+ @return
+ osl_Process_E_None on success
+ osl_Process_E_TimedOut waiting for the child process timed out
+ osl_Process_E_Unknown an error occurred or the parameter are invalid
- @see osl_executeProcess
+ @see osl_executeProcess
*/
oslProcessError SAL_CALL osl_joinProcessWithTimeout(oslProcess Process, const
TimeValue* pTimeout);
@@ -328,7 +325,7 @@ oslProcessError SAL_CALL
osl_joinProcessWithTimeout(oslProcess Process, const Ti
@param Process [in] the process handle of the process
@param Field [in] the information which is to be retrieved
this can be one or more of
- osl_Process_IDENTIFIER
+ osl_Process_IDENTIFIER
osl_Process_EXITCODE
osl_Process_CPUTIMES
osl_Process_HEAPUSAGE
@@ -339,33 +336,33 @@ oslProcessError SAL_CALL
osl_joinProcessWithTimeout(oslProcess Process, const Ti
retrieved valid information fields.
@return osl_Process_E_None on success, osl_Process_E_Unknown on failure.
*/
-oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData
Fields,
+oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData
Fields,
oslProcessInfo* pInfo);
-/** Get the filename of the executable.
+/** Get the filename of the executable.
@param strFile [out] the string that receives the executable file path.
- @return osl_Process_E_None or does not return.
- @see osl_executeProcess
+ @return osl_Process_E_None or does not return.
+ @see osl_executeProcess
*/
oslProcessError SAL_CALL osl_getExecutableFile(rtl_uString **strFile);
/** @return the number of commandline arguments passed to the main-function of
- this process
- @see osl_getCommandArg
+ this process
+ @see osl_getCommandArg
*/
sal_uInt32 SAL_CALL osl_getCommandArgCount(void);
/** Get the nArg-th command-line argument passed to the main-function of this
process.
- @param nArg [in] The number of the argument to return.
+ @param nArg [in] The number of the argument to return.
@param strCommandArg [out] The string receives the nArg-th command-line
argument.
- @return osl_Process_E_None or does not return.
+ @return osl_Process_E_None or does not return.
@see osl_executeProcess
*/
oslProcessError SAL_CALL osl_getCommandArg(sal_uInt32 nArg, rtl_uString
**strCommandArg);
/** Set the command-line arguments as passed to the main-function of this
process.
- Depricated: This function is only for internal use. Passing the args from
main will
+ Deprecated: This function is only for internal use. Passing the args
from main will
only work for Unix, on Windows there's no effect, the full command line
will automatically
be taken. This is due to Windows 9x/ME limitation that don't allow
UTF-16 wmain to provide
a osl_setCommandArgsU( int argc, sal_Unicode **argv );
@@ -399,7 +396,7 @@ oslProcessError SAL_CALL osl_setEnvironment(rtl_uString
*strVar, rtl_uString *st
*/
oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString *strVar);
-/** Get the working directory of the current process as a file URL.
+/** Get the working directory of the current process as a file URL.
The file URL is encoded as common for the OSL file API.
@param pustrWorkingDir [out] string that receives the working
directory file URL.
@@ -407,32 +404,32 @@ oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString
*strVar);
oslProcessError SAL_CALL osl_getProcessWorkingDir( rtl_uString
**pustrWorkingDir );
-/** Get the locale the process is currently running in.
+/** Get the locale the process is currently running in.
The unix implementation caches the value it returns, so if you have to
change the locale
- your are running in, you will have to use osl_setProcessLocale therefor.
-
+ your are running in, you will have to use osl_setProcessLocale therefor.
+
@param ppLocale [out] a pointer that receives the currently selected
locale structure
- @see osl_setProcessLocale
+ @see osl_setProcessLocale
*/
oslProcessError SAL_CALL osl_getProcessLocale( rtl_Locale ** ppLocale );
-/** Change the locale of the process.
+/** Change the locale of the process.
@param pLocale [in] a pointer to the locale to be set
- @see osl_getProcessLocale
+ @see osl_getProcessLocale
*/
oslProcessError SAL_CALL osl_setProcessLocale( rtl_Locale * pLocale );
-
+
sal_Bool SAL_CALL osl_sendResourcePipe(oslPipe Pipe, oslSocket Socket);
-
+
oslSocket SAL_CALL osl_receiveResourcePipe(oslPipe Pipe);
#ifdef __cplusplus
}
#endif
-#endif /* _OSL_PROCESS_H_ */
+#endif /* _OSL_PROCESS_H_ */
diff --git a/main/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
b/main/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
index e662df4e10..43f7e31a66 100644
--- a/main/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
+++ b/main/sd/source/ui/sidebar/MasterPageContainerProviders.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.
- *
+ *
*************************************************************/
#include "precompiled_sd.hxx"
@@ -40,7 +40,6 @@ using namespace ::com::sun::star::uno;
namespace sd { namespace sidebar {
-
//===== PagePreviewProvider ===================================================
PagePreviewProvider::PagePreviewProvider (void)
@@ -48,289 +47,263 @@ PagePreviewProvider::PagePreviewProvider (void)
}
-
-
Image PagePreviewProvider::operator () (
- int nWidth,
- SdPage* pPage,
- ::sd::PreviewRenderer& rRenderer)
+ int nWidth,
+ SdPage* pPage,
+ ::sd::PreviewRenderer& rRenderer)
{
- Image aPreview;
-
- if (pPage != NULL)
- {
- // Use the given renderer to create a preview of the given page
- // object.
- aPreview = rRenderer.RenderPage(
- pPage,
- nWidth,
- String::CreateFromAscii(""),
- false);
- }
-
- return aPreview;
-}
+ Image aPreview;
+ if (pPage != NULL)
+ {
+ // Use the given renderer to create a preview of the given page
+ // object.
+ aPreview = rRenderer.RenderPage(
+ pPage,
+ nWidth,
+ String::CreateFromAscii(""),
+ false);
+ }
+ return aPreview;
+}
int PagePreviewProvider::GetCostIndex (void)
{
- return 5;
+ return 5;
}
-
-
bool PagePreviewProvider::NeedsPageObject (void)
{
- return true;
+ return true;
}
-
-
//===== TemplatePreviewProvider ===============================================
TemplatePreviewProvider::TemplatePreviewProvider (const ::rtl::OUString& rsURL)
- : msURL(rsURL)
+ : msURL(rsURL)
{
}
-
-
Image TemplatePreviewProvider::operator() (
- int nWidth,
- SdPage* pPage,
- ::sd::PreviewRenderer& rRenderer)
+ int nWidth,
+ SdPage* pPage,
+ ::sd::PreviewRenderer& rRenderer)
{
- // Unused parameters.
- (void)nWidth;
- (void)pPage;
- (void)rRenderer;
-
- // Load the thumbnail from a template document.
+ // Unused parameters.
+ (void)nWidth;
+ (void)pPage;
+ (void)rRenderer;
+
+ // Load the thumbnail from a template document.
uno::Reference<io::XInputStream> xIStream;
- uno::Reference< lang::XMultiServiceFactory > xServiceManager (
- ::comphelper::getProcessServiceFactory());
+ uno::Reference< lang::XMultiServiceFactory > xServiceManager (
+ ::comphelper::getProcessServiceFactory());
if (xServiceManager.is())
{
try
- {
+ {
uno::Reference<lang::XSingleServiceFactory>
xStorageFactory(
- xServiceManager->createInstance(
- ::rtl::OUString::createFromAscii(
- "com.sun.star.embed.StorageFactory")),
+ xServiceManager->createInstance(
+ ::rtl::OUString::createFromAscii(
+
"com.sun.star.embed.StorageFactory")),
uno::UNO_QUERY);
-
+
if (xStorageFactory.is())
{
uno::Sequence<uno::Any> aArgs (2);
aArgs[0] <<= msURL;
aArgs[1] <<= embed::ElementModes::READ;
uno::Reference<embed::XStorage> xDocStorage (
- xStorageFactory->createInstanceWithArguments(aArgs),
- uno::UNO_QUERY);
-
- try
- {
- if (xDocStorage.is())
- {
- uno::Reference<embed::XStorage> xStorage (
- xDocStorage->openStorageElement(
- ::rtl::OUString::createFromAscii("Thumbnails"),
- embed::ElementModes::READ));
- if (xStorage.is())
- {
- uno::Reference<io::XStream> xThumbnailCopy (
- xStorage->cloneStreamElement(
- ::rtl::OUString::createFromAscii(
- "thumbnail.png")));
- if (xThumbnailCopy.is())
- xIStream = xThumbnailCopy->getInputStream();
- }
- }
- }
- catch (uno::Exception& rException)
- {
- OSL_TRACE (
- "caught exception while trying to access
Thumbnail/thumbnail.png of %s: %s",
- ::rtl::OUStringToOString(msURL,
- RTL_TEXTENCODING_UTF8).getStr(),
- ::rtl::OUStringToOString(rException.Message,
- RTL_TEXTENCODING_UTF8).getStr());
- }
-
- try
- {
- // An (older) implementation had a bug - The storage
- // name was "Thumbnail" instead of "Thumbnails". The
- // old name is still used as fallback but this code can
- // be removed soon.
- if ( ! xIStream.is())
- {
- uno::Reference<embed::XStorage> xStorage (
- xDocStorage->openStorageElement(
- ::rtl::OUString::createFromAscii("Thumbnail"),
- embed::ElementModes::READ));
- if (xStorage.is())
- {
- uno::Reference<io::XStream> xThumbnailCopy (
- xStorage->cloneStreamElement(
- ::rtl::OUString::createFromAscii(
- "thumbnail.png")));
- if (xThumbnailCopy.is())
- xIStream = xThumbnailCopy->getInputStream();
- }
+
xStorageFactory->createInstanceWithArguments(aArgs),
+ uno::UNO_QUERY);
+
+ try
+ {
+ if (xDocStorage.is())
+ {
+ uno::Reference<embed::XStorage>
xStorage (
+
xDocStorage->openStorageElement(
+
::rtl::OUString::createFromAscii("Thumbnails"),
+
embed::ElementModes::READ));
+ if (xStorage.is())
+ {
+
uno::Reference<io::XStream> xThumbnailCopy (
+
xStorage->cloneStreamElement(
+
::rtl::OUString::createFromAscii(
+
"thumbnail.png")));
+ if (xThumbnailCopy.is())
+ xIStream =
xThumbnailCopy->getInputStream();
+ }
}
- }
- catch (uno::Exception& rException)
- {
- OSL_TRACE (
- "caught exception while trying to access
Thumbnails/thumbnail.png of %s: %s",
- ::rtl::OUStringToOString(msURL,
- RTL_TEXTENCODING_UTF8).getStr(),
- ::rtl::OUStringToOString(rException.Message,
- RTL_TEXTENCODING_UTF8).getStr());
- }
+ }
+ catch (uno::Exception& rException)
+ {
+ OSL_TRACE (
+ "caught exception while trying
to access Thumbnail/thumbnail.png of %s: %s",
+ ::rtl::OUStringToOString(msURL,
+
RTL_TEXTENCODING_UTF8).getStr(),
+
::rtl::OUStringToOString(rException.Message,
+
RTL_TEXTENCODING_UTF8).getStr());
+ }
+
+ try
+ {
+ // An (older) implementation had a bug
- The storage
+ // name was "Thumbnail" instead of
"Thumbnails". The
+ // old name is still used as fallback
but this code can
+ // be removed soon.
+ if ( ! xIStream.is())
+ {
+ uno::Reference<embed::XStorage>
xStorage (
+
xDocStorage->openStorageElement(
+
::rtl::OUString::createFromAscii("Thumbnail"),
+
embed::ElementModes::READ));
+ if (xStorage.is())
+ {
+
uno::Reference<io::XStream> xThumbnailCopy (
+
xStorage->cloneStreamElement(
+
::rtl::OUString::createFromAscii(
+
"thumbnail.png")));
+ if (xThumbnailCopy.is())
+ xIStream =
xThumbnailCopy->getInputStream();
+ }
+ }
+ }
+ catch (uno::Exception& rException)
+ {
+ OSL_TRACE (
+ "caught exception while trying
to access Thumbnails/thumbnail.png of %s: %s",
+ ::rtl::OUStringToOString(msURL,
+
RTL_TEXTENCODING_UTF8).getStr(),
+
::rtl::OUStringToOString(rException.Message,
+
RTL_TEXTENCODING_UTF8).getStr());
+ }
}
}
catch (uno::Exception& rException)
{
- OSL_TRACE (
- "caught exception while trying to access tuhmbnail of %s: %s",
- ::rtl::OUStringToOString(msURL,
- RTL_TEXTENCODING_UTF8).getStr(),
- ::rtl::OUStringToOString(rException.Message,
- RTL_TEXTENCODING_UTF8).getStr());
- }
+ OSL_TRACE (
+ "caught exception while trying to access
thumbnail of %s: %s",
+ ::rtl::OUStringToOString(msURL,
+ RTL_TEXTENCODING_UTF8).getStr(),
+ ::rtl::OUStringToOString(rException.Message,
+ RTL_TEXTENCODING_UTF8).getStr());
+ }
}
- // Extract the image from the stream.
- BitmapEx aThumbnail;
+ // Extract the image from the stream.
+ BitmapEx aThumbnail;
if (xIStream.is())
- {
- ::std::auto_ptr<SvStream> pStream (
- ::utl::UcbStreamHelper::CreateStream (xIStream));
- ::vcl::PNGReader aReader (*pStream);
- aThumbnail = aReader.Read ();
- }
-
- // Note that the preview is returned without scaling it to the desired
- // width. This gives the caller the chance to take advantage of a
- // possibly larger resolution then was asked for.
- return aThumbnail;
-}
-
+ {
+ ::std::auto_ptr<SvStream> pStream (
+ ::utl::UcbStreamHelper::CreateStream (xIStream));
+ ::vcl::PNGReader aReader (*pStream);
+ aThumbnail = aReader.Read ();
+ }
+ // Note that the preview is returned without scaling it to the desired
+ // width. This gives the caller the chance to take advantage of a
+ // possibly larger resolution then was asked for.
+ return aThumbnail;
+}
int TemplatePreviewProvider::GetCostIndex (void)
{
- return 10;
+ return 10;
}
-
-
bool TemplatePreviewProvider::NeedsPageObject (void)
{
- return false;
+ return false;
}
-
-
//===== TemplatePageObjectProvider
=============================================
TemplatePageObjectProvider::TemplatePageObjectProvider (const ::rtl::OUString&
rsURL)
- : msURL(rsURL),
- mxDocumentShell()
+ : msURL(rsURL),
+ mxDocumentShell()
{
}
-
-
SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument*
pContainerDocument)
{
- // Unused parameters.
- (void)pContainerDocument;
-
- SdPage* pPage = NULL;
-
- mxDocumentShell = NULL;
- ::sd::DrawDocShell* pDocumentShell = NULL;
- try
- {
- // Load the template document and return its first page.
- pDocumentShell = LoadDocument (msURL);
- if (pDocumentShell != NULL)
- {
- SdDrawDocument* pDocument = pDocumentShell->GetDoc();
- if (pDocument != NULL)
- {
- pPage = pDocument->GetMasterSdPage(0, PK_STANDARD);
- // In order to make the newly loaded master page deletable
- // when copied into documents it is marked as no "precious".
- // When it is modified then it is marked as "precious".
- if (pPage != NULL)
- pPage->SetPrecious(false);
- }
- }
- }
- catch (uno::RuntimeException)
- {
- DBG_UNHANDLED_EXCEPTION();
- pPage = NULL;
- }
-
- return pPage;
-}
+ // Unused parameters.
+ (void)pContainerDocument;
+ SdPage* pPage = NULL;
+ mxDocumentShell = NULL;
+ ::sd::DrawDocShell* pDocumentShell = NULL;
+ try
+ {
+ // Load the template document and return its first page.
+ pDocumentShell = LoadDocument (msURL);
+ if (pDocumentShell != NULL)
+ {
+ SdDrawDocument* pDocument = pDocumentShell->GetDoc();
+ if (pDocument != NULL)
+ {
+ pPage = pDocument->GetMasterSdPage(0,
PK_STANDARD);
+ // In order to make the newly loaded master
page deletable
+ // when copied into documents it is marked as
no "precious".
+ // When it is modified then it is marked as
"precious".
+ if (pPage != NULL)
+ pPage->SetPrecious(false);
+ }
+ }
+ }
+ catch (uno::RuntimeException)
+ {
+ DBG_UNHANDLED_EXCEPTION();
+ pPage = NULL;
+ }
+
+ return pPage;
+}
::sd::DrawDocShell* TemplatePageObjectProvider::LoadDocument (const
::rtl::OUString& sFileName)
{
SfxApplication* pSfxApp = SFX_APP();
- SfxItemSet* pSet = new SfxAllItemSet (pSfxApp->GetPool());
- pSet->Put (SfxBoolItem (SID_TEMPLATE, sal_True));
- pSet->Put (SfxBoolItem (SID_PREVIEW, sal_True));
- if (pSfxApp->LoadTemplate (mxDocumentShell, sFileName, sal_True, pSet))
- {
- mxDocumentShell = NULL;
- }
- SfxObjectShell* pShell = mxDocumentShell;
- return PTR_CAST(::sd::DrawDocShell,pShell);
+ SfxItemSet* pSet = new SfxAllItemSet (pSfxApp->GetPool());
+ pSet->Put (SfxBoolItem (SID_TEMPLATE, sal_True));
+ pSet->Put (SfxBoolItem (SID_PREVIEW, sal_True));
+ if (pSfxApp->LoadTemplate (mxDocumentShell, sFileName, sal_True, pSet))
+ {
+ mxDocumentShell = NULL;
+ }
+ SfxObjectShell* pShell = mxDocumentShell;
+ return PTR_CAST(::sd::DrawDocShell,pShell);
}
-
-
int TemplatePageObjectProvider::GetCostIndex (void)
{
- return 20;
+ return 20;
}
-
-
bool TemplatePageObjectProvider::operator== (const PageObjectProvider&
rProvider)
{
- const TemplatePageObjectProvider* pTemplatePageObjectProvider
- = dynamic_cast<const TemplatePageObjectProvider*>(&rProvider);
- if (pTemplatePageObjectProvider != NULL)
- return (msURL == pTemplatePageObjectProvider->msURL);
- else
- return false;
+ const TemplatePageObjectProvider* pTemplatePageObjectProvider
+ = dynamic_cast<const TemplatePageObjectProvider*>(&rProvider);
+ if (pTemplatePageObjectProvider != NULL)
+ return (msURL == pTemplatePageObjectProvider->msURL);
+ else
+ return false;
}
-
-
//===== DefaultPageObjectProvider
==============================================
DefaultPageObjectProvider::DefaultPageObjectProvider (void)
@@ -338,83 +311,70 @@ DefaultPageObjectProvider::DefaultPageObjectProvider
(void)
}
-
-
SdPage* DefaultPageObjectProvider::operator () (SdDrawDocument*
pContainerDocument)
{
- SdPage* pLocalMasterPage = NULL;
- if (pContainerDocument != NULL)
- {
- sal_Int32 nIndex (0);
- SdPage* pLocalSlide =
pContainerDocument->GetSdPage((sal_uInt16)nIndex, PK_STANDARD);
- if (pLocalSlide!=NULL && pLocalSlide->TRG_HasMasterPage())
- pLocalMasterPage =
dynamic_cast<SdPage*>(&pLocalSlide->TRG_GetMasterPage());
- }
-
- if (pLocalMasterPage == NULL)
- {
- DBG_ASSERT(false, "can not create master page for slide");
- }
-
- return pLocalMasterPage;
-}
+ SdPage* pLocalMasterPage = NULL;
+ if (pContainerDocument != NULL)
+ {
+ sal_Int32 nIndex (0);
+ SdPage* pLocalSlide =
pContainerDocument->GetSdPage((sal_uInt16)nIndex, PK_STANDARD);
+ if (pLocalSlide!=NULL && pLocalSlide->TRG_HasMasterPage())
+ pLocalMasterPage =
dynamic_cast<SdPage*>(&pLocalSlide->TRG_GetMasterPage());
+ }
+ if (pLocalMasterPage == NULL)
+ {
+ DBG_ASSERT(false, "can not create master page for slide");
+ }
+ return pLocalMasterPage;
+}
int DefaultPageObjectProvider::GetCostIndex (void)
{
- return 15;
+ return 15;
}
-
-
bool DefaultPageObjectProvider::operator== (const PageObjectProvider&
rProvider)
{
- return (dynamic_cast<const DefaultPageObjectProvider*>(&rProvider) !=
NULL);
+ return (dynamic_cast<const DefaultPageObjectProvider*>(&rProvider) !=
NULL);
}
-
-
//===== ExistingPageProvider ==================================================
ExistingPageProvider::ExistingPageProvider (SdPage* pPage)
- : mpPage(pPage)
+ : mpPage(pPage)
{
}
-
-
SdPage* ExistingPageProvider::operator() (SdDrawDocument* pDocument)
{
- (void)pDocument; // Unused parameter.
-
- return mpPage;
-}
-
+ (void)pDocument; // Unused parameter.
+ return mpPage;
+}
int ExistingPageProvider::GetCostIndex (void)
{
- return 0;
+ return 0;
}
-
-
bool ExistingPageProvider::operator== (const PageObjectProvider& rProvider)
{
- const ExistingPageProvider* pExistingPageProvider
- = dynamic_cast<const ExistingPageProvider*>(&rProvider);
- if (pExistingPageProvider != NULL)
- return (mpPage == pExistingPageProvider->mpPage);
- else
- return false;
+ const ExistingPageProvider* pExistingPageProvider
+ = dynamic_cast<const ExistingPageProvider*>(&rProvider);
+ if (pExistingPageProvider != NULL)
+ return (mpPage == pExistingPageProvider->mpPage);
+ else
+ return false;
}
-
} } // end of namespace sd::sidebar
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/inc/svx/fontwork.hxx b/main/svx/inc/svx/fontwork.hxx
index e97e64e80d..f469778983 100644
--- a/main/svx/inc/svx/fontwork.hxx
+++ b/main/svx/inc/svx/fontwork.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,19 +7,18 @@
* 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.
- *
+ *
*************************************************************/
-
#ifndef _SVX_FONTWORK_HXX
#define _SVX_FONTWORK_HXX
@@ -56,9 +55,7 @@ class XFormTextShadowXValItem;
class XFormTextShadowYValItem;
/*************************************************************************
-|*
-|* ControllerItem fuer Fontwork
-|*
+|* ControllerItem for Fontwork
\************************************************************************/
class SvxFontWorkDialog;
@@ -76,9 +73,7 @@ public:
};
/*************************************************************************
-|*
-|* Ableitung vom SfxChildWindow als "Behaelter" fuer Fontwork-Dialog
-|*
+|* Ableitung vom SfxChildWindow als "Behälter" für Fontwork-Dialog
\************************************************************************/
class SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWindow
@@ -89,9 +84,7 @@ class SVX_DLLPUBLIC SvxFontWorkChildWindow : public
SfxChildWindow
};
/*************************************************************************
-|*
|* Floating Window zur Attributierung von Texteffekten
-|*
\************************************************************************/
class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
@@ -143,7 +136,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public
SfxDockingWindow
DECL_LINK( SelectShadowHdl_Impl, void * );
DECL_LINK( ModifyInputHdl_Impl, void * );
- DECL_LINK( InputTimoutHdl_Impl, void * );
+ DECL_LINK( InputTimeoutHdl_Impl, void * );
DECL_LINK( ColorSelectHdl_Impl, void * );
@@ -179,4 +172,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public
SfxDockingWindow
void SetActive(sal_Bool bActivate = sal_True);
};
-#endif // _SVX_FONTWORK_HXX
+#endif // _SVX_FONTWORK_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/dialog/fontwork.cxx
b/main/svx/source/dialog/fontwork.cxx
index 1e8772a4c8..eebdf5bfe4 100644
--- a/main/svx/source/dialog/fontwork.cxx
+++ b/main/svx/source/dialog/fontwork.cxx
@@ -284,7 +284,7 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
aShadowColorLB.SetSelectHdl( LINK(this, SvxFontWorkDialog,
ColorSelectHdl_Impl) );
aInputTimer.SetTimeout(500);
- aInputTimer.SetTimeoutHdl(LINK(this, SvxFontWorkDialog,
InputTimoutHdl_Impl));
+ aInputTimer.SetTimeoutHdl(LINK(this, SvxFontWorkDialog,
InputTimeoutHdl_Impl));
}
/*************************************************************************
@@ -794,7 +794,7 @@ IMPL_LINK_INLINE_END( SvxFontWorkDialog,
ModifyInputHdl_Impl, void *, EMPTYARG )
|*
\************************************************************************/
-IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG )
+IMPL_LINK( SvxFontWorkDialog, InputTimeoutHdl_Impl, void *, EMPTYARG )
{
// System-Metrik evtl. neu setzen
// Dieses sollte mal als Listener passieren, ist aber aus
diff --git a/main/vos/inc/vos/process.hxx b/main/vos/inc/vos/process.hxx
index 51a7c9f8a5..e4d7d311e8 100644
--- a/main/vos/inc/vos/process.hxx
+++ b/main/vos/inc/vos/process.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,20 +7,18 @@
* 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.
- *
+ *
*************************************************************/
-
-
#ifndef _VOS_PROCESS_HXX_
#define _VOS_PROCESS_HXX_
@@ -117,7 +115,7 @@ public:
enum TProcessError {
E_None = osl_Process_E_None, /* no error */
E_NotFound = osl_Process_E_NotFound, /* image not found */
- E_TimedOut = osl_Process_E_TimedOut, /* timout occurred */
+ E_TimedOut = osl_Process_E_TimedOut, /* timeout occurred */
E_NoPermission = osl_Process_E_NoPermission, /* permission denied */
E_Unknown = osl_Process_E_Unknown, /* unknown error */
E_InvalidError = osl_Process_E_InvalidError /* unmapped error */
@@ -202,7 +200,7 @@ public:
static TProcessError SAL_CALL getCurrentInfo(TProcessData Data,
TProcessInfo* pInfo);
- /** wait for the completation of this child process
+ /** wait for the completion of this child process
@return eNONE if child process exits, otherwise nothing.
*/
TProcessError SAL_CALL join();
@@ -214,7 +212,7 @@ protected:
oslProcess m_Process;
};
-/** informations for client processes provided by the parent.
+/** information for client processes provided by the parent.
@see OProcess
*/
@@ -229,7 +227,7 @@ public:
enum TStartupError {
E_None = osl_Process_E_None, /* no error */
E_NotFound = osl_Process_E_NotFound, /* image not found */
- E_TimedOut = osl_Process_E_TimedOut, /* timout occurred */
+ E_TimedOut = osl_Process_E_TimedOut, /* timeout occurred */
E_NoPermission = osl_Process_E_NoPermission, /* permission denied */
E_Unknown = osl_Process_E_Unknown, /* unknown error */
E_InvalidError = osl_Process_E_InvalidError /* unmapped error */
@@ -312,3 +310,5 @@ public:
}
#endif // _VOS_PROCESS_HXX_
+
+/* vim: set noet sw=4 ts=4: */
