[Libreoffice-commits] .: odk/examples
odk/examples/DevelopersGuide/OfficeDev/makefile.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 88909169372fd342f8e93aff689f744c18f14fe3 Author: Lior Kaplan kaplanl...@gmail.com Date: Fri Dec 14 11:20:53 2012 +0200 Remove xml2cmp leftovers: Remove FlatXmlFilter_cpp.uno.xml from make files (follow up for a9916dabb48df8ea857ce6b255563e31352988a8) Change-Id: I816c9dd797fbf49d300cd0442c87f343bd1308d4 Reviewed-on: https://gerrit.libreoffice.org/1336 Reviewed-by: Stephan Bergmann sberg...@redhat.com Tested-by: Stephan Bergmann sberg...@redhat.com diff --git a/odk/examples/DevelopersGuide/OfficeDev/makefile.mk b/odk/examples/DevelopersGuide/OfficeDev/makefile.mk index c6bf8a8..09d4a5b 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/makefile.mk +++ b/odk/examples/DevelopersGuide/OfficeDev/makefile.mk @@ -92,7 +92,6 @@ FILTERDETECTION_FILES=\ DESTFLATXMLCPP=$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/FilterDevelopment$/FlatXmlFilter_cpp FLATXMLCPP_FILES=\ $(DESTFLATXMLCPP)$/FlatXml.cxx \ -$(DESTFLATXMLCPP)$/FlatXmlFilter_cpp.uno.xml \ $(DESTFLATXMLCPP)$/Makefile \ $(DESTFLATXMLCPP)$/FlatXmlFilter_cpp.xcu ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: odk/examples
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx
| 10 --
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx
| 12 +-
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
| 10 --
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
| 50 --
odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
|8 -
odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
| 50 --
odk/examples/DevelopersGuide/Forms/ButtonOperator.java
| 14 --
odk/examples/java/ToDo/ToDo.java
|2
8 files changed, 72 insertions(+), 84 deletions(-)
New commits:
commit 693332c0b4a8e340b8350f548dce07456975531a
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Dec 11 18:05:45 2012 +0100
Fix SDK examples
Change-Id: I0a3153bc3fa8338a1a0865db2fbe65a56ae064a4
diff --git
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx
index fb35eed..8fac616 100644
---
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx
+++
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx
@@ -36,8 +36,6 @@
#include addon.hxx
#include osl/diagnose.h
#include rtl/ustring.hxx
-#include comphelper/componentcontext.hxx
-#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/beans/PropertyValue.hpp
#include com/sun/star/frame/XFrame.hpp
#include com/sun/star/frame/XController.hpp
@@ -45,12 +43,12 @@
#include com/sun/star/awt/XWindowPeer.hpp
#include com/sun/star/awt/WindowAttribute.hpp
#include com/sun/star/awt/XMessageBox.hpp
+#include com/sun/star/uno/XComponentContext.hpp
using rtl::OUString;
using namespace com::sun::star::uno;
using namespace com::sun::star::frame;
using namespace com::sun::star::awt;
-using com::sun::star::lang::XMultiServiceFactory;
using com::sun::star::beans::PropertyValue;
using com::sun::star::util::URL;
@@ -105,7 +103,7 @@ void SAL_CALL Addon::initialize( const Sequence Any
aArguments ) throw ( Exc
}
// Create the toolkit to have access to it later
-mxToolkit = Reference XToolkit (
Toolkit::create(comphelper::getComponentContext(mxMSF)), UNO_QUERY_THROW );
+mxToolkit = Reference XToolkit ( Toolkit::create(mxContext),
UNO_QUERY_THROW );
}
/**
@@ -220,10 +218,10 @@ throw (RuntimeException)
return aRet;
}
-Reference XInterface SAL_CALL Addon_createInstance( const Reference
XMultiServiceFactory rSMgr)
+Reference XInterface SAL_CALL Addon_createInstance( const Reference
XComponentContext rContext)
throw( Exception )
{
-return (cppu::OWeakObject*) new Addon( rSMgr );
+return (cppu::OWeakObject*) new Addon( rContext );
}
//##
diff --git
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx
index f2e4a0f..9568aea 100644
---
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx
+++
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx
@@ -57,6 +57,10 @@ namespace com
{
class XToolkit;
}
+namespace uno
+{
+class XComponentContext;
+}
}
}
}
@@ -70,13 +74,13 @@ class Addon : public cppu::WeakImplHelper4
{
private:
-::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory mxMSF;
+::com::sun::star::uno::Reference ::com::sun::star::uno::XComponentContext
mxContext;
::com::sun::star::uno::Reference ::com::sun::star::frame::XFrame
mxFrame;
::com::sun::star::uno::Reference ::com::sun::star::awt::XToolkit
mxToolkit;
public:
-Addon( const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory rxMSF)
-: mxMSF( rxMSF ) {}
+Addon( const ::com::sun::star::uno::Reference
::com::sun::star::uno::XComponentContext rxContext)
+: mxContext( rxContext ) {}
// XDispatchProvider
virtual ::com::sun::star::uno::Reference
::com::sun::star::frame::XDispatch
@@ -120,7 +124,7 @@ sal_Bool SAL_CALL Addon_supportsService( const
::rtl::OUString ServiceName )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
-SAL_CALL Addon_createInstance( const ::com::sun::star::uno::Reference
[Libreoffice-commits] .: odk/examples
odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx |
28 +-
odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx |
2
odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx |
2
odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx |
2
odk/examples/cpp/complextoolbarcontrols/MyListener.cxx |
4 -
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx |
6 +-
6 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 62640a8436c837db6d1f63d98585b9929c36682d
Author: Mark Wolf mark.wolf.mu...@gmail.com
Date: Thu Apr 5 13:09:35 2012 -0400
German comment translation for odk folder
Mark
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx
index ed2f763..dffe3e6 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx
@@ -43,26 +43,26 @@ namespace connectivity
{
struct OTypeInfo
{
-::rtl::OUString aTypeName; // Name des Types in der Datenbank
-::rtl::OUString aLiteralPrefix; // Prefix zum Quoten
-::rtl::OUString aLiteralSuffix; // Suffix zum Quoten
-::rtl::OUString aCreateParams; // Parameter zum Erstellen
+::rtl::OUString aTypeName; // Name of the the type in the database
+::rtl::OUString aLiteralPrefix; // Prefix for literals
+::rtl::OUString aLiteralSuffix; // Suffix for literals
+::rtl::OUString aCreateParams; // Parameters to create
::rtl::OUString aLocalTypeName;
-sal_Int32 nPrecision; // Laenge des Types
+sal_Int32 nPrecision; // Length of the types
-sal_Int16 nMaximumScale; // Nachkommastellen
-sal_Int16 nMinimumScale; // Min Nachkommastellen
+sal_Int16 nMaximumScale; // Decimal places (precision)
+sal_Int16 nMinimumScale; // Min decimal places (precision)
-sal_Int16 nType; // Datenbanktyp
-sal_Int16 nSearchType;// kann nach dem Typen gesucht werden
+sal_Int16 nType; // Database type
+sal_Int16 nSearchType;// Can search for the type
sal_Int16 nNumPrecRadix; // indicating the radix, which is
usually 2 or 10
-sal_BoolbCurrency : 1,// Waehrung
-bAutoIncrement : 1,// Ist es ein automatisch
incrementierendes Feld
-bNullable : 1,// Kann das Feld NULL annehmen
-bCaseSensitive : 1,// Ist der Type Casesensitive
-bUnsigned : 1,// Ist der Type Unsigned
+sal_BoolbCurrency : 1,// Currency
+bAutoIncrement : 1,// Is this field auto
incrementing?
+bNullable : 1,// Can this field assume a
NULL value?
+bCaseSensitive : 1,// Is this type case-sensitive?
+bUnsigned : 1,// Is this type unsigned?
bEmpty_1: 1,// for later use
bEmpty_2: 1;
diff --git
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
index b01823f..315d781 100644
---
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
+++
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
@@ -94,7 +94,7 @@ namespace connectivity
virtual ~OPreparedStatement();
public:
DECLARE_SERVICE_INFO();
-// ein Konstruktor, der fuer das Returnen des Objektes benoetigt
wird:
+// a constructor, which is required for returning objects:
OPreparedStatement( OConnection* _pConnection,const
TTypeInfoVector _TypeInfo,const ::rtl::OUString sql);
//XInterface
diff --git
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
index 1560801..7ce5fd5 100644
---
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
+++
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
@@ -56,7 +56,7 @@ namespace connectivity
protected:
virtual ~OResultSetMetaData();
public:
-// ein Konstruktor, der fuer das Returnen des Objektes benoetigt
wird:
+// a constructor, which is required for returning objects:
OResultSetMetaData(OConnection* _pConnection) :
m_pConnection(_pConnection){}
/// Avoid
