CWS-TOOLING: integrate CWS bjm02

2009-08-12 Bjoern Michaelsen #i101879# moved officeversion from envelope body to requestbody
2009-08-11 Bjoern Michaelsen #i103732# reverting changeset f3f527950572
2009-08-10 Bjoern Michaelsen cws bjm02: merging local minibranches
2009-08-10 Bjoern Michaelsen #i104128# remove additional duplication in svx headers, remove license header merge conflicts in svx headers
2009-08-10 Bjoern Michaelsen #i100484# fixed buildbreaker on win32
2009-08-10 Bjoern Michaelsen #i104128# remove duplication in svx headers
2009-08-04 Bjoern Michaelsen #i103913# fixed bookmark updating when moving numbered para
2009-08-03 Bjoern Michaelsen #i101879# include officeversion/productname in soaprequest
2009-07-31 Bjoern Michaelsen #i84926# Selecting all in blockmode automatically falls back to std mode
2009-07-31 Bjoern Michaelsen #i100484# operation on 'pCmpLine' may be undefined, thanks cmc
2009-07-29 Bjoern Michaelsen #i103059# fixing crash on empty enumeration
2009-07-29 Bjoern Michaelsen #i98659# fixing typo in usagetracking option tabpage
2009-07-29 Bjoern Michaelsen #i103732# not triggering loading of oooimprovement dll if usage tracking is disabled
2009-07-29 Bjoern Michaelsen #i103036# stlunosequence can be use simple array-pointers as iterators, fixing used type in xmloff
2009-07-29 Bjoern Michaelsen #i103036# stlunosequence can be use simple array-pointers as iterators
2009-07-29 Bjoern Michaelsen #i103182# completely removing unused functions in extensions/oooimprovement
2009-07-28 Bjoern Michaelsen cws bjm02: merged changes from master up to milestone DEV300_m53
2009-06-29 Bjoern Michaelsen #i103182# commenting out getFailedAttempts(..) for future use
2009-06-29 Bjoern Michaelsen #i103183# removed unused function sw::mark::CrossRefBookmark::IsLegalName(..)
2009-06-29 Bjoern Michaelsen #i103182# removing unused functions in extensions/oooimprovement
2009-06-24 Bjoern Michaelsen #i103059# not using enumeration for getByName/getByIndex
2009-06-24 Bjoern Michaelsen #i103059# not using enumeration for hasByName/GetCount/hasElements for performance reasons
2009-06-24 Bjoern Michaelsen #i103036# stlunosequence can be use simple array-pointers as iterators
2009-08-27 releng CWS-TOOLING: integrate CWS hr65
2009-08-26 Jens-Heiner Rechtien #i104521#: implement 'setcurrent'; document --hg option to 'create'
2009-08-26 Jens-Heiner Rechtien #i104521#: SOAP method setSCMName() doesn't return a value
2009-08-26 Jens-Heiner Rechtien #i104521#: implement [set|get]_scm()
2009-08-26 Jens-Heiner Rechtien #i104521#: implement --hg switch to 'cws create'
2009-08-27 vg CWS-TOOLING: integrate CWS hr64_DEV300
2009-07-21 13:24:57 +0200 hr  r274189 : #i99576#: re-enable optimization for tabcont.cxx
2009-07-21 13:17:18 +0200 hr  r274188 : #i99592: disable -xspace optimization for Solaris x86 and SunStudio 12, due to some mis-optimzation in sc and elsewhere. SunStudio 12 update 1 is OK, but needs a few unrelated changes which will be implemented in DEV300 code line
2009-08-27 releng CWS-TOOLING: integrate CWS sw32bf02
2009-08-25 15:52:04 +0200 hde  r275366 : reactived testcases hit by issue 102752
2009-08-21 13:52:17 +0200 od  r275245 : #i102921# delete files whose deletion has been forgotten in cws impress172
2009-08-21 11:20:47 +0200 od  r275225 : CWS-TOOLING: rebase CWS sw32bf02 to trunk@275001 (milestone: DEV300:m55)
2009-08-20 16:21:30 +0200 od  r275191 : #i92511# method <lcl_MoveAllLowerObjs(..)>
	 - invalidation of cache for object rectangle inclusive spaces is needed.
