This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 883ba44fa5 Cleanup
883ba44fa5 is described below
commit 883ba44fa57d8dd873f9491a44215c47fb8f7173
Author: mseidel <[email protected]>
AuthorDate: Tue Apr 29 13:32:15 2025 +0200
Cleanup
---
main/autodoc/source/parser/cpp/cx_c_std.cxx | 68 ++--
main/cppuhelper/source/interfacecontainer.cxx | 170 +++++----
main/cui/source/dialogs/hlmarkwn.cxx | 68 ++--
main/cui/source/inc/cuitabarea.hxx | 67 ++--
.../source/ui/tabledesign/TEditControl.cxx | 386 ++++++++++-----------
main/filter/source/graphicfilter/icgm/class4.cxx | 48 +--
6 files changed, 372 insertions(+), 435 deletions(-)
diff --git a/main/autodoc/source/parser/cpp/cx_c_std.cxx
b/main/autodoc/source/parser/cpp/cx_c_std.cxx
index 348446126c..ba832b8a00 100644
--- a/main/autodoc/source/parser/cpp/cx_c_std.cxx
+++ b/main/autodoc/source/parser/cpp/cx_c_std.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,21 @@
* 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 <precomp.h>
#include "cx_c_std.hxx"
-
// NOT FULLY DECLARED SERVICES
#include "all_toks.hxx"
#include "cx_c_pp.hxx"
@@ -32,15 +31,11 @@
#include <x_parse.hxx>
#include "c_dealer.hxx"
-
namespace cpp {
-
const intt C_nCppInitialNrOfStati = 600;
const intt C_nStatusSize = 128;
-
-
const uintt nF_fin_Error = 1;
const uintt nF_fin_CreateWithoutText = 2;
const uintt nF_fin_CreateWithText = 3;
@@ -112,7 +107,7 @@ DYN TextToken * TCF_Eof(const char *) { return new Tok_Eof;
}
Context_CppStd::Context_CppStd( DYN autodoc::TkpDocuContext &
let_drContext_Docu )
: Cx_Base(0),
- aStateMachine(C_nStatusSize,C_nCppInitialNrOfStati),
+ aStateMachine(C_nStatusSize,C_nCppInitialNrOfStati),
pDocuContext(&let_drContext_Docu),
pContext_Comment(0),
pContext_Preprocessor(0),
@@ -123,7 +118,7 @@ Context_CppStd::Context_CppStd( DYN autodoc::TkpDocuContext
& let_drContext_Docu
{
pDocuContext->SetParentContext(*this,"*/");
- pContext_Comment = new Context_Comment(*this);
+ pContext_Comment = new Context_Comment(*this);
pContext_Preprocessor = new Context_Preprocessor(*this);
pContext_ConstString = new Context_ConstString(*this);
pContext_ConstChar = new Context_ConstChar(*this);
@@ -156,21 +151,21 @@ Context_CppStd::ReadCharChain( CharacterSource & io_rText
)
void
Context_CppStd::AssignDealer( Distributor & o_rDealer )
{
- Cx_Base::AssignDealer(o_rDealer);
-
- pDocuContext->AssignDealer(o_rDealer);
- pContext_Comment->AssignDealer(o_rDealer);
- pContext_Preprocessor->AssignDealer(o_rDealer);
- pContext_ConstString->AssignDealer(o_rDealer);
- pContext_ConstChar->AssignDealer(o_rDealer);
- pContext_ConstNumeric->AssignDealer(o_rDealer);
- pContext_UnblockMacro->AssignDealer(o_rDealer);
+ Cx_Base::AssignDealer(o_rDealer);
+
+ pDocuContext->AssignDealer(o_rDealer);
+ pContext_Comment->AssignDealer(o_rDealer);
+ pContext_Preprocessor->AssignDealer(o_rDealer);
+ pContext_ConstString->AssignDealer(o_rDealer);
+ pContext_ConstChar->AssignDealer(o_rDealer);
+ pContext_ConstNumeric->AssignDealer(o_rDealer);
+ pContext_UnblockMacro->AssignDealer(o_rDealer);
}
void
Context_CppStd::PerformStatusFunction( uintt
i_nStatusSignal,
-
F_CRTOK i_fTokenCreateFunction,
-
CharacterSource & io_rText )
+
F_CRTOK i_fTokenCreateFunction,
+
CharacterSource & io_rText )
{
switch (i_nStatusSignal)
{
@@ -215,17 +210,17 @@ Context_CppStd::PerformStatusFunction( uintt
i_nStatusSignal,
case nF_goto_Const:
SetNewToken(0);
break;
- case nF_goto_UnblockMacro:
+ case nF_goto_UnblockMacro:
SetNewToken(0);
break;
case nF_fin_Error:
default:
- {
- char cCC = io_rText.CurChar();
- String sCurChar( &cCC, 1 );
+ {
+ char cCC = io_rText.CurChar();
+ String sCurChar( &cCC, 1 );
throw X_Parser( X_Parser::x_InvalidChar, sCurChar,
String::Null_(), 0 );
- }
+ }
} // end switch (i_nStatusSignal)
}
@@ -234,8 +229,8 @@ Context_CppStd::SetupStateMachine()
{
// Besondere Array-Stati (kein Tokenabschluss oder Kontextwechsel):
// const INT16 top = 0; // Top-Status
- const INT16 wht = 1; // Whitespace-�berlese-Status
- const INT16 bez = 2; // Bezeichner-lese-Status
+ const INT16 wht = 1; // Whitespace-Überlese-Status
+ const INT16 bez = 2; // Bezeichner-lese-Status
// Tokenfinish-Stati:
const INT16 finError = 3;
@@ -393,7 +388,7 @@ Context_CppStd::SetupStateMachine()
aStateMachine.AddStatus(dpBst_gotoConstString);
aStateMachine.AddStatus(dpBst_gotoConstChar);
aStateMachine.AddStatus(dpBst_gotoConstNumeric);
- aStateMachine.AddStatus(dpBst_gotoUnblockMacro);
+ aStateMachine.AddStatus(dpBst_gotoUnblockMacro);
// Identifier
@@ -481,8 +476,8 @@ Context_CppStd::SetupStateMachine()
aStateMachine.AddToken("long", TCF_BuiltInType,
A_nBezDefStatus, finBiType);
aStateMachine.AddToken("float", TCF_BuiltInType,
A_nBezDefStatus, finBiType);
aStateMachine.AddToken("double",TCF_BuiltInType,
A_nBezDefStatus, finBiType);
- aStateMachine.AddToken("wchar_t",TCF_BuiltInType,
A_nBezDefStatus, finBiType);
- aStateMachine.AddToken("size_t",TCF_BuiltInType,
A_nBezDefStatus, finBiType);
+ aStateMachine.AddToken("wchar_t",TCF_BuiltInType,
A_nBezDefStatus, finBiType);
+ aStateMachine.AddToken("size_t",TCF_BuiltInType,
A_nBezDefStatus, finBiType);
// Type modifiers
aStateMachine.AddToken("signed", TCF_TypeModifier,
A_nBezDefStatus, finTypeModifier);
@@ -494,13 +489,13 @@ Context_CppStd::SetupStateMachine()
aStateMachine.AddToken("__cdecl", 0, A_nBezDefStatus,
finIgnore);
aStateMachine.AddToken("__stdcall", 0, A_nBezDefStatus,
finIgnore);
aStateMachine.AddToken("__fastcall",0, A_nBezDefStatus,
finIgnore);
- aStateMachine.AddToken("/**/", 0, A_nOperatorDefStatus,finIgnore);
+ aStateMachine.AddToken("/**/", 0,
A_nOperatorDefStatus,finIgnore);
// Context changers
aStateMachine.AddToken("#", 0, A_nOperatorDefStatus,
gotoPreprocessor);
aStateMachine.AddToken("#undef",0, A_nOperatorDefStatus,
gotoPreprocessor);
aStateMachine.AddToken("#unblock-",
- 0, A_nOperatorDefStatus,
gotoUnblockMacro);
+ 0,
A_nOperatorDefStatus, gotoUnblockMacro);
aStateMachine.AddToken("/*", 0, A_nOperatorDefStatus,
gotoComment);
aStateMachine.AddToken("//", 0, A_nOperatorDefStatus,
gotoComment);
aStateMachine.AddToken("/**", 0, A_nOperatorDefStatus,
gotoDocu);
@@ -510,7 +505,7 @@ Context_CppStd::SetupStateMachine()
// regular
aStateMachine.AddToken("\r\n", 0, A_nOperatorDefStatus, finEOL);
aStateMachine.AddToken("\n", 0, A_nOperatorDefStatus, finEOL);
- aStateMachine.AddToken("\r", 0, A_nOperatorDefStatus, finEOL);
+ aStateMachine.AddToken("\r", 0, A_nOperatorDefStatus, finEOL);
// To ignore in some cases(may be only at preprocessor?),
but
// linecount has to be incremented.
aStateMachine.AddToken("\\\r\n",0, A_nOperatorDefStatus, finEOL);
@@ -518,5 +513,6 @@ Context_CppStd::SetupStateMachine()
aStateMachine.AddToken("\\\r", 0, A_nOperatorDefStatus, finEOL);
};
+} // namespace cpp
-} // namespace cpp
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/cppuhelper/source/interfacecontainer.cxx
b/main/cppuhelper/source/interfacecontainer.cxx
index 3ca1289516..1f7aa4b9a0 100644
--- a/main/cppuhelper/source/interfacecontainer.cxx
+++ b/main/cppuhelper/source/interfacecontainer.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_cppuhelper.hxx"
@@ -35,7 +33,6 @@
#include <com/sun/star/lang/XEventListener.hpp>
-
using namespace osl;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -43,8 +40,6 @@ using namespace com::sun::star::lang;
namespace cppu
{
-//===================================================================
-//===================================================================
//===================================================================
/**
* Reallocate the sequence.
@@ -75,8 +70,6 @@ static void sequenceRemoveElementAt( Sequence< Reference<
XInterface > > & rSeq,
rSeq = aDestSeq;
}
-
-//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
#ifdef _MSC_VER
@@ -84,8 +77,7 @@ static void sequenceRemoveElementAt( Sequence< Reference<
XInterface > > & rSeq,
#endif
//===================================================================
-//===================================================================
-//===================================================================
+
OInterfaceIteratorHelper::OInterfaceIteratorHelper( OInterfaceContainerHelper
& rCont_ )
SAL_THROW( () )
: rCont( rCont_ )
@@ -156,7 +148,7 @@ void OInterfaceIteratorHelper::remove() SAL_THROW( () )
{
OSL_ASSERT( nRemain >= 0 &&
nRemain <
aData.pAsSequence->getLength() );
- XInterface * p = aData.pAsSequence->getConstArray()[nRemain].get();
+ XInterface * p =
aData.pAsSequence->getConstArray()[nRemain].get();
rCont.removeInterface( * reinterpret_cast< const Reference<
XInterface > * >( &p ) );
}
else
@@ -167,9 +159,6 @@ void OInterfaceIteratorHelper::remove() SAL_THROW( () )
}
//===================================================================
-//===================================================================
-//===================================================================
-
OInterfaceContainerHelper::OInterfaceContainerHelper( Mutex & rMutex_ )
SAL_THROW( () )
: rMutex( rMutex_ )
@@ -274,7 +263,7 @@ sal_Int32 OInterfaceContainerHelper::removeInterface( const
Reference<XInterface
sal_Int32 i;
for( i = 0; i < nLen; i++ )
{
- // It is not valid to compare the Pointer direkt, but
is is is much
+ // It is not valid to compare the Pointer directly, but
is is is much
// more faster.
if( pL[i].get() == rListener.get() )
{
@@ -320,7 +309,7 @@ void OInterfaceContainerHelper::disposeAndClear( const
EventObject & rEvt ) SAL_
{
ClearableMutexGuard aGuard( rMutex );
OInterfaceIteratorHelper aIt( *this );
- // Container freigeben, falls im disposing neue Eintr�ge kommen
+ // Container freigeben, falls im disposing neue Einträge kommen
OSL_ENSURE( !bIsList || bInUse, "OInterfaceContainerHelper not in use"
);
if( !bIsList && aData.pAsInterface )
aData.pAsInterface->release();
@@ -350,7 +339,7 @@ void OInterfaceContainerHelper::clear() SAL_THROW( () )
{
ClearableMutexGuard aGuard( rMutex );
OInterfaceIteratorHelper aIt( *this );
- // Container freigeben, falls im disposing neue Eintr�ge kommen
+ // Container freigeben, falls im disposing neue Einträge kommen
OSL_ENSURE( !bIsList || bInUse, "OInterfaceContainerHelper not in use"
);
if( !bIsList && aData.pAsInterface )
aData.pAsInterface->release();
@@ -362,8 +351,6 @@ void OInterfaceContainerHelper::clear() SAL_THROW( () )
aGuard.clear();
}
-//##################################################################################################
-//##################################################################################################
//##################################################################################################
// specialized class for type
@@ -371,15 +358,15 @@ void OInterfaceContainerHelper::clear() SAL_THROW( () )
typedef ::std::vector< std::pair < Type , void* > > t_type2ptr;
OMultiTypeInterfaceContainerHelper::OMultiTypeInterfaceContainerHelper( Mutex
& rMutex_ )
- SAL_THROW( () )
- : rMutex( rMutex_ )
+ SAL_THROW( () )
+ : rMutex( rMutex_ )
{
m_pMap = new t_type2ptr();
}
OMultiTypeInterfaceContainerHelper::~OMultiTypeInterfaceContainerHelper()
- SAL_THROW( () )
+ SAL_THROW( () )
{
- t_type2ptr * pMap = (t_type2ptr *)m_pMap;
+ t_type2ptr * pMap = (t_type2ptr *)m_pMap;
t_type2ptr::iterator iter = pMap->begin();
t_type2ptr::iterator end = pMap->end();
@@ -392,9 +379,9 @@
OMultiTypeInterfaceContainerHelper::~OMultiTypeInterfaceContainerHelper()
delete pMap;
}
Sequence< Type > OMultiTypeInterfaceContainerHelper::getContainedTypes() const
- SAL_THROW( () )
+ SAL_THROW( () )
{
- t_type2ptr * pMap = (t_type2ptr *)m_pMap;
+ t_type2ptr * pMap = (t_type2ptr *)m_pMap;
t_type2ptr::size_type nSize;
::osl::MutexGuard aGuard( rMutex );
@@ -431,65 +418,65 @@ static t_type2ptr::iterator findType(t_type2ptr *pMap,
const Type & rKey )
t_type2ptr::iterator end = pMap->end();
while( iter != end )
- {
- if (iter->first == rKey)
- break;
- iter++;
- }
- return iter;
+ {
+ if (iter->first == rKey)
+ break;
+ iter++;
+ }
+ return iter;
}
OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelper::getContainer(
const Type & rKey ) const
- SAL_THROW( () )
+ SAL_THROW( () )
{
::osl::MutexGuard aGuard( rMutex );
- t_type2ptr * pMap = (t_type2ptr *)m_pMap;
+ t_type2ptr * pMap = (t_type2ptr *)m_pMap;
t_type2ptr::iterator iter = findType( pMap, rKey );
if( iter != pMap->end() )
return (OInterfaceContainerHelper*) (*iter).second;
return 0;
}
sal_Int32 OMultiTypeInterfaceContainerHelper::addInterface(
- const Type & rKey, const Reference< XInterface > & rListener )
- SAL_THROW( () )
+ const Type & rKey, const Reference< XInterface > & rListener )
+ SAL_THROW( () )
{
::osl::MutexGuard aGuard( rMutex );
- t_type2ptr * pMap = (t_type2ptr *)m_pMap;
+ t_type2ptr * pMap = (t_type2ptr *)m_pMap;
t_type2ptr::iterator iter = findType( pMap, rKey );
if( iter == pMap->end() )
{
OInterfaceContainerHelper * pLC = new
OInterfaceContainerHelper( rMutex );
- pMap->push_back(std::pair<Type, void*>(rKey, pLC));
+ pMap->push_back(std::pair<Type, void*>(rKey, pLC));
return pLC->addInterface( rListener );
}
else
return
((OInterfaceContainerHelper*)(*iter).second)->addInterface( rListener );
}
sal_Int32 OMultiTypeInterfaceContainerHelper::removeInterface(
- const Type & rKey, const Reference< XInterface > & rListener )
- SAL_THROW( () )
+ const Type & rKey, const Reference< XInterface > & rListener )
+ SAL_THROW( () )
{
::osl::MutexGuard aGuard( rMutex );
// search container with id nUik
- t_type2ptr * pMap = (t_type2ptr *)m_pMap;
+ t_type2ptr * pMap = (t_type2ptr *)m_pMap;
t_type2ptr::iterator iter = findType( pMap, rKey );
// container found?
if( iter != pMap->end() )
- return ((OInterfaceContainerHelper*)(*iter).second)->removeInterface(
rListener );
+ return
((OInterfaceContainerHelper*)(*iter).second)->removeInterface( rListener );
// no container with this id. Always return 0
return 0;
}
void OMultiTypeInterfaceContainerHelper::disposeAndClear( const EventObject &
rEvt )
- SAL_THROW( () )
+ SAL_THROW( () )
{
t_type2ptr::size_type nSize = 0;
OInterfaceContainerHelper ** ppListenerContainers = NULL;
{
::osl::MutexGuard aGuard( rMutex );
- t_type2ptr * pMap = (t_type2ptr *)m_pMap;
+ t_type2ptr * pMap = (t_type2ptr *)m_pMap;
nSize = pMap->size();
if( nSize )
{
@@ -520,10 +507,10 @@ void OMultiTypeInterfaceContainerHelper::disposeAndClear(
const EventObject & rE
delete [] ppListenerContainers;
}
void OMultiTypeInterfaceContainerHelper::clear()
- SAL_THROW( () )
+ SAL_THROW( () )
{
::osl::MutexGuard aGuard( rMutex );
- t_type2ptr * pMap = (t_type2ptr *)m_pMap;
+ t_type2ptr * pMap = (t_type2ptr *)m_pMap;
t_type2ptr::iterator iter = pMap->begin();
t_type2ptr::iterator end = pMap->end();
@@ -534,9 +521,6 @@ void OMultiTypeInterfaceContainerHelper::clear()
}
}
-
-//##################################################################################################
-//##################################################################################################
//##################################################################################################
// specialized class for long
@@ -549,28 +533,28 @@ static t_long2ptr::iterator findLong(t_long2ptr *pMap,
sal_Int32 nKey )
t_long2ptr::iterator end = pMap->end();
while( iter != end )
- {
- if (iter->first == nKey)
- break;
- iter++;
- }
- return iter;
+ {
+ if (iter->first == nKey)
+ break;
+ iter++;
+ }
+ return iter;
}
OMultiTypeInterfaceContainerHelperInt32::OMultiTypeInterfaceContainerHelperInt32(
Mutex & rMutex_ )
- SAL_THROW( () )
- : m_pMap( NULL )
- , rMutex( rMutex_ )
+ SAL_THROW( () )
+ : m_pMap( NULL )
+ , rMutex( rMutex_ )
{
- // delay pMap allocation until necessary.
+ // delay pMap allocation until necessary.
}
OMultiTypeInterfaceContainerHelperInt32::~OMultiTypeInterfaceContainerHelperInt32()
- SAL_THROW( () )
+ SAL_THROW( () )
{
- if (!m_pMap)
- return;
+ if (!m_pMap)
+ return;
- t_long2ptr * pMap = (t_long2ptr *)m_pMap;
+ t_long2ptr * pMap = (t_long2ptr *)m_pMap;
t_long2ptr::iterator iter = pMap->begin();
t_long2ptr::iterator end = pMap->end();
@@ -583,9 +567,9 @@
OMultiTypeInterfaceContainerHelperInt32::~OMultiTypeInterfaceContainerHelperInt3
delete pMap;
}
Sequence< sal_Int32 >
OMultiTypeInterfaceContainerHelperInt32::getContainedTypes() const
- SAL_THROW( () )
+ SAL_THROW( () )
{
- t_long2ptr * pMap = (t_long2ptr *)m_pMap;
+ t_long2ptr * pMap = (t_long2ptr *)m_pMap;
t_long2ptr::size_type nSize;
::osl::MutexGuard aGuard( rMutex );
@@ -597,7 +581,7 @@ Sequence< sal_Int32 >
OMultiTypeInterfaceContainerHelperInt32::getContainedTypes
t_long2ptr::iterator iter = pMap->begin();
t_long2ptr::iterator end = pMap->end();
-
+
sal_Int32 i = 0;
while( iter != end )
{
@@ -616,65 +600,65 @@ Sequence< sal_Int32 >
OMultiTypeInterfaceContainerHelperInt32::getContainedTypes
return ::com::sun::star::uno::Sequence< sal_Int32 >();
}
OInterfaceContainerHelper *
OMultiTypeInterfaceContainerHelperInt32::getContainer( const sal_Int32 & rKey )
const
- SAL_THROW( () )
+ SAL_THROW( () )
{
::osl::MutexGuard aGuard( rMutex );
- if (!m_pMap)
- return 0;
- t_long2ptr * pMap = (t_long2ptr *)m_pMap;
+ if (!m_pMap)
+ return 0;
+ t_long2ptr * pMap = (t_long2ptr *)m_pMap;
t_long2ptr::iterator iter = findLong( pMap, rKey );
if( iter != pMap->end() )
return (OInterfaceContainerHelper*) (*iter).second;
return 0;
}
sal_Int32 OMultiTypeInterfaceContainerHelperInt32::addInterface(
- const sal_Int32 & rKey, const Reference< XInterface > & rListener )
- SAL_THROW( () )
+ const sal_Int32 & rKey, const Reference< XInterface > & rListener )
+ SAL_THROW( () )
{
::osl::MutexGuard aGuard( rMutex );
- if (!m_pMap)
- m_pMap = new t_long2ptr();
- t_long2ptr * pMap = (t_long2ptr *)m_pMap;
+ if (!m_pMap)
+ m_pMap = new t_long2ptr();
+ t_long2ptr * pMap = (t_long2ptr *)m_pMap;
t_long2ptr::iterator iter = findLong( pMap, rKey );
if( iter == pMap->end() )
{
OInterfaceContainerHelper * pLC = new
OInterfaceContainerHelper( rMutex );
- pMap->push_back(std::pair< sal_Int32, void* >(rKey, pLC));
+ pMap->push_back(std::pair< sal_Int32, void* >(rKey, pLC));
return pLC->addInterface( rListener );
}
else
return
((OInterfaceContainerHelper*)(*iter).second)->addInterface( rListener );
}
sal_Int32 OMultiTypeInterfaceContainerHelperInt32::removeInterface(
- const sal_Int32 & rKey, const Reference< XInterface > & rListener )
- SAL_THROW( () )
+ const sal_Int32 & rKey, const Reference< XInterface > & rListener )
+ SAL_THROW( () )
{
::osl::MutexGuard aGuard( rMutex );
- if (!m_pMap)
- return 0;
+ if (!m_pMap)
+ return 0;
// search container with id nUik
- t_long2ptr * pMap = (t_long2ptr *)m_pMap;
+ t_long2ptr * pMap = (t_long2ptr *)m_pMap;
t_long2ptr::iterator iter = findLong( pMap, rKey );
// container found?
if( iter != pMap->end() )
- return ((OInterfaceContainerHelper*)(*iter).second)->removeInterface(
rListener );
+ return
((OInterfaceContainerHelper*)(*iter).second)->removeInterface( rListener );
// no container with this id. Always return 0
return 0;
}
void OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const
EventObject & rEvt )
- SAL_THROW( () )
+ SAL_THROW( () )
{
t_long2ptr::size_type nSize = 0;
OInterfaceContainerHelper ** ppListenerContainers = NULL;
{
::osl::MutexGuard aGuard( rMutex );
- if (!m_pMap)
- return;
+ if (!m_pMap)
+ return;
- t_long2ptr * pMap = (t_long2ptr *)m_pMap;
+ t_long2ptr * pMap = (t_long2ptr *)m_pMap;
nSize = pMap->size();
if( nSize )
{
@@ -705,12 +689,12 @@ void
OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const EventObject
delete [] ppListenerContainers;
}
void OMultiTypeInterfaceContainerHelperInt32::clear()
- SAL_THROW( () )
+ SAL_THROW( () )
{
::osl::MutexGuard aGuard( rMutex );
- if (!m_pMap)
- return;
- t_long2ptr * pMap = (t_long2ptr *)m_pMap;
+ if (!m_pMap)
+ return;
+ t_long2ptr * pMap = (t_long2ptr *)m_pMap;
t_long2ptr::iterator iter = pMap->begin();
t_long2ptr::iterator end = pMap->end();
@@ -722,3 +706,5 @@ void OMultiTypeInterfaceContainerHelperInt32::clear()
}
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/cui/source/dialogs/hlmarkwn.cxx
b/main/cui/source/dialogs/hlmarkwn.cxx
index 0fb7c3c641..fe24b07cae 100644
--- a/main/cui/source/dialogs/hlmarkwn.cxx
+++ b/main/cui/source/dialogs/hlmarkwn.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_cui.hxx"
@@ -51,9 +49,7 @@ using namespace ::com::sun::star;
using namespace ::rtl;
/*************************************************************************
-|*
|* Userdata-struct for tree-entries
-|*
|************************************************************************/
struct TargetData
@@ -71,9 +67,7 @@ struct TargetData
//########################################################################
-//# #
//# Tree-Window #
-//# #
//########################################################################
SvxHlmarkTreeLBox::SvxHlmarkTreeLBox( Window* pParent, const ResId& rResId )
@@ -113,15 +107,11 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect )
}
//########################################################################
-//# #
//# Window-Class #
-//# #
//########################################################################
/*************************************************************************
-|*
|* Constructor / Destructor
-|*
|************************************************************************/
SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
@@ -130,7 +120,7 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd(
SvxHyperlinkTabPageBase *pParent )
maBtClose( this, CUI_RES (BT_CLOSE) ),
maLbTree ( this, CUI_RES (TLB_MARK) ),
mbUserMoved ( sal_False ),
- mbFirst ( sal_True ),
+ mbFirst ( sal_True ),
mpParent ( pParent ),
mnError ( LERR_NOERROR )
{
@@ -144,9 +134,9 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd(
SvxHyperlinkTabPageBase *pParent )
maLbTree.SetStyle( maLbTree.GetStyle() | WB_TABSTOP | WB_BORDER |
WB_HASLINES |
WB_HASBUTTONS |
//WB_HASLINESATROOT |
WB_HSCROLL |
WB_HASBUTTONSATROOT );
-
- maLbTree.SetAccessibleName(String(CUI_RES(STR_MARK_TREE)));
-
+
+ maLbTree.SetAccessibleName(String(CUI_RES(STR_MARK_TREE)));
+
}
SvxHlinkDlgMarkWnd::~SvxHlinkDlgMarkWnd()
@@ -155,9 +145,7 @@ SvxHlinkDlgMarkWnd::~SvxHlinkDlgMarkWnd()
}
/*************************************************************************
-|*
|* Set an errorstatus
-|*
|************************************************************************/
sal_uInt16 SvxHlinkDlgMarkWnd::SetError( sal_uInt16 nError)
@@ -174,9 +162,7 @@ sal_uInt16 SvxHlinkDlgMarkWnd::SetError( sal_uInt16 nError)
}
/*************************************************************************
-|*
|* Move window
-|*
|************************************************************************/
sal_Bool SvxHlinkDlgMarkWnd::MoveTo ( Point aNewPos )
@@ -209,14 +195,12 @@ sal_Bool SvxHlinkDlgMarkWnd::ConnectToDialog( sal_Bool
bDoit )
}
/*************************************************************************
-|*
|* Interface to refresh tree
-|*
|************************************************************************/
void SvxHlinkDlgMarkWnd::RefreshTree ( String aStrURL )
{
- String aEmptyStr;
+ String aEmptyStr;
OUString aUStrURL;
EnterWait();
@@ -243,9 +227,7 @@ void SvxHlinkDlgMarkWnd::RefreshTree ( String aStrURL )
}
/*************************************************************************
-|*
|* get links from document
-|*
|************************************************************************/
sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL )
@@ -336,9 +318,7 @@ void SvxHlinkDlgMarkWnd::Error(int nNr)
}
*/
/*************************************************************************
-|*
|* Fill Tree-Control
-|*
|************************************************************************/
int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess >
xLinks, SvLBoxEntry* pParentEntry )
@@ -348,7 +328,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference<
container::XNameAccess > xLink
const sal_uLong nLinks = aNames.getLength();
const OUString* pNames = aNames.getConstArray();
- Color aMaskColor( COL_LIGHTMAGENTA );
+ Color aMaskColor( COL_LIGHTMAGENTA );
const OUString aProp_LinkDisplayName( RTL_CONSTASCII_USTRINGPARAM(
"LinkDisplayName" ) );
const OUString aProp_LinkTarget( RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.document.LinkTarget" ) );
const OUString aProp_LinkDisplayBitmap( RTL_CONSTASCII_USTRINGPARAM(
"LinkDisplayBitmap" ) );
@@ -383,7 +363,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference<
container::XNameAccess > xLink
aAny >>= aDisplayName;
String aStrDisplayname ( aDisplayName );
- // is it a target ?
+ // is it a target?
uno::Reference< lang::XServiceInfo > xSI(
xTarget, uno::UNO_QUERY );
sal_Bool bIsTarget = xSI->supportsService(
aProp_LinkTarget );
@@ -398,16 +378,16 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference<
container::XNameAccess > xLink
uno::Reference< awt::XBitmap >
aXBitmap( xTarget->getPropertyValue( aProp_LinkDisplayBitmap ), uno::UNO_QUERY
);
if( aXBitmap.is() )
{
- Image aBmp( VCLUnoHelper::GetBitmap( aXBitmap
).GetBitmap(), aMaskColor );
- // insert Displayname into treelist with bitmaps
+ Image aBmp(
VCLUnoHelper::GetBitmap( aXBitmap ).GetBitmap(), aMaskColor );
+ // insert Displayname into
treelist with bitmaps
pEntry = maLbTree.InsertEntry (
aStrDisplayname,
- aBmp, aBmp,
+
aBmp, aBmp,
pParentEntry,
sal_False, LIST_APPEND,
(void*)pData );
- maLbTree.SetExpandedEntryBmp( pEntry, aBmp,
BMP_COLOR_HIGHCONTRAST );
- maLbTree.SetCollapsedEntryBmp( pEntry, aBmp,
BMP_COLOR_HIGHCONTRAST );
- nEntries++;
+ maLbTree.SetExpandedEntryBmp(
pEntry, aBmp, BMP_COLOR_HIGHCONTRAST );
+ maLbTree.SetCollapsedEntryBmp(
pEntry, aBmp, BMP_COLOR_HIGHCONTRAST );
+ nEntries++;
}
else
{
@@ -443,9 +423,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference<
container::XNameAccess > xLink
}
/*************************************************************************
-|*
|* Clear Tree
-|*
|************************************************************************/
void SvxHlinkDlgMarkWnd::ClearTree()
@@ -464,9 +442,7 @@ void SvxHlinkDlgMarkWnd::ClearTree()
}
/*************************************************************************
-|*
|* Find Entry for String
-|*
|************************************************************************/
SvLBoxEntry* SvxHlinkDlgMarkWnd::FindEntry ( String aStrName )
@@ -487,9 +463,7 @@ SvLBoxEntry* SvxHlinkDlgMarkWnd::FindEntry ( String
aStrName )
}
/*************************************************************************
-|*
|* Select Entry
-|*
|************************************************************************/
void SvxHlinkDlgMarkWnd::SelectEntry ( String aStrMark )
@@ -503,9 +477,7 @@ void SvxHlinkDlgMarkWnd::SelectEntry ( String aStrMark )
}
/*************************************************************************
-|*
|* Click on Apply-Button / Doubleclick on item in tree
-|*
|************************************************************************/
IMPL_LINK ( SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, void *, EMPTYARG )
@@ -527,14 +499,14 @@ IMPL_LINK ( SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, void
*, EMPTYARG )
}
/*************************************************************************
-|*
|* Click on Close-Button
-|*
|************************************************************************/
IMPL_LINK ( SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl, void *, EMPTYARG )
{
- Close();
+ Close();
return( 0L );
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/cui/source/inc/cuitabarea.hxx
b/main/cui/source/inc/cuitabarea.hxx
index 19977ba227..ae9422ee75 100644
--- a/main/cui/source/inc/cuitabarea.hxx
+++ b/main/cui/source/inc/cuitabarea.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 _CUI_TAB_AREA_HXX
#define _CUI_TAB_AREA_HXX
@@ -29,9 +28,7 @@
#include <svx/SvxColorValueSet.hxx>
/*************************************************************************
-|*
-|* Fl"achen-Tab-Dialog
-|*
+|* Flächen-Tab-Dialog
\************************************************************************/
class SvxAreaTabDialog : public SfxTabDialog
@@ -92,9 +89,7 @@ public:
};
/*************************************************************************
-|*
|* Transparence-Tab-Page
-|*
\************************************************************************/
class SvxTransparenceTabPage : public SvxTabPage
@@ -173,15 +168,13 @@ public:
//CHINA001 void SetPageType(sal_uInt16 *pInType) { pPageType = pInType;
}
//CHINA001 void SetDlgType(sal_uInt16* pInType) { pDlgType = pInType; }
- void SetPageType(sal_uInt16 nInType) { nPageType = nInType; } //add
CHINA001
- void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; }//add
CHINA001
- virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+ void SetPageType(sal_uInt16 nInType) { nPageType = nInType; } //add
CHINA001
+ void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; }//add
CHINA001
+ virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
};
/*************************************************************************
-|*
-|* Fl"achen-Tab-Page
-|*
+|* Flächen-Tab-Page
\************************************************************************/
class SvxAreaTabPage : public SvxTabPage
@@ -312,13 +305,13 @@ public:
void SetBitmapList( XBitmapListSharedPtr aBmpLst) { maBitmapList =
aBmpLst; }
//CHINA001 void SetPageType( sal_uInt16* pInType ) { pPageType =
pInType; }
- void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
//add CHINA001
+ void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
//add CHINA001
//CHINA001 void SetDlgType( sal_uInt16* pInType ) { pDlgType =
pInType; }
- void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }//add
CHINA001
+ void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }//add
CHINA001
//CHINA001 void SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
- void SetPos( sal_uInt16 nInPos ) { nPos = nInPos; }//add CHINA001
+ void SetPos( sal_uInt16 nInPos ) { nPos = nInPos; }//add CHINA001
void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
- virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+ virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
void SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; }
void SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; }
@@ -326,9 +319,7 @@ public:
};
/*************************************************************************
-|*
|* Schatten-Tab-Page
-|*
\************************************************************************/
class SvxShadowTabPage : public SvxTabPage
@@ -354,8 +345,8 @@ private:
XColorListSharedPtr maColorTab;
ChangeType* pnColorTableState;
- sal_uInt16 nPageType; //add CHINA001
- sal_uInt16 nDlgType; //add CHINA001
+ sal_uInt16 nPageType; // add CHINA001
+ sal_uInt16 nDlgType; // add CHINA001
sal_uInt16* pPos;
sal_Bool* pbAreaTP;
@@ -387,18 +378,16 @@ public:
void SetColorTable( XColorListSharedPtr aColTab ) { maColorTab =
aColTab; }
//CHINA001 void SetPageType( sal_uInt16* pInType ) { pPageType =
pInType; }
//CHINA001 void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType;
}
- void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
//add CHINA001
- void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
//add CHINA001
+ void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
//add CHINA001
+ void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
//add CHINA001
void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
- virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+ virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
void DisablePage( sal_Bool bIn ) { bDisable = bIn; }
};
/*************************************************************************
-|*
|* Farbverlauf-Tab-Page
-|*
\************************************************************************/
class SvxGradientTabPage : public SfxTabPage
@@ -488,9 +477,7 @@ public:
};
/*************************************************************************
-|*
|* Schraffuren-Tab-Page
-|*
\************************************************************************/
class SvxHatchTabPage : public SvxTabPage
@@ -579,9 +566,7 @@ public:
};
/*************************************************************************
-|*
|* Bitmap-Tab-Page
-|*
\************************************************************************/
class SvxBitmapTabPage : public SvxTabPage
@@ -680,9 +665,7 @@ public:
};
/*************************************************************************
-|*
|* Farben-Tab-Page
-|*
\************************************************************************/
class SvxColorTabPage : public SfxTabPage
@@ -751,16 +734,16 @@ private:
void ImpColorCountChanged();
//-----------------------------------------------------------------------------------------------------
- DECL_LINK( ClickAddHdl_Impl, void * ); // Button 'Hinzufuegen'
- DECL_LINK( ClickModifyHdl_Impl, void * ); // Button 'Aendern'
- DECL_LINK( ClickDeleteHdl_Impl, void * ); // Button 'loeschen'
+ DECL_LINK( ClickAddHdl_Impl, void * ); // Button 'Hinzufügen'
+ DECL_LINK( ClickModifyHdl_Impl, void * ); // Button 'Ändern'
+ DECL_LINK( ClickDeleteHdl_Impl, void * ); // Button 'löschen'
DECL_LINK( ClickWorkOnHdl_Impl, void * ); // Button 'Bearbeiten'
- DECL_LINK( SelectColorLBHdl_Impl, void * ); // Farbe aus Listbox
ausw�hlen
- DECL_LINK( SelectValSetHdl_Impl, void * ); // Farbe aus
Farbpalette (links) ausw�hlen
+ DECL_LINK( SelectColorLBHdl_Impl, void * ); // Farbe aus Listbox
auswählen
+ DECL_LINK( SelectValSetHdl_Impl, void * ); // Farbe aus
Farbpalette (links) auswählen
DECL_LINK( SelectColorModelHdl_Impl, void * ); // Auswahl Listbox
'Farbmodell'
long ChangeColorHdl_Impl( void* p );
- DECL_LINK( ModifiedHdl_Impl, void * ); // Inhalt der
Farbwerte-Felder wurde ver�ndert
+ DECL_LINK( ModifiedHdl_Impl, void * ); // Inhalt der
Farbwerte-Felder wurde verändert
DECL_LINK( ClickLoadHdl_Impl, void * ); // Button 'Farbtabelle
laden'
DECL_LINK( ClickSaveHdl_Impl, void * ); // Button 'Farbtabelle
sichern'
@@ -793,3 +776,5 @@ public:
#endif // _CUI_TAB_AREA_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/dbaccess/source/ui/tabledesign/TEditControl.cxx
b/main/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 445c4c72d7..af59ea727d 100644
--- a/main/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/main/dbaccess/source/ui/tabledesign/TEditControl.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_dbui.hxx"
#ifndef DBAUI_TABLEEDITORCONTROL_HXX
@@ -71,7 +69,7 @@
#ifndef DBAUI_FIELDDESCRIPTIONS_HXX
#include "FieldDescriptions.hxx"
#endif
-#ifndef _SV_MSGBOX_HXX
+#ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
#endif
#ifndef DBAUI_TABLEUNDO_HXX
@@ -89,7 +87,7 @@
#ifndef DBAUI_TABLEROW_EXCHANGE_HXX
#include "TableRowExchange.hxx"
#endif
-#ifndef _SOT_STORAGE_HXX
+#ifndef _SOT_STORAGE_HXX
#include <sot/storage.hxx>
#endif
#ifndef DBAUI_TOOLS_HXX
@@ -137,7 +135,7 @@ DBG_NAME(OTableEditorCtrl)
#define FIELDTYPE_WIDTH 150
#define FIELDDESCR_WIDTH 300
-// Maximale Eingabelaenge im Beschreibungsfeld
+// Maximale Eingabelänge im Beschreibungsfeld
#define MAX_DESCR_LEN 256
@@ -156,7 +154,7 @@ DBG_NAME(ClipboardInvalidator)
OTableEditorCtrl::ClipboardInvalidator::ClipboardInvalidator(sal_uLong
nTimeout,OTableEditorCtrl* _pOwner)
: m_pOwner(_pOwner)
{
- DBG_CTOR(ClipboardInvalidator,NULL);
+ DBG_CTOR(ClipboardInvalidator,NULL);
m_aInvalidateTimer.SetTimeout(nTimeout);
m_aInvalidateTimer.SetTimeoutHdl(LINK(this,
OTableEditorCtrl::ClipboardInvalidator, OnInvalidate));
@@ -168,7 +166,7 @@
OTableEditorCtrl::ClipboardInvalidator::~ClipboardInvalidator()
{
m_aInvalidateTimer.Stop();
- DBG_DTOR(ClipboardInvalidator,NULL);
+ DBG_DTOR(ClipboardInvalidator,NULL);
}
//------------------------------------------------------------------
@@ -187,34 +185,34 @@ void OTableEditorCtrl::Init()
OTableRowView::Init();
//////////////////////////////////////////////////////////////////////
- // Soll der Entwurf ReadOnly geoeffnet werden ?
+ // Soll der Entwurf ReadOnly geöffnet werden ?
sal_Bool bRead(GetView()->getController().isReadOnly());
SetReadOnly( bRead );
//////////////////////////////////////////////////////////////////////
- // Spalten einfuegen
+ // Spalten einfügen
String aColumnName( ModuleRes(STR_TAB_FIELD_COLUMN_NAME) );
InsertDataColumn( FIELD_NAME, aColumnName, FIELDNAME_WIDTH );
aColumnName = String( ModuleRes(STR_TAB_FIELD_COLUMN_DATATYPE) );
InsertDataColumn( FIELD_TYPE, aColumnName, FIELDTYPE_WIDTH );
- ::dbaccess::ODsnTypeCollection
aDsnTypes(GetView()->getController().getORB());
- sal_Bool bShowColumnDescription =
aDsnTypes.supportsColumnDescription(::comphelper::getString(GetView()->getController().getDataSource()->getPropertyValue(PROPERTY_URL)));
+ ::dbaccess::ODsnTypeCollection
aDsnTypes(GetView()->getController().getORB());
+ sal_Bool bShowColumnDescription =
aDsnTypes.supportsColumnDescription(::comphelper::getString(GetView()->getController().getDataSource()->getPropertyValue(PROPERTY_URL)));
aColumnName = String( ModuleRes(STR_TAB_HELP_TEXT) );
- InsertDataColumn( HELP_TEXT, aColumnName, bShowColumnDescription ?
FIELDTYPE_WIDTH : FIELDDESCR_WIDTH );
+ InsertDataColumn( HELP_TEXT, aColumnName, bShowColumnDescription ?
FIELDTYPE_WIDTH : FIELDDESCR_WIDTH );
- if ( bShowColumnDescription )
- {
- aColumnName = String( ModuleRes(STR_COLUMN_DESCRIPTION) );
- InsertDataColumn( COLUMN_DESCRIPTION, aColumnName, FIELDTYPE_WIDTH
);
- }
+ if ( bShowColumnDescription )
+ {
+ aColumnName = String( ModuleRes(STR_COLUMN_DESCRIPTION) );
+ InsertDataColumn( COLUMN_DESCRIPTION, aColumnName,
FIELDTYPE_WIDTH );
+ }
InitCellController();
//////////////////////////////////////////////////////////////////////
- // Zeilen einfuegen
+ // Zeilen einfügen
RowInserted(0, m_pRowList->size(), sal_True);
}
@@ -230,24 +228,24 @@ void OTableEditorCtrl::UpdateAll()
}
//==================================================================
OTableEditorCtrl::OTableEditorCtrl(Window* pWindow)
- :OTableRowView(pWindow)
- ,pNameCell(NULL)
- ,pTypeCell(NULL)
- ,pHelpTextCell(NULL)
- ,pDescrCell(NULL)
- ,pDescrWin(NULL)
- ,nIndexEvent(0)
- ,nCutEvent(0)
- ,nPasteEvent(0)
- ,nDeleteEvent(0)
- ,nInsNewRowsEvent(0)
- ,nInvalidateTypeEvent(0)
- ,nEntryNotFoundEvent(0)
- ,m_eChildFocus(NONE)
- ,nOldDataPos(-1)
- ,bSaveOnMove(sal_True)
- ,bReadOnly(sal_True)
- ,m_aInvalidate(500,this)
+ :OTableRowView(pWindow)
+ ,pNameCell(NULL)
+ ,pTypeCell(NULL)
+ ,pHelpTextCell(NULL)
+ ,pDescrCell(NULL)
+ ,pDescrWin(NULL)
+ ,nIndexEvent(0)
+ ,nCutEvent(0)
+ ,nPasteEvent(0)
+ ,nDeleteEvent(0)
+ ,nInsNewRowsEvent(0)
+ ,nInvalidateTypeEvent(0)
+ ,nEntryNotFoundEvent(0)
+ ,m_eChildFocus(NONE)
+ ,nOldDataPos(-1)
+ ,bSaveOnMove(sal_True)
+ ,bReadOnly(sal_True)
+ ,m_aInvalidate(500,this)
{
DBG_CTOR(OTableEditorCtrl,NULL);
@@ -276,8 +274,8 @@ void OTableEditorCtrl::SetReadOnly( sal_Bool bRead )
{
// nix zu tun ?
if (bRead == IsReadOnly())
- // diese Abfrage ist wichtig, da die zugrundeliegende Def sonst
im folgenden gelockt oder ge-unlocked wird, obwohl es
- // nicht notwendig waere (und was schlimmer ist, das wuerde
dann auch nicht wieder rueckgaengig gemacht)
+ // diese Abfrage ist wichtig, da die zugrundeliegende Def sonst
im folgenden gelocked oder ge-unlocked wird, obwohl es
+ // nicht notwendig wäre (und was schlimmer ist, das wuerde dann
auch nicht wieder rückgängig gemacht)
return;
DBG_CHKTHIS(OTableEditorCtrl,NULL);
@@ -323,7 +321,7 @@ void OTableEditorCtrl::InitCellController()
nMaxTextLen = ((xub_StrLen)xMetaData.is() ?
static_cast<xub_StrLen>(xMetaData->getMaxColumnNameLength()) : 0);
if( nMaxTextLen == 0 )
- nMaxTextLen = EDIT_NOLIMIT;
+ nMaxTextLen = EDIT_NOLIMIT;
sExtraNameChars = xMetaData.is() ?
xMetaData->getExtraNameCharacters() : ::rtl::OUString();
}
@@ -340,30 +338,30 @@ void OTableEditorCtrl::InitCellController()
//////////////////////////////////////////////////////////////////////
// Zelle Typ
pTypeCell = new ListBoxControl( &GetDataWindow() );
- pTypeCell->SetDropDownLineCount( 15 );
+ pTypeCell->SetDropDownLineCount( 15 );
//////////////////////////////////////////////////////////////////////
// Zelle Beschreibung
pDescrCell = new Edit( &GetDataWindow(), WB_LEFT );
pDescrCell->SetMaxTextLen( MAX_DESCR_LEN );
- pHelpTextCell = new Edit( &GetDataWindow(), WB_LEFT );
+ pHelpTextCell = new Edit( &GetDataWindow(), WB_LEFT );
pHelpTextCell->SetMaxTextLen( MAX_DESCR_LEN );
pNameCell->SetHelpId(HID_TABDESIGN_NAMECELL);
pTypeCell->SetHelpId(HID_TABDESIGN_TYPECELL);
pDescrCell->SetHelpId(HID_TABDESIGN_COMMENTCELL);
- pHelpTextCell->SetHelpId(HID_TABDESIGN_HELPTEXT);
-
- Size aHeight;
- const Control* pControls[] = {
pTypeCell,pDescrCell,pNameCell,pHelpTextCell};
- for(sal_Size i= 0; i < sizeof(pControls)/sizeof(pControls[0]);++i)
- {
- const Size aTemp( pControls[i]->GetOptimalSize(WINDOWSIZE_PREFERRED) );
- if ( aTemp.Height() > aHeight.Height() )
- aHeight.Height() = aTemp.Height();
- } // for(int i= 0; i < sizeof(pControls)/sizeof(pControls[0]);++i
- SetDataRowHeight(aHeight.Height());
+ pHelpTextCell->SetHelpId(HID_TABDESIGN_HELPTEXT);
+
+ Size aHeight;
+ const Control* pControls[] = {
pTypeCell,pDescrCell,pNameCell,pHelpTextCell};
+ for(sal_Size i= 0; i < sizeof(pControls)/sizeof(pControls[0]);++i)
+ {
+ const Size aTemp(
pControls[i]->GetOptimalSize(WINDOWSIZE_PREFERRED) );
+ if ( aTemp.Height() > aHeight.Height() )
+ aHeight.Height() = aTemp.Height();
+ } // for(int i= 0; i < sizeof(pControls)/sizeof(pControls[0]);++i
+ SetDataRowHeight(aHeight.Height());
ClearModified();
}
@@ -374,7 +372,7 @@ void OTableEditorCtrl::ClearModified()
DBG_CHKTHIS(OTableEditorCtrl,NULL);
pNameCell->ClearModifyFlag();
pDescrCell->ClearModifyFlag();
- pHelpTextCell->ClearModifyFlag();
+ pHelpTextCell->ClearModifyFlag();
pTypeCell->SaveValue();
}
@@ -383,11 +381,11 @@ OTableEditorCtrl::~OTableEditorCtrl()
{
DBG_DTOR(OTableEditorCtrl,NULL);
//////////////////////////////////////////////////////////////////////
- // Undo-Manager zuruecksetzen
+ // Undo-Manager zurücksetzen
GetUndoManager().Clear();
//////////////////////////////////////////////////////////////////////
- // Moegliche Events aus Queue entfernen
+ // Mögliche Events aus Queue entfernen
if( nCutEvent )
Application::RemoveUserEvent( nCutEvent );
if( nPasteEvent )
@@ -402,11 +400,11 @@ OTableEditorCtrl::~OTableEditorCtrl()
Application::RemoveUserEvent( nEntryNotFoundEvent );
//////////////////////////////////////////////////////////////////////
- // Controltypen zerstoeren
+ // Controltypen zerstören
delete pNameCell;
delete pTypeCell;
delete pDescrCell;
- delete pHelpTextCell;
+ delete pHelpTextCell;
}
//------------------------------------------------------------------------------
@@ -443,7 +441,7 @@ void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const
Rectangle& rRect,
const Point aPos(rRect.TopLeft());
const Size TxtSize(GetDataWindow().GetTextWidth(aText),
GetDataWindow().GetTextHeight());
- rDev.Push( PUSH_CLIPREGION );
+ rDev.Push( PUSH_CLIPREGION );
rDev.SetClipRegion( rRect );
rDev.DrawText( rRect, aText, TEXT_DRAW_LEFT | TEXT_DRAW_VCENTER );
rDev.Pop();
@@ -456,8 +454,8 @@ CellController* OTableEditorCtrl::GetController(long nRow,
sal_uInt16 nColumnId)
//////////////////////////////////////////////////////////////////////
// Wenn EditorCtrl ReadOnly ist, darf nicht editiert werden
Reference<XPropertySet> xTable = GetView()->getController().getTable();
- if (IsReadOnly() || ( xTable.is() &&
-
xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) &&
+ if (IsReadOnly() || ( xTable.is() &&
+
xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) &&
::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) ==
::rtl::OUString::createFromAscii("VIEW")))
return NULL;
@@ -476,16 +474,16 @@ CellController* OTableEditorCtrl::GetController(long
nRow, sal_uInt16 nColumnId)
if (pActFieldDescr &&
(pActFieldDescr->GetName().getLength() != 0))
return new ListBoxCellController( pTypeCell );
else return NULL;
- case HELP_TEXT:
- if (pActFieldDescr && (pActFieldDescr->GetName().getLength() != 0))
+ case HELP_TEXT:
+ if (pActFieldDescr &&
(pActFieldDescr->GetName().getLength() != 0))
return new EditCellController( pHelpTextCell );
- else
- return NULL;
+ else
+ return NULL;
case COLUMN_DESCRIPTION:
if (pActFieldDescr &&
(pActFieldDescr->GetName().getLength() != 0))
return new EditCellController( pDescrCell );
- else
- return NULL;
+ else
+ return NULL;
default:
return NULL;
}
@@ -517,27 +515,27 @@ void OTableEditorCtrl::InitController(CellControllerRef&,
long nRow, sal_uInt16
pTypeCell->Clear();
if( !pActFieldDescr )
break;
-
+
const OTypeInfoMap* pTypeInfo =
GetView()->getController().getTypeInfo();
OTypeInfoMap::const_iterator aIter =
pTypeInfo->begin();
- OTypeInfoMap::const_iterator aEnd = pTypeInfo->end();
+ OTypeInfoMap::const_iterator aEnd =
pTypeInfo->end();
for(;aIter != aEnd;++aIter)
pTypeCell->InsertEntry(
aIter->second->aUIName );
pTypeCell->SelectEntry( aInitString );
}
break;
- case HELP_TEXT:
- if( pActFieldDescr )
- aInitString = pActFieldDescr->GetHelpText();
+ case HELP_TEXT:
+ if( pActFieldDescr )
+ aInitString = pActFieldDescr->GetHelpText();
pHelpTextCell->SetText( aInitString );
- pHelpTextCell->SaveValue();
+ pHelpTextCell->SaveValue();
break;
case COLUMN_DESCRIPTION:
if( pActFieldDescr )
- aInitString = pActFieldDescr->GetDescription();
+ aInitString = pActFieldDescr->GetDescription();
pDescrCell->SetText( aInitString );
- pDescrCell->SaveValue();
+ pDescrCell->SaveValue();
break;
}
@@ -585,7 +583,7 @@ void OTableEditorCtrl::DisplayData(long nRow, sal_Bool
bGrabFocus)
// zur richtigen Zelle fahren
SetDataPtr(nRow);
- // Editier-Modus temporaer aus
+ // Editier-Modus temporär aus
sal_Bool bWasEditing = IsEditing();
if (bWasEditing)
DeactivateCell();
@@ -594,7 +592,7 @@ void OTableEditorCtrl::DisplayData(long nRow, sal_Bool
bGrabFocus)
InitController(aTemp, nRow, FIELD_NAME);
InitController(aTemp, nRow, FIELD_TYPE);
InitController(aTemp, nRow, COLUMN_DESCRIPTION);
- InitController(aTemp, nRow, HELP_TEXT);
+ InitController(aTemp, nRow, HELP_TEXT);
GoToRow(nRow);
// das Description-Window aktualisieren
@@ -612,7 +610,7 @@ void OTableEditorCtrl::CursorMoved()
{
DBG_CHKTHIS(OTableEditorCtrl,NULL);
//////////////////////////////////////////////////////////////////////
- // Zeilenwechsel ?
+ // Zeilenwechsel?
m_nDataPos = GetCurRow();
if( m_nDataPos != nOldDataPos && m_nDataPos != -1)
{
@@ -620,7 +618,7 @@ void OTableEditorCtrl::CursorMoved()
InitController(aTemp,m_nDataPos,FIELD_NAME);
InitController(aTemp,m_nDataPos,FIELD_TYPE);
InitController(aTemp,m_nDataPos,COLUMN_DESCRIPTION);
- InitController(aTemp,m_nDataPos,HELP_TEXT);
+ InitController(aTemp,m_nDataPos,HELP_TEXT);
}
OTableRowView::CursorMoved();
@@ -637,7 +635,7 @@ sal_Int32 OTableEditorCtrl::HasFieldName( const String&
rFieldName )
::comphelper::UStringMixEqual bCase(xMetaData.is() ?
xMetaData->supportsMixedCaseQuotedIdentifiers() : sal_True);
::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter =
m_pRowList->begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd =
m_pRowList->end();
+ ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd =
m_pRowList->end();
OFieldDescription* pFieldDescr;
sal_Int32 nCount(0);
for(;aIter != aEnd;++aIter)
@@ -694,17 +692,17 @@ sal_Bool OTableEditorCtrl::SaveData(long nRow, sal_uInt16
nColId)
//////////////////////////////////////////////////////////////
// Speichern Inhalt DescrCell
- case HELP_TEXT:
- {
+ case HELP_TEXT:
+ {
//////////////////////////////////////////////////////////////
// Wenn aktuelle Feldbeschreibung NULL, Default setzen
if( !pActFieldDescr )
- {
+ {
pHelpTextCell->SetText(String());
- pHelpTextCell->ClearModifyFlag();
- }
- else
- pActFieldDescr->SetHelpText( pHelpTextCell->GetText() );
+ pHelpTextCell->ClearModifyFlag();
+ }
+ else
+ pActFieldDescr->SetHelpText(
pHelpTextCell->GetText() );
break;
}
case COLUMN_DESCRIPTION:
@@ -712,11 +710,11 @@ sal_Bool OTableEditorCtrl::SaveData(long nRow, sal_uInt16
nColId)
//////////////////////////////////////////////////////////////
// Wenn aktuelle Feldbeschreibung NULL, Default setzen
if( !pActFieldDescr )
- {
+ {
pDescrCell->SetText(String());
- pDescrCell->ClearModifyFlag();
- }
- else
+ pDescrCell->ClearModifyFlag();
+ }
+ else
pActFieldDescr->SetDescription(
pDescrCell->GetText() );
break;
}
@@ -730,16 +728,16 @@ sal_Bool OTableEditorCtrl::SaveData(long nRow, sal_uInt16
nColId)
case FIELD_PROPERTY_BOOL_DEFAULT:
pDescrWin->SaveData(pActFieldDescr);
- if ( FIELD_PROPERTY_AUTOINC == nColId &&
pActFieldDescr->IsAutoIncrement() )
- {
- OTableController& rController = GetView()->getController();
- if ( rController.isAutoIncrementPrimaryKey() )
- {
- pActFieldDescr->SetPrimaryKey( true );
- InvalidateHandleColumn();
- Invalidate();
- }
- }
+ if ( FIELD_PROPERTY_AUTOINC == nColId &&
pActFieldDescr->IsAutoIncrement() )
+ {
+ OTableController& rController =
GetView()->getController();
+ if ( rController.isAutoIncrementPrimaryKey() )
+ {
+ pActFieldDescr->SetPrimaryKey( true );
+ InvalidateHandleColumn();
+ Invalidate();
+ }
+ }
break;
}
return sal_True;
@@ -768,7 +766,7 @@ sal_Bool OTableEditorCtrl::SaveModified()
{
//////////////////////////////////////////////////////////////////////
// Type umstellen
- resetType();
+ resetType();
} break;
}
@@ -838,15 +836,15 @@ void OTableEditorCtrl::CellModified( long nRow,
sal_uInt16 nColId )
SetDataPtr( nRow );
OFieldDescription* pActFieldDescr = pActRow->GetActFieldDescr();
- String sActionDescription;
- switch ( nColId )
- {
- case FIELD_NAME: sActionDescription = String( ModuleRes(
STR_CHANGE_COLUMN_NAME ) ); break;
- case FIELD_TYPE: sActionDescription = String( ModuleRes(
STR_CHANGE_COLUMN_TYPE ) ); break;
- case HELP_TEXT:
- case COLUMN_DESCRIPTION: sActionDescription = String( ModuleRes(
STR_CHANGE_COLUMN_DESCRIPTION ) ); break;
- default: sActionDescription = String( ModuleRes(
STR_CHANGE_COLUMN_ATTRIBUTE ) ); break;
- }
+ String sActionDescription;
+ switch ( nColId )
+ {
+ case FIELD_NAME: sActionDescription = String( ModuleRes(
STR_CHANGE_COLUMN_NAME ) ); break;
+ case FIELD_TYPE: sActionDescription = String( ModuleRes(
STR_CHANGE_COLUMN_TYPE ) ); break;
+ case HELP_TEXT:
+ case COLUMN_DESCRIPTION: sActionDescription = String( ModuleRes(
STR_CHANGE_COLUMN_DESCRIPTION ) ); break;
+ default: sActionDescription = String( ModuleRes(
STR_CHANGE_COLUMN_ATTRIBUTE ) ); break;
+ }
GetUndoManager().EnterListAction( sActionDescription, String() );
if (!pActFieldDescr)
@@ -873,9 +871,9 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16
nColId )
else
{
GetUndoManager().AddUndoAction(new
OTableEditorTypeSelUndoAct(this, GetCurRow(), nColId,
GetFieldDescr(GetCurRow())->getTypeInfo()));
- resetType();
+ resetType();
}
-
+
SaveData(nRow,nColId);
// SaveData could create a undo action as well
GetUndoManager().LeaveListAction();
@@ -883,7 +881,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16
nColId )
CellControllerRef xController(Controller());
if(xController.Is())
xController->SetModified();
-
+
//////////////////////////////////////////////////////////////////////
// Das ModifyFlag setzen
GetView()->getController().setModified( sal_True );
@@ -892,7 +890,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16
nColId )
//
-----------------------------------------------------------------------------
void OTableEditorCtrl::resetType()
{
- sal_uInt16 nPos = pTypeCell->GetSelectEntryPos();
+ sal_uInt16 nPos = pTypeCell->GetSelectEntryPos();
if(nPos != LISTBOX_ENTRY_NOTFOUND)
SwitchType( GetView()->getController().getTypeInfo(nPos) );
else
@@ -944,12 +942,12 @@ void OTableEditorCtrl::CopyRows()
for( long nIndex=FirstSelectedRow(); nIndex >= 0 && nIndex <
static_cast<long>(m_pRowList->size()); nIndex=NextSelectedRow() )
{
pRow = (*m_pRowList)[nIndex];
- OSL_ENSURE(pRow,"OTableEditorCtrl::CopyRows: Row is NULL!");
- if ( pRow && pRow->GetActFieldDescr() )
- {
- pClipboardRow.reset(new OTableRow( *pRow ));
- vClipboardList.push_back( pClipboardRow);
- }
+ OSL_ENSURE(pRow,"OTableEditorCtrl::CopyRows: Row is NULL!");
+ if ( pRow && pRow->GetActFieldDescr() )
+ {
+ pClipboardRow.reset(new OTableRow( *pRow ));
+ vClipboardList.push_back( pClipboardRow);
+ }
}
if(!vClipboardList.empty())
{
@@ -964,7 +962,7 @@ String OTableEditorCtrl::GenerateName( const String& rName )
{
DBG_CHKTHIS(OTableEditorCtrl,NULL);
//////////////////////////////////////////////////////////////////////
- // Basisnamen zum Anhaengen einer Numerierung erstellen
+ // Basisnamen zum Anhängen einer Numerierung erstellen
String aBaseName;
Reference<XConnection> xCon =
GetView()->getController().getConnection();
Reference< XDatabaseMetaData> xMetaData = xCon.is() ?
xCon->getMetaData() : Reference< XDatabaseMetaData>();
@@ -1034,7 +1032,7 @@ void OTableEditorCtrl::InsertRows( long nRow )
}
//////////////////////////////////////////////////////////////////////
// Beim RowInserted wird CursorMoved gerufen.
- // Die UI-Daten duerfen hier beim CursorMoved nicht gespeichert werden.
+ // Die UI-Daten dürfen hier beim CursorMoved nicht gespeichert werden.
bSaveOnMove = sal_False;
RowInserted( nRow,vInsertedUndoRedoRows.size(),sal_True );
bSaveOnMove = sal_True;
@@ -1054,10 +1052,9 @@ void OTableEditorCtrl::DeleteRows()
//////////////////////////////////////////////////////////////////////
// Undo-Action erzeugen
GetUndoManager().AddUndoAction( new OTableEditorDelUndoAct(this) );
-
//////////////////////////////////////////////////////////////////////
- // Alle markierten Zeilen loeschen
+ // Alle markierten Zeilen löschen
long nIndex = FirstSelectedRow();
nOldDataPos = nIndex;
bSaveOnMove = sal_False;
@@ -1070,7 +1067,7 @@ void OTableEditorCtrl::DeleteRows()
RowRemoved( nIndex, 1, sal_True );
//////////////////////////////////////////////////////////////////////
- // Leerzeile am Ende wieder einfuegen
+ // Leerzeile am Ende wieder einfügen
m_pRowList->push_back( ::boost::shared_ptr<OTableRow>(new
OTableRow()));
RowInserted( GetRowCount()-1, 1, sal_True );
@@ -1103,7 +1100,7 @@ void OTableEditorCtrl::InsertNewRows( long nRow )
nInsertRows = 1;
GetUndoManager().AddUndoAction( new OTableEditorInsNewUndoAct(this,
nRow, nInsertRows) );
//////////////////////////////////////////////////////////////////////
- // Zahl der selektierten Zeilen werden neu eingefuegt
+ // Zahl der selektierten Zeilen werden neu eingefügt
for( long i=nRow; i<(nRow+nInsertRows); i++ )
m_pRowList->insert( m_pRowList->begin()+i
,::boost::shared_ptr<OTableRow>(new OTableRow()));
RowInserted( nRow, nInsertRows, sal_True );
@@ -1194,7 +1191,7 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16
nColId, const ::com::s
OFieldDescription* pFieldDescr = GetFieldDescr( nRow );
if( !pFieldDescr && nColId != FIELD_TYPE)
return;
-
+
String sValue;
//////////////////////////////////////////////////////////////////////
// Einzelne Felder setzen
@@ -1301,7 +1298,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16
nColId )
case COLUMN_DESCRIPTION:
sValue = pFieldDescr->GetDescription();
break;
- case HELP_TEXT:
+ case HELP_TEXT:
sValue = pFieldDescr->GetHelpText();
break;
@@ -1345,8 +1342,8 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16
nColId )
String OTableEditorCtrl::GetCellText( long nRow, sal_uInt16 nColId ) const
{
DBG_CHKTHIS(OTableEditorCtrl,NULL);
- ::rtl::OUString sCellText;
- const_cast< OTableEditorCtrl* >( this )->GetCellData( nRow, nColId ) >>=
sCellText;
+ ::rtl::OUString sCellText;
+ const_cast< OTableEditorCtrl* >( this )->GetCellData( nRow, nColId )
>>= sCellText;
return sCellText;
}
@@ -1362,7 +1359,7 @@ OFieldDescription* OTableEditorCtrl::GetFieldDescr( long
nRow )
{
DBG_CHKTHIS(OTableEditorCtrl,NULL);
std::vector< ::boost::shared_ptr<OTableRow> >::size_type nListCount(
- m_pRowList->size());
+ m_pRowList->size());
if( (nRow<0) || (sal::static_int_cast< unsigned long
>(nRow)>=nListCount) )
{
OSL_ENSURE(0,"(nRow<0) || (nRow>=nListCount)");
@@ -1378,29 +1375,29 @@ OFieldDescription* OTableEditorCtrl::GetFieldDescr(
long nRow )
sal_Bool OTableEditorCtrl::IsCutAllowed( long nRow )
{
DBG_CHKTHIS(OTableEditorCtrl,NULL);
- sal_Bool bIsCutAllowed = (GetView()->getController().isAddAllowed() &&
GetView()->getController().isDropAllowed()) ||
+ sal_Bool bIsCutAllowed = (GetView()->getController().isAddAllowed() &&
GetView()->getController().isDropAllowed()) ||
GetView()->getController().isAlterAllowed();
if(bIsCutAllowed)
{
- switch(m_eChildFocus)
- {
- case DESCRIPTION:
- bIsCutAllowed = pDescrCell->GetSelected().Len() != 0;
- break;
- case HELPTEXT:
- bIsCutAllowed = pHelpTextCell->GetSelected().Len() != 0;
- break;
- case NAME:
- bIsCutAllowed = pNameCell->GetSelected().Len() != 0;
- break;
- case ROW:
- bIsCutAllowed = IsCopyAllowed(nRow);
- break;
- default:
- bIsCutAllowed = sal_False;
- break;
- }
+ switch(m_eChildFocus)
+ {
+ case DESCRIPTION:
+ bIsCutAllowed = pDescrCell->GetSelected().Len()
!= 0;
+ break;
+ case HELPTEXT:
+ bIsCutAllowed =
pHelpTextCell->GetSelected().Len() != 0;
+ break;
+ case NAME:
+ bIsCutAllowed = pNameCell->GetSelected().Len()
!= 0;
+ break;
+ case ROW:
+ bIsCutAllowed = IsCopyAllowed(nRow);
+ break;
+ default:
+ bIsCutAllowed = sal_False;
+ break;
+ }
}
// Reference<XPropertySet> xTable = GetView()->getController().getTable();
@@ -1418,7 +1415,7 @@ sal_Bool OTableEditorCtrl::IsCopyAllowed( long /*nRow*/ )
sal_Bool bIsCopyAllowed = sal_False;
if(m_eChildFocus == DESCRIPTION )
bIsCopyAllowed = pDescrCell->GetSelected().Len() != 0;
- else if(HELPTEXT == m_eChildFocus )
+ else if(HELPTEXT == m_eChildFocus )
bIsCopyAllowed = pHelpTextCell->GetSelected().Len() != 0;
else if(m_eChildFocus == NAME)
bIsCopyAllowed = pNameCell->GetSelected().Len() != 0;
@@ -1429,10 +1426,10 @@ sal_Bool OTableEditorCtrl::IsCopyAllowed( long /*nRow*/
)
return sal_False;
//////////////////////////////////////////////////////////////////////
- // Wenn eine der markierten Zeilen leer ist, kein Copy moeglich
+ // Wenn eine der markierten Zeilen leer ist, kein Copy möglich
::boost::shared_ptr<OTableRow> pRow;
long nIndex = FirstSelectedRow();
- while( nIndex >= 0 && nIndex < static_cast<long>(m_pRowList->size()) )
+ while( nIndex >= 0 && nIndex <
static_cast<long>(m_pRowList->size()) )
{
pRow = (*m_pRowList)[nIndex];
if( !pRow->GetActFieldDescr() )
@@ -1443,7 +1440,7 @@ sal_Bool OTableEditorCtrl::IsCopyAllowed( long /*nRow*/ )
bIsCopyAllowed = sal_True;
}
-
+
return bIsCopyAllowed;
}
@@ -1486,7 +1483,7 @@ void OTableEditorCtrl::cut()
CellModified(-1,COLUMN_DESCRIPTION);
}
}
- else if(HELPTEXT == m_eChildFocus )
+ else if(HELPTEXT == m_eChildFocus )
{
if(GetView()->getController().isAlterAllowed())
{
@@ -1512,7 +1509,7 @@ void OTableEditorCtrl::copy()
pNameCell->Copy();
else if(HELPTEXT == m_eChildFocus )
pHelpTextCell->Copy();
- else if(m_eChildFocus == DESCRIPTION )
+ else if(m_eChildFocus == DESCRIPTION )
pDescrCell->Copy();
}
@@ -1542,7 +1539,7 @@ void OTableEditorCtrl::paste()
CellModified();
}
}
- else if(m_eChildFocus == DESCRIPTION)
+ else if(m_eChildFocus == DESCRIPTION)
{
if(GetView()->getController().isAlterAllowed())
{
@@ -1567,7 +1564,7 @@ sal_Bool OTableEditorCtrl::IsInsertNewAllowed( long nRow )
sal_Bool bInsertNewAllowed = GetView()->getController().isAddAllowed();
//////////////////////////////////////////////////////////////
- // Wenn nur Felder hinzugefuegt werden duerfen, Paste nur in neue Felder
+ // Wenn nur Felder hinzugefügt werden dürfen, Paste nur in neue Felder
if (bInsertNewAllowed && !GetView()->getController().isDropAllowed())
{
SetDataPtr(nRow);
@@ -1586,13 +1583,13 @@ sal_Bool OTableEditorCtrl::IsPrimaryKeyAllowed( long
/*nRow*/ )
return sal_False;
OTableController& rController = GetView()->getController();
- if ( !rController.getSdbMetaData().supportsPrimaryKeys() )
- return sal_False;
+ if ( !rController.getSdbMetaData().supportsPrimaryKeys() )
+ return sal_False;
Reference<XPropertySet> xTable = rController.getTable();
//////////////////////////////////////////////////////////////
- // Key darf nicht veraendert werden
- // Dies gilt jedoch nur, wenn die Tabelle nicht neu ist und keine
::com::sun::star::sdbcx::View. Ansonsten wird kein DROP ausgef�hrt
+ // Key darf nicht verändert werden
+ // Dies gilt jedoch nur, wenn die Tabelle nicht neu ist und keine
::com::sun::star::sdbcx::View. Ansonsten wird kein DROP ausgeführt
if(xTable.is() &&
::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) ==
::rtl::OUString::createFromAscii("VIEW"))
return sal_False;
@@ -1614,11 +1611,11 @@ sal_Bool OTableEditorCtrl::IsPrimaryKeyAllowed( long
/*nRow*/ )
{
//////////////////////////////////////////////////////////////
// Wenn Feldtyp Memo oder Image, kein PrimKey
- // oder wenn Spalten nicht gedroped werden k�nnen und
das Required Flag ist nicht gesetzt
+ // oder wenn Spalten nicht gedropped werden können und
das Required Flag ist nicht gesetzt
// oder wenn eine ::com::sun::star::sdbcx::View
vorhanden ist und das Required Flag nicht gesetzt ist
TOTypeInfoSP pTypeInfo = pFieldDescr->getTypeInfo();
if( pTypeInfo->nSearchType == ColumnSearch::NONE
- || (pFieldDescr->IsNullable() && pRow->IsReadOnly())
+ || (pFieldDescr->IsNullable() &&
pRow->IsReadOnly())
)
return sal_False;
}
@@ -1643,8 +1640,8 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt)
if ( 1 == GetSelectColumnCount() )
{
sal_uInt16 nSelId = GetColumnId(
- sal::static_int_cast< sal_uInt16 >(
- FirstSelectedColumn() ) );
+ sal::static_int_cast<
sal_uInt16 >(
+ FirstSelectedColumn() )
);
::Rectangle aColRect(
GetFieldRectPixel( 0, nSelId, sal_False ) );
aMenuPos = aColRect.TopCenter();
@@ -1663,7 +1660,7 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt)
}
//////////////////////////////////////////////////////////////
- // Kontextmenu einblenden
+ // Kontextmenü einblenden
if( !IsReadOnly() )
{
sal_uInt16 nColId =
GetColumnAtXPosPixel(aMenuPos.X());
@@ -1702,15 +1699,15 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt)
aContextMenu.EnableItem(
SID_TABLEDESIGN_INSERTROWS, IsInsertNewAllowed(nRow) );
aContextMenu.CheckItem(
SID_TABLEDESIGN_TABED_PRIMARYKEY, IsRowSelected(GetCurRow()) && IsPrimaryKey()
);
- // jetzt alles, was disabled wurde, wech
+ // jetzt alles, was disabled wurde, weg
aContextMenu.RemoveDisabledEntries(sal_True, sal_True);
if( SetDataPtr(m_nDataPos) )
pDescrWin->SaveData(
pActRow->GetActFieldDescr() );
//////////////////////////////////////////////////////////////
- // Alle Aktionen, die die Zeilenzahl
veraendern, muessen asynchron
- // ausgefuehrt werden->sonst Probleme
zwischen Kontextmenu u. Browser
+ // Alle Aktionen, die die Zeilenzahl
veraendern, müssen asynchron
+ // ausgeführt werden->sonst Probleme
zwischen Kontextmenu u. Browser
m_nDataPos = GetCurRow();
switch (aContextMenu.Execute(this,
aMenuPos))
{
@@ -1767,7 +1764,7 @@ IMPL_LINK( OTableEditorCtrl, DelayedPaste, void*,
/*EMPTYTAG*/ )
nPastePosition = GetSelectRowCount() ? FirstSelectedRow() :
GetCurRow();
if (!IsInsertNewAllowed(nPastePosition))
- { // kein Einfuegen erlaubt, sondern nur anhaengen, also testen,
ob hinter der PastePosition noch
+ { // kein Einfügen erlaubt, sondern nur anhängen, also testen, ob
hinter der PastePosition noch
// belegte Zeilen erscheinen
sal_Int32 nFreeFromPos; // ab da nur freie Zeilen
@@ -1811,7 +1808,7 @@ IMPL_LINK( OTableEditorCtrl, DelayedInsNewRows, void*,
/*EMPTYTAG*/ )
return 0;
}
//
-----------------------------------------------------------------------------
-void OTableEditorCtrl::AdjustFieldDescription(OFieldDescription* _pFieldDesc,
+void OTableEditorCtrl::AdjustFieldDescription(OFieldDescription* _pFieldDesc,
MultiSelection& _rMultiSel,
sal_Int32 _nPos,
sal_Bool _bSet,
@@ -1823,14 +1820,14 @@ void
OTableEditorCtrl::AdjustFieldDescription(OFieldDescription* _pFieldDesc,
_pFieldDesc->SetIsNullable(ColumnValue::NO_NULLS);
_pFieldDesc->SetControlDefault(Any());
} // if(!_bSet && _pFieldDesc->getTypeInfo()->bNullable)
- if ( _pFieldDesc->IsAutoIncrement() && !_bPrimaryKey )
- {
- OTableController& rController = GetView()->getController();
- if ( rController.isAutoIncrementPrimaryKey() )
- {
- _pFieldDesc->SetAutoIncrement(false);
- }
- }
+ if ( _pFieldDesc->IsAutoIncrement() && !_bPrimaryKey )
+ {
+ OTableController& rController = GetView()->getController();
+ if ( rController.isAutoIncrementPrimaryKey() )
+ {
+ _pFieldDesc->SetAutoIncrement(false);
+ }
+ }
//////////////////////////////////////////////////////////////////////
// update field description
pDescrWin->DisplayData(_pFieldDesc);
@@ -1849,7 +1846,7 @@ void OTableEditorCtrl::SetPrimaryKey( sal_Bool bSet )
long nIndex = 0;
::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter =
m_pRowList->begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd =
m_pRowList->end();
+ ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd =
m_pRowList->end();
for(sal_Int32 nRow = 0;aIter != aEnd;++aIter,++nRow)
{
OFieldDescription* pFieldDescr = (*aIter)->GetActFieldDescr();
@@ -1900,7 +1897,7 @@ sal_Bool OTableEditorCtrl::IsPrimaryKey()
// Gehoeren alle markierten Felder zu einem Primary Key ?
long nPrimaryKeys = 0;
::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter =
m_pRowList->begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd =
m_pRowList->end();
+ ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd =
m_pRowList->end();
for(sal_Int32 nRow=0;aIter != aEnd;++aIter,++nRow)
{
if( IsRowSelected(nRow) && !(*aIter)->IsPrimaryKey() )
@@ -1927,8 +1924,8 @@ void OTableEditorCtrl::SwitchType( const TOTypeInfoSP&
_pType )
// Alte Beschreibung speichern
pDescrWin->SaveData( pActFieldDescr );
- if ( nRow < 0 || nRow > static_cast<long>(m_pRowList->size()) )
- return;
+ if ( nRow < 0 || nRow > static_cast<long>(m_pRowList->size()) )
+ return;
//////////////////////////////////////////////////////////////////////
// Neue Beschreibung darstellen
::boost::shared_ptr<OTableRow> pRow = (*m_pRowList)[nRow];
@@ -1938,13 +1935,13 @@ void OTableEditorCtrl::SwitchType( const TOTypeInfoSP&
_pType )
const sal_uInt16 nCurrentlySelected =
pTypeCell->GetSelectEntryPos();
if ( ( LISTBOX_ENTRY_NOTFOUND == nCurrentlySelected )
- || ( GetView()->getController().getTypeInfo( nCurrentlySelected )
!= _pType )
- )
+ || ( GetView()->getController().getTypeInfo(
nCurrentlySelected ) != _pType )
+ )
{
sal_uInt16 nEntryPos = 0;
const OTypeInfoMap* pTypeInfo =
GetView()->getController().getTypeInfo();
OTypeInfoMap::const_iterator aIter = pTypeInfo->begin();
- OTypeInfoMap::const_iterator aEnd = pTypeInfo->end();
+ OTypeInfoMap::const_iterator aEnd = pTypeInfo->end();
for(;aIter != aEnd;++aIter,++nEntryPos)
{
if(aIter->second == _pType)
@@ -1990,14 +1987,15 @@ long OTableEditorCtrl::PreNotify( NotifyEvent& rNEvt )
{
if( pHelpTextCell && pHelpTextCell->HasChildPathFocus() )
m_eChildFocus = HELPTEXT;
- else if( pDescrCell && pDescrCell->HasChildPathFocus() )
+ else if( pDescrCell && pDescrCell->HasChildPathFocus() )
m_eChildFocus = DESCRIPTION;
else if(pNameCell && pNameCell->HasChildPathFocus() )
m_eChildFocus = NAME;
else
m_eChildFocus = ROW;
}
-
+
return OTableRowView::PreNotify(rNEvt);
}
-//
-----------------------------------------------------------------------------
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/filter/source/graphicfilter/icgm/class4.cxx
b/main/filter/source/graphicfilter/icgm/class4.cxx
index d6bbc18bbc..d62257862a 100644
--- a/main/filter/source/graphicfilter/icgm/class4.cxx
+++ b/main/filter/source/graphicfilter/icgm/class4.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_filter.hxx"
@@ -115,7 +113,7 @@ void CGM::ImplDoClass4()
if ( mbFirstOutPut )
mpOutAct->FirstOutPut();
- if ( mpBitmapInUse && ( mnElementID != 9 ) ) // vorhandene grafik
verarbeiten,
+ if ( mpBitmapInUse && ( mnElementID != 9 ) ) // vorhandene Grafik
verarbeiten,
{
// da jetzt nicht bitmap actions anstehen
CGMBitmapDescriptor* pBmpDesc = mpBitmapInUse->GetBitmap();
// irgendetwas mit der Bitmap anfangen
@@ -148,7 +146,7 @@ void CGM::ImplDoClass4()
case 0x02 : ComOut( CGM_LEVEL1 |
CGM_EXTENDED_PRIMITIVES_SET, "Disjoint PolyLine" )
{
sal_uInt16 nPoints = sal::static_int_cast<
sal_uInt16 >(
- mnElementSize / ImplGetPointSize());
+ mnElementSize / ImplGetPointSize());
if ( ! ( nPoints & 1 ) )
{
nPoints >>= 1;
@@ -267,7 +265,7 @@ void CGM::ImplDoClass4()
mpOutAct->CloseRegion();
sal_uInt16 nPoints = sal::static_int_cast<
sal_uInt16 >(
- mnElementSize / ImplGetPointSize());
+ mnElementSize / ImplGetPointSize());
Polygon aPolygon( nPoints );
for ( sal_uInt16 i = 0; i < nPoints; i++)
{
@@ -319,8 +317,8 @@ void CGM::ImplDoClass4()
if ( mpBitmapInUse )
{
CGMBitmap* pBmpDesc =
mpBitmapInUse->GetNext();
- if ( pBmpDesc ) // eventuell bekommen
wir eine bitmap zur�ck, die nicht
- { // zur
vorherigen pa�t -> diese m�ssen wir dann auch l�schen
+ if ( pBmpDesc ) // eventuell bekommen
wir eine bitmap zurück, die nicht
+ { // zur
vorherigen passt -> diese müssen wir dann auch löschen
mpOutAct->DrawBitmap(
pBmpDesc->GetBitmap() );
delete pBmpDesc;
}
@@ -334,7 +332,7 @@ void CGM::ImplDoClass4()
case 0x0a : ComOut( CGM_LEVEL1, "Generalized Drawing
Primitive" )
{
- ImplGetI( pElement->nIntegerPrecision );
//-Wall is this needed
+ ImplGetI( pElement->nIntegerPrecision );
//-Wall is this needed
ImplGetUI( pElement->nIntegerPrecision );
//-Wall is this needed
mnParaSize = mnElementSize;
}
@@ -506,7 +504,7 @@ void CGM::ImplDoClass4()
}
break;
- case 0x0f : ComOut( CGM_LEVEL1 |
CGM_EXTENDED_PRIMITIVES_SET, "Circular Arc Centre" )
+ case 0x0f : ComOut( CGM_LEVEL1 |
CGM_EXTENDED_PRIMITIVES_SET, "Circular Arc Center" )
{
double fOrientation, fStartAngle, fEndAngle,
vector[ 4 ];
FloatPoint aCenter, aRadius;
@@ -560,7 +558,7 @@ void CGM::ImplDoClass4()
}
break;
- case 0x10 : ComOut( CGM_LEVEL1 |
CGM_EXTENDED_PRIMITIVES_SET, "Circular Arc Centre Close" )
+ case 0x10 : ComOut( CGM_LEVEL1 |
CGM_EXTENDED_PRIMITIVES_SET, "Circular Arc Center Close" )
{
double fOrientation, fStartAngle, fEndAngle,
vector[ 4 ];
FloatPoint aCenter, aRadius;
@@ -682,37 +680,37 @@ void CGM::ImplDoClass4()
nType,
fEndAngle, fStartAngle);
}
break;
- case 0x14 : ComOut( CGM_LEVEL2, "Circular Arc Centre
Reversed" )
+ case 0x14 : ComOut( CGM_LEVEL2, "Circular Arc Center
Reversed" )
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0x15 : ComOut( CGM_LEVEL2, "Connection Edge" )
// NS
+ case 0x15 : ComOut( CGM_LEVEL2, "Connection Edge" ) //
NS
{
// if ( mbFigure )
// mpOutAct->CloseRegion();
}
break;
- case 0x16 : ComOut( CGM_LEVEL3, "Hyperbolic Arc" )
// NS
+ case 0x16 : ComOut( CGM_LEVEL3, "Hyperbolic Arc" ) // NS
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0x17 : ComOut( CGM_LEVEL3, "Parabolic Arc" )
// NS
+ case 0x17 : ComOut( CGM_LEVEL3, "Parabolic Arc" ) // NS
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0x18 : ComOut( CGM_LEVEL3, "Non Uniform B-Spline"
) // NS
+ case 0x18 : ComOut( CGM_LEVEL3, "Non Uniform B-Spline"
) // NS
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0x19 : ComOut( CGM_LEVEL3, "Non Uniform Rational
B-Spline" ) // NS
+ case 0x19 : ComOut( CGM_LEVEL3, "Non Uniform Rational
B-Spline" ) // NS
{
if ( mbFigure )
mpOutAct->CloseRegion();
@@ -762,19 +760,19 @@ void CGM::ImplDoClass4()
}
break;
- case 0x1b : ComOut( CGM_LEVEL3, "Polysymbol" )
// NS
+ case 0x1b : ComOut( CGM_LEVEL3, "Polysymbol" ) // NS
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0x1c : ComOut( CGM_LEVEL3, "Bitonal Tile" )
// NS
+ case 0x1c : ComOut( CGM_LEVEL3, "Bitonal Tile" ) // NS
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0x1d : ComOut( CGM_LEVEL3, "Tile" )
// NS
+ case 0x1d : ComOut( CGM_LEVEL3, "Tile" ) // NS
{
if ( mbFigure )
mpOutAct->CloseRegion();
@@ -804,7 +802,7 @@ void CGM::ImplDoClass4()
mpOutAct->CloseRegion();
}
break;
- case 0xfc : ComOut( CGM_GDSF_ONLY, "Reounded Rectangle"
)
+ case 0xfc : ComOut( CGM_GDSF_ONLY, "Rounded Rectangle" )
{
if ( mbFigure )
mpOutAct->CloseRegion();
@@ -853,3 +851,5 @@ void CGM::ImplDoClass4()
else
mnParaSize = mnElementSize;
};
+
+/* vim: set noet sw=4 ts=4: */
