[Libreoffice-commits] .: codemaker/source
codemaker/source/cppumaker/cpputype.cxx | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 2848788ec7212829af17a1318354524a112f9a4f
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Dec 3 17:45:56 2012 +0100
No reason to turn throws nothing specifications into comments
...as had been done in 0295bd6b3f21dd648af6145ca23d90467f3cec73 Remove
exception spec from idl-generated c++ headers.
Change-Id: I1b900a91be6db6cb4d7b60759e844117aa6b027d
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index 5b9721b..09de49c 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -268,7 +268,7 @@ void CppuType::dumpGetCppuTypePostamble(FileStream out) {
getCppuType(SAL_UNUSED_PARAMETER );
dumpType(out, m_typeName);
dumpTemplateParameters(out);
-out const *) { // throw()\n;
+out const *) SAL_THROW(()) {\n;
inc();
out indent() return ::cppu::UnoType ;
dumpType(out, m_typeName);
@@ -537,7 +537,7 @@ void CppuType::dumpHFileContent(
out inline ::com::sun::star::uno::Type const SAL_CALL getCppuType(;
dumpType(out, m_typeName, true);
dumpTemplateParameters(out);
-out *); // throw()\n\n#endif\n;
+out *) SAL_THROW(());\n\n#endif\n;
}
void CppuType::dumpGetCppuType(FileStream out) {
@@ -546,7 +546,7 @@ void CppuType::dumpGetCppuType(FileStream out) {
(inline ::com::sun::star::uno::Type const SAL_CALL
getCppuType(SAL_UNUSED_PARAMETER );
dumpType(out, m_typeName, true, false);
-out *) { // throw()\n;
+out *) SAL_THROW(()) {\n;
inc();
out indent()
(return ::cppu::UnoType ::com::sun::star::uno::XInterface
@@ -558,7 +558,7 @@ void CppuType::dumpGetCppuType(FileStream out) {
(inline ::com::sun::star::uno::Type const SAL_CALL
getCppuType(SAL_UNUSED_PARAMETER );
dumpType(out, m_typeName, true, false);
-out *) { // throw()\n;
+out *) SAL_THROW(()) {\n;
inc();
out indent()
(return ::cppu::UnoType ::com::sun::star::uno::Exception
@@ -1416,7 +1416,7 @@ void InterfaceType::dumpDeclaration(FileStream o)
o protected:\n;
inc();
o indent() ~ m_name
- (() {} // nothrow(); avoid warnings about virtual members and
+ (() throw () {} // avoid warnings about virtual members and
non-virtual dtor\n);
dec();
o };\n\n;
@@ -2528,7 +2528,7 @@ void StructureType::dumpDeclaration(FileStream o)
}
o {\n;
inc();
-o indent() inline m_name (); // throw()\n;
+o indent() inline m_name () SAL_THROW(());\n;
sal_uInt16 members = m_reader.getFieldCount();
if (members 0 || getInheritedMemberCount() 0) {
o \n indent() inline m_name (;
@@ -2553,7 +2553,7 @@ void StructureType::dumpDeclaration(FileStream o)
m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8)
_;
}
-o ); // throw()\n;
+o ) SAL_THROW(());\n;
}
if (members 0) {
o \n;
@@ -2608,7 +2608,7 @@ sal_Bool StructureType::dumpHxxFile(
dumpTemplateHead(o);
o inline m_name;
dumpTemplateParameters(o);
-o :: m_name () // throw()\n;
+o :: m_name () SAL_THROW(())\n;
inc();
OString superType;
if (m_reader.getSuperTypeCount() = 1) {
@@ -2687,7 +2687,7 @@ sal_Bool StructureType::dumpHxxFile(
}
o fieldName _;
}
-o ) // throw()\n;
+o ) SAL_THROW(())\n;
inc();
first = sal_True;
@@ -2752,7 +2752,7 @@ sal_Bool StructureType::dumpHxxFile(
m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8)
_;
}
-o ) // throw()\n;
+o ) SAL_THROW(())\n;
o indent() {\n;
inc();
o indent() return m_name;
@@ -3271,7 +3271,7 @@ void ExceptionType::dumpDeclaration(FileStream o)
o \n{\npublic:\n;
inc();
o indent() inline CPPU_GCC_DLLPRIVATE m_name
- (); // throw()\n\n;
+ () SAL_THROW(());\n\n;
sal_uInt16 fieldCount = m_reader.getFieldCount();
RTFieldAccess access = RT_ACCESS_INVALID;
@@ -3305,7 +3305,7 @@ void ExceptionType::dumpDeclaration(FileStream o)
dumpType(o, fieldType, sal_True, sal_True);
o fieldName _;
}
-o ); // throw()\n\n;
+o ) SAL_THROW(());\n\n;
}
o indent() inline CPPU_GCC_DLLPRIVATE m_name ( m_name
const );\n\n
@@ -3357,7 +3357,7 @@ sal_Bool ExceptionType::dumpHxxFile(
}
o \n;
-o inline m_name :: m_name () // throw()\n;
+o inline m_name :: m_name () SAL_THROW(())\n;
inc();
OString superType;
if
[Libreoffice-commits] .: codemaker/source
codemaker/source/cppumaker/cppumaker.cxx |2 +-
codemaker/source/javamaker/javamaker.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 625e173aaf1816686853f6142227519dc7c37544
Author: Tor Lillqvist t...@iki.fi
Date: Wed Nov 28 20:07:22 2012 +0200
OUString::replace() does not replace in-place
Change-Id: I5a1d713ee8e9c913adad57b7d8fb0597f96a2db4
diff --git a/codemaker/source/cppumaker/cppumaker.cxx
b/codemaker/source/cppumaker/cppumaker.cxx
index c3aee2a..7910149 100644
--- a/codemaker/source/cppumaker/cppumaker.cxx
+++ b/codemaker/source/cppumaker/cppumaker.cxx
@@ -196,7 +196,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
if (tmpName.isEmpty())
tmpName = /;
else
-tmpName.replace('.', '/');
+tmpName = tmpName.replace('.', '/');
}
// related to task #116780# the scope is recursively
// generated. bFullScope = true
diff --git a/codemaker/source/javamaker/javamaker.cxx
b/codemaker/source/javamaker/javamaker.cxx
index c64fce2..af4796d 100644
--- a/codemaker/source/javamaker/javamaker.cxx
+++ b/codemaker/source/javamaker/javamaker.cxx
@@ -188,7 +188,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
if (tmpName.isEmpty())
tmpName = /;
else
-tmpName.replace('.', '/');
+tmpName = tmpName.replace('.', '/');
}
// related to task #116780# the scope is recursively
// generated. bFullScope = true
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: codemaker/source filter/source sc/source
codemaker/source/cppumaker/cppuoptions.cxx | 51 ++---
filter/source/t602/t602filter.cxx | 20 +--
sc/source/filter/excel/excdoc.cxx |1
3 files changed, 41 insertions(+), 31 deletions(-)
New commits:
commit fe347327a44f2d8ed201f9fbc2ae4858f34962d8
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 26 12:41:27 2012 +0100
loplugin: unused aName string and whacky indent
Change-Id: I3febbc1618ca86f19c851a8eea313327a9c0a96c
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx
b/codemaker/source/cppumaker/cppuoptions.cxx
index bebcb65..10b1d0c 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -55,7 +55,8 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[],
sal_Bool bCmdFile)
}
i = 1;
-} else
+}
+else
{
i = 0;
}
@@ -74,7 +75,8 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[],
sal_Bool bCmdFile)
{
i++;
s = av[i];
-} else
+}
+else
{
OString tmp('-O', please check);
if (i = ac - 1)
@@ -84,7 +86,8 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[],
sal_Bool bCmdFile)
throw IllegalArgument(tmp);
}
-} else
+}
+else
{
s = av[i] + 2;
}
@@ -98,7 +101,8 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[],
sal_Bool bCmdFile)
{
i++;
s = av[i];
-} else
+}
+else
{
OString tmp('-B', please check);
if (i = ac - 1)
@@ -108,7 +112,8 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[],
sal_Bool bCmdFile)
throw IllegalArgument(tmp);
}
-} else
+}
+else
{
s = av[i] + 2;
}
@@ -122,7 +127,8 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[],
sal_Bool bCmdFile)
{
i++;
s = av[i];
-} else
+}
+else
{
OString tmp('-T', please check);
if (i = ac - 1)
@@ -132,7 +138,8 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[],
sal_Bool bCmdFile)
throw IllegalArgument(tmp);
}
-} else
+}
+else
{
s = av[i] + 2;
}
@@ -142,7 +149,8 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[],
sal_Bool bCmdFile)
OString tmp(m_options[-T]);
tmp = tmp + ; + s;
m_options[-T] = tmp;
-} else
+}
+else
{
m_options[-T] = OString(s);
}
@@ -187,8 +195,8 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[],
sal_Bool bCmdFile)
}
m_options[-CS] = OString();
break;
-} else
-if (av[i][2] != '\0')
+}
+else if (av[i][2] != '\0')
{
OString tmp('-C', please check);
if (i = ac - 1)
@@ -222,8 +230,8 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[],
sal_Bool bCmdFile)
m_options[-Gc] = OString();
break;
-} else
-if (av[i][2] != '\0')
+}
+else if (av[i][2] != '\0')
{
OString tmp('-G', please check);
if (i = ac - 1)
@@ -244,7 +252,8 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[],
sal_Bool bCmdFile)
{
i++;
s = av[i];
-} else
+}
+else
{
OString tmp('-X', please check);
if (i = ac - 1)
@@ -254,7 +263,8 @@ sal_Bool
[Libreoffice-commits] .: codemaker/source sal/inc svx/source tools/source xmloff/source xmlsecurity/source
codemaker/source/javamaker/javaoptions.cxx|3 +--
sal/inc/sal/log-areas.dox |5 +
svx/source/table/tablertfimporter.cxx |2 --
tools/source/inet/inetmime.cxx|8 +++-
tools/source/ref/errinf.cxx |6 +++---
xmloff/source/transform/StyleOASISTContext.cxx|3 ---
xmloff/source/transform/TransformerBase.cxx |2 --
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |1 -
8 files changed, 12 insertions(+), 18 deletions(-)
New commits:
commit 1f9f8f4f4074ce7ec9d2b0f2f751f5c47ce38634
Author: Caolán McNamara caol...@redhat.com
Date: Sat Oct 13 20:34:54 2012 +0100
loplugin: some log, indent and unused variable warnings
fix up some indents, remove some unused OUStrings and add some log areas
Change-Id: I5c50807aff7a726b03b72522975d9b75e6685b9b
diff --git a/codemaker/source/javamaker/javaoptions.cxx
b/codemaker/source/javamaker/javaoptions.cxx
index b6e57b5..3889724 100644
--- a/codemaker/source/javamaker/javaoptions.cxx
+++ b/codemaker/source/javamaker/javaoptions.cxx
@@ -172,8 +172,7 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[],
sal_Bool bCmdFile)
m_options[-Gc] = OString();
break;
-} else
-if (av[i][2] != '\0')
+} else if (av[i][2] != '\0')
{
OString tmp('-G', please check);
if (i = ac - 1)
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 3040cdb..5ecfd39 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -189,16 +189,21 @@ certain functionality.
@li @c cppuhelper
@li @c cppu
@li @c editeng
+@li @c framework
@li @c helpcompiler
@li @c linguistic
@li @c oox
@li @c rsc
@li @c shell
@li @c stoc
+@li @c svl
+@li @c svx
@li @c ucbhelper
@li @c writerfilter
@li @c xmlhelp
+@li @c xmloff
@li @c xmlreader
+@li @c xmlsecurity
*/
/* vim:set ft=cpp shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablertfimporter.cxx
b/svx/source/table/tablertfimporter.cxx
index 77d340f..a0f6b8a 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -282,8 +282,6 @@ void SdrTableRTFParser::FillTable()
if(
xCellInfo-maItemSet.GetItemState(SDRATTR_TABLE_BORDER,sal_False,pPoolItem)==SFX_ITEM_SET)
xCell-SetMergedItem( *pPoolItem );
-String sDebug = mpOutliner-GetText(
mpOutliner-GetParagraph( xCellInfo-mnStartPara ), xCellInfo-mnParaCount );
-
OutlinerParaObject* pTextObject =
mpOutliner-CreateParaObject( (sal_uInt16)xCellInfo-mnStartPara,
(sal_uInt16)xCellInfo-mnParaCount );
if( pTextObject )
{
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 4619858..ae1bdb8 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -3591,16 +3591,14 @@ void INetMIMEEncodedWordOutputSink::finish(bool
bWriteTrailer)
nSize += nWrapperSize;
for (; m_nExtraSpaces 1; --m_nExtraSpaces)
{
-if (m_rSink.getColumn()
-= m_rSink.getLineLengthLimit())
+if (m_rSink.getColumn() =
m_rSink.getLineLengthLimit())
m_rSink INetMIMEOutputSink::endl;
m_rSink ' ';
}
if (m_nExtraSpaces == 1)
{
-if (m_rSink.getColumn() + nSize
-= m_rSink.getLineLengthLimit())
-m_rSink INetMIMEOutputSink::endl;
+if (m_rSink.getColumn() + nSize =
m_rSink.getLineLengthLimit())
+m_rSink INetMIMEOutputSink::endl;
m_rSink ' ';
}
m_rSink =? pCharsetName ?Q?;
diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index b7867a8..0038c86 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.cxx
@@ -323,10 +323,10 @@ sal_uInt16 ErrorHandler::HandleError_Impl(
}
else
{
-if( nFlags != USHRT_MAX )
-nErrFlags = nFlags;
+if (nFlags != USHRT_MAX)
+nErrFlags = nFlags;
return (*(WindowDisplayErrorFunc*)pData-pDsp)(
-pParent, nErrFlags, aErr, aAction);
+pParent, nErrFlags, aErr, aAction);
[Libreoffice-commits] .: codemaker/source framework/source
codemaker/source/javamaker/javatype.cxx |1 -
framework/source/loadenv/loadenv.cxx|3 +--
framework/source/services/modulemanager.cxx |6 ++
3 files changed, 3 insertions(+), 7 deletions(-)
New commits:
commit 586895f8fa09e006a4cbef31f675585a5b6e42e9
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 11 17:36:33 2012 +0100
loplugin: more unused OUString and misleading indentation
Change-Id: Ic21ca9e14520f4f16c2d665a07a79ee1a46ab91d
diff --git a/codemaker/source/javamaker/javatype.cxx
b/codemaker/source/javamaker/javatype.cxx
index b762823..b0edb7f 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -171,7 +171,6 @@ SpecialType translateUnoTypeToDescriptor(
}
if (sort == codemaker::UnoType::SORT_COMPLEX) {
//TODO: check that nucleus is a valid (Java-modified UTF-8) identifier
-rtl::OString superClass;
if (typeClass == RT_TYPE_INTERFACE
(nucleus
== rtl::OString(
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index b5dac0f..799a48d 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1141,8 +1141,7 @@ sal_Bool LoadEnv::impl_loadContent()
return sal_True;
}
-else
-if (xSyncLoader.is())
+else if (xSyncLoader.is())
{
sal_Bool bResult = xSyncLoader-load(lDescriptor, xTargetFrame);
// react for the result here, so the outside waiting
diff --git a/framework/source/services/modulemanager.cxx
b/framework/source/services/modulemanager.cxx
index 04158c0..8860f0d 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -153,11 +153,9 @@ css::uno::Sequence rtl::OUString
ModuleManager::getSupportedServiceNames()
::rtl::OUString sModule;
if (xModel.is())
sModule = implts_identify(xModel);
-else
-if (xController.is())
+else if (xController.is())
sModule = implts_identify(xController);
-else
-if (xWindow.is())
+else if (xWindow.is())
sModule = implts_identify(xWindow);
if (sModule.isEmpty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: codemaker/source
codemaker/source/cppumaker/cpputype.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 73c3907bce33c07ef78c0bb9ff1e0df8b9fbb323
Author: Tor Lillqvist t...@iki.fi
Date: Sat Oct 6 23:10:58 2012 +0300
For some reason saxparser aborts for me without this
This is in a Mac build tree using the 10.7 SDK and latest Xcode Clang.
This codemaker-generated type stuff seems awfully fragile. Should we
just bite the bullet and do the comprehensive thing for all UDKAPI
types all the time on all platforms? Is that a sane question to ask?
Change-Id: I9d17e76a83ff71898409179acb445832436f7bbd
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index eca0143..0996db6 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -119,6 +119,7 @@ bool isBootstrapType(rtl::OString const name) {
com/sun/star/reflection/XMethodParameter,
com/sun/star/reflection/XStructTypeDescription,
com/sun/star/reflection/XTypeDescription,
+com/sun/star/reflection/XTypeDescriptionEnumeration,
com/sun/star/reflection/XTypeDescriptionEnumerationAccess,
com/sun/star/reflection/XUnionTypeDescription,
com/sun/star/registry/XImplementationRegistration,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: codemaker/source
codemaker/source/cppumaker/cpputype.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit a73656244f75099415efe1b671783eea9dcbe5f9
Author: Tor Lillqvist t...@iki.fi
Date: Fri Sep 28 10:05:28 2012 +0300
Add css.reflection.XTypeDescriptionEnumerationAccess to the bootstrap types
Needed for some unknown reason in a 64-bit Mac LO. Doesn't do any harm
to have it included everywhere.
Change-Id: I62ae599692bb922678caabe78b7e1c0588573bb2
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index 23b0bc6..f4f1304 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -119,6 +119,7 @@ bool isBootstrapType(rtl::OString const name) {
com/sun/star/reflection/XMethodParameter,
com/sun/star/reflection/XStructTypeDescription,
com/sun/star/reflection/XTypeDescription,
+com/sun/star/reflection/XTypeDescriptionEnumerationAccess,
com/sun/star/reflection/XUnionTypeDescription,
com/sun/star/registry/XImplementationRegistration,
com/sun/star/registry/XRegistryKey,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: codemaker/source codemaker/test configmgr/source cppuhelper/source javaunohelper/com udkapi/com ure/source
codemaker/source/cppumaker/cpputype.cxx | 51 ++-
codemaker/source/cppumaker/includes.cxx |6
codemaker/source/cppumaker/includes.hxx |2
codemaker/source/javamaker/javatype.cxx | 71 ---
codemaker/test/javamaker/java15/Test.java|7 -
configmgr/source/components.cxx |6
configmgr/source/configurationregistry.cxx | 13 --
cppuhelper/source/component_context.cxx |6
javaunohelper/com/sun/star/comp/helper/ComponentContext.java |5
udkapi/com/sun/star/uno/XComponentContext.idl|5
ure/source/uretest/JavaClient.java |7 -
ure/source/uretest/cppmain.cc| 11 -
12 files changed, 56 insertions(+), 134 deletions(-)
New commits:
commit 543158edba6678d3d76eee983a9d4edd2a422fee
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Sep 17 16:56:19 2012 +0200
Require XComponentContext.getServiceManager to throw instead of returning
null
This is such a fatal error that there is probably no point in trying to
handle
it, so allow to simplify client code by removing the requirement to check
for a
null return value.
Simplified some client code accordingly (modules configmgr and ure, and the
code
generated by cppumaker and javamaker).
Change-Id: I51c0b270ec73409374f7439a47ee061407a46e31
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index b4637a9..23b0bc6 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -3872,10 +3872,10 @@ sal_Bool ServiceType::dumpHxxFile(
//TODO: Decide whether the types added to includes should rather be
// added to m_dependencies (and thus be generated during
// dumpDependedTypes):
+includes.addCassert();
includes.addReference();
includes.addRtlUstringH();
includes.addRtlUstringHxx();
-includes.add(com/sun/star/lang/XMultiComponentFactory);
includes.add(com/sun/star/uno/DeploymentException);
includes.add(com/sun/star/uno/XComponentContext);
for (sal_uInt16 i = 0; i ctors; ++i) {
@@ -3949,27 +3949,16 @@ sal_Bool ServiceType::dumpHxxFile(
::com::sun::star::uno::XComponentContext const
the_context) {\n);
inc();
-o indent()
- (::com::sun::star::uno::Reference
- ::com::sun::star::lang::XMultiComponentFactory
- the_factory(the_context-getServiceManager());\n)
- indent() if (!the_factory.is()) {\n;
-inc();
-o indent()
- (throw ::com::sun::star::uno::DeploymentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\component
- context fails to supply service manager\)),
- the_context);\n);
-dec();
-o indent() }\n indent()
+o indent() assert(the_context.is());\n indent()
::com::sun::star::uno::Reference scopedBaseName
the_instance;\n indent() try {\n;
inc();
o indent()
the_instance = ::com::sun::star::uno::Reference
scopedBaseName
- ( (the_factory-createInstanceWithContext(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\)
+ ( (the_context-getServiceManager()-
+ createInstanceWithContext(::rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM(\)
fullName
\)), the_context),
::com::sun::star::uno::UNO_QUERY);\n;
dec();
@@ -4038,19 +4027,7 @@ sal_Bool ServiceType::dumpHxxFile(
}
o ) {\n;
inc();
-o indent()
- (::com::sun::star::uno::Reference
- ::com::sun::star::lang::XMultiComponentFactory
- the_factory(the_context-getServiceManager());\n)
- indent() if (!the_factory.is()) {\n;
-inc();
-o indent()
- (throw com::sun::star::uno::DeploymentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- \component context fails to supply service
manager\)),
- the_context);\n);
-dec();
-o indent() }\n;
+o indent() assert(the_context.is());\n;
if (!rest params 0) {
o indent()
(::com::sun::star::uno::Sequence
[Libreoffice-commits] .: codemaker/source
codemaker/source/cppumaker/cpputype.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit b67445306634571cd7d2a62942b00c0edb82b215
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 7 14:36:05 2012 +0200
XInterfaceTypeDescription missing from isBootstrapType
...it is base of XInterfaceTypeDescription2 (included in isBootstrapType),
which
ultimately caused uno-skeletonmaker to crash.
Change-Id: I17421f58efd9edd4112532a3221125865cc5560e
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index 7fc720a..628b4c6 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -123,6 +123,7 @@ bool isBootstrapType(rtl::OString const name) {
com/sun/star/reflection/XInterfaceAttributeTypeDescription2,
com/sun/star/reflection/XInterfaceMemberTypeDescription,
com/sun/star/reflection/XInterfaceMethodTypeDescription,
+com/sun/star/reflection/XInterfaceTypeDescription,
com/sun/star/reflection/XInterfaceTypeDescription2,
com/sun/star/reflection/XMethodParameter,
com/sun/star/reflection/XStructTypeDescription,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: codemaker/source
codemaker/source/javamaker/classfile.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 26643fb59e0005f0bc83708b785d20d62d8e7411
Author: Michael Stahl mst...@redhat.com
Date: Fri May 18 00:50:25 2012 +0200
codemaker: write version 49 (1.5) class files
The trick of writing generic types into class files of versions 49
does no longer work with javac from OpenJDK 7:
/comphelper/qa/complex/comphelper/Map.java:154: error: type Pair does
not take parameters
Pair ?, ? [] initialMappings = new Pair ?, ? [ _keys.length ];
There appears to be a related JDK bug for this, at some time javac had
an undocumented option to produce similar class files that are also
rejected now, this has been closed as Not a Defect:
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7078419
Change-Id: I8a504f6cbb3bb58cd914aebb88637cc6feb0bd48
diff --git a/codemaker/source/javamaker/classfile.cxx
b/codemaker/source/javamaker/classfile.cxx
index 1a8bf01..8efdddb 100644
--- a/codemaker/source/javamaker/classfile.cxx
+++ b/codemaker/source/javamaker/classfile.cxx
@@ -693,7 +693,7 @@ void ClassFile::addMethod(
void ClassFile::write(FileStream file) const {
writeU4(file, 0xCAFEBABE);
writeU2(file, 0);
-writeU2(file, 46);
+writeU2(file, 49); // class file version of JRE 1.5
writeU2(file, m_constantPoolCount);
writeStream(file, m_constantPool);
writeU2(file, static_cast sal_uInt16 (m_accessFlags));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: codemaker/source registry/inc registry/source
codemaker/source/cppumaker/cpputype.cxx |3 +--
codemaker/source/javamaker/javatype.cxx |5 +
registry/inc/registry/types.h |2 +-
registry/source/reflread.cxx|9 +
registry/source/reflwrit.cxx|3 ++-
registry/source/regimpl.cxx |4 +---
6 files changed, 11 insertions(+), 15 deletions(-)
New commits:
commit 66a88dc17e91d03a130b21a511ce298dd5a52e12
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Mar 29 12:06:33 2012 +0200
UNO BYTE is signed
This is hopefully a better fix for c589fa17b8f3e6ded0d1e04120781eb5d6735bc7
Dalvik enforces byte constants being in range (-128..127).
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index 7c0326d..64dad4d 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -1262,8 +1262,7 @@ void CppuType::dumpConstantValue(FileStream o,
sal_uInt16 index)
o sal_False;
break;
case RT_TYPE_BYTE:
-o (sal_Int8)
- sal::static_int_cast sal_Int8 (constValue.m_value.aByte);
+o (sal_Int8) constValue.m_value.aByte;
break;
case RT_TYPE_INT16:
o (sal_Int16) constValue.m_value.aShort;
diff --git a/codemaker/source/javamaker/javatype.cxx
b/codemaker/source/javamaker/javatype.cxx
index f297980..1453122 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -2447,10 +2447,7 @@ void addConstant(
rtl::OString(
RTL_CONSTASCII_STRINGPARAM(Bad type information)));
//TODO
}
-if (fieldValue.m_value.aByte 0x80)
-valueIndex = classFile-addIntegerInfo(fieldValue.m_value.aByte);
-else
-valueIndex = classFile-addIntegerInfo(-256 + (int)
fieldValue.m_value.aByte);
+valueIndex = classFile-addIntegerInfo(fieldValue.m_value.aByte);
break;
case codemaker::UnoType::SORT_SHORT:
diff --git a/registry/inc/registry/types.h b/registry/inc/registry/types.h
index cee37bb..77ae249 100644
--- a/registry/inc/registry/types.h
+++ b/registry/inc/registry/types.h
@@ -218,7 +218,7 @@ enum RTValueType {
*/
union RTConstValueUnion {
sal_Bool aBool;
-sal_uInt8 aByte;
+sal_Int8 aByte;
sal_Int16 aShort;
sal_uInt16 aUShort;
sal_Int32 aLong;
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index cac943f..e8ddab0 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -259,7 +259,7 @@ public:
const sal_Char* readUTF8NameConstant(sal_uInt16 index);
sal_BoolreadBOOLConstant(sal_uInt16 index);
-sal_uInt8 readBYTEConstant(sal_uInt16 index);
+sal_Int8readBYTEConstant(sal_uInt16 index);
sal_Int16 readINT16Constant(sal_uInt16 index);
sal_uInt16 readUINT16Constant(sal_uInt16 index);
sal_Int32 readINT32Constant(sal_uInt16 index);
@@ -367,15 +367,16 @@ sal_Bool ConstantPool::readBOOLConstant(sal_uInt16 index)
return aBool;
}
-sal_uInt8 ConstantPool::readBYTEConstant(sal_uInt16 index)
+sal_Int8 ConstantPool::readBYTEConstant(sal_uInt16 index)
{
-sal_uInt8 aByte = sal_False;
+sal_Int8 aByte = 0;
if (m_pIndex (index 0) (index = m_numOfEntries))
{
if (readUINT16(m_pIndex[index - 1] + CP_OFFSET_ENTRY_TAG) ==
CP_TAG_CONST_BYTE)
{
-aByte = readBYTE(m_pIndex[index - 1] + CP_OFFSET_ENTRY_DATA);
+aByte = static_cast sal_Int8 (
+readBYTE(m_pIndex[index - 1] + CP_OFFSET_ENTRY_DATA));
}
}
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 9fb415a..791a6e4 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -302,7 +302,8 @@ sal_uInt32 CPInfo::toBlop(sal_uInt8* buffer)
buff += writeBYTE(buff, (sal_uInt8) m_value.aConst.aBool);
break;
case CP_TAG_CONST_BYTE:
-buff += writeBYTE(buff, m_value.aConst.aByte);
+buff += writeBYTE(
+buff, static_cast sal_uInt8 (m_value.aConst.aByte));
break;
case CP_TAG_CONST_INT16:
buff += writeINT16(buff, m_value.aConst.aShort);
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index e82789b..401fb98 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -242,9 +242,7 @@ void dumpType(typereg::Reader const reader, rtl::OString
const indent) {
break;
case RT_TYPE_BYTE:
-printf(
-byte 0x%02X,
-static_cast unsigned int (value.m_value.aByte));
+printf(byte %d, static_cast int (value.m_value.aByte));
break;
case RT_TYPE_INT16:
[Libreoffice-commits] .: codemaker/source
codemaker/source/cppumaker/cpputype.cxx | 45 ++--
1 file changed, 20 insertions(+), 25 deletions(-)
New commits:
commit df68f63f0b24bae202b6526486d26a8402b16341
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 3 13:51:32 2012 +0100
Leak comprehensive type descriptions to avoid problems at exit.
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index 977c8b3..dc238fc 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -715,10 +715,10 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream o)
OString sType = m_typeName.copy(m_typeName.lastIndexOf('/') + 1);
OString sStaticTypeClass = the + sType + Type;
-o indent() struct sStaticTypeClass : public
rtl::StaticWithInit ::com::sun::star::uno::Type, sStaticTypeClass
\n;
+o indent() struct sStaticTypeClass : public
rtl::StaticWithInit ::com::sun::star::uno::Type *, sStaticTypeClass
\n;
o indent() {\n;
inc();
-o indent() ::com::sun::star::uno::Type operator()() const\n;
+o indent() ::com::sun::star::uno::Type * operator()() const\n;
o indent() {\n;
inc();
@@ -807,9 +807,8 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream o)
o indent() typelib_typedescription_release( pTD );\n
indent() // End inline typedescription generation\n\n;
-o indent() ::com::sun::star::uno::Type the_staticType(
- getTypeClass(m_typeName) , sTypeName );\n;
-o indent() return the_staticType;\n;
+o indent() return new ::com::sun::star::uno::Type(
+ getTypeClass(m_typeName) , sTypeName ); // leaked\n;
dec();
o indent() }\n;
@@ -824,7 +823,7 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream o)
o }\n\n;
dumpGetCppuTypePreamble(o);
-o indent() return detail:: sStaticTypeClass ::get();\n;
+o indent() return *detail:: sStaticTypeClass ::get();\n;
dumpGetCppuTypePostamble(o);
}
@@ -1633,10 +1632,10 @@ void
InterfaceType::dumpComprehensiveGetCppuType(FileStream o)
OString sType = m_typeName.copy(m_typeName.lastIndexOf('/') + 1);
OString sStaticTypeClass = the + sType + Type;
-o indent() struct sStaticTypeClass : public
rtl::StaticWithInit ::com::sun::star::uno::Type, sStaticTypeClass
\n;
+o indent() struct sStaticTypeClass : public
rtl::StaticWithInit ::com::sun::star::uno::Type *, sStaticTypeClass
\n;
o indent() {\n;
inc();
-o indent() ::com::sun::star::uno::Type operator()() const\n;
+o indent() ::com::sun::star::uno::Type * operator()() const\n;
o indent() {\n;
inc();
@@ -1710,10 +1709,8 @@ void
InterfaceType::dumpComprehensiveGetCppuType(FileStream o)
(typelib_typedescription_release( (typelib_TypeDescription*)pTD
);\n\n);
-o indent() ::com::sun::star::uno::Type the_staticType(
- getTypeClass(m_typeName) , sTypeName );\n;
-
-o indent() return the_staticType;\n;
+o indent() return new ::com::sun::star::uno::Type(
+ getTypeClass(m_typeName) , sTypeName ); // leaked\n;
dec();
@@ -1728,7 +1725,7 @@ void
InterfaceType::dumpComprehensiveGetCppuType(FileStream o)
o }\n\n;
dumpGetCppuTypePreamble(o);
-o indent() const ::com::sun::star::uno::Type rRet = detail::
sStaticTypeClass ::get();\n;
+o indent() const ::com::sun::star::uno::Type rRet = *detail::
sStaticTypeClass ::get();\n;
o indent() // End inline typedescription generation\n;
@@ -2915,7 +2912,7 @@ void
StructureType::dumpComprehensiveGetCppuType(FileStream out)
out indent();
if (isPolymorphic())
dumpTemplateHead(out);
-out struct sStaticTypeClass : public rtl::StaticWithInit
::com::sun::star::uno::Type, ;
+out struct sStaticTypeClass : public rtl::StaticWithInit
::com::sun::star::uno::Type *, ;
out sStaticTypeClass;
if (isPolymorphic())
dumpTemplateParameters(out);
@@ -2923,7 +2920,7 @@ void
StructureType::dumpComprehensiveGetCppuType(FileStream out)
out indent() {\n;
inc();
-out indent() ::com::sun::star::uno::Type operator()() const\n;
+out indent() ::com::sun::star::uno::Type * operator()() const\n;
out indent() {\n;
inc();
@@ -3050,9 +3047,8 @@ void
StructureType::dumpComprehensiveGetCppuType(FileStream out)
out indent() ::typelib_typedescription_register(the_newType);\n;
out indent() ::typelib_typedescription_release(the_newType);\n;
-out indent() ::com::sun::star::uno::Type the_staticType(
- getTypeClass(m_typeName) , the_name);\n;
-out indent() return the_staticType;\n;
+out indent() return new ::com::sun::star::uno::Type(
+ getTypeClass(m_typeName) , the_name); // leaked\n;
dec();
out indent() }\n;
dec();
@@ -3065,7 +3061,7 @@
[Libreoffice-commits] .: codemaker/source
codemaker/source/codemaker/global.cxx|8 ++---
codemaker/source/codemaker/unotype.cxx |2 -
codemaker/source/cppumaker/cppumaker.cxx |2 -
codemaker/source/cppumaker/cpputype.cxx | 46 +++
codemaker/source/cppumaker/includes.cxx |2 -
codemaker/source/javamaker/classfile.cxx |8 ++---
codemaker/source/javamaker/javamaker.cxx |2 -
7 files changed, 35 insertions(+), 35 deletions(-)
New commits:
commit fd866ac8f184c0910883963c9c12b45a239a9227
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Mon Dec 12 18:19:01 2011 -0200
Fix for fdo43460 Part VI getLength() to isEmpty()
Part VI
Module
codemaker
diff --git a/codemaker/source/codemaker/global.cxx
b/codemaker/source/codemaker/global.cxx
index 36d06f0..af87ee8 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -116,7 +116,7 @@ OString createFileNameFromType( const OString destination,
fileNameBuf.append(/, 1);
OString tmpStr(type);
-if (prefix.getLength() 0)
+if (!prefix.isEmpty())
{
tmpStr = type.replaceAt(type.lastIndexOf('/')+1, 0, prefix);
}
@@ -298,7 +298,7 @@ FileStream::FileStream()
FileStream::FileStream(const OString name, FileAccessMode mode)
: m_file(NULL)
{
-if ( name.getLength() 0 )
+if ( !name.isEmpty() )
{
OUString sUrl(convertToFileUrl(name));
#ifdef SAL_UNX
@@ -338,7 +338,7 @@ void FileStream::createTempFile(const OString sPath)
OUString sTmpPath;
OUString sTmpName;
-if (sPath.getLength() 0)
+if (!sPath.isEmpty())
sTmp = sPath;
sTmpPath = convertToFileUrl(sTmp);
@@ -364,7 +364,7 @@ void FileStream::createTempFile(const OString sPath)
void FileStream::open(const OString name, FileAccessMode mode)
{
-if ( name.getLength() 0 )
+if ( !name.isEmpty() )
{
oslFileError ret = osl_File_E_None;
if ((ret = osl_openFile(convertToFileUrl(name).pData, m_file,
checkAccessMode(mode))) == osl_File_E_None)
diff --git a/codemaker/source/codemaker/unotype.cxx
b/codemaker/source/codemaker/unotype.cxx
index 0432a29..0ae8e43 100644
--- a/codemaker/source/codemaker/unotype.cxx
+++ b/codemaker/source/codemaker/unotype.cxx
@@ -56,7 +56,7 @@ codemaker::UnoType::Sort
codemaker::UnoType::getSort(rtl::OString const type)
}
bool codemaker::UnoType::isSequenceType(rtl::OString const type) {
-return type.getLength() 0 type[0] == '[';
+return !type.isEmpty() type[0] == '[';
}
rtl::OString codemaker::UnoType::decompose(
diff --git a/codemaker/source/cppumaker/cppumaker.cxx
b/codemaker/source/cppumaker/cppumaker.cxx
index e6cee20..0b9d8c0 100644
--- a/codemaker/source/cppumaker/cppumaker.cxx
+++ b/codemaker/source/cppumaker/cppumaker.cxx
@@ -202,7 +202,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
} else
{
tmpName = typeName.copy(0,
typeName.lastIndexOf('.')).replace('.', '/');
-if (tmpName.getLength() == 0)
+if (tmpName.isEmpty())
tmpName = /;
else
tmpName.replace('.', '/');
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index f2007e5..3a436ca 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -253,7 +253,7 @@ sal_Bool CppuType::dumpFile(CppuOptions* pOptions,
}
OString sFileName = createFileNameFromType(sOutPath, sName, sExtension);
-if (sFileName.getLength() == 0)
+if (sFileName.isEmpty())
return sal_False;
sal_Bool bFileExists = fileExists( sFileName );
@@ -539,7 +539,7 @@ void CppuType::dumpNormalGetCppuType(FileStream o)
m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8);
}
sal_Bool bIsBaseException = sal_False;
-if (superType.getLength() 0)
+if (!superType.isEmpty())
{
if ( superType.equals(com/sun/star/uno/Exception) )
{
@@ -599,7 +599,7 @@ void CppuType::dumpNormalGetCppuType(FileStream o)
o indent() typelib_static_compound_type_init( the_type,
getTypeClass(m_typeName, sal_True) , \
m_typeName.replace('/', '.') \, ;
-if ( superType.getLength() 0 || bIsBaseException )
+if ( !superType.isEmpty() || bIsBaseException )
{
if ( bIsBaseException )
{
@@ -658,7 +658,7 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream o)
superType = rtl::OUStringToOString(
m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8);
}
-if (superType.getLength() 0) {
+if (!superType.isEmpty()) {
o indent()
const ::com::sun::star::uno::Type rSuperType = ::cppu::UnoType
;
dumpType(o, superType, false, false, false, true);
@@ -712,7 +712,7 @@ void
