Rebased ref, commits from common ancestor:
commit 252489446e0c9f5a60ab24a82d1b010a8820e16d
Author: Pranav Kant <pran...@gnome.org>
Date: Thu Aug 20 00:23:58 2015 +0530
Mark gtk+ calls as critical section
Change-Id: I6166ccc76a574049031b8a8da2ea1a104612c5d1
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index 41ec8f0..a2698af 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1249,7 +1249,9 @@ setEditInThread(gpointer data)
}
priv->m_bEdit = bEdit;
g_signal_emit(pDocView, doc_view_signals[EDIT_CHANGED], 0, bWasEdit);
+ gdk_threads_enter();
gtk_widget_queue_draw(GTK_WIDGET(pDocView));
+ gdk_threads_leave();
}
static void
@@ -1305,7 +1307,9 @@ paintTileInThread (gpointer data)
//create a mapping for it
buffer.m_mTiles[index].setPixbuf(pPixBuf);
buffer.m_mTiles[index].valid = true;
+ gdk_threads_enter();
gtk_widget_queue_draw(GTK_WIDGET(pDocView));
+ gdk_threads_leave();
}
commit 3acab6705b478c0f4d3ca8c0b0ba2df1ad7b4893
Author: Pranav Kant <pran...@gnome.org>
Date: Sat Aug 15 18:48:53 2015 +0530
create_tree.sh: Generate g-i files
Change-Id: I1749b5b02018cfe6f85a13aed8de4b31a09788e3
diff --git a/configure.ac b/configure.ac
index 5944d23..66453fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,6 +201,11 @@ SRC_ROOT=`pwd`
cd $BUILDDIR
x_Cygwin=[\#]
+dnl ======================================
+dnl Required GObject introspection version
+dnl ======================================
+INTROSPECTION_REQUIRED_VERSION=1.32.0
+
dnl ===================================================================
dnl Search all the common names for GNU Make
dnl ===================================================================
@@ -9987,6 +9992,7 @@ if test "x$enable_gtk3" = "xyes"; then
PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.2 gtk+-unix-print-3.0
gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE",
ENABLE_GTK3="")
if test "x$ENABLE_GTK3" = "xTRUE"; then
R="gtk3"
+ GOBJECT_INTROSPECTION_CHECK(INTROSPECTION_REQUIRED_VERSION)
else
AC_MSG_ERROR([gtk3 or dependent libraries of the correct versions, not
found])
fi
diff --git a/m4/introspection.m4 b/m4/introspection.m4
new file mode 100644
index 0000000..aa7b3b4
--- /dev/null
+++ b/m4/introspection.m4
@@ -0,0 +1,96 @@
+dnl -*- mode: autoconf -*-
+dnl Copyright 2009 Johan Dahlin
+dnl
+dnl This file is free software; the author(s) gives unlimited
+dnl permission to copy and/or distribute it, with or without
+dnl modifications, as long as this notice is preserved.
+dnl
+
+# serial 1
+
+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
+[
+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
+
+ dnl enable/disable introspection
+ m4_if([$2], [require],
+ [dnl
+ enable_introspection=yes
+ ],[dnl
+ AC_ARG_ENABLE(introspection,
+
AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
+ [Enable introspection for this build]),,
+ [enable_introspection=auto])
+ ])dnl
+
+ AC_MSG_CHECKING([for gobject-introspection])
+
+ dnl presence/version checking
+ AS_CASE([$enable_introspection],
+ [no], [dnl
+ found_introspection="no (disabled, use --enable-introspection to
enable)"
+ ],dnl
+ [yes],[dnl
+ PKG_CHECK_EXISTS([gobject-introspection-1.0],,
+ AC_MSG_ERROR([gobject-introspection-1.0 is not
installed]))
+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
+ found_introspection=yes,
+ AC_MSG_ERROR([You need to have gobject-introspection
>= $1 installed to build AC_PACKAGE_NAME]))
+ ],dnl
+ [auto],[dnl
+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
found_introspection=yes, found_introspection=no)
+ dnl Canonicalize enable_introspection
+ enable_introspection=$found_introspection
+ ],dnl
+ [dnl
+ AC_MSG_ERROR([invalid argument passed to --enable-introspection,
should be one of @<:@no/auto/yes@:>@])
+ ])dnl
+
+ AC_MSG_RESULT([$found_introspection])
+
+ INTROSPECTION_SCANNER=
+ INTROSPECTION_COMPILER=
+ INTROSPECTION_GENERATE=
+ INTROSPECTION_GIRDIR=
+ INTROSPECTION_TYPELIBDIR=
+ if test "x$found_introspection" = "xyes"; then
+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner
gobject-introspection-1.0`
+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler
gobject-introspection-1.0`
+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate
gobject-introspection-1.0`
+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir
gobject-introspection-1.0`
+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir
gobject-introspection-1.0)"
+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir
gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+ fi
+ AC_SUBST(INTROSPECTION_SCANNER)
+ AC_SUBST(INTROSPECTION_COMPILER)
+ AC_SUBST(INTROSPECTION_GENERATE)
+ AC_SUBST(INTROSPECTION_GIRDIR)
+ AC_SUBST(INTROSPECTION_TYPELIBDIR)
+ AC_SUBST(INTROSPECTION_CFLAGS)
+ AC_SUBST(INTROSPECTION_LIBS)
+ AC_SUBST(INTROSPECTION_MAKEFILE)
+
+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
+])
+
+
+dnl Usage:
+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
+
+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
+[
+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
+])
+
+dnl Usage:
+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
+
+
+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
+[
+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
+])
diff --git a/sysui/desktop/share/create_tree.sh
b/sysui/desktop/share/create_tree.sh
index c6be0bb..3cda12f 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -87,3 +87,16 @@ for i in base calc draw impress writer; do
cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml"
"${DESTDIR}/${PREFIXDIR}/share/appdata/${PREFIX}-${i}.appdata.xml"
done
+# Generate gobject-introspection files
+mkdir -p "${DESTDIR}/${PREFIXDIR}/share/gir-1.0"
+g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h"
"${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
+ `${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0`
-I"${SRCDIR}/include/" \
+ --include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \
+ --library=libreofficekitgtk
--library-path="${INSTALLDIR}/program/libreofficekitgtk" \
+ --include=Gdk-3.0 --include=GdkPixbuf-2.0 --include=Gtk-3.0 \
+ --namespace=LOKDocView --nsversion=0.1 --identifier-prefix=LOKDoc
--symbol-prefix=lok_doc \
+
--output="${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" --warn-all
--no-libtool
+
+mkdir -p "${DESTDIR}/${LIBDIR}/girepository-1.0"
+g-ir-compiler "${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" \
+
--output="${DESTDIR}/${LIBDIR}/girepository-1.0/LOKDocView-0.1.typelib"
commit a4de770bab5e05af42dcd790b1e4a54fcc758e6c
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Aug 19 13:21:18 2015 +0200
comphelper: reduce copypasta with UniquePtrValueLess functor
Change-Id: Ib93b818eeebc2f370535d1b061beabf7e8c65257
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 251137b..f5c58fd 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -23,6 +23,7 @@
#include <math.h>
#include <functional>
+#include <memory>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
@@ -86,6 +87,19 @@ public:
}
};
+/// by-value less functor for std::set<std::unique_ptr<T>>
+template<class T> struct UniquePtrValueLess
+ : public ::std::binary_function<std::unique_ptr<T>, std::unique_ptr<T>,
bool>
+{
+ bool operator()(std::unique_ptr<T> const& lhs,
+ std::unique_ptr<T> const& rhs) const
+ {
+ assert(lhs.get());
+ assert(rhs.get());
+ return (*lhs) < (*rhs);
+ }
+};
+
/** STL-compliant structure for comparing Reference< <iface> >
instances
*/
template < class IAFCE >
diff --git a/include/filter/msfilter/msdffimp.hxx
b/include/filter/msfilter/msdffimp.hxx
index 5c256e8..42328e0 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -31,6 +31,8 @@
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <comphelper/stl_types.hxx>
+
#include <tools/solar.h>
#include <tools/color.hxx>
#include <tools/gen.hxx>
@@ -266,15 +268,9 @@ private:
SvxMSDffImportRec &operator=(const SvxMSDffImportRec&)
SAL_DELETED_FUNCTION;
};
-struct MSDffImportRecords_Less
-{
- bool operator()(std::unique_ptr<SvxMSDffImportRec> const& left,
- std::unique_ptr<SvxMSDffImportRec> const& right) const
- { return (*left) < (*right); }
-};
/** list of all SvxMSDffImportRec instances of/for a group */
-typedef std::set<std::unique_ptr<SvxMSDffImportRec>, MSDffImportRecords_Less>
- MSDffImportRecords;
+typedef std::set<std::unique_ptr<SvxMSDffImportRec>,
+ comphelper::UniquePtrValueLess<SvxMSDffImportRec>> MSDffImportRecords;
/** block of parameters for import/export for a single call of
ImportObjAtCurrentStreamPos() */
diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx
index 6c14225..8b9fc5d 100644
--- a/sw/source/core/inc/blink.hxx
+++ b/sw/source/core/inc/blink.hxx
@@ -26,6 +26,7 @@ class SwTextFrm;
#include <vcl/timer.hxx>
#include <tools/gen.hxx>
+#include <comphelper/stl_types.hxx>
#include <set>
#include <memory>
@@ -63,16 +64,8 @@ public:
{ return reinterpret_cast<sal_IntPtr>(pPor) ==
reinterpret_cast<sal_IntPtr>(rBlinkPortion.pPor); }
};
-struct SwBlinkPortion_Less
-{
- bool operator()(std::unique_ptr<SwBlinkPortion> const& lhs,
- std::unique_ptr<SwBlinkPortion> const& rhs)
- {
- return (*lhs) < (*rhs);
- }
-};
-
-typedef std::set<std::unique_ptr<SwBlinkPortion>, SwBlinkPortion_Less>
SwBlinkSet;
+typedef std::set<std::unique_ptr<SwBlinkPortion>,
+ comphelper::UniquePtrValueLess<SwBlinkPortion>> SwBlinkSet;
class SwBlink
{
diff --git a/sw/source/filter/html/wrthtml.hxx
b/sw/source/filter/html/wrthtml.hxx
index df11e3e..f032329 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -29,6 +29,7 @@
#include <vcl/field.hxx>
#include <i18nlangtag/lang.h>
#include <tools/stream.hxx>
+#include <comphelper/stl_types.hxx>
#include <o3tl/sorted_vector.hxx>
#include "shellio.hxx"
@@ -262,16 +263,8 @@ struct SwHTMLFormatInfo
};
-struct SwHTMLFormatInfo_Less
-{
- bool operator()(std::unique_ptr<SwHTMLFormatInfo> const& lhs,
- std::unique_ptr<SwHTMLFormatInfo> const& rhs)
- {
- return (*lhs) < (*rhs);
- }
-};
-
-typedef std::set<std::unique_ptr<SwHTMLFormatInfo>, SwHTMLFormatInfo_Less>
SwHTMLFormatInfos;
+typedef std::set<std::unique_ptr<SwHTMLFormatInfo>,
+ comphelper::UniquePtrValueLess<SwHTMLFormatInfo>> SwHTMLFormatInfos;
class IDocumentStylePoolAccess;
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 4dbce49..d7a8240 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -28,6 +28,9 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+
+#include <comphelper/stl_types.hxx>
+
#include <xmloff/maptype.hxx>
#include <xmloff/xmlexppr.hxx>
@@ -102,15 +105,8 @@ public:
struct XMLAutoStyleFamily : boost::noncopyable
{
- struct XMLAutoStylePoolParent_Less
- {
- bool operator()(std::unique_ptr<XMLAutoStylePoolParent> const& lhs,
- std::unique_ptr<XMLAutoStylePoolParent> const& rhs)
const
- {
- return (*lhs) < (*rhs);
- }
- };
- typedef std::set<std::unique_ptr<XMLAutoStylePoolParent>,
XMLAutoStylePoolParent_Less> ParentSetType;
+ typedef std::set<std::unique_ptr<XMLAutoStylePoolParent>,
+ comphelper::UniquePtrValueLess<XMLAutoStylePoolParent>> ParentSetType;
typedef std::set<OUString> NameSetType;
sal_uInt32 mnFamily;
@@ -140,16 +136,9 @@ struct XMLAutoStyleFamily : boost::noncopyable
class SvXMLAutoStylePoolP_Impl
{
- struct XMLAutoStyleFamily_Less
- {
- bool operator()(std::unique_ptr<XMLAutoStyleFamily> const& lhs,
- std::unique_ptr<XMLAutoStyleFamily> const& rhs) const
- {
- return (*lhs) < (*rhs);
- }
- };
// A set that finds and sorts based only on mnFamily
- typedef std::set<std::unique_ptr<XMLAutoStyleFamily>,
XMLAutoStyleFamily_Less> FamilySetType;
+ typedef std::set<std::unique_ptr<XMLAutoStyleFamily>,
+ comphelper::UniquePtrValueLess<XMLAutoStyleFamily>> FamilySetType;
SvXMLExport& rExport;
FamilySetType m_FamilySet;
commit 58c3bbfd467b93d133e00789afcd7a00a3f53895
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Aug 19 12:55:59 2015 +0200
comphelper: remove unnecessary include <stack>
Change-Id: I39295d69dd8a48f0f40275830cb6fda4ca0b69f3
diff --git a/connectivity/source/inc/file/fcode.hxx
b/connectivity/source/inc/file/fcode.hxx
index 725e0f2..98a240e 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -29,6 +29,8 @@
#include <connectivity/FValue.hxx>
#include "file/filedllapi.hxx"
+#include <stack>
+
namespace connectivity
{
class OSQLParseNode;
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index c438a26..8d8b5a3 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -40,6 +40,8 @@
#include <xmloff/XMLSettingsExportContext.hxx>
#include <xmloff/SettingsExportHelper.hxx>
+#include <stack>
+
namespace dbaccess
{
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index df6922c..251137b 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -21,8 +21,6 @@
#include <sal/config.h>
-#include <stack>
-
#include <math.h>
#include <functional>
diff --git a/xmloff/source/forms/layerexport.cxx
b/xmloff/source/forms/layerexport.cxx
index 9787b92..861c21f 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -50,6 +50,7 @@
#include <com/sun/star/text/XText.hpp>
+#include <stack>
#include <numeric>
namespace xmloff
commit 37039980981355fc65c5b871d07b336486baa7d6
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Aug 19 12:25:38 2015 +0200
sc: these are ptr_map not ptr_set
Change-Id: I55848b3fedae79d714c8341fd84d505cb83a7c2c
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 53e2449..5d01b31 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -28,7 +28,6 @@
#include <map>
#include <vector>
-#include <boost/ptr_container/ptr_set.hpp>
#include <boost/ptr_container/ptr_map.hpp>
class ScDocument;
@@ -211,7 +210,7 @@ public:
bool empty() const;
/** Insert object into set.
- @ATTENTION: The underlying ::boost::ptr_set_adapter::insert(p) takes
+ @ATTENTION: The underlying ::boost::ptr_map_adapter::insert(p) takes
ownership of p and if it can't insert it deletes the object! So, if
this insert here returns false the object where p pointed to is gone!
*/
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index c021dc2..ebad873 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -680,7 +680,7 @@ ScRangeName::ScRangeName() {}
ScRangeName::ScRangeName(const ScRangeName& r) :
maData(r.maData)
{
- // boost::ptr_set clones and deletes, so each collection needs its own
+ // boost::ptr_map clones and deletes, so each collection needs its own
// index to data.
maIndexToData.resize( r.maIndexToData.size(), NULL);
DataType::const_iterator itr = maData.begin(), itrEnd = maData.end();
diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx
b/sc/source/filter/inc/sheetdatabuffer.hxx
index 35832b2..c703bb6 100644
--- a/sc/source/filter/inc/sheetdatabuffer.hxx
+++ b/sc/source/filter/inc/sheetdatabuffer.hxx
@@ -22,6 +22,8 @@
#include <list>
#include <map>
+#include <set>
+
#include "richstring.hxx"
#include "worksheethelper.hxx"
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index aa4b8c4..5b6edb1 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -31,7 +31,6 @@
#include "namemgrtable.hxx"
#include <boost/ptr_container/ptr_map.hpp>
-#include <boost/ptr_container/ptr_set.hpp>
#include <stack>
#include <map>
commit 086fe6f1e87c575ad5480c4ee9676aa2af6d489d
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Wed Aug 19 18:06:45 2015 +0300
tdf#93293 Fix inverted condition
Regression of ece8699f8f22f6bae137c601bc29b83b75dc3bf3
Change-Id: I1aac18dcb469b30de625c5cbfb5b0dd27fe33364
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index f7409eb..9473edc 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -889,7 +889,7 @@ void ComboBox::Modify()
void ComboBox::Impl::ImplUpdateFloatSelection()
{
- if (!m_pImplLB || m_pSubEdit)
+ if (!m_pImplLB || !m_pSubEdit)
return;
// move text in the ListBox into the visible region
commit c5425d5005ae8d3078aa4fffb9216228dc2040fa
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Aug 19 15:44:30 2015 +0300
Still more hacking on OpenGL glyph caching for Windows
Show the whole height of the cache bitmap after all (when SAL_LOG
contains vcl.gdi.opengl). The interesting pieces are often at the
bottom, like the tip of the hook of the "j" glyphs that used to bleed
over into the preceding glyphs, usually "i", when they were rendered
into the same chunk.
Add more space between glyphs and at top and bottom of the bitmap, for
anti-aliasing. The glyph ABC widths don't take expansions caused by
anti-aliasing into consideration and are misleading. Hopefully
anti-aliasing can expand the (partially) painted pixels of a glyph
just one column/row in each direction, but for safety use a two-pixel
border. (Defensive programming, eek?)
Some getWidth() instead of GetWidth() etc craziness. Using
<tools/gen.hxx> types truly is programming-by-coincidence as Thorsten
says.
In a dbgutil build, setting the environment variable
VCL_GLYPH_CACHING_HACK_NO_ANTIALIAS causes the code to turn off
anti-aliasing for the fonts used. I used this to verify that it indeed
was anti-aliasing that made the ABC widths inconsistent with
reality. Not sure if it makes sense to keep this code in?
Anyway, now I don't see any leaked pixels in "i" glyphs any more,
touch wood.
Change-Id: If527343ff1dcdb1fa208cd5e7fa4d08f812d0d7b
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 540a76b..c1c2d7e 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -147,7 +147,7 @@ OUString DumpGlyphBitmap(OpenGLGlyphCacheChunk& rChunk, HDC
hDC)
}
std::cerr << std::endl;
- for (long y = 0; y < std::min(20l, aBitmap.bmHeight); y++)
+ for (long y = 0; y < aBitmap.bmHeight; y++)
{
for (long x = 0; x < std::min(75l, aBitmap.bmWidth); x++)
std::cerr << ColorFor(GetPixel(hDC, x, y));
@@ -279,7 +279,10 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex,
const WinLayout& rLayou
std::cerr << aABC[i].abcA << ":" << aABC[i].abcB << ":" <<
aABC[i].abcC << " ";
std::cerr << std::endl;
- // Avoid kerning as we want to be able to use individual rectangles for
each glyph
+ // Try hard to avoid overlap as we want to be able to use
+ // individual rectangles for each glyph. The ABC widths don't
+ // take anti-alising into consideration. Let's hope that leaving
+ // four pixels of "extra" space inbetween glyphs will help.
std::vector<int> aDX(nCount);
int totWidth = 0;
for (int i = 0; i < nCount; i++)
@@ -289,6 +292,7 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex,
const WinLayout& rLayou
aDX[0] += std::abs(aABC[0].abcA);
if (i < nCount-1)
aDX[i] += std::abs(aABC[i+1].abcA);
+ aDX[i] += 4;
totWidth += aDX[i];
}
@@ -299,9 +303,32 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex,
const WinLayout& rLayou
if (!DeleteDC(hDC))
SAL_WARN("vcl.gdi", "DeleteDC failed: " <<
WindowsErrorString(GetLastError()));
- OpenGLCompatibleDC aDC(rGraphics, 0, 0, totWidth, aSize.cy);
+ // Leave two pixels of extra space also at top and bottom
+ OpenGLCompatibleDC aDC(rGraphics, 0, 0, totWidth, aSize.cy + 4);
- hOrigFont = SelectFont(aDC.getCompatibleHDC(), rLayout.mhFont);
+ HFONT hNonAntialiasedFont = NULL;
+
+#ifdef DBG_UTIL
+ static bool bNoAntialias =
(std::getenv("VCL_GLYPH_CACHING_HACK_NO_ANTIALIAS") != NULL);
+ if (bNoAntialias)
+ {
+ LOGFONTW aLogfont;
+ if (!GetObjectW(rLayout.mhFont, sizeof(aLogfont), &aLogfont))
+ {
+ SAL_WARN("vcl.gdi", "GetObject failed: " <<
WindowsErrorString(GetLastError()));
+ return false;
+ }
+ aLogfont.lfQuality = NONANTIALIASED_QUALITY;
+ hNonAntialiasedFont = CreateFontIndirectW(&aLogfont);
+ if (hNonAntialiasedFont == NULL)
+ {
+ SAL_WARN("vcl.gdi", "CreateFontIndirect failed: " <<
WindowsErrorString(GetLastError()));
+ return false;
+ }
+ }
+#endif
+
+ hOrigFont = SelectFont(aDC.getCompatibleHDC(), hNonAntialiasedFont != NULL
? hNonAntialiasedFont : rLayout.mhFont);
if (hOrigFont == NULL)
{
SAL_WARN("vcl.gdi", "SelectObject failed: " <<
WindowsErrorString(GetLastError()));
@@ -311,9 +338,15 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex,
const WinLayout& rLayou
SetTextColor(aDC.getCompatibleHDC(), RGB(0, 0, 0));
SetBkColor(aDC.getCompatibleHDC(), RGB(255, 255, 255));
- if (!ExtTextOutW(aDC.getCompatibleHDC(), 0, 0, ETO_GLYPH_INDEX, NULL,
aGlyphIndices.data(), nCount, aDX.data()))
+ aDC.fill(MAKE_SALCOLOR(0xff, 0xff, 0xff));
+
+ // The 2,2 is for the extra space
+ if (!ExtTextOutW(aDC.getCompatibleHDC(), 2, 2, ETO_GLYPH_INDEX, NULL,
aGlyphIndices.data(), nCount, aDX.data()))
{
SAL_WARN("vcl.gdi", "ExtTextOutW failed: " <<
WindowsErrorString(GetLastError()));
+ SelectFont(aDC.getCompatibleHDC(), hOrigFont);
+ if (hNonAntialiasedFont != NULL)
+ DeleteObject(hNonAntialiasedFont);
return false;
}
@@ -325,7 +358,7 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex,
const WinLayout& rLayou
aChunk.maLocation[i].Right() = nPos + aDX[i];
nPos = aChunk.maLocation[i].Right();
aChunk.maLocation[i].Top() = 0;
- aChunk.maLocation[i].Bottom() = aSize.cy;
+ aChunk.maLocation[i].Bottom() = aSize.cy + 4;
}
aChunk.mpTexture = std::unique_ptr<OpenGLTexture>(aDC.getTexture());
@@ -333,6 +366,8 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex,
const WinLayout& rLayou
maOpenGLGlyphCache.insert(n, aChunk);
SelectFont(aDC.getCompatibleHDC(), hOrigFont);
+ if (hNonAntialiasedFont != NULL)
+ DeleteObject(hNonAntialiasedFont);
SAL_INFO("vcl.gdi.opengl", "this=" << this << " now: " <<
maOpenGLGlyphCache << DumpGlyphBitmap(aChunk, aDC.getCompatibleHDC()));
@@ -1562,7 +1597,7 @@ void UniscribeLayout::DrawTextImpl(HDC hDC) const
bool UniscribeLayout::CacheGlyphs(SalGraphics& rGraphics) const
{
- const bool bDoGlyphCaching = (std::getenv("SAL_ENABLE_GLYPH_CACHING") !=
NULL);
+ static bool bDoGlyphCaching = (std::getenv("SAL_ENABLE_GLYPH_CACHING") !=
NULL);
if (!bDoGlyphCaching)
return false;
@@ -1639,9 +1674,9 @@ bool UniscribeLayout::DrawCachedGlyphs(SalGraphics&
rGraphics) const
const int n = mpOutGlyphs[i] - rChunk.mnFirstGlyph;
SalTwoRect a2Rects(rChunk.maLocation[n].Left(),
rChunk.maLocation[n].Top(),
- rChunk.maLocation[n].GetWidth(),
rChunk.maLocation[n].GetHeight(),
- nAdvance + aPos.X() + mpGlyphOffsets[i].du,
aPos.Y() + mpGlyphOffsets[i].dv - rChunk.maLocation[n].GetHeight(),
- rChunk.maLocation[n].GetWidth(),
rChunk.maLocation[n].GetHeight()); // ???
+ rChunk.maLocation[n].getWidth(),
rChunk.maLocation[n].getHeight(),
+ nAdvance + aPos.X() + mpGlyphOffsets[i].du,
aPos.Y() + mpGlyphOffsets[i].dv - rChunk.maLocation[n].getHeight(),
+ rChunk.maLocation[n].getWidth(),
rChunk.maLocation[n].getHeight()); // ???
pImpl->DrawMask(*rChunk.mpTexture, salColor, a2Rects);
nAdvance += mpGlyphAdvances[i];
}
commit a8d3a1048f414424018f98a1c03cccc42d57bcae
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Aug 19 14:29:45 2015 +0200
loplugin:literaltoboolconversion
Change-Id: Iad48cf4949cb4a398a8abee32febaf8e152dade5
diff --git a/sc/source/filter/oox/worksheetbuffer.cxx
b/sc/source/filter/oox/worksheetbuffer.cxx
index e55ea42..00d789c 100644
--- a/sc/source/filter/oox/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -233,7 +233,7 @@ void WorksheetBuffer::finalizeImport( sal_Int16
nActiveSheet )
if ( aSheetInfo->mnCalcSheet == nActiveSheet)
rDoc.SetVisible( aSheetInfo->mnCalcSheet, true );
else
- rDoc.SetVisible( aSheetInfo->mnCalcSheet, (aSheetInfo->mnState ==
XML_visible) ? 1 : 0 );
+ rDoc.SetVisible( aSheetInfo->mnCalcSheet, aSheetInfo->mnState ==
XML_visible );
}
}
commit ef1556416adb5ee88b9560e430281e7ce480da32
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Aug 19 14:05:24 2015 +0200
Avoid css::uno::Sequence<sal_uInt8> (which is not a proper UNO type)
Change-Id: I887c358161f7ac4032b9ad9166ff16aa0b19eaa1
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 5d01ec6..eb13752 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1447,8 +1447,8 @@ bool EscherPropertyContainer::CreateGraphicProperties(
sal_uInt16 nAngle = 0;
if ( rSource == "MetaFile" )
{
- ::com::sun::star::uno::Sequence<sal_uInt8> aSeq =
*static_cast<css::uno::Sequence<sal_uInt8> const *>(aAny.getValue());
- const sal_uInt8* pAry = aSeq.getArray();
+ ::com::sun::star::uno::Sequence<sal_Int8> aSeq =
*static_cast<css::uno::Sequence<sal_Int8> const *>(aAny.getValue());
+ const sal_Int8* pAry = aSeq.getArray();
sal_uInt32 nAryLen = aSeq.getLength();
// the metafile is already rotated
@@ -1457,7 +1457,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(
if ( pAry && nAryLen )
{
Graphic aGraphic;
- SvMemoryStream aTemp( const_cast<sal_uInt8 *>(pAry), nAryLen,
StreamMode::READ );
+ SvMemoryStream aTemp( const_cast<sal_Int8 *>(pAry), nAryLen,
StreamMode::READ );
sal_uInt32 nErrCode = GraphicConverter::Import( aTemp,
aGraphic, ConvertDataFormat::WMF );
if ( nErrCode == ERRCODE_NONE )
{
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index fc48fae..52dc142e 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1477,9 +1477,9 @@ const char* DrawingML::GetFieldType(
::com::sun::star::uno::Reference< ::com::su
void DrawingML::GetUUID( OStringBuffer& rBuffer )
{
- Sequence< sal_uInt8 > aSeq( 16 );
+ sal_uInt8 aSeq[16];
static const char cDigits[17] = "0123456789ABCDEF";
- rtl_createUuid( aSeq.getArray(), 0, true );
+ rtl_createUuid( aSeq, 0, true );
int i;
rBuffer.append( '{' );
commit 63de6ba249a0e4349b66442821ad73aff71f25d8
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Aug 19 14:04:47 2015 +0200
There is no css::uno::Sequence<sal_uInt8> in UNO
Change-Id: Ibf5095fea20314180a4e002295c89f570d66d45f
diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx
index 06afb83..025000d 100644
--- a/comphelper/source/misc/types.cxx
+++ b/comphelper/source/misc/types.cxx
@@ -333,18 +333,6 @@ bool compare_impl(const Type& _rType, const void* pData,
const Any& _rValue)
memcmp(rLeftSeq.getConstArray(),
rRightSeq.getConstArray(), rLeftSeq.getLength()) == 0;
}
}
- else if (_rType == cppu::UnoType<Sequence<sal_uInt8>>::get())
- {
- Sequence<sal_uInt8> aTemp;
- bConversionSuccess = _rValue >>= aTemp;
- if (bConversionSuccess)
- {
- const Sequence<sal_uInt8>& rLeftSeq =
*static_cast<const Sequence<sal_uInt8>*>(pData);
- const Sequence<sal_uInt8>& rRightSeq = aTemp;
- bRes = rLeftSeq.getLength() == rRightSeq.getLength() &&
- memcmp(rLeftSeq.getConstArray(),
rRightSeq.getConstArray(), rLeftSeq.getLength()) == 0;
- }
- }
else if (_rType == cppu::UnoType<Sequence<sal_Int16>>::get())
{
Sequence<sal_Int16> aTemp;
commit 39ce314c12e3570c074475c7809c3b37b2241c41
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Aug 19 13:53:34 2015 +0200
comphelper::isA(Type... -> Type == cppu::UnoType...
Change-Id: I1bfb99b1715a907a03af5a30df6c7a41f91fd2fb
diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx
index e81a813..06afb83 100644
--- a/comphelper/source/misc/types.cxx
+++ b/comphelper/source/misc/types.cxx
@@ -289,7 +289,7 @@ bool compare_impl(const Type& _rType, const void* pData,
const Any& _rValue)
break;
}
case TypeClass_STRUCT:
- if (isA(_rType, static_cast<FontDescriptor*>(NULL)))
+ if (_rType == cppu::UnoType<FontDescriptor>::get())
{
FontDescriptor aTemp;
bConversionSuccess = _rValue >>= aTemp;
@@ -301,19 +301,19 @@ bool compare_impl(const Type& _rType, const void* pData,
const Any& _rValue)
bRes = false;
break;
}
- if (isA(_rType, static_cast<Date*>(NULL)))
+ if (_rType == cppu::UnoType<Date>::get())
{
Date aDummy;
bConversionSuccess = tryCompare(pData, _rValue, bRes,
aDummy);
break;
}
- if (isA(_rType, static_cast<Time*>(NULL)))
+ if (_rType == cppu::UnoType<Time>::get())
{
Time aDummy;
bConversionSuccess = tryCompare(pData, _rValue, bRes,
aDummy);
break;
}
- if (isA(_rType, static_cast<DateTime*>(NULL)))
+ if (_rType == cppu::UnoType<DateTime>::get())
{
DateTime aDummy;
bConversionSuccess = tryCompare(pData, _rValue, bRes,
aDummy);
@@ -321,7 +321,7 @@ bool compare_impl(const Type& _rType, const void* pData,
const Any& _rValue)
}
break;
case TypeClass_SEQUENCE:
- if (isA(_rType, static_cast< Sequence<sal_Int8>* >(NULL)))
+ if (_rType == cppu::UnoType<Sequence<sal_Int8>>::get())
{
Sequence<sal_Int8> aTemp;
bConversionSuccess = _rValue >>= aTemp;
@@ -333,7 +333,7 @@ bool compare_impl(const Type& _rType, const void* pData,
const Any& _rValue)
memcmp(rLeftSeq.getConstArray(),
rRightSeq.getConstArray(), rLeftSeq.getLength()) == 0;
}
}
- else if (isA(_rType, static_cast< Sequence<sal_uInt8>*
>(NULL)))
+ else if (_rType == cppu::UnoType<Sequence<sal_uInt8>>::get())
{
Sequence<sal_uInt8> aTemp;
bConversionSuccess = _rValue >>= aTemp;
@@ -345,7 +345,7 @@ bool compare_impl(const Type& _rType, const void* pData,
const Any& _rValue)
memcmp(rLeftSeq.getConstArray(),
rRightSeq.getConstArray(), rLeftSeq.getLength()) == 0;
}
}
- else if (isA(_rType, static_cast< Sequence<sal_Int16>*
>(NULL)))
+ else if (_rType == cppu::UnoType<Sequence<sal_Int16>>::get())
{
Sequence<sal_Int16> aTemp;
bConversionSuccess = _rValue >>= aTemp;
@@ -357,7 +357,7 @@ bool compare_impl(const Type& _rType, const void* pData,
const Any& _rValue)
memcmp(rLeftSeq.getConstArray(),
rRightSeq.getConstArray(), rLeftSeq.getLength()*sizeof(sal_Int16)) == 0;
}
}
- else if (isA(_rType, static_cast< Sequence<sal_uInt16>*
>(NULL)))
+ else if (_rType ==
cppu::UnoType<cppu::UnoSequenceType<cppu::UnoUnsignedShortType>>::get())
{
Sequence<sal_uInt16> aTemp;
bConversionSuccess = _rValue >>= aTemp;
@@ -369,7 +369,7 @@ bool compare_impl(const Type& _rType, const void* pData,
const Any& _rValue)
memcmp(rLeftSeq.getConstArray(),
rRightSeq.getConstArray(), rLeftSeq.getLength()*sizeof(sal_uInt16)) == 0;
}
}
- else if (isA(_rType, static_cast< Sequence<sal_Int32>*
>(NULL)))
+ else if (_rType == cppu::UnoType<Sequence<sal_Int32>>::get())
{
Sequence<sal_Int32> aTemp;
bConversionSuccess = _rValue >>= aTemp;
@@ -381,7 +381,7 @@ bool compare_impl(const Type& _rType, const void* pData,
const Any& _rValue)
memcmp(rLeftSeq.getConstArray(),
rRightSeq.getConstArray(), rLeftSeq.getLength()*sizeof(sal_Int32)) == 0;
}
}
- else if (isA(_rType, static_cast< Sequence<sal_uInt32>*
>(NULL)))
+ else if (_rType == cppu::UnoType<Sequence<sal_uInt32>>::get())
{
Sequence<sal_uInt32> aTemp;
bConversionSuccess = _rValue >>= aTemp;
@@ -393,7 +393,7 @@ bool compare_impl(const Type& _rType, const void* pData,
const Any& _rValue)
memcmp(rLeftSeq.getConstArray(),
rRightSeq.getConstArray(), rLeftSeq.getLength()*sizeof(sal_uInt32)) == 0;
}
}
- else if (isA(_rType, static_cast< Sequence< OUString >*
>(NULL)))
+ else if (_rType == cppu::UnoType<Sequence<OUString>>::get())
{
Sequence< OUString > aTemp;
bConversionSuccess = _rValue >>= aTemp;
diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx
index 142cee9..0e506f3 100644
--- a/include/comphelper/types.hxx
+++ b/include/comphelper/types.hxx
@@ -55,20 +55,6 @@ namespace comphelper
/// returns sal_True if objects of the types given are "compatible"
COMPHELPER_DLLPUBLIC bool isAssignableFrom(const css::uno::Type&
_rAssignable, const css::uno::Type& _rFrom);
-
- /** just a small shortcut ...
- check if a type you have at hand at runtime is equal to another type
you have at compile time
- if all our compiler would accept function calls with explicit template
arguments (like
- isA<classFoo>(runtimeType)), we wouldn't need the second parameter.
But unfortunately at
- least the current solaris compiler doesn't allow this ....
- So this function is nearly senseless ....
- */
- template <class TYPE>
- bool isA(const css::uno::Type& _rType, TYPE* pDummy)
- {
- return _rType.equals(cppu::getTypeFavourUnsigned(pDummy));
- }
-
/** ask the given object for an XComponent interface and dispose on it
*/
template <class TYPE>
commit 884e970b8c5b56b640eac1120522f77aac0eae60
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Aug 19 13:45:59 2015 +0200
Remove unused comphelper::isAReference
Change-Id: I7033e1e60f67e93a31d19ea08513982643dd61ae
diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx
index 5611446..142cee9 100644
--- a/include/comphelper/types.hxx
+++ b/include/comphelper/types.hxx
@@ -69,17 +69,6 @@ namespace comphelper
return _rType.equals(cppu::getTypeFavourUnsigned(pDummy));
}
- /** check if a type you have at hand at runtime is equal to another type
you have at compile time
- */
- template <class TYPE>
- bool isAReference(const css::uno::Any& _rVal, TYPE*)
- {
- return _rVal.getValueType().equals(
- cppu::getTypeFavourUnsigned(
- static_cast<css::uno::Reference<TYPE>*>(NULL)));
- }
-
-
/** ask the given object for an XComponent interface and dispose on it
*/
template <class TYPE>
commit d0f18382c59a54fcbbe8419b43e264a0c48fa6ec
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Aug 19 13:45:01 2015 +0200
comphelper::isA(Any... -> Any::has
Change-Id: I4fdc77c6fde93d9d1ee814f7614a1c4c81e18247
diff --git a/forms/source/component/FormattedField.cxx
b/forms/source/component/FormattedField.cxx
index 5a91466..036605d 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -208,7 +208,7 @@ void OFormattedControl::keyPressed(const
::com::sun::star::awt::KeyEvent& e) thr
if( !xFormSet.is() )
return;
Any aTmp(xFormSet->getPropertyValue( PROPERTY_TARGET_URL ));
- if (!isA(aTmp, static_cast< OUString* >(NULL)) ||
+ if (!aTmp.has<OUString>() ||
getString(aTmp).isEmpty() )
return;
Reference<XIndexAccess> xElements(xParent, UNO_QUERY);
@@ -690,8 +690,8 @@ void OFormattedModel::write(const
Reference<XObjectOutputStream>& _rxOutStream)
if (hasProperty(s_aLocaleProp, xFormat))
{
Any aLocale = xFormat->getPropertyValue(s_aLocaleProp);
- DBG_ASSERT(isA(aLocale, static_cast<Locale*>(NULL)),
"OFormattedModel::write : invalid language property !");
- if (isA(aLocale, static_cast<Locale*>(NULL)))
+ DBG_ASSERT(aLocale.has<Locale>(), "OFormattedModel::write :
invalid language property !");
+ if (aLocale.has<Locale>())
{
Locale const * pLocale = static_cast<Locale const
*>(aLocale.getValue());
eFormatLanguage = LanguageTag::convertToLanguageType(
*pLocale, false);
diff --git a/forms/source/component/clickableimage.cxx
b/forms/source/component/clickableimage.cxx
index 0001bf6..7490d39 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -628,7 +628,7 @@ namespace frm
switch (nHandle)
{
case PROPERTY_ID_BUTTONTYPE :
- DBG_ASSERT(isA(rValue, static_cast<FormButtonType*>(NULL)),
"OClickableImageBaseModel::setFastPropertyValue_NoBroadcast : invalid type !" );
+ DBG_ASSERT(rValue.has<FormButtonType>(),
"OClickableImageBaseModel::setFastPropertyValue_NoBroadcast : invalid type !" );
rValue >>= m_eButtonType;
break;
diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx
index feeb522..5611446 100644
--- a/include/comphelper/types.hxx
+++ b/include/comphelper/types.hxx
@@ -69,18 +69,6 @@ namespace comphelper
return _rType.equals(cppu::getTypeFavourUnsigned(pDummy));
}
-
- /** check if a type you have at hand at runtime is equal to another type
you have at compile time
- same comment as for the other isA ....
- */
- template <class TYPE>
- bool isA(const css::uno::Any& _rVal, TYPE* pDummy)
- {
- return _rVal.getValueType().equals(
- cppu::getTypeFavourUnsigned(pDummy));
- }
-
-
/** check if a type you have at hand at runtime is equal to another type
you have at compile time
*/
template <class TYPE>
commit 7a57765241b8e9b57273f7548445ea57a1f44401
Author: Katarina Behrens <katarina.behr...@cib.de>
Date: Wed Aug 19 12:46:12 2015 +0200
Bugfix test for tdf#77431
Change-Id: I2120ed72c281d2078e387f7f3ae91004ad95822c
Reviewed-on: https://gerrit.libreoffice.org/17855
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/sc/qa/unit/data/xlsx/hidden_sheets.xlsx
b/sc/qa/unit/data/xlsx/hidden_sheets.xlsx
new file mode 100644
index 0000000..771de7f
Binary files /dev/null and b/sc/qa/unit/data/xlsx/hidden_sheets.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 51b83d0..98c80d3 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -204,6 +204,7 @@ public:
void testEmbeddedImageXLS();
void testEditEngStrikeThroughXLSX();
void testRefStringXLSX();
+ void testHiddenSheetsXLSX();
void testBnc762542();
@@ -304,6 +305,8 @@ public:
CPPUNIT_TEST(testBnc762542);
+ CPPUNIT_TEST(testHiddenSheetsXLSX);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -3138,6 +3141,17 @@ void ScFiltersTest::testBnc762542()
xDocSh->DoClose();
}
+void ScFiltersTest::testHiddenSheetsXLSX()
+{
+ ScDocShellRef xDocSh = loadDoc("hidden_sheets.", XLSX);
+ CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is());
+
+ ScDocument& rDoc = xDocSh->GetDocument();
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("1st sheet should be hidden", false,
rDoc.IsVisible(0));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("2nd sheet should be visible", true,
rDoc.IsVisible(1));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("3rd sheet should be hidden", false,
rDoc.IsVisible(2));
+}
+
ScFiltersTest::ScFiltersTest()
: ScBootstrapFixture( "sc/qa/unit/data" )
{
commit d21260cdb6e6fa898ed90bafb41ba4fe5dd3140c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Aug 19 13:34:43 2015 +0200
Remove two silly typedefs
Change-Id: Ia7de1cebf6009e770ca1b96bab6d5e121573ccc1
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index 67e827f..ee42cd0 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -51,7 +51,7 @@ OUString ChartTypeUnoDlg::getImplementationName_Static()
throw(uno::RuntimeExcep
return OUString(CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME);
}
-::comphelper::StringSequence SAL_CALL
ChartTypeUnoDlg::getSupportedServiceNames() throw(uno::RuntimeException,
std::exception)
+css::uno::Sequence<OUString> SAL_CALL
ChartTypeUnoDlg::getSupportedServiceNames() throw(uno::RuntimeException,
std::exception)
{
return getSupportedServiceNames_Static();
}
diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
index 524a87c..611db51 100644
--- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
@@ -50,7 +50,7 @@ private:
virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId( ) throw(com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx
index 9dc225f..e81a813 100644
--- a/comphelper/source/misc/types.cxx
+++ b/comphelper/source/misc/types.cxx
@@ -284,7 +284,7 @@ bool compare_impl(const Type& _rType, const void* pData,
const Any& _rValue)
}
case TypeClass_INTERFACE:
{
- InterfaceRef aDummy;
+ css::uno::Reference<css::uno::XInterface> aDummy;
bConversionSuccess = tryCompare(pData, _rValue, bRes, aDummy);
break;
}
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx
b/dbaccess/source/ui/browser/exsrcbrw.cxx
index 4a4efbc..004faa6 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -73,7 +73,7 @@ SbaExternalSourceBrowser::~SbaExternalSourceBrowser()
}
-::comphelper::StringSequence SAL_CALL
SbaExternalSourceBrowser::getSupportedServiceNames() throw(RuntimeException,
std::exception)
+css::uno::Sequence<OUString> SAL_CALL
SbaExternalSourceBrowser::getSupportedServiceNames() throw(RuntimeException,
std::exception)
{
return getSupportedServiceNames_Static();
}
@@ -83,9 +83,9 @@ OUString
SbaExternalSourceBrowser::getImplementationName_Static() throw(RuntimeE
return OUString("org.openoffice.comp.dbu.OFormGridView");
}
-::comphelper::StringSequence
SbaExternalSourceBrowser::getSupportedServiceNames_Static()
throw(RuntimeException)
+css::uno::Sequence<OUString>
SbaExternalSourceBrowser::getSupportedServiceNames_Static()
throw(RuntimeException)
{
- ::comphelper::StringSequence aSupported(1);
+ css::uno::Sequence<OUString> aSupported(1);
aSupported[0] = "com.sun.star.sdb.FormGridView";
return aSupported;
}
diff --git a/dbaccess/source/ui/browser/formadapter.cxx
b/dbaccess/source/ui/browser/formadapter.cxx
index 75f851a..87c8a5a 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -144,7 +144,7 @@ void SbaXFormAdapter::StartListening()
Reference< css::beans::XMultiPropertySet > xBroadcaster(m_xMainForm,
UNO_QUERY);
OUString sEmpty;
if (xBroadcaster.is())
-
xBroadcaster->addPropertiesChangeListener(::comphelper::StringSequence(&sEmpty,
1), &m_aPropertiesChangeListeners);
+
xBroadcaster->addPropertiesChangeListener(css::uno::Sequence<OUString>(&sEmpty,
1), &m_aPropertiesChangeListeners);
}
// log off ourself
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx
b/dbaccess/source/ui/browser/sbagrid.cxx
index f1f5589..29ca432 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -107,7 +107,7 @@ extern "C" void SAL_CALL
createRegistryInfo_SbaXGridControl()
static OMultiInstanceAutoRegistration< SbaXGridControl > aAutoRegistration;
}
-::comphelper::StringSequence SAL_CALL
SbaXGridControl::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> SAL_CALL
SbaXGridControl::getSupportedServiceNames() throw(std::exception)
{
return getSupportedServiceNames_Static();
}
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index 78f1c49..c776e6f 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -185,7 +185,7 @@ OUString SAL_CALL
SbaTableQueryBrowser::getImplementationName() throw(RuntimeExc
return getImplementationName_Static();
}
-::comphelper::StringSequence SAL_CALL
SbaTableQueryBrowser::getSupportedServiceNames() throw(RuntimeException,
std::exception)
+css::uno::Sequence<OUString> SAL_CALL
SbaTableQueryBrowser::getSupportedServiceNames() throw(RuntimeException,
std::exception)
{
return getSupportedServiceNames_Static();
}
@@ -195,9 +195,9 @@ OUString
SbaTableQueryBrowser::getImplementationName_Static() throw(RuntimeExcep
return OUString("org.openoffice.comp.dbu.ODatasourceBrowser");
}
-::comphelper::StringSequence
SbaTableQueryBrowser::getSupportedServiceNames_Static() throw(RuntimeException)
+css::uno::Sequence<OUString>
SbaTableQueryBrowser::getSupportedServiceNames_Static() throw(RuntimeException)
{
- ::comphelper::StringSequence aSupported(1);
+ css::uno::Sequence<OUString> aSupported(1);
aSupported[0] = "com.sun.star.sdb.DataSourceBrowser";
return aSupported;
}
diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx
b/dbaccess/source/ui/inc/exsrcbrw.hxx
index 4a72a13..737c8c5 100644
--- a/dbaccess/source/ui/inc/exsrcbrw.hxx
+++ b/dbaccess/source/ui/inc/exsrcbrw.hxx
@@ -80,7 +80,7 @@ namespace dbaui
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL
getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
protected:
virtual ~SbaExternalSourceBrowser();
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx
b/dbaccess/source/ui/inc/sbagrid.hxx
index d12fb09..0ffd2f1 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -70,7 +70,7 @@ namespace dbaui
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() throw(std::exception)
SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL
getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
// need by registration
static OUString getImplementationName_Static() throw(
css::uno::RuntimeException );
static css::uno::Sequence< OUString >
getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx
b/dbaccess/source/ui/inc/unodatbr.hxx
index 2bf3406..8aad618 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -179,7 +179,7 @@ namespace dbaui
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL
getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
// XContainerListener
virtual void SAL_CALL elementInserted( const
css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx
b/dbaccess/source/ui/inc/unosqlmessage.hxx
index 617f184..c365565 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -48,7 +48,7 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo - static methods
static css::uno::Sequence< OUString > getSupportedServiceNames_Static()
throw( css::uno::RuntimeException );
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index 0434dea..a277d9b 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -47,7 +47,7 @@ namespace dbaui
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL
getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
// XServiceInfo - static methods
static css::uno::Sequence< OUString >
getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
@@ -90,14 +90,14 @@ namespace dbaui
return OUString("org.openoffice.comp.dbu.OAdvancedSettingsDialog");
}
- ::comphelper::StringSequence SAL_CALL
OAdvancedSettingsDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
+ css::uno::Sequence<OUString> SAL_CALL
OAdvancedSettingsDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
{
return getSupportedServiceNames_Static();
}
- ::comphelper::StringSequence
OAdvancedSettingsDialog::getSupportedServiceNames_Static()
throw(RuntimeException)
+ css::uno::Sequence<OUString>
OAdvancedSettingsDialog::getSupportedServiceNames_Static()
throw(RuntimeException)
{
- ::comphelper::StringSequence aSupported(1);
+ css::uno::Sequence<OUString> aSupported(1);
aSupported[0] = "com.sun.star.sdb.AdvancedDatabaseSettingsDialog";
return aSupported;
}
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
index a667d1f..d39aec3 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
@@ -62,14 +62,14 @@ OUString ODBTypeWizDialog::getImplementationName_Static()
throw(RuntimeException
return OUString("org.openoffice.comp.dbu.ODBTypeWizDialog");
}
-::comphelper::StringSequence SAL_CALL
ODBTypeWizDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
+css::uno::Sequence<OUString> SAL_CALL
ODBTypeWizDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
{
return getSupportedServiceNames_Static();
}
-::comphelper::StringSequence
ODBTypeWizDialog::getSupportedServiceNames_Static() throw(RuntimeException)
+css::uno::Sequence<OUString>
ODBTypeWizDialog::getSupportedServiceNames_Static() throw(RuntimeException)
{
- ::comphelper::StringSequence aSupported(1);
+ css::uno::Sequence<OUString> aSupported(1);
aSupported[0] = "com.sun.star.sdb.DataSourceTypeChangeDialog";
return aSupported;
}
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
index e1193ab..f8dc22b 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
@@ -39,7 +39,7 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo - static methods
static css::uno::Sequence< OUString > getSupportedServiceNames_Static()
throw( css::uno::RuntimeException );
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
index f13cc2e..c575b49 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@@ -77,14 +77,14 @@ OUString
ODBTypeWizDialogSetup::getImplementationName_Static() throw(RuntimeExce
return OUString("org.openoffice.comp.dbu.ODBTypeWizDialogSetup");
}
-::comphelper::StringSequence SAL_CALL
ODBTypeWizDialogSetup::getSupportedServiceNames() throw(RuntimeException,
std::exception)
+css::uno::Sequence<OUString> SAL_CALL
ODBTypeWizDialogSetup::getSupportedServiceNames() throw(RuntimeException,
std::exception)
{
return getSupportedServiceNames_Static();
}
-::comphelper::StringSequence
ODBTypeWizDialogSetup::getSupportedServiceNames_Static() throw(RuntimeException)
+css::uno::Sequence<OUString>
ODBTypeWizDialogSetup::getSupportedServiceNames_Static() throw(RuntimeException)
{
- ::comphelper::StringSequence aSupported(1);
+ css::uno::Sequence<OUString> aSupported(1);
aSupported[0] = "com.sun.star.sdb.DatabaseWizardDialog";
return aSupported;
}
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
index 0ff240f..aa6b89e 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
@@ -41,7 +41,7 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo - static methods
static css::uno::Sequence< OUString > getSupportedServiceNames_Static()
throw( css::uno::RuntimeException );
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx
b/dbaccess/source/ui/uno/TableFilterDlg.cxx
index 813736d..203f924 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.cxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx
@@ -62,14 +62,14 @@ OUString OTableFilterDialog::getImplementationName_Static()
throw(RuntimeExcepti
return OUString("org.openoffice.comp.dbu.OTableFilterDialog");
}
-::comphelper::StringSequence SAL_CALL
OTableFilterDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
+css::uno::Sequence<OUString> SAL_CALL
OTableFilterDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
{
return getSupportedServiceNames_Static();
}
-::comphelper::StringSequence
OTableFilterDialog::getSupportedServiceNames_Static() throw(RuntimeException)
+css::uno::Sequence<OUString>
OTableFilterDialog::getSupportedServiceNames_Static() throw(RuntimeException)
{
- ::comphelper::StringSequence aSupported(1);
+ css::uno::Sequence<OUString> aSupported(1);
aSupported[0] = "com.sun.star.sdb.TableFilterDialog";
return aSupported;
}
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx
b/dbaccess/source/ui/uno/TableFilterDlg.hxx
index 0b036fa..5901a8c 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.hxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx
@@ -39,7 +39,7 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo - static methods
static css::uno::Sequence< OUString > getSupportedServiceNames_Static()
throw( css::uno::RuntimeException );
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
index db51ea5..22b66f5 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
@@ -62,14 +62,14 @@ OUString
OUserSettingsDialog::getImplementationName_Static() throw(RuntimeExcept
return OUString("org.openoffice.comp.dbu.OUserSettingsDialog");
}
-::comphelper::StringSequence SAL_CALL
OUserSettingsDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
+css::uno::Sequence<OUString> SAL_CALL
OUserSettingsDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
{
return getSupportedServiceNames_Static();
}
-::comphelper::StringSequence
OUserSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException)
+css::uno::Sequence<OUString>
OUserSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException)
{
- ::comphelper::StringSequence aSupported(1);
+ css::uno::Sequence<OUString> aSupported(1);
aSupported[0] = "com.sun.star.sdb.UserAdministrationDialog";
return aSupported;
}
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx
b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
index 0923ffc..6ecaa14 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
@@ -39,7 +39,7 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo - static methods
static css::uno::Sequence< OUString > getSupportedServiceNames_Static()
throw( css::uno::RuntimeException );
diff --git a/dbaccess/source/ui/uno/admindlg.cxx
b/dbaccess/source/ui/uno/admindlg.cxx
index adfe04c..9b854eb 100644
--- a/dbaccess/source/ui/uno/admindlg.cxx
+++ b/dbaccess/source/ui/uno/admindlg.cxx
@@ -62,14 +62,14 @@ OUString
ODataSourcePropertyDialog::getImplementationName_Static() throw(Runtime
return OUString("org.openoffice.comp.dbu.ODatasourceAdministrationDialog");
}
-::comphelper::StringSequence SAL_CALL
ODataSourcePropertyDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
+css::uno::Sequence<OUString> SAL_CALL
ODataSourcePropertyDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
{
return getSupportedServiceNames_Static();
}
-::comphelper::StringSequence
ODataSourcePropertyDialog::getSupportedServiceNames_Static()
throw(RuntimeException)
+css::uno::Sequence<OUString>
ODataSourcePropertyDialog::getSupportedServiceNames_Static()
throw(RuntimeException)
{
- ::comphelper::StringSequence aSupported(1);
+ css::uno::Sequence<OUString> aSupported(1);
aSupported[0] = "com.sun.star.sdb.DatasourceAdministrationDialog";
return aSupported;
}
diff --git a/dbaccess/source/ui/uno/admindlg.hxx
b/dbaccess/source/ui/uno/admindlg.hxx
index 1ee90ae..e511940 100644
--- a/dbaccess/source/ui/uno/admindlg.hxx
+++ b/dbaccess/source/ui/uno/admindlg.hxx
@@ -39,7 +39,7 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo - static methods
static css::uno::Sequence< OUString > getSupportedServiceNames_Static()
throw( css::uno::RuntimeException );
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx
b/dbaccess/source/ui/uno/copytablewizard.cxx
index 3ba09f0..05e5a2d 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -151,7 +151,7 @@ namespace dbaui
public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw(RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL
getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo - static methods
static Sequence< OUString > getSupportedServiceNames_Static() throw(
RuntimeException );
@@ -423,14 +423,14 @@ OUString CopyTableWizard::getImplementationName_Static()
throw(RuntimeException)
return OUString( "org.openoffice.comp.dbu.CopyTableWizard" );
}
-::comphelper::StringSequence SAL_CALL
CopyTableWizard::getSupportedServiceNames() throw(RuntimeException,
std::exception)
+css::uno::Sequence<OUString> SAL_CALL
CopyTableWizard::getSupportedServiceNames() throw(RuntimeException,
std::exception)
{
return getSupportedServiceNames_Static();
}
-::comphelper::StringSequence
CopyTableWizard::getSupportedServiceNames_Static() throw(RuntimeException)
+css::uno::Sequence<OUString>
CopyTableWizard::getSupportedServiceNames_Static() throw(RuntimeException)
{
- ::comphelper::StringSequence aSupported(1);
+ css::uno::Sequence<OUString> aSupported(1);
aSupported.getArray()[0] = "com.sun.star.sdb.application.CopyTableWizard";
return aSupported;
}
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx
b/dbaccess/source/ui/uno/unosqlmessage.cxx
index 897974c..49b3d83 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -73,14 +73,14 @@ OUString OSQLMessageDialog::getImplementationName_Static()
throw(RuntimeExceptio
return OUString("org.openoffice.comp.dbu.OSQLMessageDialog");
}
-::comphelper::StringSequence SAL_CALL
OSQLMessageDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
+css::uno::Sequence<OUString> SAL_CALL
OSQLMessageDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
{
return getSupportedServiceNames_Static();
}
-::comphelper::StringSequence
OSQLMessageDialog::getSupportedServiceNames_Static() throw(RuntimeException)
+css::uno::Sequence<OUString>
OSQLMessageDialog::getSupportedServiceNames_Static() throw(RuntimeException)
{
- ::comphelper::StringSequence aSupported(1);
+ css::uno::Sequence<OUString> aSupported(1);
aSupported.getArray()[0] = "com.sun.star.sdb.ErrorMessageDialog";
return aSupported;
}
diff --git a/extensions/source/abpilot/unodialogabp.cxx
b/extensions/source/abpilot/unodialogabp.cxx
index 990b313..6077f01 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -101,15 +101,15 @@ namespace abp
}
- ::comphelper::StringSequence SAL_CALL
OABSPilotUno::getSupportedServiceNames() throw(RuntimeException, std::exception)
+ css::uno::Sequence<OUString> SAL_CALL
OABSPilotUno::getSupportedServiceNames() throw(RuntimeException, std::exception)
{
return getSupportedServiceNames_Static();
}
- ::comphelper::StringSequence
OABSPilotUno::getSupportedServiceNames_Static() throw(RuntimeException)
+ css::uno::Sequence<OUString>
OABSPilotUno::getSupportedServiceNames_Static() throw(RuntimeException)
{
- ::comphelper::StringSequence aSupported(1);
+ css::uno::Sequence<OUString> aSupported(1);
aSupported[0] = "com.sun.star.ui.dialogs.AddressBookSourcePilot";
return aSupported;
}
diff --git a/extensions/source/abpilot/unodialogabp.hxx
b/extensions/source/abpilot/unodialogabp.hxx
index d9ff057..ba4c620 100644
--- a/extensions/source/abpilot/unodialogabp.hxx
+++ b/extensions/source/abpilot/unodialogabp.hxx
@@ -56,7 +56,7 @@ namespace abp
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL
getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
// XServiceInfo - static methods
static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static() throw(
::com::sun::star::uno::RuntimeException );
diff --git a/extensions/source/dbpilots/unoautopilot.hxx
b/extensions/source/dbpilots/unoautopilot.hxx
index 83a58ee..638e97e 100644
--- a/extensions/source/dbpilots/unoautopilot.hxx
+++ b/extensions/source/dbpilots/unoautopilot.hxx
@@ -61,7 +61,7 @@ namespace dbp
return getImplementationName_Static();
}
- virtual ::comphelper::StringSequence SAL_CALL
getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE
+ virtual css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE
{
return getSupportedServiceNames_Static();
}
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
index 7f87be7..4f37497 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
@@ -64,15 +64,15 @@ namespace pcr
}
- ::comphelper::StringSequence SAL_CALL
MasterDetailLinkDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
+ css::uno::Sequence<OUString> SAL_CALL
MasterDetailLinkDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
{
return getSupportedServiceNames_static();
}
- ::comphelper::StringSequence
MasterDetailLinkDialog::getSupportedServiceNames_static()
throw(RuntimeException)
+ css::uno::Sequence<OUString>
MasterDetailLinkDialog::getSupportedServiceNames_static()
throw(RuntimeException)
{
- ::comphelper::StringSequence aSupported(1);
+ css::uno::Sequence<OUString> aSupported(1);
aSupported[0] = "com.sun.star.form.MasterDetailLinkDialog";
return aSupported;
}
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
index 924b062..3cb4664 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
@@ -47,7 +47,7 @@ namespace pcr
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL
getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
// XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx
b/extensions/source/propctrlr/controlfontdialog.cxx
index 37a0488..96ccc57 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -86,15 +86,15 @@ namespace pcr
}
- ::comphelper::StringSequence SAL_CALL
OControlFontDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
+ css::uno::Sequence<OUString> SAL_CALL
OControlFontDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
{
return getSupportedServiceNames_static();
}
- ::comphelper::StringSequence
OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException)
+ css::uno::Sequence<OUString>
OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException)
{
- ::comphelper::StringSequence aSupported(1);
+ css::uno::Sequence<OUString> aSupported(1);
aSupported[0] = "com.sun.star.form.ControlFontDialog";
return aSupported;
}
diff --git a/extensions/source/propctrlr/controlfontdialog.hxx
b/extensions/source/propctrlr/controlfontdialog.hxx
index f2b2041..aa49cd2 100644
--- a/extensions/source/propctrlr/controlfontdialog.hxx
+++ b/extensions/source/propctrlr/controlfontdialog.hxx
@@ -58,7 +58,7 @@ namespace pcr
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL
getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
// XServiceInfo - static methods
static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_static() throw(
::com::sun::star::uno::RuntimeException );
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx
b/extensions/source/propctrlr/pcrunodialogs.cxx
index 98c4b49..d45d3e5 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -94,15 +94,15 @@ namespace pcr
}
- ::comphelper::StringSequence SAL_CALL
OTabOrderDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
+ css::uno::Sequence<OUString> SAL_CALL
OTabOrderDialog::getSupportedServiceNames() throw(RuntimeException,
std::exception)
{
return getSupportedServiceNames_static();
}
- ::comphelper::StringSequence
OTabOrderDialog::getSupportedServiceNames_static() throw(RuntimeException)
+ css::uno::Sequence<OUString>
OTabOrderDialog::getSupportedServiceNames_static() throw(RuntimeException)
{
- ::comphelper::StringSequence aSupported(2);
+ css::uno::Sequence<OUString> aSupported(2);
aSupported.getArray()[0] = "com.sun.star.form.ui.TabOrderDialog";
aSupported.getArray()[1] = "com.sun.star.form.TabOrderDialog";
return aSupported;
diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx
b/extensions/source/propctrlr/pcrunodialogs.hxx
index 35663f1..8257540 100644
--- a/extensions/source/propctrlr/pcrunodialogs.hxx
+++ b/extensions/source/propctrlr/pcrunodialogs.hxx
@@ -58,7 +58,7 @@ namespace pcr
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL
getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
// XServiceInfo - static methods
static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_static() throw(
::com::sun::star::uno::RuntimeException );
diff --git a/forms/source/component/Button.cxx
b/forms/source/component/Button.cxx
index 2f31859..9d5f55d 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -113,9 +113,9 @@ IMPLEMENT_DEFAULT_CLONING( OButtonModel )
// XServiceInfo
-StringSequence OButtonModel::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> OButtonModel::getSupportedServiceNames()
throw(std::exception)
{
- StringSequence aSupported =
OClickableImageBaseModel::getSupportedServiceNames();
+ css::uno::Sequence<OUString> aSupported =
OClickableImageBaseModel::getSupportedServiceNames();
aSupported.realloc( aSupported.getLength() + 2 );
OUString* pArray = aSupported.getArray();
@@ -338,9 +338,9 @@ Sequence<Type> OButtonControl::_getTypes()
}
-StringSequence OButtonControl::getSupportedServiceNames()
throw(std::exception)
+css::uno::Sequence<OUString> OButtonControl::getSupportedServiceNames()
throw(std::exception)
{
- StringSequence aSupported =
OClickableImageBaseControl::getSupportedServiceNames();
+ css::uno::Sequence<OUString> aSupported =
OClickableImageBaseControl::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 2);
OUString*pArray = aSupported.getArray();
diff --git a/forms/source/component/Button.hxx
b/forms/source/component/Button.hxx
index cd28061..825d8dc 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -59,7 +59,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OButtonModel"); }
- virtual StringSequence SAL_CALL getSupportedServiceNames()
throw(std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw(std::exception) SAL_OVERRIDE;
// ::com::sun::star::io::XPersistObject
virtual OUString SAL_CALL getServiceName() throw (
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -138,7 +138,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OButtonControl"); }
- virtual StringSequence SAL_CALL getSupportedServiceNames()
throw(std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw(std::exception) SAL_OVERRIDE;
// UNO binding
DECLARE_UNO3_AGG_DEFAULTS(OButtonControl, OClickableImageBaseControl)
diff --git a/forms/source/component/CheckBox.cxx
b/forms/source/component/CheckBox.cxx
index dc4d86f..d19405e 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -45,9 +45,9 @@ OCheckBoxControl::OCheckBoxControl(const
Reference<XComponentContext>& _rxFactor
}
-StringSequence SAL_CALL OCheckBoxControl::getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL
OCheckBoxControl::getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- StringSequence aSupported = OBoundControl::getSupportedServiceNames();
+ css::uno::Sequence<OUString> aSupported =
OBoundControl::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 2);
OUString* pArray = aSupported.getArray();
@@ -84,9 +84,9 @@ IMPLEMENT_DEFAULT_CLONING( OCheckBoxModel )
// XServiceInfo
-StringSequence SAL_CALL OCheckBoxModel::getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL
OCheckBoxModel::getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- StringSequence aSupported =
OReferenceValueComponent::getSupportedServiceNames();
+ css::uno::Sequence<OUString> aSupported =
OReferenceValueComponent::getSupportedServiceNames();
sal_Int32 nOldLen = aSupported.getLength();
aSupported.realloc( nOldLen + 9 );
diff --git a/forms/source/component/CheckBox.hxx
b/forms/source/component/CheckBox.hxx
index c27e0b2..1ce87f4 100644
--- a/forms/source/component/CheckBox.hxx
+++ b/forms/source/component/CheckBox.hxx
@@ -39,7 +39,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OCheckBoxModel"); }
- virtual StringSequence SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPersistObject
virtual OUString SAL_CALL getServiceName()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -72,7 +72,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OCheckBoxControl"); }
- virtual StringSequence SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/forms/source/component/Columns.cxx
b/forms/source/component/Columns.cxx
index 94c7e5f..aac57f6 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -36,7 +36,6 @@
#include <comphelper/sequence.hxx>
#include <comphelper/property.hxx>
#include <comphelper/basicio.hxx>
-#include <comphelper/types.hxx>
#include <comphelper/servicehelper.hxx>
#include "services.hxx"
#include "frm_resource.hrc"
@@ -63,9 +62,9 @@ const sal_uInt16 OLD_HIDDEN = 0x0004;
const sal_uInt16 COMPATIBLE_HIDDEN = 0x0008;
-const StringSequence& getColumnTypes()
+const css::uno::Sequence<OUString>& getColumnTypes()
{
- static StringSequence aColumnTypes(10);
+ static css::uno::Sequence<OUString> aColumnTypes(10);
if (aColumnTypes.getConstArray()[0].isEmpty())
{
OUString* pNames = aColumnTypes.getArray();
@@ -105,7 +104,7 @@ sal_Int32 getColumnTypeByModelName(const OUString&
aModelName)
? aModelName.copy(aModelPrefix.getLength())
: aModelName.copy(aCompatibleModelPrefix.getLength());
- const StringSequence& rColumnTypes = getColumnTypes();
+ const css::uno::Sequence<OUString>& rColumnTypes = getColumnTypes();
nTypeId = ::detail::findPos(aColumnType, rColumnTypes);
}
return nTypeId;
@@ -262,7 +261,7 @@ OGridColumn::~OGridColumn()
// Free the aggregate
if (m_xAggregate.is())
{
- InterfaceRef xIface;
+ css::uno::Reference<css::uno::XInterface> xIface;
m_xAggregate->setDelegator(xIface);
}
diff --git a/forms/source/component/Columns.hxx
b/forms/source/component/Columns.hxx
index ecfa789..008b6a1 100644
--- a/forms/source/component/Columns.hxx
+++ b/forms/source/component/Columns.hxx
@@ -182,7 +182,7 @@ OGridColumn* ClassName::createCloneColumn() const \
#define TYPE_TIMEFIELD 9
// List of all known columns
-const StringSequence& getColumnTypes();
+const css::uno::Sequence<OUString>& getColumnTypes();
sal_Int32 getColumnTypeByModelName(const OUString& aModelName);
// Columns
diff --git a/forms/source/component/ComboBox.cxx
b/forms/source/component/ComboBox.cxx
index 654d962..c7dbe98 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -82,9 +82,9 @@ Sequence<Type> OComboBoxModel::_getTypes()
// XServiceInfo
-StringSequence SAL_CALL OComboBoxModel::getSupportedServiceNames()
throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL
OComboBoxModel::getSupportedServiceNames() throw(RuntimeException,
std::exception)
{
- StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
+ css::uno::Sequence<OUString> aSupported =
OBoundControlModel::getSupportedServiceNames();
sal_Int32 nOldLen = aSupported.getLength();
aSupported.realloc( nOldLen + 9 );
@@ -336,7 +336,7 @@ void SAL_CALL OComboBoxModel::write(const
Reference<css::io::XObjectOutputStream
nAnyMask |= BOUNDCOLUMN;
_rxOutStream << nAnyMask;
- StringSequence aListSourceSeq(&m_aListSource, 1);
+ css::uno::Sequence<OUString> aListSourceSeq(&m_aListSource, 1);
_rxOutStream << aListSourceSeq;
_rxOutStream << (sal_Int16)m_eListSourceType;
@@ -402,7 +402,7 @@ void SAL_CALL OComboBoxModel::read(const
Reference<css::io::XObjectInputStream>&
else // nVersion == 4
{
m_aListSource.clear();
- StringSequence aListSource;
+ css::uno::Sequence<OUString> aListSource;
_rxInStream >> aListSource;
const OUString* pToken = aListSource.getConstArray();
sal_Int32 nLen = aListSource.getLength();
@@ -437,7 +437,7 @@ void SAL_CALL OComboBoxModel::read(const
Reference<css::io::XObjectInputStream>&
&& !hasExternalListSource()
)
{
- setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny(
StringSequence() ) );
+ setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny(
css::uno::Sequence<OUString>() ) );
}
if (nVersion > 0x0004)
@@ -634,7 +634,7 @@ void OComboBoxModel::loadData( bool _bForce )
Reference<XNameAccess> xFieldNames =
getTableFields(xConnection, m_aListSource);
if (xFieldNames.is())
{
- StringSequence seqNames = xFieldNames->getElementNames();
+ css::uno::Sequence<OUString> seqNames =
xFieldNames->getElementNames();
sal_Int32 nFieldsCount = seqNames.getLength();
const OUString* pustrNames = seqNames.getConstArray();
@@ -659,8 +659,8 @@ void OComboBoxModel::loadData( bool _bForce )
return;
}
- // Create StringSequence for ListBox
- StringSequence aStringSeq(aStringList.size());
+ // Create css::uno::Sequence<OUString> for ListBox
+ css::uno::Sequence<OUString> aStringSeq(aStringList.size());
OUString* pStringAry = aStringSeq.getArray();
for (sal_Int32 i = 0; i<aStringSeq.getLength(); ++i)
pStringAry[i] = aStringList[i];
@@ -758,7 +758,7 @@ bool OComboBoxModel::commitControlValueToDbColumn( bool
_bPostReset )
if ( bAddToList )
{
- StringSequence aStringItemList;
+ css::uno::Sequence<OUString> aStringItemList;
if ( getPropertyValue( PROPERTY_STRINGITEMLIST ) >>= aStringItemList )
{
const OUString* pStringItems = aStringItemList.getConstArray();
@@ -867,9 +867,9 @@ OComboBoxControl::OComboBoxControl(const
Reference<XComponentContext>& _rxContex
}
-StringSequence SAL_CALL OComboBoxControl::getSupportedServiceNames()
throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL
OComboBoxControl::getSupportedServiceNames() throw(RuntimeException,
std::exception)
{
- StringSequence aSupported = OBoundControl::getSupportedServiceNames();
+ css::uno::Sequence<OUString> aSupported =
OBoundControl::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 2);
OUString* pArray = aSupported.getArray();
diff --git a/forms/source/component/ComboBox.hxx
b/forms/source/component/ComboBox.hxx
index b752c32..e5348fc 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -52,7 +52,7 @@ class OComboBoxModel
OUString m_aDefaultText; //
DefaultText
::com::sun::star::uno::Any m_aLastKnownValue;
- StringSequence m_aDesignModeStringItems;
+ css::uno::Sequence<OUString>
m_aDesignModeStringItems;
// upon loading, in some cases we reset fill our string item list ourself.
We don't want
// to lose the user's items then, so we remember them here.
::com::sun::star::uno::Reference<
::com::sun::star::util::XNumberFormatter> m_xFormatter;
@@ -88,7 +88,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OComboBoxModel"); }
- virtual StringSequence SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// UNO
DECLARE_UNO3_AGG_DEFAULTS(OComboBoxModel, OBoundControlModel)
@@ -151,7 +151,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OComboBoxControl"); }
- virtual StringSequence SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/forms/source/component/Currency.cxx
b/forms/source/component/Currency.cxx
index bc7975d..28844bc 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -51,9 +51,9 @@ Sequence<Type> OCurrencyControl::_getTypes()
}
-StringSequence SAL_CALL OCurrencyControl::getSupportedServiceNames()
throw(std::exception)
+css::uno::Sequence<OUString> SAL_CALL
OCurrencyControl::getSupportedServiceNames() throw(std::exception)
{
- StringSequence aSupported = OBoundControl::getSupportedServiceNames();
+ css::uno::Sequence<OUString> aSupported =
OBoundControl::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 2);
OUString*pArray = aSupported.getArray();
@@ -146,9 +146,9 @@ IMPLEMENT_DEFAULT_CLONING( OCurrencyModel )
// XServiceInfo
-StringSequence SAL_CALL OCurrencyModel::getSupportedServiceNames()
throw(std::exception)
+css::uno::Sequence<OUString> SAL_CALL
OCurrencyModel::getSupportedServiceNames() throw(std::exception)
{
- StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
+ css::uno::Sequence<OUString> aSupported =
OBoundControlModel::getSupportedServiceNames();
sal_Int32 nOldLen = aSupported.getLength();
aSupported.realloc( nOldLen + 5 );
diff --git a/forms/source/component/Currency.hxx
b/forms/source/component/Currency.hxx
index 98230b9..dc51cd8 100644
--- a/forms/source/component/Currency.hxx
+++ b/forms/source/component/Currency.hxx
@@ -42,7 +42,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OCurrencyModel"); }
- virtual StringSequence SAL_CALL getSupportedServiceNames()
throw(std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw(std::exception) SAL_OVERRIDE;
// ::com::sun::star::io::XPersistObject
virtual OUString SAL_CALL getServiceName() throw ( ::com::sun
::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -81,7 +81,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OCurrencyControl"); }
- virtual StringSequence SAL_CALL getSupportedServiceNames()
throw(std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw(std::exception) SAL_OVERRIDE;
};
diff --git a/forms/source/component/DatabaseForm.cxx
b/forms/source/component/DatabaseForm.cxx
index 47488b2..56d6121 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -2346,7 +2346,7 @@ void ODatabaseForm::_propertyChanged(const
PropertyChangeEvent& evt) throw( Runt
// smartXChild
-void SAL_CALL ODatabaseForm::setParent(const InterfaceRef& Parent) throw (
::com::sun::star::lang::NoSupportException,
::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL ODatabaseForm::setParent(const
css::uno::Reference<css::uno::XInterface>& Parent) throw (
::com::sun::star::lang::NoSupportException,
::com::sun::star::uno::RuntimeException, std::exception)
{
// SYNCHRONIZED ----->
::osl::ResettableMutexGuard aGuard(m_aMutex);
@@ -3090,7 +3090,7 @@ bool ODatabaseForm::impl_approveRowChange_throw( const
EventObject& _rEvent, con
sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event)
throw( RuntimeException, std::exception )
{
// is our aggregate calling?
- if (event.Source == InterfaceRef(static_cast<XWeak*>(this)))
+ if (event.Source ==
css::uno::Reference<css::uno::XInterface>(static_cast<XWeak*>(this)))
{
// Our aggregate doesn't have any ApproveRowSetListeners (expect
ourself), as we re-routed the queryInterface
// for XRowSetApproveBroadcaster-interface.
@@ -3139,7 +3139,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const
EventObject& event) thr
sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event)
throw( RuntimeException, std::exception )
{
// is our aggregate calling?
- if (event.Source == InterfaceRef(static_cast<XWeak*>(this)))
+ if (event.Source ==
css::uno::Reference<css::uno::XInterface>(static_cast<XWeak*>(this)))
{
// Our aggregate doesn't have any ApproveRowSetListeners (expect
ourself), as we re-routed the queryInterface
// for XRowSetApproveBroadcaster-interface.
@@ -3178,7 +3178,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const
RowChangeEvent& event) t
sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event)
throw( RuntimeException, std::exception )
{
- if (event.Source == InterfaceRef(static_cast<XWeak*>(this))) // ignore our
aggregate as we handle this approve ourself
+ if (event.Source ==
css::uno::Reference<css::uno::XInterface>(static_cast<XWeak*>(this))) // ignore
our aggregate as we handle this approve ourself
{
::osl::ClearableMutexGuard aGuard( m_aMutex );
bool bWasLoaded = isLoaded();
@@ -3433,7 +3433,7 @@ sal_Bool SAL_CALL ODatabaseForm::rowDeleted() throw(
SQLException, RuntimeExcept
}
-InterfaceRef SAL_CALL ODatabaseForm::getStatement() throw( SQLException,
RuntimeException, std::exception )
+css::uno::Reference<css::uno::XInterface> SAL_CALL
ODatabaseForm::getStatement() throw( SQLException, RuntimeException,
std::exception )
{
return m_xAggregateAsRowSet->getStatement();
}
@@ -4019,7 +4019,7 @@ void ODatabaseForm::implInserted( const
ElementDescription* _pElement )
}
-void ODatabaseForm::implRemoved(const InterfaceRef& _rxObject)
+void ODatabaseForm::implRemoved(const
css::uno::Reference<css::uno::XInterface>& _rxObject)
{
OFormComponents::implRemoved( _rxObject );
diff --git a/forms/source/component/DatabaseForm.hxx
b/forms/source/component/DatabaseForm.hxx
index 5e6c4ab..2a5f1d7 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -276,8 +276,8 @@ public:
virtual void SAL_CALL removeSubmitListener(const
::com::sun::star::uno::Reference< ::com::sun::star::form::XSubmitListener>&
_rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
// com::sun::star::container::XChild
- virtual InterfaceRef SAL_CALL getParent() throw (
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return
OFormComponents::getParent(); }
- virtual void SAL_CALL setParent(const InterfaceRef& Parent) throw ( ::
com::sun::star::lang::NoSupportException ,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent()
throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {
return OFormComponents::getParent(); }
+ virtual void SAL_CALL setParent(const
css::uno::Reference<css::uno::XInterface>& Parent) throw ( ::
com::sun::star::lang::NoSupportException ,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// com::sun::star::container::XNamed
virtual OUString SAL_CALL getName()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -362,7 +362,7 @@ public:
virtual sal_Bool SAL_CALL rowUpdated()
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL rowInserted()
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL rowDeleted()
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual InterfaceRef SAL_CALL getStatement()
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getStatement()
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// com::sun::star::sdbc::XResultSetUpdate
virtual void SAL_CALL insertRow()
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -443,7 +443,7 @@ protected:
// OInterfaceContainer overridables
virtual void implInserted( const ElementDescription* _pElement )
SAL_OVERRIDE;
- virtual void implRemoved(const InterfaceRef& _rxObject) SAL_OVERRIDE;
+ virtual void implRemoved(const css::uno::Reference<css::uno::XInterface>&
_rxObject) SAL_OVERRIDE;
// OPropertyChangeListener
virtual void _propertyChanged( const
::com::sun::star::beans::PropertyChangeEvent& )
throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index ace2196..b28531e 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -56,9 +56,9 @@ Sequence<Type> ODateControl::_getTypes()
}
-StringSequence SAL_CALL ODateControl::getSupportedServiceNames()
throw(std::exception)
+css::uno::Sequence<OUString> SAL_CALL ODateControl::getSupportedServiceNames()
throw(std::exception)
{
- StringSequence aSupported = OBoundControl::getSupportedServiceNames();
+ css::uno::Sequence<OUString> aSupported =
OBoundControl::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 2);
OUString*pArray = aSupported.getArray();
@@ -120,9 +120,9 @@ IMPLEMENT_DEFAULT_CLONING( ODateModel )
// XServiceInfo
-StringSequence SAL_CALL ODateModel::getSupportedServiceNames()
throw(std::exception)
+css::uno::Sequence<OUString> SAL_CALL ODateModel::getSupportedServiceNames()
throw(std::exception)
{
- StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
+ css::uno::Sequence<OUString> aSupported =
OBoundControlModel::getSupportedServiceNames();
sal_Int32 nOldLen = aSupported.getLength();
aSupported.realloc( nOldLen + 9 );
diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx
index 2971008..f54ac84 100644
--- a/forms/source/component/Date.hxx
+++ b/forms/source/component/Date.hxx
@@ -55,7 +55,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.ODateModel"); }
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