2009-08-20 15:50:40 +0200 od  r275188 : #i96726# method <SwPagePreView::DocSzChgd(..)>
	 - trigger recalculation of page preview layout even if the count of pages is not changing
2009-08-20 12:37:32 +0200 od  r275172 : #i100466# correction for showing and hiding redlines
2009-08-18 13:25:18 +0200 od  r275100 : #i103817# method <XMLTextImportHelper::SetStyleAndAttrs(..)
          - assure that a heading applies the outline style, if no other list style is applied.
2009-08-18 13:21:38 +0200 od  r275098 : #i103817# allow the outline style - list style for outline numbering - to be set directly at the paragraph
2009-08-17 14:13:02 +0200 od  r275052 : #i103684# add missing documentation for new optional OutlineLevel attribute introduced in OOo 3.1
2009-08-17 14:00:25 +0200 od  r275049 : #i100481# method <XMLTextFrameContext_Impl::CreateChildContext(..)>#
	  - correct condition for handling embedded documents and embedded math objects
2009-08-12 14:11:34 +0200 od  r274891 : #i97379# assure that columns are not applied to fly frames, which represent graphics or embedded objects
2009-08-12 12:51:43 +0200 od  r274889 : #i101870# method <SwTxtNode::_MakeNewTxtNode(..)>
	  - perform action on different paragraph styles before applying new paragraph style
2009-08-12 12:24:44 +0200 od  r274888 : #i101092# method <ViewShell::Paint(..)>
	  - encapsulate paint of document background and document into pre and post drawing layer paint calls
2009-08-12 11:38:48 +0200 od  r274886 : #i98766# minor adjustment in order to be warning free under Mac port builds
2009-08-12 11:33:54 +0200 od  r274885 : #i99267# method <SwTabFrm::MakeAll()>
	 - reset <bSplit> after forward move to assure that follows can be joined, if further space is available.
2009-08-12 11:11:49 +0200 od  r274882 : #i98766# method <ViewShell::SmoothScroll(..)
	 - disable smooth scroll for Mac port builds
2009-08-10 12:17:58 +0200 od  r274801 : CWS-TOOLING: rebase CWS sw32bf02 to trunk@274622 (milestone: DEV300:m54)
2009-07-21 16:56:45 +0200 od  r274206 : #i103685# method <SwTxtFormatter::NewTabPortion(..)>
	  - adjust condition to apply automatic tab stop at left margin correctly
	    in case that tab stops are not relative to indent
2009-07-10 11:53:53 +0200 od  r273883 : #i102752 method <SwDrawContact::Modify(..)>
	 - assure that a ShapePropertyChangeNotifier exists
2009-07-07 12:01:58 +0200 mst  r273788 : #i103304# apply patch by dtardon to fix bogus conditional
2009-07-07 09:01:13 +0200 od  r273767 : CWS-TOOLING: rebase CWS sw32bf02 to trunk@273468 (milestone: DEV300:m51)
2009-08-27 vg CWS-TOOLING: integrate CWS native264_DEV300
2009-08-13 11:58:58 +0200 is  r274928 : #i104200# update to jre6u16
2009-08-27 vg CWS-TOOLING: integrate CWS automationdev300m54tables
2009-08-14 13:01:05 +0200 wg  r274976 : i104224
2009-08-14 13:00:28 +0200 wg  r274975 : i104224
2009-08-14 12:12:34 +0200 wg  r274974 : i104222
2009-08-13 14:28:13 +0200 wg  r274944 : i104205
2009-08-13 14:27:40 +0200 wg  r274943 : i104205
2009-08-13 14:26:36 +0200 wg  r274942 : i104205

9 files changed, 33 insertions, 89 deletions

diff --git a/extensions/source/oooimprovement/config.cxx b/extensions/source/oooimprovement/config.cxx
index daf1e81bc60d..bece7e089f1a 100644
--- a/extensions/source/oooimprovement/config.cxx
+++ b/extensions/source/oooimprovement/config.cxx
@@ -222,6 +222,7 @@ namespace oooimprovement
         return result;
     }
 
