diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:19:40 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:19:40 +0200 |
commit | 566a5bcb2039dbe6db6b9696449c6f5fe142c763 (patch) | |
tree | 2012c7ad41c5058904ba05848e17d1e248f7559d /unodevtools/source/skeletonmaker/skeletoncommon.hxx | |
parent | cbb79e541cd2aa1f56cf7fbefcf8d0ce9c8db664 (diff) |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit f4a669793477ff9765085fff8ced14cbe8d7f159 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:21 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit c6241c81b61717941cf0a3e4a4188468ceddef07
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:38 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
Notes:
split repo tag: sdk_libreoffice-3.3.0.4
Diffstat (limited to 'unodevtools/source/skeletonmaker/skeletoncommon.hxx')
-rw-r--r-- | unodevtools/source/skeletonmaker/skeletoncommon.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.hxx b/unodevtools/source/skeletonmaker/skeletoncommon.hxx index 83b89bf15a21..557addb6b867 100644 --- a/unodevtools/source/skeletonmaker/skeletoncommon.hxx +++ b/unodevtools/source/skeletonmaker/skeletoncommon.hxx @@ -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 @@ -42,7 +42,7 @@ namespace skeletonmaker { typedef ::std::map< ::rtl::OString, ::std::vector< ::rtl::OString >, ::std::less< ::rtl::OString > > ProtocolCmdMap; -typedef ::std::vector< ::std::pair< rtl::OString, +typedef ::std::vector< ::std::pair< rtl::OString, ::std::pair< rtl::OString, sal_Int16 > > > AttributeInfo; @@ -85,7 +85,7 @@ void printLicenseHeader(std::ostream& o, rtl::OString const & filename); create dependent on the output path, the implementation name and the extension a new output file. If output path is equal "stdout" the tool generates the output to standard out. - + @param options the program options including the output path and the implementation name @param extension specifies the file extensions (e.g. .cxx or .java) @@ -131,10 +131,10 @@ rtl::OString checkPropertyHelper( checks whether the return and parameters types are valid and allowed calc add-in type. The function throws a CannotDumpException with an detailed error description which type is wrong - + @param manager a type manager @param reader a registry type reader of an interface defining - calc add-in functions + calc add-in functions */ void checkAddInTypes(TypeManager const & manager, typereg::Reader const & reader); |