cppuhelper/inc/cppuhelper/weakagg.hxx | 1 +
sal/inc/sal/types.h | 15 +++++++++++++++
solenv/gbuild/gbuild.mk | 5 +++++
vcl/unx/gtk/window/gtkframe.cxx | 9 ++++++++-
4 files changed, 29 insertions(+), 1 deletion(-)
New commits:
commit 37abb0b9ef0c29796ca08b68073e150874c73e6c
Author: Michael Meeks <michael.me...@suse.com>
Date: Thu Nov 22 12:12:19 2012 +0000
add version string to GtkWindow's to help theme authors.
Change-Id: I3b03dc67de563e5d87fb85c0566fc411e372c690
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 5736413..fdc7290 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -56,6 +56,7 @@
#include <basegfx/vector/b2ivector.hxx>
#include <algorithm>
+#include <glib/gprintf.h>
#if OSL_DEBUG_LEVEL > 1
# include <cstdio>
@@ -1065,9 +1066,15 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong
nStyle )
}
}
else
- m_pWindow = gtk_widget_new( GTK_TYPE_WINDOW, "type", eWinType,
"visible", FALSE, NULL );
+ m_pWindow = gtk_widget_new( GTK_TYPE_WINDOW, "type", eWinType,
+ "visible", FALSE, NULL );
g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this );
+ static char pVersion[16] = "";
+ if( pVersion[0] == '\0' )
+ g_sprintf( pVersion, "%d", SUPD );
+ g_object_set_data( G_OBJECT( m_pWindow ), "libo-version", pVersion );
+
// force wm class hint
m_nExtStyle = ~0;
if (m_pParent)
commit c90f5c66512f35025d7ecc6ad5eae9ccef6c1290
Author: Michael Meeks <michael.me...@suse.com>
Date: Thu Nov 22 11:08:06 2012 +0000
create SAL_DEPRECATED_INTERNAL for annotating API
It flags methods that we don't want used externally, but havn't
finished removing internally.
Change-Id: I818ee0ea2bf5294be816256a0e7f1868f26806b8
diff --git a/cppuhelper/inc/cppuhelper/weakagg.hxx
b/cppuhelper/inc/cppuhelper/weakagg.hxx
index 094e178..f4ae380 100644
--- a/cppuhelper/inc/cppuhelper/weakagg.hxx
+++ b/cppuhelper/inc/cppuhelper/weakagg.hxx
@@ -79,6 +79,7 @@ public:
@param Delegator the object that delegate its queryInterface to this
aggregate.
*/
+ SAL_DEPRECATED_INTERNAL("do not use XAggregation")
virtual void SAL_CALL setDelegator( const
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > &
Delegator )
throw(::com::sun::star::uno::RuntimeException);
/** Called by the delegator or queryInterface. Re-implement this method
instead of
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 2c7a2cf..3e3dc7c 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -445,6 +445,21 @@ template< typename T1, typename T2 > inline T1
static_int_cast(T2 n) {
#endif
/**
+ This macro is used to tag interfaces that are deprecated for both
+ internal and external API users, but where we are still writing
+ out the internal usage. Ultimately these should be replaced by
+ SAL_DEPRECATED, and then removed.
+
+ Use as follows:
+ SAL_DEPRECATED_INTERNAL("Dont use, its evil.") void doit(int nPara);
+ */
+#ifdef LIBO_INTERNAL_ONLY
+# define SAL_DEPRECATED_INTERNAL(message)
+#else
+# define SAL_DEPRECATED_INTERNAL(message) SAL_DEPRECATED(message)
+#endif
+
+/**
Use as follows:
SAL_WNODEPRECATED_DECLARATIONS_PUSH
\::std::auto_ptr<X> ...
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 521d4bd..b9f8d75 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -231,6 +231,11 @@ gb_GLOBALDEFS := \
$(gb_COMPILERDEFS) \
$(gb_CPUDEFS) \
+# This is used to tag deprecation for API we want to
+# ensure is not used at all externally while we clean
+# out our internal usage.
+gb_GLOBALDEFS += \
+ -DLIBO_INTERNAL_ONLY \
ifeq ($(gb_ENABLE_DBGUTIL),$(true))
gb_GLOBALDEFS += -DDBG_UTIL \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