+#ifdef FUTURE
     sal_Int32 Config::getFailedAttempts() const
     {
         sal_Int32 result = 0;
@@ -231,6 +232,7 @@ namespace oooimprovement
             MyConfigurationHelper::E_READONLY) >>= result;
         return result;
     }
+#endif
 
     sal_Int32 Config::getOfficeStartCounterdown() const
     {
diff --git a/extensions/source/oooimprovement/config.hxx b/extensions/source/oooimprovement/config.hxx
index ff032a6032a5..c5ea887fa76f 100644
--- a/extensions/source/oooimprovement/config.hxx
+++ b/extensions/source/oooimprovement/config.hxx
@@ -53,7 +53,9 @@ namespace oooimprovement
             ::rtl::OUString getSoapId() const;
             ::rtl::OUString getSoapUrl() const;
             sal_Int32 getReportCount() const;
+#ifdef FUTURE
             sal_Int32 getFailedAttempts() const;
+#endif
             sal_Int32 getOfficeStartCounterdown() const;
             sal_Int32 incrementEventCount(sal_Int32 by);
             sal_Int32 incrementReportCount(sal_Int32 by);
diff --git a/extensions/source/oooimprovement/corecontroller.cxx b/extensions/source/oooimprovement/corecontroller.cxx
index 34fc24e42302..3c9245d3faa9 100644
--- a/extensions/source/oooimprovement/corecontroller.cxx
+++ b/extensions/source/oooimprovement/corecontroller.cxx
@@ -33,7 +33,6 @@
 #include "corecontroller.hxx"
 #include "config.hxx"
 
-
 using ::rtl::OUString;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
@@ -41,14 +40,6 @@ using namespace ::com::sun::star::uno;
 
 namespace oooimprovement
 {
-
-    CoreController::CoreController(const Reference<XComponentContext>& context)
-        : m_ServiceFactory(Reference<XMultiServiceFactory>(
-            context->getServiceManager()->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.lang.XMultiServiceFactory"), context),
-            UNO_QUERY))
-    { }
-
     CoreController::CoreController(const Reference<XMultiServiceFactory>& sf)
         : m_ServiceFactory(sf)
     { }
@@ -96,9 +87,6 @@ namespace oooimprovement
         return aServiceNames;
     }
 
-    Reference<XInterface> SAL_CALL CoreController::Create(const Reference<XComponentContext>& context)
-    { return *(new CoreController(context)); }
-
     Reference<XInterface> SAL_CALL CoreController::Create(const Reference<XMultiServiceFactory>& sm)
     { return *(new CoreController(sm)); }
 }
diff --git a/extensions/source/oooimprovement/corecontroller.hxx b/extensions/source/oooimprovement/corecontroller.hxx
index 3f1cadb82b69..4f62e9d026b6 100644
--- a/extensions/source/oooimprovement/corecontroller.hxx
+++ b/extensions/source/oooimprovement/corecontroller.hxx
@@ -54,8 +54,8 @@ namespace oooimprovement
             // css::lang::XServiceInfo - static version
             static ::rtl::OUString SAL_CALL getImplementationName_static();
             static css::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames_static();
-            static css::uno::Reference< css::uno::XInterface> SAL_CALL Create(
-                const css::uno::Reference<css::uno::XComponentContext>& context);
+            //static css::uno::Reference< css::uno::XInterface> SAL_CALL Create(
+            //    const css::uno::Reference<css::uno::XComponentContext>& context);
 
             static css::uno::Reference< css::uno::XInterface> SAL_CALL Create(
                 const css::uno::Reference< css::lang::XMultiServiceFactory>& sm);
diff --git a/extensions/source/oooimprovement/invite_job.cxx b/extensions/source/oooimprovement/invite_job.cxx
index 20efafcaa69a..bb1ce11d23fe 100644
--- a/extensions/source/oooimprovement/invite_job.cxx
+++ b/extensions/source/oooimprovement/invite_job.cxx
@@ -67,12 +67,12 @@ namespace
 
 namespace oooimprovement
 {
-    InviteJob::InviteJob(const Reference<XComponentContext>& context)
-        : m_ServiceFactory(Reference<XMultiServiceFactory>(
-            context->getServiceManager()->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.lang.XMultiServiceFactory"), context),
-            UNO_QUERY))
-    { }
+//    InviteJob::InviteJob(const Reference<XComponentContext>& context)
+//        : m_ServiceFactory(Reference<XMultiServiceFactory>(
+//            context->getServiceManager()->createInstanceWithContext(
+//                OUString::createFromAscii("com.sun.star.lang.XMultiServiceFactory"), context),
+//            UNO_QUERY))
+//    { }
 
     InviteJob::InviteJob(const Reference<XMultiServiceFactory>& sf)
         : m_ServiceFactory(sf)
@@ -128,8 +128,8 @@ namespace oooimprovement
         return aServiceNames;
     }
 
