[Libreoffice-commits] .: 7 commits -

[Jan Holesovsky]

 0 files changed

New commits:
commit 50b18c2c2f8e4c941f995555cf195357c933691c
Merge: cb8c6eb... c548670...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Jul 28 18:40:09 2011 +0200

    Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/ure

commit cb8c6ebedbf9ef071aa16650194f26189b96ed20
Merge: 6cdd9ef... 3d83517...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Jul 28 18:39:38 2011 +0200

    Merge commit 'libreoffice-3.4.2.3'
    
    Conflicts:
    	offapi/com/sun/star/sheet/NameToken.idl

commit 3d835172b2e332e77bcf81c41361d0c32c2245a3
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jul 25 20:28:46 2011 +0200

    Version 3.4.2.3, tag libreoffice-3.4.2.3 (3.4.2-rc3)
commit f340179733e6fc16dff53aa9389800a1b00ded92
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 19 17:08:02 2011 +0200

    Version 3.4.2.2, tag libreoffice-3.4.2.2 (3.4.2-rc2)
commit 5323fee23c580c01a53e01bf7d400820c246ea6f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 12 16:41:14 2011 +0200

    Branch libreoffice-3-4-2
    
    This is 'libreoffice-3-4-2' - the stable branch for the 3.4.2 release.
    Only very safe changes, reviewed by three people are allowed.
    
    If you want to commit more complicated fix for the next 3.4.x release,
    please use the 'libreoffice-3-4' branch.
    
    If you want to build something cool, unstable, and risky, use master.
commit a2fd16290f9e7a1f3a6474bae17e4bbd860101e1
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 12 15:49:43 2011 +0200

    Version 3.4.2.1, tag libreoffice-3.4.2.1 (3.4.2-rc1)
commit cfd08384cdc45b62c25e88a8382a9a1348234deb
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Jun 22 16:01:12 2011 +0200

    fix for fdo 37880
    
    we need to save the information if we have a global range name or a
    local range name in the uno api too
    
    Signed-off-by: Kohei Yoshida <kyoshida at novell.com>

diff --git a/offapi/com/sun/star/sheet/NameToken.idl b/offapi/com/sun/star/sheet/NameToken.idl
new file mode 100644
index 0000000..5bd57d6
--- /dev/null
+++ b/offapi/com/sun/star/sheet/NameToken.idl
@@ -0,0 +1,53 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Markus Mohrhard <markus.mohrhard at googlemail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Major Contributor(s):
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __com_sun_star_sheet_NameToken_idl__
+#define __com_sun_star_sheet_NameToken_idl__
+
+//=============================================================================
+
+module com {  module sun {  module star {  module sheet {
+
+//=============================================================================
+
+/** contains the information regarding named tokens
+ */
+struct NameToken
+{
+    long Index;
+
+    boolean Global;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/sheet/makefile.mk b/offapi/com/sun/star/sheet/makefile.mk
index 10bb43d..26901cb 100644
--- a/offapi/com/sun/star/sheet/makefile.mk
+++ b/offapi/com/sun/star/sheet/makefile.mk
@@ -166,6 +166,7 @@ IDLFILES=\
     NamedRangeFlag.idl\
     NamedRanges.idl\
     NamedRangesEnumeration.idl\
+    NameToken.idl\
     NoConvergenceException.idl\
     PasteOperation.idl\
     RangeSelectionArguments.idl\