[Libreoffice-commits] core.git: 59 commits - basegfx/source bridges/source comphelper/source cppuhelper/source cui/source extensions/source i18npool/source include/apple_remote include/clew include/comphelper include/i18nutil include/jvmfwk include/store include/svl include/svtools include/toolkit sal/osl sal/rtl sfx2/source solenv/bin soltools/mkdepend stoc/source store/source svl/source svtools/inc svtools/source toolkit/source ucb/source unotools/source unusedcode.easy vcl/inc vcl/source xmlscript/source
Stephan Bergmann
sbergman at redhat.com
Thu Mar 10 19:59:00 UTC 2016
basegfx/source/inc/hommatrixtemplate.hxx | 8
bridges/source/jni_uno/jni_data.cxx | 8
bridges/source/jni_uno/jni_info.cxx | 12
bridges/source/jni_uno/jni_info.h | 6
bridges/source/jni_uno/jni_java2uno.cxx | 2
comphelper/source/container/enumerablemap.cxx | 18
comphelper/source/misc/interaction.cxx | 4
cppuhelper/source/access_control.cxx | 17
cppuhelper/source/implbase_ex.cxx | 40 +-
cui/source/options/optjava.hxx | 2
extensions/source/macosx/spotlight/main.m | 2
i18npool/source/inputchecker/inputsequencechecker_hi.cxx | 4
i18npool/source/inputchecker/inputsequencechecker_th.cxx | 8
include/apple_remote/RemoteControl.h | 2
include/clew/clew.h | 2
include/comphelper/containermultiplexer.hxx | 2
include/comphelper/interaction.hxx | 2
include/comphelper/stl_types.hxx | 18
include/i18nutil/unicode.hxx | 4
include/jvmfwk/framework.hxx | 4
include/store/types.h | 24 -
include/svl/aeitem.hxx | 2
include/svtools/hyperlabel.hxx | 4
include/svtools/parhtml.hxx | 4
include/svtools/parrtf.hxx | 2
include/svtools/svparser.hxx | 4
include/toolkit/controls/roadmapcontrol.hxx | 6
sal/osl/unx/conditn.cxx | 4
sal/osl/unx/file_volume.cxx | 4
sal/osl/unx/nlsupport.cxx | 74 +--
sal/osl/unx/nlsupport.hxx | 4
sal/osl/unx/pipe.cxx | 20 -
sal/osl/unx/process_impl.cxx | 4
sal/osl/unx/profile.cxx | 20 -
sal/osl/unx/secimpl.hxx | 4
sal/osl/unx/signal.cxx | 6
sal/osl/unx/socket.cxx | 78 ++--
sal/osl/unx/sockimpl.hxx | 3
sal/osl/unx/thread.cxx | 10
sal/rtl/cipher.cxx | 104 ++---
sal/rtl/digest.cxx | 282 +++++++--------
sal/rtl/random.cxx | 56 +-
sfx2/source/appl/app.src | 2
sfx2/source/appl/openuriexternally.cxx | 7
solenv/bin/concat-deps.c | 14
soltools/mkdepend/cppsetup.c | 28 -
soltools/mkdepend/ifparser.h | 8
stoc/source/security/permissions.cxx | 10
store/source/stordir.cxx | 6
svl/source/items/aeitem.cxx | 6
svl/source/numbers/zformat.cxx | 22 -
svtools/inc/roadmap.hxx | 16
svtools/source/control/hyperlabel.cxx | 8
svtools/source/control/roadmap.cxx | 78 ++--
svtools/source/svhtml/parhtml.cxx | 12
svtools/source/svrtf/parrtf.cxx | 18
svtools/source/svrtf/svparser.cxx | 2
svtools/source/table/defaultinputhandler.cxx | 4
toolkit/source/controls/roadmapcontrol.cxx | 8
ucb/source/ucp/file/filinl.hxx | 8
ucb/source/ucp/file/filnot.cxx | 4
ucb/source/ucp/file/filrow.hxx | 2
ucb/source/ucp/file/shell.hxx | 20 -
unotools/source/ucbhelper/ucblockbytes.cxx | 6
unusedcode.easy | 2
vcl/inc/fontsubset.hxx | 6
vcl/inc/sft.hxx | 8
vcl/source/edit/textdat2.hxx | 8
vcl/source/fontsubset/fontsubset.cxx | 2
vcl/source/fontsubset/gsub.cxx | 8
vcl/source/fontsubset/gsub.h | 8
vcl/source/fontsubset/list.cxx | 12
vcl/source/fontsubset/list.h | 2
vcl/source/fontsubset/ttcr.cxx | 2
vcl/source/fontsubset/ttcr.hxx | 2
xmlscript/source/xmlmod_imexp/imp_share.hxx | 2
xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 4
77 files changed, 615 insertions(+), 624 deletions(-)
New commits:
commit 83de4879c3cd416c423dd147be6511a1d074c8c9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Mar 10 20:57:35 2016 +0100
Improve error message when URL cannot be opened externally
It need not be due to no browser, but might also be e.g. a misspelled URL
like <htp://...>, see mail thread starting at
<http://listarchives.libreoffice.org/global/users/msg48090.html>
"[libreoffice-users] LO 5.1 Presentation can't find system browser on OSX
10.11."
Change-Id: I74ce7abb4e78d72ce9bf92424f66608c6780d2d3
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index a3cec3a..aa2024d 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -60,7 +60,7 @@ String STR_QUERY_LASTVERSION
String STR_NO_WEBBROWSER_FOUND
{
- Text [ en-US ] = "%PRODUCTNAME could not find a web browser on your system. Please check your Desktop Preferences or install a web browser (for example, Firefox) in the default location requested during the browser installation." ;
+ Text [ en-US ] = "Opening \"$(ARG1)\" failed with error code $(ARG2) and message: \"$(ARG3)\"\n(Maybe no web browser could be found on your system. In that case, please check your Desktop Preferences or install a web browser (for example, Firefox) in the default location requested during the browser installation.)" ;
};
String STR_NO_ABS_URI_REF
diff --git a/sfx2/source/appl/openuriexternally.cxx b/sfx2/source/appl/openuriexternally.cxx
index 77c412b..ed70234 100644
--- a/sfx2/source/appl/openuriexternally.cxx
+++ b/sfx2/source/appl/openuriexternally.cxx
@@ -48,7 +48,7 @@ bool sfx2::openUriExternally(
SfxGetpApp()->GetTopWindow(), SfxResId(STR_NO_ABS_URI_REF));
eb->set_primary_text(eb->get_primary_text().replaceFirst("$(ARG1)", uri));
eb->Execute();
- } catch (css::system::SystemShellExecuteException &) {
+ } catch (css::system::SystemShellExecuteException & e) {
if (!handleSystemShellExecuteException) {
throw;
}
@@ -56,6 +56,11 @@ bool sfx2::openUriExternally(
ScopedVclPtrInstance<MessageDialog> eb(
SfxGetpApp()->GetTopWindow(),
SfxResId(STR_NO_WEBBROWSER_FOUND));
+ eb->set_primary_text(
+ eb->get_primary_text().replaceFirst("$(ARG1)", uri)
+ .replaceFirst("$(ARG2)", OUString::number(e.PosixError))
+ .replaceFirst("$(ARG3)", e.Message));
+ //TODO: avoid subsequent replaceFirst acting on previous replacement
eb->Execute();
}
return false;
commit 45a771ef727585ceb8ebcd4b4627f3aa9bfa9b37
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 20:19:14 2016 +0100
Avoid reserved identifiers
Change-Id: Ic2c7cc2a78e8e58c3ca28acd9b6a35ddaceeab60
diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx
index b6e2e05..59f5696 100644
--- a/ucb/source/ucp/file/shell.hxx
+++ b/ucb/source/ucp/file/shell.hxx
@@ -88,14 +88,14 @@ namespace fileaccess {
sal_Int16 Attributes;
public:
MyProperty();
- explicit MyProperty( const OUString& __PropertyName );
- MyProperty( const bool& __isNative,
- const OUString& __PropertyName,
- const sal_Int32& __Handle,
- const css::uno::Type& __Typ,
- const css::uno::Any& __Value,
- const css::beans::PropertyState& __State,
- const sal_Int16& __Attributes );
+ explicit MyProperty( const OUString& thePropertyName );
+ MyProperty( const bool& theIsNative,
+ const OUString& thePropertyName,
+ const sal_Int32& theHandle,
+ const css::uno::Type& theTyp,
+ const css::uno::Any& theValue,
+ const css::beans::PropertyState& theState,
+ const sal_Int16& theAttributes );
~MyProperty();
inline const bool& SAL_CALL IsNative() const;
@@ -107,8 +107,8 @@ namespace fileaccess {
inline const sal_Int16& SAL_CALL getAttributes() const;
// The set* functions are declared const, because the key of "this" stays intact
- inline void SAL_CALL setValue( const css::uno::Any& __Value ) const;
- inline void SAL_CALL setState( const css::beans::PropertyState& __State ) const;
+ inline void SAL_CALL setValue( const css::uno::Any& theValue ) const;
+ inline void SAL_CALL setState( const css::beans::PropertyState& theState ) const;
};
struct eMyProperty
commit 7b9429473a68c3fbaac3685c6f1eb825bca97e27
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 20:18:58 2016 +0100
Avoid reserved identifier
Change-Id: I4d0dc49e44b9e9f7504008ea1d10876cd80e76f8
diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx
index bf09f2f..9b58d88 100644
--- a/ucb/source/ucp/file/filrow.hxx
+++ b/ucb/source/ucp/file/filrow.hxx
@@ -32,7 +32,7 @@ namespace fileaccess {
css::sdbc::XRow >
{
public:
- XRow_impl( shell* pShell,const css::uno::Sequence< css::uno::Any >& __m_aValueMap );
+ XRow_impl( shell* pShell,const css::uno::Sequence< css::uno::Any >& aValueMap );
virtual ~XRow_impl();
virtual sal_Bool SAL_CALL
commit cda55df8a0091271ba372e4e191f86fdeae7ae53
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 20:18:46 2016 +0100
Avoid reserved identifier
Change-Id: I6c60905541de56229bc26e9dc6e589d4099e9266
diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx
index 35e7036..32ca396 100644
--- a/ucb/source/ucp/file/filnot.cxx
+++ b/ucb/source/ucp/file/filnot.cxx
@@ -211,10 +211,10 @@ PropertyChangeNotifier::~PropertyChangeNotifier()
void PropertyChangeNotifier::notifyPropertyChanged(
- const uno::Sequence< beans::PropertyChangeEvent >& _Changes )
+ const uno::Sequence< beans::PropertyChangeEvent >& Changes_ )
{
sal_Int32 j;
- uno::Sequence< beans::PropertyChangeEvent > Changes = _Changes;
+ uno::Sequence< beans::PropertyChangeEvent > Changes = Changes_;
for( j = 0; j < Changes.getLength(); ++j )
Changes[j].Source = m_xCreatorContent;
commit 4a296a0548c0e7ac76dca1f0fbd8e67be1f2e76c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 20:18:28 2016 +0100
Avoid reserved identifiers
Change-Id: I75158ff7588452f38306b0bed351a6532b9c8d1f
diff --git a/ucb/source/ucp/file/filinl.hxx b/ucb/source/ucp/file/filinl.hxx
index 003f11b..224353c 100644
--- a/ucb/source/ucp/file/filinl.hxx
+++ b/ucb/source/ucp/file/filinl.hxx
@@ -43,13 +43,13 @@ inline const sal_Int16& SAL_CALL shell::MyProperty::getAttributes() const
{
return Attributes;
}
-inline void SAL_CALL shell::MyProperty::setValue( const css::uno::Any& __Value ) const
+inline void SAL_CALL shell::MyProperty::setValue( const css::uno::Any& theValue ) const
{
- const_cast<MyProperty*>(this)->Value = __Value;
+ const_cast<MyProperty*>(this)->Value = theValue;
}
-inline void SAL_CALL shell::MyProperty::setState( const css::beans::PropertyState& __State ) const
+inline void SAL_CALL shell::MyProperty::setState( const css::beans::PropertyState& theState ) const
{
- const_cast<MyProperty*>(this)->State = __State;
+ const_cast<MyProperty*>(this)->State = theState;
}
#endif
commit f9202971b4bd7cf21fe56fb59e26675c0cc28cc1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 20:18:01 2016 +0100
Avoid reserved identifier
Change-Id: Ifc4929a5ef43194af33b0aa2816aaf21bc61cd0e
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index 57030fb..d5f033c 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -520,7 +520,7 @@ Sequence< OUString > PermissionCollection::toStrings() const
}
#endif
-inline static bool __implies(
+inline static bool implies(
::rtl::Reference< Permission > const & head, Permission const & demanded )
{
for ( Permission * perm = head.get(); perm; perm = perm->m_next.get() )
@@ -567,7 +567,7 @@ void PermissionCollection::checkPermission( Any const & perm ) const
{
FilePermission demanded(
*static_cast< io::FilePermission const * >( perm.pData ) );
- if (__implies( m_head, demanded ))
+ if (implies( m_head, demanded ))
{
#ifdef __DIAGNOSE
demanded_diag( demanded );
@@ -580,7 +580,7 @@ void PermissionCollection::checkPermission( Any const & perm ) const
{
SocketPermission demanded(
*static_cast< connection::SocketPermission const * >( perm.pData ) );
- if (__implies( m_head, demanded ))
+ if (implies( m_head, demanded ))
{
#ifdef __DIAGNOSE
demanded_diag( demanded );
@@ -593,7 +593,7 @@ void PermissionCollection::checkPermission( Any const & perm ) const
{
RuntimePermission demanded(
*static_cast< security::RuntimePermission const * >( perm.pData ) );
- if (__implies( m_head, demanded ))
+ if (implies( m_head, demanded ))
{
#ifdef __DIAGNOSE
demanded_diag( demanded );
@@ -605,7 +605,7 @@ void PermissionCollection::checkPermission( Any const & perm ) const
else if (demanded_type.equals( cppu::UnoType<security::AllPermission>::get()))
{
AllPermission demanded;
- if (__implies( m_head, demanded ))
+ if (implies( m_head, demanded ))
{
#ifdef __DIAGNOSE
demanded_diag( demanded );
commit fede8cfaa7f43862c503476a13472020cba9ce1e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 20:17:45 2016 +0100
Avoid reserved identifiers
Change-Id: I33b9966c0d57b4f9b2028352dfbb68359653f976
diff --git a/i18npool/source/inputchecker/inputsequencechecker_th.cxx b/i18npool/source/inputchecker/inputsequencechecker_th.cxx
index 48e3ca3..81535d2 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_th.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_th.cxx
@@ -34,7 +34,7 @@ InputSequenceChecker_th::~InputSequenceChecker_th()
}
/* Table for Thai Cell Manipulation */
-sal_Char _TAC_celltype_inputcheck[17][17] = {
+sal_Char TAC_celltype_inputcheck[17][17] = {
/* Cn */ /* 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, A, B, C, D, E, F */
/* Cn-1 00 */{ 'X', 'A', 'A', 'A', 'A', 'A', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
/* 10 */{ 'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
@@ -55,7 +55,7 @@ sal_Char _TAC_celltype_inputcheck[17][17] = {
{ 'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'C', 'R', 'C', 'R', 'R', 'R', 'R' }
};
-sal_Bool _TAC_Composible[3][5] = {
+sal_Bool TAC_Composible[3][5] = {
/* 'A', 'C', 'S', 'R', 'X' */
/* Mode 0 */ {sal_True, sal_True, sal_True, sal_True, sal_True}, // PASSTHROUGH = 0
/* Mode 1 */ {sal_True, sal_True, sal_True, sal_False, sal_True}, // BASIC = 1
@@ -65,7 +65,7 @@ sal_Bool _TAC_Composible[3][5] = {
static bool SAL_CALL check(sal_Unicode ch1, sal_Unicode ch2, sal_Int16 inputCheckMode)
{
sal_Int16 composible_class;
- switch (_TAC_celltype_inputcheck[getCharType(ch1)][getCharType(ch2)]) {
+ switch (TAC_celltype_inputcheck[getCharType(ch1)][getCharType(ch2)]) {
case 'A': composible_class = 0; break;
case 'C': composible_class = 1; break;
case 'S': composible_class = 2; break;
@@ -73,7 +73,7 @@ static bool SAL_CALL check(sal_Unicode ch1, sal_Unicode ch2, sal_Int16 inputChec
case 'X': composible_class = 4; break;
default: composible_class = 0;
}
- return (_TAC_Composible[inputCheckMode][composible_class]);
+ return (TAC_Composible[inputCheckMode][composible_class]);
}
sal_Bool SAL_CALL
commit 0417cdceb91160e3e9eb6ada561649a1b15858b2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 20:17:32 2016 +0100
Avoid reserved identifier
Change-Id: Iba05a29b75666a595e58dfe753bba0825d09f61f
diff --git a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
index 0b5c3e2..3d7b415 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
@@ -99,7 +99,7 @@ static const sal_uInt16 dev_cell_check[14][14] = {
/* 13 */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* HD */
};
-sal_Bool _DEV_Composible[2][2] = {
+sal_Bool DEV_Composible[2][2] = {
/* Mode 0 */ {sal_True, sal_True }, // PASSTHROUGH = 0
/* Mode 1 */ {sal_False, sal_True} // STRICT = 1
};
@@ -118,7 +118,7 @@ InputSequenceChecker_hi::checkInputSequence(const OUString& Text,
sal_uInt16 ch1 = getCharType(inputChar);
sal_uInt16 ch2 = getCharType(currentChar);
- return (_DEV_Composible[inputCheckMode][dev_cell_check[ch2][ch1]]);
+ return (DEV_Composible[inputCheckMode][dev_cell_check[ch2][ch1]]);
}
sal_Int32 SAL_CALL
commit 88754ea53da4098d2a1d00b9a99c0169eb5b0469
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 19:49:41 2016 +0100
Avoid reserved identifiers
Change-Id: I0e353e3d892e1d01155dd7e48f8d24597604d3c4
diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx
index 7de2d6c..f6b2db2 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -411,7 +411,7 @@ void Bridge::map_to_uno(
// type name
JLocalAutoRef jo_type_name(
jni, jni->GetObjectField(
- java_data.l, getJniInfo()->m_field_Type__typeName ) );
+ java_data.l, getJniInfo()->m_field_Type_typeName ) );
if (! jo_type_name.is())
{
throw BridgeRuntimeError(
@@ -466,7 +466,7 @@ void Bridge::map_to_uno(
{
// boxed any
jo_type.reset( jni->GetObjectField(
- java_data.l, getJniInfo()->m_field_Any__type ) );
+ java_data.l, getJniInfo()->m_field_Any_type ) );
if (! jo_type.is())
{
throw BridgeRuntimeError(
@@ -477,7 +477,7 @@ void Bridge::map_to_uno(
// wrapped value
jo_wrapped_holder.reset(
jni->GetObjectField(
- java_data.l, getJniInfo()->m_field_Any__object ) );
+ java_data.l, getJniInfo()->m_field_Any_object ) );
java_data.l = jo_wrapped_holder.get();
}
else
@@ -490,7 +490,7 @@ void Bridge::map_to_uno(
// get type name
JLocalAutoRef jo_type_name(
jni, jni->GetObjectField(
- jo_type.get(), getJniInfo()->m_field_Type__typeName ) );
+ jo_type.get(), getJniInfo()->m_field_Type_typeName ) );
jni.ensure_no_exception();
OUString type_name(
jstring_to_oustring( jni, static_cast<jstring>(jo_type_name.get()) ) );
diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index 74f02de..70df22a 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -673,10 +673,10 @@ JNI_info::JNI_info(
jni.ensure_no_exception();
assert( nullptr != m_ctor_Type_with_Name_TypeClass );
// field Type._typeName
- m_field_Type__typeName = jni->GetFieldID(
+ m_field_Type_typeName = jni->GetFieldID(
static_cast<jclass>(jo_Type.get()), "_typeName", "Ljava/lang/String;" );
jni.ensure_no_exception();
- assert( nullptr != m_field_Type__typeName );
+ assert( nullptr != m_field_Type_typeName );
// ctor Any( Type, Object )
m_ctor_Any_with_Type_Object = jni->GetMethodID(
@@ -686,15 +686,15 @@ JNI_info::JNI_info(
assert( nullptr != m_ctor_Any_with_Type_Object );
// field Any._type
- m_field_Any__type = jni->GetFieldID(
+ m_field_Any_type = jni->GetFieldID(
static_cast<jclass>(jo_Any.get()), "_type", "Lcom/sun/star/uno/Type;" );
jni.ensure_no_exception();
- assert( nullptr != m_field_Any__type );
+ assert( nullptr != m_field_Any_type );
// field Any._object
- m_field_Any__object = jni->GetFieldID(
+ m_field_Any_object = jni->GetFieldID(
static_cast<jclass>(jo_Any.get()), "_object", "Ljava/lang/Object;" );
jni.ensure_no_exception();
- assert( nullptr != m_field_Any__object );
+ assert( nullptr != m_field_Any_object );
// method IEnvironment.getRegisteredInterface()
m_method_IEnvironment_getRegisteredInterface = jni->GetMethodID(
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index 2ff2048..0976e46 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -177,11 +177,11 @@ public:
jmethodID m_method_UnoRuntime_generateOid;
jmethodID m_method_UnoRuntime_queryInterface;
jmethodID m_ctor_Any_with_Type_Object;
- jfieldID m_field_Any__type;
- jfieldID m_field_Any__object;
+ jfieldID m_field_Any_type;
+ jfieldID m_field_Any_object;
jmethodID m_ctor_Type_with_Class;
jmethodID m_ctor_Type_with_Name_TypeClass;
- jfieldID m_field_Type__typeName;
+ jfieldID m_field_Type_typeName;
jmethodID m_method_TypeClass_fromInt;
jfieldID m_field_Enum_m_value;
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index d5280f4..5a3c6d5 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -412,7 +412,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
JLocalAutoRef jo_type_name(
jni, jni->GetObjectField(
- jo_type.get(), jni_info->m_field_Type__typeName ) );
+ jo_type.get(), jni_info->m_field_Type_typeName ) );
if (! jo_type_name.is())
{
throw BridgeRuntimeError(
commit e01e2342fb063d5763706802657915720c5f3d0e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 19:23:26 2016 +0100
Avoid reserved identifier, remove unnecessary typedef
Change-Id: I1172bff37539d1ffb8da7b53c0e5f1913f7b7ec7
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 5950d42..ca5ac45 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -37,7 +37,7 @@
// forward ---------------------------------------------------------------
#if HAVE_FEATURE_JAVA
-typedef struct _JavaInfo JavaInfo;
+struct JavaInfo;
#else
typedef void* JavaInfo;
#endif
diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index a85e38b..9ba49ce 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -215,7 +215,7 @@ typedef enum _javaFrameworkError
For convenience this API provides the function <code>jfw_freeJavaInfo</code>
which frees the objects properly. </p>
*/
-struct _JavaInfo
+struct JavaInfo
{
/** contains the vendor.
@@ -260,8 +260,6 @@ struct _JavaInfo
sal_Sequence * arVendorData;
};
-typedef struct _JavaInfo JavaInfo;
-
/** frees the memory of a <code>JavaInfo</code> object.
@param pInfo
The object which is to be freed. It can be NULL;
commit 8988d1a744c983ecd1435cb7b75d17a6f5acf9f9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 18:50:17 2016 +0100
Avoid reserved identifier
Change-Id: I69e8a6b2d449aff92e7bd8d0d4c39b0d1c71c97c
diff --git a/xmlscript/source/xmlmod_imexp/imp_share.hxx b/xmlscript/source/xmlmod_imexp/imp_share.hxx
index 48495f0..05ca094 100644
--- a/xmlscript/source/xmlmod_imexp/imp_share.hxx
+++ b/xmlscript/source/xmlmod_imexp/imp_share.hxx
@@ -90,7 +90,7 @@ protected:
OUString _aLocalName;
css::uno::Reference< css::xml::input::XAttributes > _xAttributes;
- OUStringBuffer _StrBuffer;
+ OUStringBuffer _strBuffer;
public:
ModuleElement(
diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
index 965f1bb..f724ff7 100644
--- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
+++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
@@ -61,7 +61,7 @@ void ModuleElement::ignorableWhitespace(
void ModuleElement::characters( OUString const & rChars )
throw (xml::sax::SAXException, RuntimeException, std::exception)
{
- _StrBuffer.append( rChars );
+ _strBuffer.append( rChars );
}
void ModuleElement::processingInstruction(
@@ -73,7 +73,7 @@ void ModuleElement::processingInstruction(
void ModuleElement::endElement()
throw (xml::sax::SAXException, RuntimeException, std::exception)
{
- _pImport->mrModuleDesc.aCode = _StrBuffer.makeStringAndClear();
+ _pImport->mrModuleDesc.aCode = _strBuffer.makeStringAndClear();
}
Reference< xml::input::XElement > ModuleElement::startChildElement(
commit 82ef1b8111883a04d56983892eb416f0df975237
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 18:49:40 2016 +0100
Avoid reserved identifier
Change-Id: I4e846dcfa3325a1b700da0ec16a380b97a9fb2ed
diff --git a/svtools/source/table/defaultinputhandler.cxx b/svtools/source/table/defaultinputhandler.cxx
index 24d5822..5a81bed 100644
--- a/svtools/source/table/defaultinputhandler.cxx
+++ b/svtools/source/table/defaultinputhandler.cxx
@@ -141,7 +141,7 @@ namespace svt { namespace table
const vcl::KeyCode& rKeyCode = rKEvt.GetKeyCode();
sal_uInt16 nKeyCode = rKeyCode.GetCode();
- struct _ActionMapEntry
+ struct ActionMapEntry
{
sal_uInt16 nKeyCode;
sal_uInt16 nKeyModifier;
@@ -169,7 +169,7 @@ namespace svt { namespace table
{ 0, 0, invalidTableControlAction }
};
- const _ActionMapEntry* pActions = aKnownActions;
+ const ActionMapEntry* pActions = aKnownActions;
for ( ; pActions->eAction != invalidTableControlAction; ++pActions )
{
if ( ( pActions->nKeyCode == nKeyCode ) && ( pActions->nKeyModifier == rKeyCode.GetModifier() ) )
commit cafad3b73e5bbcc8b4f86cb7d5359b0adab75984
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 18:49:30 2016 +0100
Avoid reserved identifier
Change-Id: I47c9613771bb99c43c12dfe43e2d3c2417403b56
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 37131de..26461f6 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -337,16 +337,16 @@ void SvRTFParser::ScanText()
sal_Char nSlash = '\\';
while (!bBreak)
{
- wchar_t __next=GetNextChar();
- if (__next>0xFF) // fix for #i43933# and #i35653#
+ wchar_t next=GetNextChar();
+ if (next>0xFF) // fix for #i43933# and #i35653#
{
if (!aByteString.isEmpty())
aStrBuffer.append( OStringToOUString(aByteString.makeStringAndClear(), GetSrcEncoding()) );
- aStrBuffer.append((sal_Unicode)__next);
+ aStrBuffer.append((sal_Unicode)next);
continue;
}
- nSlash = (sal_Char)__next;
+ nSlash = (sal_Char)next;
while (nSlash == 0xD || nSlash == 0xA)
nSlash = (sal_Char)GetNextChar();
commit 732417ca248519555fdf5fa344f048bfce900bd3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 18:48:23 2016 +0100
Avoid reserved identifiers
Change-Id: I0b9e187be888cb1f89b52dcc60edadf6399802d6
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index f9d7f26..4977c08 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -55,13 +55,13 @@ public:
RoadmapItem( ORoadmap& _rParent, const Size& _rItemPlayground );
~RoadmapItem();
- void SetID( sal_Int16 _ID );
+ void SetID( sal_Int16 ID );
sal_Int16 GetID() const;
- void SetIndex( ItemIndex _Index );
+ void SetIndex( ItemIndex Index );
ItemIndex GetIndex() const;
- void Update( ItemIndex _RMIndex, const OUString& _rText );
+ void Update( ItemIndex RMIndex, const OUString& _rText );
void SetPosition( RoadmapItem* OldHyperLabel );
@@ -115,9 +115,9 @@ public:
return m_aRoadmapSteps;
}
- void insertHyperLabel(ItemIndex _Index, RoadmapItem* _rRoadmapStep)
+ void insertHyperLabel(ItemIndex Index, RoadmapItem* _rRoadmapStep)
{
- m_aRoadmapSteps.insert(m_aRoadmapSteps.begin() + _Index, _rRoadmapStep);
+ m_aRoadmapSteps.insert(m_aRoadmapSteps.begin() + Index, _rRoadmapStep);
}
ItemIndex getItemCount() const
@@ -176,12 +176,12 @@ public:
return m_aItemSizePixel;
}
- void removeHyperLabel(ItemIndex _Index)
+ void removeHyperLabel(ItemIndex Index)
{
- if ((_Index > -1) && (_Index < getItemCount()))
+ if ((Index > -1) && (Index < getItemCount()))
{
- delete m_aRoadmapSteps[_Index];
- m_aRoadmapSteps.erase(m_aRoadmapSteps.begin() + _Index);
+ delete m_aRoadmapSteps[Index];
+ m_aRoadmapSteps.erase(m_aRoadmapSteps.begin() + Index);
}
}
};
@@ -259,21 +259,21 @@ RoadmapTypes::ItemId ORoadmap::GetCurrentRoadmapItemID() const
return m_pImpl->getCurItemID();
}
-RoadmapItem* ORoadmap::GetPreviousHyperLabel(ItemIndex _Index)
+RoadmapItem* ORoadmap::GetPreviousHyperLabel(ItemIndex Index)
{
RoadmapItem* pOldItem = nullptr;
- if ( _Index > 0 )
- pOldItem = m_pImpl->getHyperLabels().at( _Index - 1 );
+ if ( Index > 0 )
+ pOldItem = m_pImpl->getHyperLabels().at( Index - 1 );
return pOldItem;
}
-RoadmapItem* ORoadmap::InsertHyperLabel(ItemIndex _Index, const OUString& _sLabel, ItemId _RMID, bool _bEnabled, bool _bIncomplete)
+RoadmapItem* ORoadmap::InsertHyperLabel(ItemIndex Index, const OUString& _sLabel, ItemId RMID, bool _bEnabled, bool _bIncomplete)
{
if (m_pImpl->getItemCount() == 0)
m_pImpl->initItemSize();
RoadmapItem* pItem = nullptr;
- RoadmapItem* pOldItem = GetPreviousHyperLabel( _Index );
+ RoadmapItem* pOldItem = GetPreviousHyperLabel( Index );
pItem = new RoadmapItem( *this, m_pImpl->getItemSize() );
if ( _bIncomplete )
@@ -283,13 +283,13 @@ RoadmapItem* ORoadmap::InsertHyperLabel(ItemIndex _Index, const OUString& _sLabe
else
{
pItem->SetInteractive( m_pImpl->isInteractive() );
- m_pImpl->insertHyperLabel( _Index, pItem );
+ m_pImpl->insertHyperLabel( Index, pItem );
}
pItem->SetPosition( pOldItem );
- pItem->Update( _Index, _sLabel );
+ pItem->Update( Index, _sLabel );
pItem->SetClickHdl(LINK( this, ORoadmap, ImplClickHdl ) );
- pItem->SetID( _RMID );
- pItem->SetIndex( _Index );
+ pItem->SetID( RMID );
+ pItem->SetIndex( Index );
if (!_bEnabled)
pItem->Enable( _bEnabled );
return pItem;
@@ -360,13 +360,13 @@ void ORoadmap::UpdatefollowingHyperLabels(ItemIndex _nIndex)
}
}
-void ORoadmap::ReplaceRoadmapItem(ItemIndex _Index, const OUString& _RoadmapItem, ItemId _RMID, bool _bEnabled)
+void ORoadmap::ReplaceRoadmapItem(ItemIndex Index, const OUString& roadmapItem, ItemId RMID, bool _bEnabled)
{
- RoadmapItem* pItem = GetByIndex( _Index);
+ RoadmapItem* pItem = GetByIndex( Index);
if ( pItem != nullptr )
{
- pItem->Update( _Index, _RoadmapItem );
- pItem->SetID( _RMID );
+ pItem->Update( Index, roadmapItem );
+ pItem->SetID( RMID );
pItem->Enable( _bEnabled );
}
}
@@ -384,19 +384,19 @@ RoadmapTypes::ItemId ORoadmap::GetItemID(ItemIndex _nIndex) const
return -1;
}
-void ORoadmap::InsertRoadmapItem(ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, bool _bEnabled)
+void ORoadmap::InsertRoadmapItem(ItemIndex Index, const OUString& RoadmapItem, ItemId _nUniqueId, bool _bEnabled)
{
- InsertHyperLabel( _Index, _RoadmapItem, _nUniqueId, _bEnabled, false/*bIncomplete*/ );
+ InsertHyperLabel( Index, RoadmapItem, _nUniqueId, _bEnabled, false/*bIncomplete*/ );
// TODO YPos is superfluous, if items are always appended
- UpdatefollowingHyperLabels( _Index + 1 );
+ UpdatefollowingHyperLabels( Index + 1 );
}
-void ORoadmap::DeleteRoadmapItem(ItemIndex _Index)
+void ORoadmap::DeleteRoadmapItem(ItemIndex Index)
{
- if ( m_pImpl->getItemCount() > 0 && ( _Index > -1) && ( _Index < m_pImpl->getItemCount() ) )
+ if ( m_pImpl->getItemCount() > 0 && ( Index > -1) && ( Index < m_pImpl->getItemCount() ) )
{
- m_pImpl->removeHyperLabel( _Index );
- UpdatefollowingHyperLabels( _Index );
+ m_pImpl->removeHyperLabel( Index );
+ UpdatefollowingHyperLabels( Index );
}
}
@@ -430,11 +430,11 @@ void ORoadmap::ChangeRoadmapItemLabel( ItemId _nID, const OUString& _sLabel )
}
}
-void ORoadmap::ChangeRoadmapItemID(ItemId _nID, ItemId _NewID)
+void ORoadmap::ChangeRoadmapItemID(ItemId _nID, ItemId NewID)
{
RoadmapItem* pItem = GetByID( _nID );
if ( pItem != nullptr )
- pItem->SetID( _NewID );
+ pItem->SetID( NewID );
}
RoadmapItem* ORoadmap::GetByID(ItemId _nID)
@@ -644,9 +644,9 @@ bool ORoadmap::PreNotify(NotifyEvent& _rNEvt)
return Window::PreNotify( _rNEvt );
}
-IMPL_LINK_TYPED(ORoadmap, ImplClickHdl, HyperLabel*, _CurHyperLabel, void)
+IMPL_LINK_TYPED(ORoadmap, ImplClickHdl, HyperLabel*, CurHyperLabel, void)
{
- SelectRoadmapItemByID( _CurHyperLabel->GetID() );
+ SelectRoadmapItemByID( CurHyperLabel->GetID() );
}
void ORoadmap::DataChanged(const DataChangedEvent& rDCEvt)
@@ -704,10 +704,10 @@ void RoadmapItem::SetInteractive(bool _bInteractive)
mpDescription->SetInteractive(_bInteractive);
}
-void RoadmapItem::SetID(sal_Int16 _ID)
+void RoadmapItem::SetID(sal_Int16 ID)
{
if ( mpDescription )
- mpDescription->SetID(_ID);
+ mpDescription->SetID(ID);
}
sal_Int16 RoadmapItem::GetID() const
@@ -726,9 +726,9 @@ void RoadmapItem::ImplUpdateIndex(const ItemIndex _nIndex)
ImplUpdatePosSize();
}
-void RoadmapItem::SetIndex(ItemIndex _Index)
+void RoadmapItem::SetIndex(ItemIndex Index)
{
- ImplUpdateIndex(_Index);
+ ImplUpdateIndex(Index);
}
RoadmapTypes::ItemIndex RoadmapItem::GetIndex() const
@@ -802,13 +802,13 @@ void RoadmapItem::ImplUpdatePosSize()
mpDescription->SetSizePixel( aDescriptionSize );
}
-void RoadmapItem::Update(ItemIndex _RMIndex, const OUString& _rText)
+void RoadmapItem::Update(ItemIndex RMIndex, const OUString& _rText)
{
// update description label
mpDescription->SetLabel( _rText );
// update the index in both controls, which triggers updating the geometry of both
- ImplUpdateIndex( _RMIndex );
+ ImplUpdateIndex( RMIndex );
}
void RoadmapItem::SetClickHdl(const Link<HyperLabel*,void>& rLink)
commit 1fd693e91d1b8ace3e90e0183ac379b738a42c62
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 18:48:13 2016 +0100
Avoid reserved identifiers
Change-Id: Ie27122c31703b1a09874d21a686cd0bc54ebbccb
diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx
index 9b7203a..4530f99 100644
--- a/svtools/source/control/hyperlabel.cxx
+++ b/svtools/source/control/hyperlabel.cxx
@@ -178,14 +178,14 @@ namespace svt
return m_pImpl->Index;
}
- void HyperLabel::SetID( sal_Int16 _ID )
+ void HyperLabel::SetID( sal_Int16 ID )
{
- m_pImpl->ID = _ID;
+ m_pImpl->ID = ID;
}
- void HyperLabel::SetIndex( sal_Int32 _Index )
+ void HyperLabel::SetIndex( sal_Int32 Index )
{
- m_pImpl->Index = _Index;
+ m_pImpl->Index = Index;
}
void HyperLabel::SetLabel( const OUString& _rText )
commit 5c968ab1da2a81da13a51c9e1b3de5ee49afe323
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 18:48:03 2016 +0100
Avoid reserved identifiers
Change-Id: Id82db66f932c033491c6014eecdff4cc48f5c083
diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx
index d752265..5cd9a1d 100644
--- a/svtools/inc/roadmap.hxx
+++ b/svtools/inc/roadmap.hxx
@@ -58,7 +58,7 @@ public:
void EnableRoadmapItem( ItemId _nItemId, bool _bEnable );
void ChangeRoadmapItemLabel( ItemId _nID, const OUString& sLabel );
- void ChangeRoadmapItemID( ItemId _nID, ItemId _NewID );
+ void ChangeRoadmapItemID( ItemId _nID, ItemId NewID );
void SetRoadmapInteractive( bool _bInteractive );
bool IsRoadmapInteractive();
@@ -69,8 +69,8 @@ public:
ItemIndex GetItemCount() const;
ItemId GetItemID( ItemIndex _nIndex ) const;
- void InsertRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, bool _bEnabled = true );
- void ReplaceRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, bool _bEnabled );
+ void InsertRoadmapItem( ItemIndex Index, const OUString& RoadmapItem, ItemId _nUniqueId, bool _bEnabled = true );
+ void ReplaceRoadmapItem( ItemIndex Index, const OUString& RoadmapItem, ItemId _nUniqueId, bool _bEnabled );
void DeleteRoadmapItem( ItemIndex _nIndex );
ItemId GetCurrentRoadmapItemID() const;
@@ -96,15 +96,15 @@ private:
RoadmapItem* GetByID( ItemId _nID );
const RoadmapItem* GetByID( ItemId _nID ) const;
- RoadmapItem* GetPreviousHyperLabel( ItemIndex _Index);
+ RoadmapItem* GetPreviousHyperLabel( ItemIndex Index);
void DrawHeadline(vcl::RenderContext& rRenderContext);
void DeselectOldRoadmapItems();
- ItemId GetNextAvailableItemId( ItemIndex _NewIndex );
- ItemId GetPreviousAvailableItemId( ItemIndex _NewIndex );
+ ItemId GetNextAvailableItemId( ItemIndex NewIndex );
+ ItemId GetPreviousAvailableItemId( ItemIndex NewIndex );
RoadmapItem* GetByPointer(vcl::Window* pWindow);
- RoadmapItem* InsertHyperLabel( ItemIndex _Index, const OUString& _aStr, ItemId _RMID, bool _bEnabled, bool _bIncomplete );
- void UpdatefollowingHyperLabels( ItemIndex _Index );
+ RoadmapItem* InsertHyperLabel( ItemIndex Index, const OUString& _aStr, ItemId RMID, bool _bEnabled, bool _bIncomplete );
+ void UpdatefollowingHyperLabels( ItemIndex Index );
};
} // namespace svt
commit 588fca321363ab9dc93fbe9296f1eec69460f779
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 18:47:52 2016 +0100
Avoid reserved identifiers
Change-Id: I7fe3cbd19358dafb998cae189f07e93a9ee791a2
diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx
index 2035ad6..b70e706 100644
--- a/include/svtools/hyperlabel.hxx
+++ b/include/svtools/hyperlabel.hxx
@@ -57,10 +57,10 @@ namespace svt
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
- void SetID( sal_Int16 _ID );
+ void SetID( sal_Int16 ID );
sal_Int16 GetID() const;
- void SetIndex( sal_Int32 _Index );
+ void SetIndex( sal_Int32 Index );
sal_Int32 GetIndex() const;
void SetLabel( const OUString& _rText );
commit fc93d61fa9e5733cd55bcae15604bbf247ca701a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 18:24:16 2016 +0100
Avoid reserved identifier
Change-Id: I8fa13369070d8364c8f1f574dfa056d021d4c083
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index 4ebc9573..e4f38e2 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -151,7 +151,7 @@ protected:
int ScanText( const sal_Unicode cBreak = 0U );
- int _GetNextRawToken();
+ int GetNextRawToken();
// scan next token
virtual int GetNextToken_() override;
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index ea51e55..b2e309f 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -823,7 +823,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
return HTML_TEXTTOKEN;
}
-int HTMLParser::_GetNextRawToken()
+int HTMLParser::GetNextRawToken()
{
OUStringBuffer sTmpBuffer( MAX_LEN );
@@ -1075,7 +1075,7 @@ int HTMLParser::GetNextToken_()
if( bReadScript || bReadStyle || !aEndToken.isEmpty() )
{
- nRet = _GetNextRawToken();
+ nRet = GetNextRawToken();
if( nRet || !IsParserWorking() )
return nRet;
}
commit 6d711b55d8440d3615923fd983d56d886266f8ea
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 18:21:35 2016 +0100
Avoid reserved identifier
Change-Id: I59b2e4859fab89fb7508b8c929d4d586495c6022
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index 5a2c196..4ebc9573 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -154,7 +154,7 @@ protected:
int _GetNextRawToken();
// scan next token
- virtual int _GetNextToken() override;
+ virtual int GetNextToken_() override;
virtual ~HTMLParser();
diff --git a/include/svtools/parrtf.hxx b/include/svtools/parrtf.hxx
index f98dc7b..1c45ddc 100644
--- a/include/svtools/parrtf.hxx
+++ b/include/svtools/parrtf.hxx
@@ -51,7 +51,7 @@ protected:
void SkipGroup();
// scanne das naechste Token,
- virtual int _GetNextToken() override;
+ virtual int GetNextToken_() override;
void ReadUnknownData();
virtual void ReadBitmapData();
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index 527c192..75d07b3 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -97,10 +97,10 @@ protected:
TokenStackType* GetStackPtr( short nCnt );
// scan the next token:
- // work off Token stack and call _GetNextToken() if necessary.
+ // work off Token stack and call GetNextToken_() if necessary.
// That one is responsible for the recognition of new Tokens.
int GetNextToken();
- virtual int _GetNextToken() = 0;
+ virtual int GetNextToken_() = 0;
// is called for each Token that is recognized in CallParser
virtual void NextToken( int nToken );
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 0ac318c..ea51e55 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -729,7 +729,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
case '\n':
if( '>'==cBreak )
{
- // cr/lf in tag is handled in _GetNextToken()
+ // cr/lf in tag is handled in GetNextToken_()
sTmpBuffer.appendUtf32( nNextCh );
break;
}
@@ -774,7 +774,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
}
else
// Only read blanks: no text must be returned
- // and _GetNextToken has to read until EOF
+ // and GetNextToken_ has to read until EOF
return 0;
}
} while ( ' ' == nNextCh || '\t' == nNextCh ||
@@ -925,7 +925,7 @@ int HTMLParser::_GetNextRawToken()
bContinue = false;
- // nToken==0 means, _GetNextToken continues to read
+ // nToken==0 means, GetNextToken_ continues to read
if( aToken.isEmpty() && (bReadStyle || bReadScript) )
{
// Immediately close environment (or context?)
@@ -1041,7 +1041,7 @@ int HTMLParser::_GetNextRawToken()
}
// Scan next token
-int HTMLParser::_GetNextToken()
+int HTMLParser::GetNextToken_()
{
int nRet = 0;
sSaveToken.clear();
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index f5a73b6..37131de 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -52,7 +52,7 @@ SvRTFParser::~SvRTFParser()
}
-int SvRTFParser::_GetNextToken()
+int SvRTFParser::GetNextToken_()
{
int nRet = 0;
do {
@@ -173,10 +173,10 @@ int SvRTFParser::_GetNextToken()
if (!_inSkipGroup) {
// UPR - overread the group with the ansi
// information
- while( '{' != _GetNextToken() )
+ while( '{' != GetNextToken_() )
;
SkipGroup();
- _GetNextToken(); // overread the last bracket
+ GetNextToken_(); // overread the last bracket
nRet = 0;
}
break;
@@ -407,7 +407,7 @@ void SvRTFParser::ScanText()
OUString sSave( aToken );
nNextCh = '\\';
- int nToken = _GetNextToken();
+ int nToken = GetNextToken_();
DBG_ASSERT( RTF_U == nToken, "doch kein UNI-Code Zeichen" );
// don't convert symbol chars
aStrBuffer.append(static_cast< sal_Unicode >(nTokenValue));
@@ -534,7 +534,7 @@ _inSkipGroup++;
}
break;
}
- int nToken = _GetNextToken();
+ int nToken = GetNextToken_();
if (nToken == RTF_BIN)
{
rInput.SeekRel(-1);
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index a17ca8a..1e70b2c 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -427,7 +427,7 @@ int SvParser::GetNextToken()
nTokenValue = -1; // marker for no value read
bTokenHasValue = false;
- nRet = _GetNextToken();
+ nRet = GetNextToken_();
if( SVPAR_PENDING == eState )
return nRet;
}
commit 19a5374b063551e448aa4ece115d6f711fc0772b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 18:19:31 2016 +0100
Avoid reserved identifiers
Change-Id: I52cab3f30c5a1365dd51d7db2c2cf2b3a609fa11
diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx
index e7eedd0..f948dc2 100644
--- a/include/toolkit/controls/roadmapcontrol.hxx
+++ b/include/toolkit/controls/roadmapcontrol.hxx
@@ -81,7 +81,7 @@ namespace toolkit
void MakeRMItemValidation( sal_Int32 Index, css::uno::Reference< XInterface > xRoadmapItem );
css::container::ContainerEvent GetContainerEvent(sal_Int32 Index, css::uno::Reference< XInterface > );
- void SetRMItemDefaultProperties( const sal_Int32 _Index, css::uno::Reference< XInterface > );
+ void SetRMItemDefaultProperties( const sal_Int32 Index, css::uno::Reference< XInterface > );
static sal_Int16 GetCurrentItemID( css::uno::Reference< css::beans::XPropertySet > xPropertySet );
sal_Int32 GetUniqueID();
@@ -116,9 +116,9 @@ namespace toolkit
sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any & _Element) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any & Element) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any & _Element) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any & Element) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index aaf8ee2..83476bd 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -274,13 +274,13 @@ static void lcl_throwIndexOutOfBoundsException( )
}
- void SAL_CALL UnoControlRoadmapModel::insertByIndex( const sal_Int32 Index, const Any& _Element)
+ void SAL_CALL UnoControlRoadmapModel::insertByIndex( const sal_Int32 Index, const Any& Element)
throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
if ( ( Index >= ( (sal_Int32)maRoadmapItems.size() + 1 ) ) || (Index < 0))
lcl_throwIndexOutOfBoundsException( );
Reference< XInterface > xRoadmapItem;
- _Element >>= xRoadmapItem;
+ Element >>= xRoadmapItem;
MakeRMItemValidation( Index, xRoadmapItem);
SetRMItemDefaultProperties( Index, xRoadmapItem );
maRoadmapItems.insert( maRoadmapItems.begin() + Index, xRoadmapItem);
@@ -328,11 +328,11 @@ static void lcl_throwIndexOutOfBoundsException( )
}
- void SAL_CALL UnoControlRoadmapModel::replaceByIndex( const sal_Int32 Index, const Any& _Element)
+ void SAL_CALL UnoControlRoadmapModel::replaceByIndex( const sal_Int32 Index, const Any& Element)
throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
Reference< XInterface > xRoadmapItem;
- _Element >>= xRoadmapItem;
+ Element >>= xRoadmapItem;
MakeRMItemValidation( Index, xRoadmapItem);
SetRMItemDefaultProperties( Index, xRoadmapItem );
maRoadmapItems.erase( maRoadmapItems.begin() + Index );
commit e4602e54af8777dbee3e420ac806556293f13ac7
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:57:51 2016 +0100
Avoid reserved identifier, remove unnecessary typedef
Change-Id: I2dfce92ef98ca18ac0fe2c415240216228b4ee0a
diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx
index b2016b9..5874749 100644
--- a/vcl/source/fontsubset/ttcr.cxx
+++ b/vcl/source/fontsubset/ttcr.cxx
@@ -42,7 +42,7 @@ namespace vcl
* Private Data Types
*/
- struct _TrueTypeCreator {
+ struct TrueTypeCreator {
sal_uInt32 tag; /**< TrueType file tag */
list tables; /**< List of table tags and pointers */
};
diff --git a/vcl/source/fontsubset/ttcr.hxx b/vcl/source/fontsubset/ttcr.hxx
index fe24fff..dd6c262 100644
--- a/vcl/source/fontsubset/ttcr.hxx
+++ b/vcl/source/fontsubset/ttcr.hxx
@@ -31,7 +31,7 @@
namespace vcl
{
- typedef struct _TrueTypeCreator TrueTypeCreator;
+ struct TrueTypeCreator;
/* TrueType data types */
typedef struct {
commit afc34aac2c6863f01d7e750083a422b86db408ea
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:54:52 2016 +0100
Avoid reserved identifier
Change-Id: I554fde45000114dd19f117d93ef5c7a780231594
diff --git a/vcl/source/fontsubset/list.cxx b/vcl/source/fontsubset/list.cxx
index ca9653e..aab4bf4 100644
--- a/vcl/source/fontsubset/list.cxx
+++ b/vcl/source/fontsubset/list.cxx
@@ -31,13 +31,13 @@
#include "list.h"
/*- private data types */
-typedef struct _lnode {
- struct _lnode *next;
- struct _lnode *prev;
+struct lnode {
+ struct lnode *next;
+ struct lnode *prev;
void *value;
-} lnode;
+};
struct list_ {
lnode *head, *tail, *cptr;
commit af6fdd68240c3b05c3cc16b422839bd6dc14175a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:54:06 2016 +0100
Avoid reserved identifier
Change-Id: Ie62bbf64a9cdb74725fd48a8f8dcc1ab76d97219
diff --git a/vcl/source/fontsubset/list.cxx b/vcl/source/fontsubset/list.cxx
index 42cc657..ca9653e 100644
--- a/vcl/source/fontsubset/list.cxx
+++ b/vcl/source/fontsubset/list.cxx
@@ -39,7 +39,7 @@ typedef struct _lnode {
} lnode;
-struct _list {
+struct list_ {
lnode *head, *tail, *cptr;
size_t aCount;
list_destructor eDtor;
@@ -84,7 +84,7 @@ static lnode *appendPrim(list pThis, void *el)
/*- public methods */
list listNewEmpty() /*- default ctor */
{
- list pThis = static_cast<list>(rtl_allocateMemory(sizeof(struct _list)));
+ list pThis = static_cast<list>(rtl_allocateMemory(sizeof(struct list_)));
assert(pThis != nullptr);
pThis->aCount = 0;
diff --git a/vcl/source/fontsubset/list.h b/vcl/source/fontsubset/list.h
index 93a4710..18fda15 100644
--- a/vcl/source/fontsubset/list.h
+++ b/vcl/source/fontsubset/list.h
@@ -37,7 +37,7 @@ extern "C"
* List of void * pointers
*/
- typedef struct _list *list;
+ typedef struct list_ *list;
typedef void (*list_destructor)(void *);
/*- constructors and a destructor */
commit d429ea8ac159283dc5ff862c254868a987a9f42b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:51:07 2016 +0100
Remove unnecessary typedef (that introduced a reserved identifier)
Change-Id: I6c0aaac10b2244271f3cdf45f4eceb6d685b213c
diff --git a/unusedcode.easy b/unusedcode.easy
index d77024d7..7285029 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -72,7 +72,7 @@ sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_M_move_data(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&, std::integral_constant<bool, true>)
std::__cxx1998::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long)
-vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
+vcl::MapChar(vcl::TrueTypeFont*, unsigned short, bool)
vcl::Region::IsInside(Rectangle const&) const
vcl::RenderSettings::PushAndApply(OutputDevice&)
vcl::Window::DrawGradientWallpaper(OutputDevice&, long, long, long, long, Wallpaper const&)
diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index 7e25b9b..5053442 100644
--- a/vcl/inc/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -25,7 +25,7 @@
#include "salglyphid.hxx"
-namespace vcl { struct _TrueTypeFont; } ///< SFT's idea of a TTF font
+namespace vcl { struct TrueTypeFont; } ///< SFT's idea of a TTF font
class FontSubsetInfo
{
@@ -49,7 +49,7 @@ public:
bool LoadFont( FontType eInFontType,
const unsigned char* pFontBytes, int nByteLength );
- bool LoadFont( vcl::_TrueTypeFont* pSftTrueTypeFont );
+ bool LoadFont( vcl::TrueTypeFont* pSftTrueTypeFont );
bool CreateFontSubset( int nOutFontTypeMask,
FILE* pOutFile, const char* pOutFontName,
@@ -70,7 +70,7 @@ private:
unsigned const char* mpInFontBytes;
int mnInByteLength;
FontType meInFontType; ///< allowed mask of input font-types
- vcl::_TrueTypeFont* mpSftTTFont;
+ vcl::TrueTypeFont* mpSftTTFont;
// subset-request details
int mnReqFontTypeMask; ///< allowed subset-target font types
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index e4daced..c4622f7 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -100,7 +100,7 @@ namespace vcl
FWIDTH_ULTRA_EXPANDED = 9 /**< 200% of normal */
};
-/** Type of the 'kern' table, stored in _TrueTypeFont::kerntype */
+/** Type of the 'kern' table, stored in TrueTypeFont::kerntype */
enum KernType {
KT_NONE = 0, /**< no kern table */
KT_APPLE_NEW = 1, /**< new Apple kern table */
@@ -226,7 +226,7 @@ namespace vcl
sal_Int16 y; /**< Y coordinate in EmSquare units */
} ControlPoint;
- typedef struct _TrueTypeFont TrueTypeFont;
+ struct TrueTypeFont;
/**
* @defgroup sft Sun Font Tools Exported Functions
@@ -520,7 +520,7 @@ namespace vcl
/*- private definitions */
- struct _TrueTypeFont {
+ struct TrueTypeFont {
sal_uInt32 tag;
char *fname;
@@ -550,7 +550,7 @@ namespace vcl
void *pGSubstitution; /* info provided by GSUB for UseGSUB() */
};
-/* indexes into _TrueTypeFont::tables[] and _TrueTypeFont::tlens[] */
+/* indexes into TrueTypeFont::tables[] and TrueTypeFont::tlens[] */
#define O_maxp 0 /* 'maxp' */
#define O_glyf 1 /* 'glyf' */
#define O_head 2 /* 'head' */
diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx
index 26403cc..a1a1476 100644
--- a/vcl/source/fontsubset/fontsubset.cxx
+++ b/vcl/source/fontsubset/fontsubset.cxx
@@ -59,7 +59,7 @@ bool FontSubsetInfo::LoadFont(
}
// prepare subsetting for fonts that are known to the SFT-parser
-bool FontSubsetInfo::LoadFont( vcl::_TrueTypeFont* pSftTTFont )
+bool FontSubsetInfo::LoadFont( vcl::TrueTypeFont* pSftTTFont )
{
DBG_ASSERT( (mpInFontBytes == nullptr), "Subset from SFT and from mapped font-file requested");
mpSftTTFont = pSftTTFont;
diff --git a/vcl/source/fontsubset/gsub.cxx b/vcl/source/fontsubset/gsub.cxx
index 399f31e..d9971fe 100644
--- a/vcl/source/fontsubset/gsub.cxx
+++ b/vcl/source/fontsubset/gsub.cxx
@@ -50,7 +50,7 @@ inline sal_uInt16 NEXT_UShort( const unsigned char* &p )
#define MKTAG(s) ((((((s[0]<<8)+s[1])<<8)+s[2])<<8)+s[3])
-bool ReadGSUB( struct _TrueTypeFont* pTTFile,
+bool ReadGSUB( struct TrueTypeFont* pTTFile,
int nRequestedScript, int nRequestedLangsys )
{
const FT_Byte* pGsubBase = pTTFile->tables[ O_gsub ];
@@ -315,13 +315,13 @@ bool ReadGSUB( struct _TrueTypeFont* pTTFile,
return true;
}
-void ReleaseGSUB(struct _TrueTypeFont* pTTFile)
+void ReleaseGSUB(struct TrueTypeFont* pTTFile)
{
GlyphSubstitution* pGlyphSubstitution = static_cast<GlyphSubstitution*>(pTTFile->pGSubstitution);
delete pGlyphSubstitution;
}
-int UseGSUB( struct _TrueTypeFont* pTTFile, int nGlyph )
+int UseGSUB( struct TrueTypeFont* pTTFile, int nGlyph )
{
GlyphSubstitution* pGlyphSubstitution = static_cast<GlyphSubstitution*>(pTTFile->pGSubstitution);
if( pGlyphSubstitution != nullptr )
@@ -334,7 +334,7 @@ int UseGSUB( struct _TrueTypeFont* pTTFile, int nGlyph )
return nGlyph;
}
-int HasVerticalGSUB( struct _TrueTypeFont* pTTFile )
+int HasVerticalGSUB( struct TrueTypeFont* pTTFile )
{
GlyphSubstitution* pGlyphSubstitution = static_cast<GlyphSubstitution*>(pTTFile->pGSubstitution);
return pGlyphSubstitution ? +1 : 0;
diff --git a/vcl/source/fontsubset/gsub.h b/vcl/source/fontsubset/gsub.h
index 362a619..51f5ce8 100644
--- a/vcl/source/fontsubset/gsub.h
+++ b/vcl/source/fontsubset/gsub.h
@@ -23,13 +23,13 @@
namespace vcl
{
-int HasVerticalGSUB( struct vcl::_TrueTypeFont* pTTFile );
+int HasVerticalGSUB( struct vcl::TrueTypeFont* pTTFile );
-int UseGSUB( struct vcl::_TrueTypeFont* pTTFile, int nGlyph );
+int UseGSUB( struct vcl::TrueTypeFont* pTTFile, int nGlyph );
-bool ReadGSUB( struct vcl::_TrueTypeFont* pTTFile, int nRequestedScript, int nRequestedLangsys );
+bool ReadGSUB( struct vcl::TrueTypeFont* pTTFile, int nRequestedScript, int nRequestedLangsys );
-void ReleaseGSUB( struct vcl::_TrueTypeFont* pTTFile );
+void ReleaseGSUB( struct vcl::TrueTypeFont* pTTFile );
}
commit 201812ee8bd8ed91df0a293649bfbd4a7dd6b059
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:46:29 2016 +0100
Avoid reserved identifiers
Change-Id: I751e75e0b63e95cc92be7b61a77ed21eeb52bc1f
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index ef1141f..076d955 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -90,10 +90,10 @@ struct TEWritingDirectionInfo
sal_uInt8 nType;
sal_Int32 nStartPos;
sal_Int32 nEndPos;
- TEWritingDirectionInfo( sal_uInt8 _Type, sal_Int32 _Start, sal_Int32 _End )
- : nType {_Type}
- , nStartPos {_Start}
- , nEndPos {_End}
+ TEWritingDirectionInfo( sal_uInt8 Type, sal_Int32 Start, sal_Int32 End )
+ : nType {Type}
+ , nStartPos {Start}
+ , nEndPos {End}
{}
};
commit 4a7237cb3130a7f9d6739f670606598f0e836e06
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:46:18 2016 +0100
Avoid reserved identifier
Change-Id: I6ac0dfb8bb013e8106bdeb9df00aef3abe4d3af6
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 784c1ed..71ad3ca 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -711,7 +711,7 @@ void SAL_CALL Moderator::onTerminated()
Function for opening UCB contents synchronously,
but with handled timeout;
*/
-static bool _UCBOpenContentSync(
+static bool UCBOpenContentSync_(
UcbLockBytesRef xLockBytes,
Reference < XContent > xContent,
const Command& rArg,
@@ -743,7 +743,7 @@ static bool UCBOpenContentSync(
! aScheme.equalsIgnoreAsciiCase("vnd.sun.star.webdav") &&
! aScheme.equalsIgnoreAsciiCase("vnd.sun.star.webdavs") &&
! aScheme.equalsIgnoreAsciiCase("ftp"))
- return _UCBOpenContentSync(
+ return UCBOpenContentSync_(
xLockBytes,xContent,rArg,xSink,xInteract);
if ( !aScheme.equalsIgnoreAsciiCase( "http" ) &&
@@ -956,7 +956,7 @@ static bool UCBOpenContentSync(
/**
Function for opening UCB contents synchronously
*/
-static bool _UCBOpenContentSync(
+static bool UCBOpenContentSync_(
UcbLockBytesRef xLockBytes,
Reference < XContent > xContent,
const Command& rArg,
commit 4657286f22f7975b96d37eeaea205fcacfb27ec5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:45:54 2016 +0100
Avoid reserved identifiers
Change-Id: I815c839b19e5b2d7d5b5bab821614ad953006de2
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index c19d52b..99b086b 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -62,12 +62,12 @@ const double EXP_ABS_UPPER_BOUND = 1.0E15; // use exponential notation above th
} // namespace
-const double _D_MAX_U_LONG_ = (double) 0xffffffff; // 4294967295.0
-const sal_uInt16 _MAX_FRACTION_PREC = 3;
+const double D_MAX_U_LONG = (double) 0xffffffff; // 4294967295.0
+const sal_uInt16 MAX_FRACTION_PREC = 3;
const double D_EPS = 1.0E-2;
-const double _D_MAX_D_BY_100 = 1.7E306;
-const double _D_MIN_M_BY_1000 = 2.3E-305;
+const double D_MAX_D_BY_100 = 1.7E306;
+const double D_MIN_M_BY_1000 = 2.3E-305;
static const sal_uInt8 cCharWidths[ 128-32 ] = {
1,1,1,2,2,3,2,1,1,1,1,2,1,1,1,1,
@@ -1788,7 +1788,7 @@ void SvNumberformat::ImpGetOutputStdToPrecision(double& rNumber, OUString& rOutS
void SvNumberformat::ImpGetOutputInputLine(double fNumber, OUString& OutString)
{
bool bModified = false;
- if ( (eType & css::util::NumberFormat::PERCENT) && (fabs(fNumber) < _D_MAX_D_BY_100))
+ if ( (eType & css::util::NumberFormat::PERCENT) && (fabs(fNumber) < D_MAX_D_BY_100))
{
if (fNumber == 0.0)
{
@@ -2409,7 +2409,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
double fNum = floor(fNumber); // Integral part
fNumber -= fNum; // Fractional part
- if (fNum > _D_MAX_U_LONG_ || rInfo.nCntExp > 9) // Too large
+ if (fNum > D_MAX_U_LONG || rInfo.nCntExp > 9) // Too large
{
sBuff = rScan.GetErrorString();
return false;
@@ -2424,7 +2424,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
sal_uLong nBasis = ((sal_uLong)floor( pow(10.0,rInfo.nCntExp))) - 1; // 9, 99, 999 ,...
sal_uLong x0, y0, x1, y1;
- if (rInfo.nCntExp <= _MAX_FRACTION_PREC)
+ if (rInfo.nCntExp <= MAX_FRACTION_PREC)
{
bool bUpperHalf;
@@ -2602,7 +2602,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
{
double fNum1 = fNum * (double)nDiv + (double)nFrac;
- if (fNum1 > _D_MAX_U_LONG_)
+ if (fNum1 > D_MAX_U_LONG)
{
sBuff = rScan.GetErrorString();
return false;
@@ -2749,7 +2749,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
{
bSign = false; // Not -00:00:00
}
- if( floor( fTime ) > _D_MAX_U_LONG_ )
+ if( floor( fTime ) > D_MAX_U_LONG )
{
sBuff = rScan.GetErrorString();
return false;
@@ -3857,7 +3857,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
if (rInfo.eScannedType == css::util::NumberFormat::PERCENT)
{
- if (fNumber < _D_MAX_D_BY_100)
+ if (fNumber < D_MAX_D_BY_100)
{
fNumber *= 100.0;
}
@@ -3876,7 +3876,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
long nPrecExp;
for (i = 0; i < nThousand; i++)
{
- if (fNumber > _D_MIN_M_BY_1000)
+ if (fNumber > D_MIN_M_BY_1000)
{
fNumber /= 1000.0;
}
commit 5da802b44ddecf6855a34ebe9353a587e3e6a848
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:45:19 2016 +0100
Drop __store_ prefix from static entity (avoid reserved identifier)
Change-Id: Ib03727f6b47d8f013f78a590d36d568ebc405bf3
diff --git a/store/source/stordir.cxx b/store/source/stordir.cxx
index b56b450..aa34f91 100644
--- a/store/source/stordir.cxx
+++ b/store/source/stordir.cxx
@@ -41,9 +41,9 @@ using namespace store;
*
*======================================================================*/
/*
- * __store_convertTextToUnicode.
+ * convertTextToUnicode.
*/
-inline sal_Size __store_convertTextToUnicode (
+static inline sal_Size convertTextToUnicode (
rtl_TextToUnicodeConverter hConverter,
const sal_Char *pSrcBuffer, sal_Size nSrcLength,
sal_Unicode *pDstBuffer, sal_Size nDstLength)
@@ -182,7 +182,7 @@ storeError OStoreDirectory_Impl::iterate (storeFindData &rFindData)
sal_Size n = rtl_str_getLength (p);
sal_Size k = rFindData.m_nLength;
- n = __store_convertTextToUnicode (
+ n = convertTextToUnicode (
m_hTextCvt, p, n,
rFindData.m_pszName, STORE_MAXIMUM_NAMESIZE - 1);
if (k > n)
commit 7605a786540720c98cc87c44c4e79bf66b991af9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:44:31 2016 +0100
Avoid reserved identifier
Change-Id: I3df7e42b69e3900eae8d10d28a97d776fabd9f4b
diff --git a/soltools/mkdepend/ifparser.h b/soltools/mkdepend/ifparser.h
index dbc1e86..490ba51 100644
--- a/soltools/mkdepend/ifparser.h
+++ b/soltools/mkdepend/ifparser.h
@@ -62,11 +62,11 @@ typedef int Bool;
#define False 0
#define True 1
-typedef struct _if_parser {
+typedef struct if_parser {
struct { /* functions */
- const char *(*handle_error) (struct _if_parser *, const char *, const char *);
- int (*eval_variable) (struct _if_parser *, const char *, size_t);
- int (*eval_defined) (struct _if_parser *, const char *, size_t);
+ const char *(*handle_error) (struct if_parser *, const char *, const char *);
+ int (*eval_variable) (struct if_parser *, const char *, size_t);
+ int (*eval_defined) (struct if_parser *, const char *, size_t);
} funcs;
char *data;
} IfParser;
commit 5318e60b1289e888bacd6563ae55059a9e8e9f34
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:44:09 2016 +0100
Avoid reserved identifiers
Change-Id: Ifa0efa673cd60eb7bd668b72b4550da6025ffd1e
diff --git a/soltools/mkdepend/cppsetup.c b/soltools/mkdepend/cppsetup.c
index e472cb0..708e75d 100644
--- a/soltools/mkdepend/cppsetup.c
+++ b/soltools/mkdepend/cppsetup.c
@@ -112,17 +112,17 @@ yyerror(s)
#else /* not CPP */
#include "ifparser.h"
-struct _parse_data {
+struct parse_data {
struct filepointer *filep;
struct inclist *inc;
const char *line;
};
static const char *
-_my_if_errors (IfParser *ip, const char *cp, const char *expecting)
+my_if_errors (IfParser *ip, const char *cp, const char *expecting)
{
#ifdef DEBUG_MKDEPEND
- struct _parse_data *pd = (struct _parse_data *) ip->data;
+ struct parse_data *pd = (struct parse_data *) ip->data;
int lineno = pd->filep->f_line;
char *filename = pd->inc->i_file;
char prefix[300];
@@ -150,8 +150,8 @@ _my_if_errors (IfParser *ip, const char *cp, const char *expecting)
#define MAXNAMELEN 256
-char *
-_lookup_variable (const char *var, size_t len)
+static char *
+lookup_variable (const char *var, size_t len)
{
char tmpbuf[MAXNAMELEN + 1];
@@ -165,10 +165,10 @@ _lookup_variable (const char *var, size_t len)
static int
-_my_eval_defined (IfParser *ip, const char *var, size_t len)
+my_eval_defined (IfParser *ip, const char *var, size_t len)
{
(void)ip;
- if (_lookup_variable (var, len))
+ if (lookup_variable (var, len))
return 1;
else
return 0;
@@ -177,20 +177,20 @@ _my_eval_defined (IfParser *ip, const char *var, size_t len)
#define isvarfirstletter(ccc) (isalpha(ccc) || (ccc) == '_')
static int
-_my_eval_variable (IfParser *ip, const char *var, size_t len)
+my_eval_variable (IfParser *ip, const char *var, size_t len)
{
char *s;
(void)ip;
- s = _lookup_variable (var, len);
+ s = lookup_variable (var, len);
if (!s)
return 0;
do {
var = s;
if (!isvarfirstletter(*var))
break;
- s = _lookup_variable (var, strlen(var));
+ s = lookup_variable (var, strlen(var));
} while (s);
return atoi(var);
@@ -200,15 +200,15 @@ _my_eval_variable (IfParser *ip, const char *var, size_t len)
int cppsetup(char *line, struct filepointer *filep, struct inclist *inc)
{
IfParser ip;
- struct _parse_data pd;
+ struct parse_data pd;
int val = 0;
pd.filep = filep;
pd.inc = inc;
pd.line = line;
- ip.funcs.handle_error = _my_if_errors;
- ip.funcs.eval_defined = _my_eval_defined;
- ip.funcs.eval_variable = _my_eval_variable;
+ ip.funcs.handle_error = my_if_errors;
+ ip.funcs.eval_defined = my_eval_defined;
+ ip.funcs.eval_variable = my_eval_variable;
ip.data = (char *) &pd;
(void) ParseIfExpression (&ip, line, &val);
commit 09f6a525fa736f7f295cd59c578f331c5d3a96e1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:42:42 2016 +0100
Remove unused tag type names (that happened to be reserved) in typedefs
Change-Id: Ic378d548cdeeac3d41323e86c5e64ed10b370858
diff --git a/include/store/types.h b/include/store/types.h
index b3b9ad5..1b1724e 100644
--- a/include/store/types.h
+++ b/include/store/types.h
@@ -59,23 +59,19 @@ extern "C" {
@see store_openDirectory()
@see store_openStream()
*/
-enum __store_AccessMode
+typedef enum
{
store_AccessCreate,
store_AccessReadCreate,
store_AccessReadWrite,
store_AccessReadOnly,
store_Access_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
-};
-
-/** Access Mode type.
- */
-typedef enum __store_AccessMode storeAccessMode;
+} storeAccessMode;
/** Error Code enumeration.
*/
-enum __store_Error
+typedef enum
{
store_E_None = 0,
store_E_AccessViolation,
@@ -100,18 +96,14 @@ enum __store_Error
store_E_WrongVersion,
store_E_Unknown,
store_E_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
-};
-
-/** Error Code type.
- */
-typedef enum __store_Error storeError;
+} storeError;
/** Find Data structure.
@see store_findFirst()
@see store_findNext()
*/
-struct __store_FindData
+typedef struct
{
/** Name.
@see m_nLength
@@ -137,11 +129,7 @@ struct __store_FindData
/** Reserved for internal use.
*/
sal_uInt32 m_nReserved;
-};
-
-/** Find Data type.
- */
-typedef struct __store_FindData storeFindData;
+} storeFindData;
/*========================================================================
commit a34986a76dd19536410b70f999108eb67d1443c3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:41:57 2016 +0100
Remove unnecessary typedef (that introduced a reserved identifier)
Change-Id: Id7ab1345869d09b079cceae2095447e8851337d1
diff --git a/include/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx
index 6265d1a..034b85e 100644
--- a/include/i18nutil/unicode.hxx
+++ b/include/i18nutil/unicode.hxx
@@ -27,11 +27,11 @@
class LanguageTag;
-typedef struct _ScriptTypeList {
+struct ScriptTypeList {
sal_Int16 from;
sal_Int16 to;
sal_Int16 value;
-} ScriptTypeList;
+};
class I18NUTIL_DLLPUBLIC unicode
{
commit e58704ff8142a937fe156048979e8a0dc1e8b460
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:41:15 2016 +0100
Avoid reserved identifiers
Change-Id: Ie6a7e3fafd1394f93164a46fa0e7e149cf947ed2
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index e6c4a72..acfc419 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -130,21 +130,21 @@ struct OInterfaceCompare
}
};
-template <class _Tp, class _Arg>
-class mem_fun1_t : public ::std::binary_function<_Tp*,_Arg,void>
+template <class Tp, class Arg>
+class mem_fun1_t : public ::std::binary_function<Tp*,Arg,void>
{
- typedef void (_Tp::*_fun_type)(_Arg);
+ typedef void (Tp::*_fun_type)(Arg);
public:
- explicit mem_fun1_t(_fun_type __pf) : _M_f(__pf) {}
- void operator()(_Tp* __p, _Arg __x) const { (__p->*_M_f)(__x); }
+ explicit mem_fun1_t(_fun_type pf) : M_f(pf) {}
+ void operator()(Tp* p, Arg x) const { (p->*M_f)(x); }
private:
- _fun_type _M_f;
+ _fun_type M_f;
};
-template <class _Tp, class _Arg>
-inline mem_fun1_t<_Tp,_Arg> mem_fun(void (_Tp::*__f)(_Arg))
+template <class Tp, class Arg>
+inline mem_fun1_t<Tp,Arg> mem_fun(void (Tp::*f)(Arg))
{
- return mem_fun1_t<_Tp,_Arg>(__f);
+ return mem_fun1_t<Tp,Arg>(f);
}
/** output iterator that appends OUStrings into an OUStringBuffer.
commit f5b426ebd7f224f51983a604a207fdcd760be3ce
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:40:51 2016 +0100
Avoid reserved identifier
Change-Id: Iccd3a443fc0df0b7090f91b3510e0677a0094fb1
diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx
index 9849465..85bf5e9 100644
--- a/include/comphelper/interaction.hxx
+++ b/include/comphelper/interaction.hxx
@@ -100,7 +100,7 @@ namespace comphelper
}
// XInteractionPassword
- virtual void SAL_CALL setPassword( const OUString& _Password ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPassword( const OUString& Password ) throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getPassword( ) throw (css::uno::RuntimeException, std::exception) override;
private:
commit 9b7b7351a22bc3e131c44cefaff8c32e87d35079
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:40:25 2016 +0100
Avoid reserved identifier
Change-Id: I1255d0a5a1d112077c258a141b384a655ba62dff
diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx
index c3e77c6..cfc76a3 100644
--- a/include/comphelper/containermultiplexer.hxx
+++ b/include/comphelper/containermultiplexer.hxx
@@ -53,7 +53,7 @@ namespace comphelper
virtual void _elementInserted( const css::container::ContainerEvent& _rEvent )
throw (css::uno::RuntimeException,
std::exception);
- virtual void _elementRemoved( const css::container::ContainerEvent& _Event )
+ virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent )
throw (css::uno::RuntimeException,
std::exception);
virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent )
commit 37e887d1823ae08662866416a47b9cc3b975d625
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:39:50 2016 +0100
Remove unused tag type name (that happens to be reserved) in typedef
Change-Id: I593e7f711c108b273f7a9d0bdcf90c84e97c4d29
diff --git a/extensions/source/macosx/spotlight/main.m b/extensions/source/macosx/spotlight/main.m
index d3c3f44..7bbf2c7 100644
--- a/extensions/source/macosx/spotlight/main.m
+++ b/extensions/source/macosx/spotlight/main.m
@@ -53,7 +53,7 @@
// typedefs
// The layout for an instance of MetaDataImporterPlugIn
-typedef struct __MetadataImporterPluginType
+typedef struct
{
MDImporterInterfaceStruct *conduitInterface;
CFUUIDRef factoryID;
commit daa6a98549045b450a15fb8e9082ef531e668b77
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:39:01 2016 +0100
Avoid reserved identifiers
Change-Id: I6add6c03c92576127c3e3f93892bcc00c1f51424
diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx
index 49b17e0..9a3b053 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/cppuhelper/source/implbase_ex.cxx
@@ -75,7 +75,7 @@ static inline void * makeInterface( sal_IntPtr nOffset, void * that )
return (static_cast<char *>(that) + nOffset);
}
-static inline bool __td_equals(
+static inline bool td_equals(
typelib_TypeDescriptionReference const * pTDR1,
typelib_TypeDescriptionReference const * pTDR2 )
{
@@ -83,7 +83,7 @@ static inline bool __td_equals(
OUString::unacquired(&pTDR1->pTypeName) == OUString::unacquired(&pTDR2->pTypeName));
}
-static inline type_entry * __getTypeEntries( class_data * cd )
+static inline type_entry * getTypeEntries( class_data * cd )
{
type_entry * pEntries = cd->m_typeEntries;
if (! cd->m_storedTypeRefs) // not inited?
@@ -113,9 +113,9 @@ static inline type_entry * __getTypeEntries( class_data * cd )
return pEntries;
}
-static inline void __fillTypes( Type * types, class_data * cd )
+static inline void fillTypes( Type * types, class_data * cd )
{
- type_entry * pEntries = __getTypeEntries( cd );
+ type_entry * pEntries = getTypeEntries( cd );
for ( sal_Int32 n = cd->m_nTypes; n--; )
{
types[ n ] = pEntries[ n ].m_type.typeRef;
@@ -141,7 +141,7 @@ bool recursivelyFindType(
typelib_InterfaceTypeDescription const * base = type->ppBaseTypes[i];
// ignore XInterface:
if (base->nBaseTypes > 0) {
- if (__td_equals(
+ if (td_equals(
reinterpret_cast<
typelib_TypeDescriptionReference const * >(base),
demandedType))
@@ -164,17 +164,17 @@ bool recursivelyFindType(
}
-static inline void * __queryDeepNoXInterface(
+static inline void * queryDeepNoXInterface(
typelib_TypeDescriptionReference * pDemandedTDR, class_data * cd, void * that )
{
- type_entry * pEntries = __getTypeEntries( cd );
+ type_entry * pEntries = getTypeEntries( cd );
sal_Int32 nTypes = cd->m_nTypes;
sal_Int32 n;
// try top interfaces without getting td
for ( n = 0; n < nTypes; ++n )
{
- if (__td_equals( pEntries[ n ].m_type.typeRef, pDemandedTDR ))
+ if (td_equals( pEntries[ n ].m_type.typeRef, pDemandedTDR ))
{
return makeInterface( pEntries[ n ].m_offset, that );
}
@@ -229,7 +229,7 @@ Any SAL_CALL ImplHelper_query(
}
else
{
- p = __queryDeepNoXInterface( pTDR, cd, that );
+ p = queryDeepNoXInterface( pTDR, cd, that );
if (! p)
{
return Any();
@@ -244,7 +244,7 @@ Any SAL_CALL ImplHelper_queryNoXInterface(
checkInterface( rType );
typelib_TypeDescriptionReference * pTDR = rType.getTypeLibType();
- void * p = __queryDeepNoXInterface( pTDR, cd, that );
+ void * p = queryDeepNoXInterface( pTDR, cd, that );
if (p)
{
return Any( &p, pTDR );
@@ -266,7 +266,7 @@ Sequence< Type > SAL_CALL ImplHelper_getTypes(
{
Sequence< Type > types( cd->m_nTypes );
Type * pTypes = types.getArray();
- __fillTypes( pTypes, cd );
+ fillTypes( pTypes, cd );
return types;
}
@@ -277,7 +277,7 @@ Sequence< Type > SAL_CALL ImplInhHelper_getTypes(
sal_Int32 nAddTypes = rAddTypes.getLength();
Sequence< Type > types( nImplTypes + nAddTypes );
Type * pTypes = types.getArray();
- __fillTypes( pTypes, cd );
+ fillTypes( pTypes, cd );
// append base types
Type const * pAddTypes = rAddTypes.getConstArray();
while (nAddTypes--)
@@ -298,7 +298,7 @@ Any SAL_CALL WeakImplHelper_query(
// shortcut XInterface to OWeakObject
if (! isXInterface( pTDR->pTypeName ))
{
- void * p = __queryDeepNoXInterface( pTDR, cd, that );
+ void * p = queryDeepNoXInterface( pTDR, cd, that );
if (p)
{
return Any( &p, pTDR );
@@ -313,7 +313,7 @@ Sequence< Type > SAL_CALL WeakImplHelper_getTypes(
sal_Int32 nTypes = cd->m_nTypes;
Sequence< Type > types( nTypes +1 );
Type * pTypes = types.getArray();
- __fillTypes( pTypes, cd );
+ fillTypes( pTypes, cd );
pTypes[ nTypes ] = cppu::UnoType<XWeak>::get();
return types;
}
@@ -329,7 +329,7 @@ Any SAL_CALL WeakAggImplHelper_queryAgg(
// shortcut XInterface to OWeakAggObject
if (! isXInterface( pTDR->pTypeName ))
{
- void * p = __queryDeepNoXInterface( pTDR, cd, that );
+ void * p = queryDeepNoXInterface( pTDR, cd, that );
if (p)
{
return Any( &p, pTDR );
@@ -344,7 +344,7 @@ Sequence< Type > SAL_CALL WeakAggImplHelper_getTypes(
sal_Int32 nTypes = cd->m_nTypes;
Sequence< Type > types( nTypes +2 );
Type * pTypes = types.getArray();
- __fillTypes( pTypes, cd );
+ fillTypes( pTypes, cd );
pTypes[ nTypes++ ] = cppu::UnoType<XWeak>::get();
pTypes[ nTypes ] = cppu::UnoType<XAggregation>::get();
return types;
@@ -361,7 +361,7 @@ Any SAL_CALL WeakComponentImplHelper_query(
// shortcut XInterface to WeakComponentImplHelperBase
if (! isXInterface( pTDR->pTypeName ))
{
- void * p = __queryDeepNoXInterface( pTDR, cd, that );
+ void * p = queryDeepNoXInterface( pTDR, cd, that );
if (p)
{
return Any( &p, pTDR );
@@ -376,7 +376,7 @@ Sequence< Type > SAL_CALL WeakComponentImplHelper_getTypes(
sal_Int32 nTypes = cd->m_nTypes;
Sequence< Type > types( nTypes +2 );
Type * pTypes = types.getArray();
- __fillTypes( pTypes, cd );
+ fillTypes( pTypes, cd );
pTypes[ nTypes++ ] = cppu::UnoType<XWeak>::get();
pTypes[ nTypes ] = cppu::UnoType<lang::XComponent>::get();
return types;
@@ -393,7 +393,7 @@ Any SAL_CALL WeakAggComponentImplHelper_queryAgg(
// shortcut XInterface to WeakAggComponentImplHelperBase
if (! isXInterface( pTDR->pTypeName ))
{
- void * p = __queryDeepNoXInterface( pTDR, cd, that );
+ void * p = queryDeepNoXInterface( pTDR, cd, that );
if (p)
{
return Any( &p, pTDR );
@@ -408,7 +408,7 @@ Sequence< Type > SAL_CALL WeakAggComponentImplHelper_getTypes(
sal_Int32 nTypes = cd->m_nTypes;
Sequence< Type > types( nTypes +3 );
Type * pTypes = types.getArray();
- __fillTypes( pTypes, cd );
+ fillTypes( pTypes, cd );
pTypes[ nTypes++ ] = cppu::UnoType<XWeak>::get();
pTypes[ nTypes++ ] = cppu::UnoType<XAggregation>::get();
pTypes[ nTypes ] = cppu::UnoType<lang::XComponent>::get();
commit 132b4e91bc6a4d4cb545f62475e3156cb22c4e6d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:38:28 2016 +0100
Avoid reserved identifiers (use unnamed namespace, just in case)
Change-Id: I3e34368a674e9f128a32604c82181b1b99632c37
diff --git a/cppuhelper/source/access_control.cxx b/cppuhelper/source/access_control.cxx
index 7d20667..2ed7735 100644
--- a/cppuhelper/source/access_control.cxx
+++ b/cppuhelper/source/access_control.cxx
@@ -69,11 +69,13 @@ AccessControl::AccessControl( AccessControl const & ac )
}
}
+namespace {
+
#ifdef SAL_W32
#pragma pack(push, 8)
#endif
// binary comp. to all Permission structs
- struct __permission
+ struct permission
{
rtl_uString * m_str1;
rtl_uString * m_str2;
@@ -82,12 +84,11 @@ AccessControl::AccessControl( AccessControl const & ac )
#pragma pack(pop)
#endif
-
-inline void __checkPermission(
+inline void checkPermission(
Reference< security::XAccessController > const & xController,
Type const & type, rtl_uString * str1, rtl_uString * str2 )
{
- __permission perm;
+ permission perm;
perm.m_str1 = str1;
perm.m_str2 = str2;
@@ -98,10 +99,12 @@ inline void __checkPermission(
xController->checkPermission( * static_cast< Any * >( &a ) );
}
+}
+
void AccessControl::checkRuntimePermission(
OUString const & name )
{
- __checkPermission(
+ checkPermission(
m_xController,
cppu::UnoType<security::RuntimePermission>::get(), name.pData, nullptr );
}
@@ -110,7 +113,7 @@ void AccessControl::checkFilePermission(
OUString const & url,
OUString const & actions )
{
- __checkPermission(
+ checkPermission(
m_xController,
cppu::UnoType<io::FilePermission>::get(), url.pData, actions.pData );
}
@@ -119,7 +122,7 @@ void AccessControl::checkSocketPermission(
OUString const & host,
OUString const & actions )
{
- __checkPermission(
+ checkPermission(
m_xController,
cppu::UnoType<connection::SocketPermission>::get(), host.pData, actions.pData );
}
commit 9128faccd3e745a1087755c3086ea012109980b9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:37:29 2016 +0100
Avoid reserved identifier
Change-Id: Ib02af22430421a2f49de742853ca0f5c42e21cd0
diff --git a/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx
index 25d3623..62f5bd2 100644
--- a/comphelper/source/misc/interaction.cxx
+++ b/comphelper/source/misc/interaction.cxx
@@ -28,9 +28,9 @@ namespace comphelper
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::task;
- void SAL_CALL OInteractionPassword::setPassword( const OUString& _Password ) throw (RuntimeException, std::exception)
+ void SAL_CALL OInteractionPassword::setPassword( const OUString& Password ) throw (RuntimeException, std::exception)
{
- m_sPassword = _Password;
+ m_sPassword = Password;
}
commit 20c6cb0e793fa495f8ebfb51a3855ea76ad9a256
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:37:07 2016 +0100
Avoid reserved identifiers
Change-Id: Iaf015fdcf9818655243e138c6c655c5f86511ac3
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index 0101b1a..3cd4e10 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -164,9 +164,9 @@ namespace comphelper
virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override;
// XEnumerableMap
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createKeyEnumeration( sal_Bool _Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createValueEnumeration( sal_Bool _Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createElementEnumeration( sal_Bool _Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createKeyEnumeration( sal_Bool Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createValueEnumeration( sal_Bool Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createElementEnumeration( sal_Bool Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
// XMap
virtual Type SAL_CALL getKeyType() throw (RuntimeException, std::exception) override;
@@ -498,24 +498,24 @@ namespace comphelper
}
- Reference< XEnumeration > SAL_CALL EnumerableMap::createKeyEnumeration( sal_Bool _Isolated ) throw (NoSupportException, RuntimeException, std::exception)
+ Reference< XEnumeration > SAL_CALL EnumerableMap::createKeyEnumeration( sal_Bool Isolated ) throw (NoSupportException, RuntimeException, std::exception)
{
ComponentMethodGuard aGuard( *this );
- return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eKeys, _Isolated );
+ return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eKeys, Isolated );
}
- Reference< XEnumeration > SAL_CALL EnumerableMap::createValueEnumeration( sal_Bool _Isolated ) throw (NoSupportException, RuntimeException, std::exception)
+ Reference< XEnumeration > SAL_CALL EnumerableMap::createValueEnumeration( sal_Bool Isolated ) throw (NoSupportException, RuntimeException, std::exception)
{
ComponentMethodGuard aGuard( *this );
- return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eValues, _Isolated );
+ return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eValues, Isolated );
}
- Reference< XEnumeration > SAL_CALL EnumerableMap::createElementEnumeration( sal_Bool _Isolated ) throw (NoSupportException, RuntimeException, std::exception)
+ Reference< XEnumeration > SAL_CALL EnumerableMap::createElementEnumeration( sal_Bool Isolated ) throw (NoSupportException, RuntimeException, std::exception)
{
ComponentMethodGuard aGuard( *this );
- return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eBoth, _Isolated );
+ return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eBoth, Isolated );
}
commit 317118c1c85c57d23d6b5c7c2dcf680a8d591841
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:36:43 2016 +0100
Avoid reserved identifiers
Change-Id: I036cb407c29ee375e1893b7418c7fa63bf1d592a
diff --git a/basegfx/source/inc/hommatrixtemplate.hxx b/basegfx/source/inc/hommatrixtemplate.hxx
index 76dc8a5..ec527d7 100644
--- a/basegfx/source/inc/hommatrixtemplate.hxx
+++ b/basegfx/source/inc/hommatrixtemplate.hxx
@@ -37,9 +37,9 @@ namespace basegfx
return 0.0;
}
- template < unsigned int _RowSize > class ImplMatLine
+ template < unsigned int RowSize_ > class ImplMatLine
{
- enum { RowSize = _RowSize };
+ enum { RowSize = RowSize_ };
double mfValue[RowSize];
@@ -74,9 +74,9 @@ namespace basegfx
}
};
- template < unsigned int _RowSize > class ImplHomMatrixTemplate
+ template < unsigned int RowSize_ > class ImplHomMatrixTemplate
{
- enum { RowSize = _RowSize };
+ enum { RowSize = RowSize_ };
ImplMatLine< RowSize > maLine[RowSize - 1];
ImplMatLine< RowSize >* mpLine;
commit df808bec43ce5204b9b6730e91bef17bf1557ee9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 17:20:27 2016 +0100
Avoid reserved identifier
Change-Id: Iea66c7230f4570d6a2b88a514958788eb4105ffb
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx
index 715d741..e0f4254 100644
--- a/include/svl/aeitem.hxx
+++ b/include/svl/aeitem.hxx
@@ -32,7 +32,7 @@ class SVL_DLLPUBLIC SfxAllEnumItem: public SfxEnumItem
std::vector<sal_uInt16>* pDisabledValues;
protected:
- sal_uInt16 _GetPosByValue( sal_uInt16 nValue ) const;
+ sal_uInt16 GetPosByValue_( sal_uInt16 nValue ) const;
public:
static SfxPoolItem* CreateDefault();
diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index 2f39126..89fdad7 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -118,7 +118,7 @@ SfxPoolItem* SfxAllEnumItem::Create( SvStream & rStream, sal_uInt16 ) const
* In contrast to @see SfxEnumItemInterface::GetPosByValue(sal_uInt16) const
* this internal method returns the position the value would be for non-present values.
*/
-sal_uInt16 SfxAllEnumItem::_GetPosByValue( sal_uInt16 nVal ) const
+sal_uInt16 SfxAllEnumItem::GetPosByValue_( sal_uInt16 nVal ) const
{
if ( !pValues )
return 0;
@@ -155,7 +155,7 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const OUString &rValue )
// remove when exists
RemoveValue( nValue );
// then insert
- pValues->insert(pValues->begin() + _GetPosByValue(nValue), aVal); // FIXME: Duplicates?
+ pValues->insert(pValues->begin() + GetPosByValue_(nValue), aVal); // FIXME: Duplicates?
}
void SfxAllEnumItem::InsertValue( sal_uInt16 nValue )
@@ -166,7 +166,7 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue )
if ( !pValues )
pValues = new SfxAllEnumValueArr;
- pValues->insert(pValues->begin() + _GetPosByValue(nValue), aVal); // FIXME: Duplicates?
+ pValues->insert(pValues->begin() + GetPosByValue_(nValue), aVal); // FIXME: Duplicates?
}
void SfxAllEnumItem::DisableValue( sal_uInt16 nValue )
commit ee4e520d11bfb266c69c66511eee443d0bc7cc31
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 11:17:57 2016 +0100
Remove unnecessary typedefs (that introduced reserved identifiers)
Change-Id: I42d09cccf07dca6733f763b1026f6c138cb70a61
diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx
index b57cd95..e9446df 100644
--- a/sal/osl/unx/thread.cxx
+++ b/sal/osl/unx/thread.cxx
@@ -556,12 +556,12 @@ void SAL_CALL osl_setThreadName(char const * name) {
#define HASHID(x) ((unsigned long)PTHREAD_VALUE(x) % HashSize)
-typedef struct _HashEntry
+struct HashEntry
{
pthread_t Handle;
sal_uInt16 Ident;
- struct _HashEntry *Next;
-} HashEntry;
+ HashEntry * Next;
+};
static HashEntry* HashTable[31];
static int HashSize = SAL_N_ELEMENTS(HashTable);
@@ -935,11 +935,11 @@ oslThreadPriority SAL_CALL osl_getThreadPriority(const oslThread Thread)
return Priority;
}
-typedef struct _wrapper_pthread_key
+struct wrapper_pthread_key
{
pthread_key_t m_key;
oslThreadKeyCallbackFunction pfnCallback;
-} wrapper_pthread_key;
+};
oslThreadKey SAL_CALL osl_createThreadKey( oslThreadKeyCallbackFunction pCallback )
{
commit 708b42b359d96d6232d190b0a4a53ddae063957b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 11:17:45 2016 +0100
Avoid reserved identifiers
Change-Id: I309985d65752c4aa041cdb7c060c32d4312d442d
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index 0fdad31..77ff58c 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -704,7 +704,7 @@ oslSocketResult SAL_CALL osl_getAddrOfSocketAddr( oslSocketAddr pAddr, sal_Seque
*/
/* wrap around different interfaces to reentrant gethostbyname */
-static struct hostent* _osl_gethostbyname_r (
+static struct hostent* osl_gethostbyname_r (
const char *name, struct hostent *result,
char *buffer, int buflen, int *h_errnop)
{
@@ -723,7 +723,7 @@ static struct hostent* _osl_gethostbyname_r (
#endif
}
-static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName)
+static sal_Char* getFullQualifiedDomainName (const sal_Char *pHostName)
{
struct hostent aHostByName;
struct hostent *pHostByName;
@@ -731,7 +731,7 @@ static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName)
sal_Char *pFullQualifiedName = nullptr;
int nErrorNo;
- pHostByName = _osl_gethostbyname_r (
+ pHostByName = osl_gethostbyname_r (
pHostName,
&aHostByName, pQualifiedHostBuffer,
sizeof(pQualifiedHostBuffer), &nErrorNo );
@@ -742,7 +742,7 @@ static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName)
return pFullQualifiedName;
}
-static bool _osl_isFullQualifiedDomainName (const sal_Char *pHostName)
+static bool isFullQualifiedDomainName (const sal_Char *pHostName)
{
/* a FQDN (aka 'hostname.domain.top_level_domain' )
* is a name which contains a dot '.' in it ( would
@@ -757,7 +757,7 @@ struct oslHostAddrImpl
oslSocketAddr pSockAddr;
};
-static oslHostAddr _osl_hostentToHostAddr (const struct hostent *he)
+static oslHostAddr hostentToHostAddr (const struct hostent *he)
{
oslHostAddr pAddr= nullptr;
oslSocketAddr pSockAddr = nullptr;
@@ -767,7 +767,7 @@ static oslHostAddr _osl_hostentToHostAddr (const struct hostent *he)
if ((he == nullptr) || (he->h_name == nullptr) || (he->h_addr_list[0] == nullptr))
return nullptr;
- if (_osl_isFullQualifiedDomainName(he->h_name))
+ if (isFullQualifiedDomainName(he->h_name))
{
cn= strdup(he->h_name);
SAL_WARN_IF( !cn, "sal.osl", "insufficient memory" );
@@ -776,7 +776,7 @@ static oslHostAddr _osl_hostentToHostAddr (const struct hostent *he)
}
else
{
- cn =_osl_getFullQualifiedDomainName (he->h_name);
+ cn = getFullQualifiedDomainName (he->h_name);
SAL_WARN_IF( !cn, "sal.osl", "couldn't get full qualified domain name" );
if (cn == nullptr)
return nullptr;
@@ -918,12 +918,12 @@ oslHostAddr SAL_CALL osl_psz_createHostAddrByName (const sal_Char *pszHostname)
sal_Char heBuffer[ MAX_HOSTBUFFER_SIZE ];
int nErrorNo;
- pHe = _osl_gethostbyname_r (
+ pHe = osl_gethostbyname_r (
pszHostname,
&aHe, heBuffer,
sizeof(heBuffer), &nErrorNo );
- return _osl_hostentToHostAddr (pHe);
+ return hostentToHostAddr (pHe);
}
oslHostAddr SAL_CALL osl_createHostAddrByAddr (const oslSocketAddr pAddr)
@@ -947,7 +947,7 @@ oslHostAddr SAL_CALL osl_createHostAddrByAddr (const oslSocketAddr pAddr)
he= gethostbyaddr(addr,
sizeof (sin->sin_addr),
sin->sin_family);
- return _osl_hostentToHostAddr (he);
+ return hostentToHostAddr (he);
}
return nullptr;
commit 8c3b333955fd1e8a7d31f177723fdfaff3e588c1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 9 11:17:07 2016 +0100
Remove unnecessary typedefs (that introduced reserved identifiers)
Change-Id: I726ca611cce66d7e25dc91b8baaec7e588eb1b8e
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index 69e47330..af8ebce 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -50,12 +50,12 @@
typedef time_t osl_TStamp;
-typedef enum _osl_TLockMode
+enum osl_TLockMode
{
un_lock, read_lock, write_lock
-} osl_TLockMode;
+};
-typedef struct _osl_TFile
+struct osl_TFile
{
int m_Handle;
sal_Char* m_pReadPtr;
@@ -63,16 +63,16 @@ typedef struct _osl_TFile
sal_Char* m_pWriteBuf;
sal_uInt32 m_nWriteBufLen;
sal_uInt32 m_nWriteBufFree;
-} osl_TFile;
+};
-typedef struct _osl_TProfileEntry
+struct osl_TProfileEntry
{
sal_uInt32 m_Line;
sal_uInt32 m_Offset;
sal_uInt32 m_Len;
-} osl_TProfileEntry;
+};
-typedef struct _osl_TProfileSection
+struct osl_TProfileSection
{
sal_uInt32 m_Line;
sal_uInt32 m_Offset;
@@ -80,10 +80,10 @@ typedef struct _osl_TProfileSection
sal_uInt32 m_NoEntries;
sal_uInt32 m_MaxEntries;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list