codecleanup02: merge with DEV300_m84

4 files changed, 108 insertions, 6 deletions

diff --git a/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src
index 6c1a90ae6412..f33896e20003 100644
--- a/svtools/source/misc/errtxt.src
+++ b/svtools/source/misc/errtxt.src
@@ -328,23 +328,23 @@ Resource RID_ERRHDL
     };
     String ERRCODE_INET_CONNECT
     {
-        Text [ en-US ] = "Could not establish Internet connection to $(ARG1)." ;
+        Text [ en-US ] = "Could not establish network connection to $(ARG1)." ;
     };
     String ERRCODE_INET_READ
     {
-        Text [ en-US ] = "Error reading data from the Internet.\nServer error message: $(ARG1)." ;
+        Text [ en-US ] = "Error reading data from the network.\nServer error message: $(ARG1)." ;
     };
     String ERRCODE_INET_WRITE
     {
-        Text [ en-US ] = "Error transferring data to the Internet.\nServer error message: $(ARG1)." ;
+        Text [ en-US ] = "Error transferring data to the network.\nServer error message: $(ARG1)." ;
     };
     String ERRCODE_INET_GENERAL
     {
-        Text [ en-US ] = "General Internet error has occurred." ;
+        Text [ en-US ] = "General network error has occurred." ;
     };
     String ERRCODE_INET_OFFLINE
     {
-        Text [ en-US ] = "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ;
+        Text [ en-US ] = "The requested network data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ;
     };
     String ERRCODE_SFXMSG_STYLEREPLACE
     {
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 1cb20d27fc12..067eb601a5af 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -319,6 +319,10 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Sardinian, Logudorese" ; LANGUAGE_USER_SARDINIAN_LOGUDORESE ; > ;
         < "Sardinian, Sassarese" ; LANGUAGE_USER_SARDINIAN_SASSARESE ; > ;
         < "Bafia" ; LANGUAGE_USER_BAFIA ; > ;
+        < "Gikuyu" ; LANGUAGE_USER_GIKUYU ; > ;
+        < "Yoruba" ; LANGUAGE_YORUBA ; > ;
+        < "Rusyn (Ukraine)" ; LANGUAGE_USER_RUSYN_UKRAINE ; > ;
+        < "Rusyn (Slovakia)" ; LANGUAGE_USER_RUSYN_SLOVAKIA ; > ;
     };
 };
 
diff --git a/svtools/source/misc/makefile.mk b/svtools/source/misc/makefile.mk
index 65e43747a586..32781dbfefb1 100644..100755
--- a/svtools/source/misc/makefile.mk
+++ b/svtools/source/misc/makefile.mk
@@ -75,7 +75,8 @@ SLOFILES=\
     $(SLO)$/transfer.obj            \
     $(SLO)$/transfer2.obj           \
     $(SLO)$/unitconv.obj           \
-    $(SLO)$/wallitem.obj
+    $(SLO)$/wallitem.obj           \
+    $(SLO)$/xwindowitem.obj
 
 # --- Targets -------------------------------------------------------
 
diff --git a/svtools/source/misc/xwindowitem.cxx b/svtools/source/misc/xwindowitem.cxx
new file mode 100755
index 000000000000..a382d8293617
--- /dev/null
+++ b/svtools/source/misc/xwindowitem.cxx
@@ -0,0 +1,97 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svtools.hxx"
+
+#include "svtools/xwindowitem.hxx"
+
+#include <vcl/window.hxx>
+
+
+using namespace ::com::sun::star;
+
+//////////////////////////////////////////////////////////////////////
+
+TYPEINIT1_FACTORY( XWindowItem, SfxPoolItem, new XWindowItem );
+
+
+XWindowItem::XWindowItem() :
+    SfxPoolItem()
+{
+}
+
+
+XWindowItem::XWindowItem( USHORT nWhichId, Window * pWin ) :
+    SfxPoolItem( nWhichId )
+{
+    if (pWin)
+    {
+        m_xWin = uno::Reference< awt::XWindow >( pWin->GetComponentInterface(), uno::UNO_QUERY );
+        // the assertion can't possibly fails since VCLXWindow implements XWindow...
+        DBG_ASSERT( m_xWin.is(), "failed to get XWindow" );
+    }
+}
+
+
+XWindowItem::XWindowItem( USHORT nWhichId, uno::Reference< awt::XWindow > & rxWin ) :
+    SfxPoolItem( nWhichId ),
+    m_xWin( rxWin )
+{
+}
+
+
+XWindowItem::XWindowItem( const XWindowItem &rItem ) :
+    SfxPoolItem( Which() ),
+    m_xWin( rItem.m_xWin )
+{
+}
+
+
+XWindowItem::~XWindowItem()
+{
+}
+
+
+SfxPoolItem * XWindowItem::Clone( SfxItemPool* /*pPool*/ ) const
+{
+    return new XWindowItem( *this );
+}
+
+
+int XWindowItem::operator == ( const SfxPoolItem & rAttr ) const
+{
+    DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
+
+    const XWindowItem * pItem = dynamic_cast< const XWindowItem * >(&rAttr);
+    return pItem ? m_xWin == pItem->m_xWin : 0;
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+