CWS-TOOLING: integrate CWS mba32issues02

2009-09-17 mb93783 merge commit
2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial
2009-09-01 mba #101455#: code simplification
2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no
2009-08-25 mba merge to m55
2009-07-29 mba cleanup after rebase
2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI
2009-07-27 mba adding dictionary changes from broken svn CWS
2009-07-27 mba adding dictionary changes from broken svn CWS
2009-07-27 mba apply patch from broken svn CWS

3 files changed, 2 insertions, 95 deletions

diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index a734d0bd1931..62361d619df3 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -2016,47 +2016,6 @@ sal_Bool Desktop::implcp_ctor( const css::uno::Reference< css::lang::XMultiServi
 
 //*****************************************************************************************************************
 //  We work with valid listener only.
-sal_Bool Desktop::implcp_addTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener )
-{
-    return(
-            ( &xListener        ==  NULL        )   ||
-            ( xListener.is()    ==  sal_False   )
-          );
-}
-
-//*****************************************************************************************************************
-//  We work with valid listener only.
-sal_Bool Desktop::implcp_removeTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener )
-{
-    return(
-            ( &xListener        ==  NULL        )   ||
-            ( xListener.is()    ==  sal_False   )
-          );
-}
-
-//*****************************************************************************************************************
-//  The target frame could be ""(!), but flags must be in range of right enum.
-sal_Bool Desktop::implcp_findFrame( const ::rtl::OUString&  sTargetFrameName,
-                                          sal_Int32         nSearchFlags    )
-{
-    return(
-            ( &sTargetFrameName == NULL )   ||
-            (
-                (    nSearchFlags != css::frame::FrameSearchFlag::AUTO        ) &&
-                ( !( nSearchFlags &  css::frame::FrameSearchFlag::PARENT    ) ) &&
-                ( !( nSearchFlags &  css::frame::FrameSearchFlag::SELF      ) ) &&
-                ( !( nSearchFlags &  css::frame::FrameSearchFlag::CHILDREN  ) ) &&
-                ( !( nSearchFlags &  css::frame::FrameSearchFlag::CREATE    ) ) &&
-                ( !( nSearchFlags &  css::frame::FrameSearchFlag::SIBLINGS  ) ) &&
-                ( !( nSearchFlags &  css::frame::FrameSearchFlag::TASKS     ) ) &&
-                ( !( nSearchFlags &  css::frame::FrameSearchFlag::ALL       ) ) &&
-                ( !( nSearchFlags &  css::frame::FrameSearchFlag::GLOBAL    ) )
-            )
-          );
-}
-
-//*****************************************************************************************************************
-//  We work with valid listener only.
 sal_Bool Desktop::implcp_addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
 {
     return(
@@ -2075,15 +2034,6 @@ sal_Bool Desktop::implcp_removeEventListener( const css::uno::Reference< css::la
           );
 }
 
-//*****************************************************************************************************************
-sal_Bool Desktop::implcp_statusChanged( const css::frame::FeatureStateEvent& aEvent )
-{
-    return(
-            ( &aEvent                              == NULL ) ||
-            ( aEvent.FeatureDescriptor.getLength() <  1    )
-          );
-}
-
 #endif  // #ifdef ENABLE_ASSERTIONS
 
 }   // namespace framework
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index a83a7120c40e..0e14404de381 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -3243,50 +3243,6 @@ sal_Bool Frame::implcp_setActiveFrame( const css::uno::Reference< css::frame::XF
 }
 
 //*****************************************************************************************************************
-// We don't accept null pointer ... but NULL-References are allowed!
-sal_Bool Frame::implcp_initialize( const css::uno::Reference< css::awt::XWindow >& xWindow )
-{
-    return( &xWindow == NULL );
-}
-
-//*****************************************************************************************************************
-// We don't accept null pointer or references!
-sal_Bool Frame::implcp_setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& xCreator )
-{
-    return  (
-                ( &xCreator     ==  NULL        )   ||
-                ( xCreator.is() ==  sal_False   )
-            );
-}
-
-//*****************************************************************************************************************
-// We don't accept null pointer or references!
-sal_Bool Frame::implcp_setName( const ::rtl::OUString& sName )
-{
-    return( &sName == NULL );
-}
-
-//*****************************************************************************************************************
-// We don't accept null pointer or references!
-// An empty target name is allowed => is the same like "_self"
-sal_Bool Frame::implcp_findFrame(  const   ::rtl::OUString& sTargetFrameName,
-                                            sal_Int32        /*nSearchFlags*/    )
-{
-    return( &sTargetFrameName == NULL );
-}
-
-//*****************************************************************************************************************
-// We don't accept null pointer!
-sal_Bool Frame::implcp_setComponent(   const   css::uno::Reference< css::awt::XWindow >&       xComponentWindow    ,
-                                        const   css::uno::Reference< css::frame::XController >& xController         )
-{
-    return  (
-                ( &xComponentWindow ==  NULL    )   ||
-                ( &xController      ==  NULL    )
-            );
-}
-
-//*****************************************************************************************************************
 sal_Bool Frame::implcp_addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener )
 {
     return  (
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 25d117ca50e2..c2a63843d45b 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -167,7 +167,7 @@ DEFINE_INIT_SERVICE                 (   License,
                                     )
 
 
-
+#if 0
 IMPL_STATIC_LINK_NOINSTANCE( License, Terminate, void*, EMPTYARG )
 {
     /*
@@ -182,6 +182,7 @@ IMPL_STATIC_LINK_NOINSTANCE( License, Terminate, void*, EMPTYARG )
     */
     return 0;
 }
+#endif
 
 static DateTime _oslDateTimeToDateTime(const oslDateTime& aDateTime)
 {