diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:18:13 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:18:13 +0200 |
commit | b817eb954419c818e04432e87af692bc0f53ce18 (patch) | |
tree | 1f51e4435aa74ba91c752831f08caee599ff0d43 /comphelper/source/misc/servicedecl.cxx | |
parent | 8ade1b264b756914ca121db4379cbbe709b7eb89 (diff) |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit f4e5c3d6e530c85d1d9be70f2f3b4f5b35d6db80 (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:07 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit a7febbdcdc9fd4a80e8357f3812456fc3fa0f39f
Author: Radek Doulik <rodo@novell.com>
Date: Thu Mar 10 15:47:35 2011 +0100
fix for 3.3.2 blocker fdo#34718 - change the type of nDrawerHeight to long
- before it became big positive long in the called Point::Move
function, moving the drawer under the visible area. so it was
basically signed/unsigned problem in the layouter
svtools/source/toolpanel/drawerlayouter.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Notes
split repo tag: libs-gui_libreoffice-3.3.3.1
Diffstat (limited to 'comphelper/source/misc/servicedecl.cxx')
-rw-r--r-- | comphelper/source/misc/servicedecl.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx index 92e3b3ef7e44..85bb01e7d15c 100644 --- a/comphelper/source/misc/servicedecl.cxx +++ b/comphelper/source/misc/servicedecl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ class ServiceDecl::Factory : public: explicit Factory( ServiceDecl const& rServiceDecl ) : m_rServiceDecl(rServiceDecl) {} - + // XServiceInfo: virtual rtl::OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); @@ -68,7 +68,7 @@ public: uno::Sequence<uno::Any> const& args, uno::Reference<uno::XComponentContext> const& xContext ) throw (uno::Exception); - + private: virtual ~Factory(); @@ -128,7 +128,7 @@ bool ServiceDecl::writeInfo( registry::XRegistryKey * xKey ) const try { uno::Reference<registry::XRegistryKey> const xNewKey( xKey->createKey( buf.makeStringAndClear() ) ); - + rtl::OString const str(m_pServiceNames); sal_Int32 nIndex = 0; do { @@ -138,7 +138,7 @@ bool ServiceDecl::writeInfo( registry::XRegistryKey * xKey ) const RTL_TEXTENCODING_ASCII_US ) ); } while (nIndex >= 0); - + bRet = true; } catch (registry::InvalidRegistryException const&) { @@ -161,8 +161,8 @@ void * ServiceDecl::getFactory( sal_Char const* pImplName ) const uno::Sequence<rtl::OUString> ServiceDecl::getSupportedServiceNames() const { std::vector<rtl::OUString> vec; - - rtl::OString const str(m_pServiceNames); + + rtl::OString const str(m_pServiceNames); sal_Int32 nIndex = 0; do { rtl::OString const token( str.getToken( 0, m_cDelim, nIndex ) ); @@ -170,7 +170,7 @@ uno::Sequence<rtl::OUString> ServiceDecl::getSupportedServiceNames() const RTL_TEXTENCODING_ASCII_US ) ); } while (nIndex >= 0); - + return comphelper::containerToSequence(vec); } |