-    Reference<XInterface> InviteJob::Create(const Reference<XComponentContext>& context)
-    { return *(new InviteJob(context)); }
+//    Reference<XInterface> InviteJob::Create(const Reference<XComponentContext>& context)
+//    { return *(new InviteJob(context)); }
 
     Reference<XInterface> InviteJob::Create(const Reference<XMultiServiceFactory>& sm)
     { return *(new InviteJob(sm)); }
diff --git a/extensions/source/oooimprovement/invite_job.hxx b/extensions/source/oooimprovement/invite_job.hxx
index 17e5c2586003..8c1cd57f07a8 100644
--- a/extensions/source/oooimprovement/invite_job.hxx
+++ b/extensions/source/oooimprovement/invite_job.hxx
@@ -53,8 +53,8 @@ namespace oooimprovement
             // XServiceInfo - static version
             static ::rtl::OUString SAL_CALL getImplementationName_static();
             static css::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames_static();
-            static css::uno::Reference< css::uno::XInterface> SAL_CALL Create(
-                const css::uno::Reference< css::uno::XComponentContext>& context);
+            //static css::uno::Reference< css::uno::XInterface> SAL_CALL Create(
+            //    const css::uno::Reference< css::uno::XComponentContext>& context);
 
             static css::uno::Reference< css::uno::XInterface> SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory>& sm);
 
diff --git a/extensions/source/oooimprovement/myconfigurationhelper.cxx b/extensions/source/oooimprovement/myconfigurationhelper.cxx
index c6e68e92a064..e0f14c6ec445 100644
--- a/extensions/source/oooimprovement/myconfigurationhelper.cxx
+++ b/extensions/source/oooimprovement/myconfigurationhelper.cxx
@@ -149,33 +149,6 @@ namespace oooimprovement
         xProps->setPropertyValue(sKey, aValue);
     }
 
-    Reference<XInterface> MyConfigurationHelper::makeSureSetNodeExists(
-        const Reference<XInterface> xCFG,
-        const OUString& sRelPathToSet,
-        const OUString& sSetNode)
-    {
-        Reference<css::container::XHierarchicalNameAccess> xAccess(xCFG, UNO_QUERY_THROW);
-        Reference<css::container::XNameAccess> xSet;
-        xAccess->getByHierarchicalName(sRelPathToSet) >>= xSet;
-        if (!xSet.is())
-            throw css::container::NoSuchElementException(
-                noSuchElement(sRelPathToSet),
-                Reference<XInterface>());
-
-        Reference<XInterface> xNode;
-        if (xSet->hasByName(sSetNode))
-            xSet->getByName(sSetNode) >>= xNode;
-        else
-        {
-            Reference<XSingleServiceFactory> xNodeFactory(xSet, UNO_QUERY_THROW);
-            xNode = xNodeFactory->createInstance();
-            Reference<css::container::XNameContainer> xSetReplace(xSet, UNO_QUERY_THROW);
-            xSetReplace->insertByName(sSetNode, makeAny(xNode));
-        }
-
-        return xNode;
-    }
-
     Any MyConfigurationHelper::readDirectKey(
         const Reference<XMultiServiceFactory> xSMGR,
         const OUString& sPackage,
diff --git a/extensions/source/oooimprovement/myconfigurationhelper.hxx b/extensions/source/oooimprovement/myconfigurationhelper.hxx
index a5d0c749e81a..5c5cb38b6a68 100644
--- a/extensions/source/oooimprovement/myconfigurationhelper.hxx
+++ b/extensions/source/oooimprovement/myconfigurationhelper.hxx
@@ -163,40 +163,6 @@ namespace oooimprovement
             const css::uno::Any& aValue);
 
         //-----------------------------------------------
-        /** it checks if the specified set node exists ... or create an empty one
-         *  otherwise.
-         *
-         *  This method must be used in combination with openConfig().
-         *  The cached configuration access must be provided here ... and
-         *  all operations are made relativ to this access point.
-         *
-         *  Further this method must be used only with configuration set's.
-         *  Atomic keys can't be "created" ... they "exists everytimes".
-         *
-         *  @param  xCFG
-         *          the configuration root, where sRelPathToSet should be interpreted
-         *          as relativ path.
-         *
-         *  @param  sRelPathToSet
-         *          path relative to xCFG parameter.
-         *
-         *  @param  sSetNode
-         *          the set node, which should be checked if its exists ...
-         *          or which should be created with default values.
-         *
-         *  @return A reference to the found (or new created) set node.
-         *          Cant be NULL .. in such case an exception occure !
-         *
-         *  @throw  css::uno::Any exceptions the underlying configuration can throw.
-         *          E.g. css::uno::Exception if the provided configuration
-         *          access does not allow writing for this set.
-         */
-        static css::uno::Reference< css::uno::XInterface> makeSureSetNodeExists(
-            const css::uno::Reference< css::uno::XInterface> xCFG,
-            const ::rtl::OUString& sRelPathToSet,
-            const ::rtl::OUString& sSetNode);
-
-        //-----------------------------------------------
         /** commit all changes made on the specified configuration access.
          *
          *  This method must be used in combination with openConfig().
diff --git a/extensions/source/oooimprovement/soaprequest.cxx b/extensions/source/oooimprovement/soaprequest.cxx
index d67ce911d204..94099cc21aee 100644
--- a/extensions/source/oooimprovement/soaprequest.cxx
+++ b/extensions/source/oooimprovement/soaprequest.cxx
@@ -33,6 +33,7 @@
 
 #include "soaprequest.hxx"
 #include "errormail.hxx"
+#include "config.hxx"
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -56,7 +57,7 @@ namespace
 {
     static unsigned long asUlong(sal_Int8 input)
     {
-        return *reinterpret_cast<unsigned char *>(&input) ;
+        return *reinterpret_cast<unsigned char *>(&input);
     };
 
     static Sequence<sal_Int8> base64_encode(const Sequence<sal_Int8>& input)
@@ -150,10 +151,22 @@ namespace
         "</SOAP-ENV:Envelope>\n");
     static const OString SOAP_ITEM_END("]]></value></item>\n");
 
-    static const OString getSoapSoapId(const OString& soap_id)
+    static const OString getSoapOfficeversion(const Reference<XMultiServiceFactory>& sf)
     {
         OStringBuffer buf =
-            "<body xsi:type=\"xsd:string\">" + xmlEncode(soap_id) + "</body>\n";
+            "<Officeversion Productname=\""
+            + ::rtl::OUStringToOString(oooimprovement::Config(sf).getCompleteProductname(), RTL_TEXTENCODING_ASCII_US)
+            + "\"/>\n";
+        return buf.makeStringAndClear();
+    };
+
+    static const OString getSoapSoapId(const Reference<XMultiServiceFactory>& sf, const OString& soap_id)
+    {
+        OStringBuffer buf;
+        buf.append("<body xsi:type=\"xsd:string\">");
+        buf.append(xmlEncode(soap_id)).append("\n");
+        buf.append(getSoapOfficeversion(sf));
+        buf.append("</body>\n");
         return buf.makeStringAndClear();
     };
 
@@ -180,7 +193,7 @@ namespace oooimprovement
         writeString(target, SOAP_START);
             writeString(
                 target,
-                getSoapSoapId(rtl::OUStringToOString(m_SoapId, RTL_TEXTENCODING_ASCII_US)));
+                getSoapSoapId(m_ServiceFactory, rtl::OUStringToOString(m_SoapId, RTL_TEXTENCODING_ASCII_US)));
             writeString(target, SOAP_ITEMS_START);
                 writeString(target, getSoapItemStart("reportmail.xml"));
                     writeString(target, Errormail(m_ServiceFactory).getXml());