CWS-TOOLING: integrate CWS sw31bf08

2009-03-20 11:52:54 +0100 b_michaelsen  r269791 : using factory to init dialogs - fixes linking breakage
2009-03-18 13:10:52 +0100 mba  r269653 : #i92532#: makefile.mk didn't copy hyphenation dictionary
2009-03-17 18:20:46 +0100 b_michaelsen  r269623 : fixing win32 buildbreakers
2009-03-17 16:45:19 +0100 b_michaelsen  r269618 : #i100235# Improvementprogram is missing in tools options (all languages but EN_US)
2009-03-16 17:43:09 +0100 mst  r269562 : fix #i100227#
- sfx2/source/doc/objuno.cxx:
  + do not return invalid Handles in PropertySetInfo

5 files changed, 35 insertions, 28 deletions

diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index 5de9fa044c..e3dcc286f9 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -289,6 +289,8 @@ MixedPropertySetInfo::~MixedPropertySetInfo()
     for (sal_Int32 i = 0; i < udProps.getLength(); ++i) {
         if (std::find(_pUserKeys, _pUserKeys+FOUR, udProps[i].Name)
             == _pUserKeys+FOUR) {
+                // #i100027#: handles from udProps are not valid here
+                udProps[i].Handle = -1;
                 lProps.push_back(udProps[i]);
         }
     }
diff --git a/svx/inc/svx/optimprove.hxx b/svx/inc/svx/optimprove.hxx
index 816e531ca2..61f184239e 100644
--- a/svx/inc/svx/optimprove.hxx
+++ b/svx/inc/svx/optimprove.hxx
@@ -79,6 +79,7 @@ public:
     inline String   GetYesButtonText() const { return m_aYesRB.GetText(); }
     inline String   GetNoButtonText() const { return m_aNoRB.GetText(); }
     inline String   GetInfoText() const { return m_sInfo; }
+    inline String   GetTitleText() const { return m_aImproveFL.GetText(); }
 };
 
 class SvxImprovementOptionsPage : public SfxTabPage
@@ -100,10 +101,10 @@ private:
     String                      m_sMoreInfo;
     ::rtl::OUString             m_sLogPath;
 
-    SVX_DLLPRIVATE  SvxImprovementOptionsPage( Window* pParent, const SfxItemSet& rSet );
+    SvxImprovementOptionsPage( Window* pParent, const SfxItemSet& rSet );
 
-    DECL_DLLPRIVATE_LINK( HandleHyperlink, svt::FixedHyperlinkImage * );
-    DECL_DLLPRIVATE_LINK( HandleShowData, PushButton * );
+    DECL_LINK( HandleHyperlink, svt::FixedHyperlinkImage * );
+    DECL_LINK( HandleShowData, PushButton * );
 
 public:
     virtual             ~SvxImprovementOptionsPage();
@@ -115,13 +116,13 @@ public:
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
-class SVX_DLLPUBLIC SvxImprovementDialog : public SfxSingleTabDialog
+class SvxImprovementDialog : public SfxSingleTabDialog
 {
 private:
     SvxImprovementPage*     m_pPage;
 
-    DECL_DLLPRIVATE_LINK( HandleOK, OKButton * );
-    DECL_DLLPRIVATE_LINK( HandleHyperlink, svt::FixedHyperlinkImage * );
+    DECL_LINK( HandleOK, OKButton * );
+    DECL_LINK( HandleHyperlink, svt::FixedHyperlinkImage * );
 
 public:
     SvxImprovementDialog( Window* pParent, const String& rInfoURL );
diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
index e88eebb8d9..17814b7c70 100644
--- a/svx/source/dialog/makefile.mk
+++ b/svx/source/dialog/makefile.mk
@@ -365,7 +365,6 @@ LIB1OBJFILES= \
         $(SLO)$/framelink.obj\
         $(SLO)$/framelinkarray.obj \
         $(SLO)$/databaseregistrationui.obj \
-        $(SLO)$/optimprove.obj \
         $(SLO)$/radiobtnbox.obj
 
 .IF "$(GUI)"=="UNX"
@@ -444,6 +443,7 @@ LIB2OBJFILES= \
         $(SLO)$/optctl.obj \
         $(SLO)$/optjava.obj \
         $(SLO)$/optupdt.obj \
+        $(SLO)$/optimprove.obj \
         $(SLO)$/optimprove2.obj \
         $(SLO)$/optgenrl.obj \
         $(SLO)$/connect.obj \
diff --git a/svx/source/dialog/optimprove.cxx b/svx/source/dialog/optimprove.cxx
index c50abdf026..e644cc58d7 100644
--- a/svx/source/dialog/optimprove.cxx
+++ b/svx/source/dialog/optimprove.cxx
@@ -31,6 +31,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
+#ifdef SVX_DLLIMPLEMENTATION
+#undef SVX_DLLIMPLEMENTATION
+#endif
 // include ---------------------------------------------------------------
 
 #define _SVX_OPTIMPROVE_CXX
diff --git a/svx/source/dialog/treeopt.cxx b/svx/source/dialog/treeopt.cxx
index b51492a22b..8510f03f0d 100644
--- a/svx/source/dialog/treeopt.cxx
+++ b/svx/source/dialog/treeopt.cxx
@@ -1919,8 +1919,29 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
             // Disable OOoImprovement page if not enabled
             if( RID_SVXPAGE_IMPROVEMENT == nPageId )
             {
+                continue;
+            }
+            if ( nPageId != RID_SVXPAGE_SSO || isSSOEnabled )
+            {
+                AddTabPage( nPageId, sNewTitle, nGroup );
+            }
+        }
+        // private iteration hack for Improvement Program
+        // hack for OOo 3.1
+        // should not be in found in any later release
+        for(bool bOnce = false; bOnce==false; bOnce=true)
+        {
+            String sNewTitle = C2U("Improvement Program");
+            {
+                SvxImprovementPage aTempTabPage(this);
+                sNewTitle = aTempTabPage.GetTitleText();
+            }
+            nPageId = RID_SVXPAGE_IMPROVEMENT;
+            if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
+                continue;
+            // Disable OOoImprovement page if not enabled
+            {
                 const ::rtl::OUString sService = C2U("com.sun.star.oooimprovement.CoreController");
-
                 try
                 {
                     Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
@@ -1935,26 +1956,6 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
                 {
                     continue;
                 }
-
-                SvxEmptyPage* pTempPage = new SvxEmptyPage( this );
-                sPageTitle = pTempPage->GetText();
-                delete pTempPage;
-                xub_StrLen nPos = sPageTitle.Search( rGeneralArray.GetString(0) );
-                if ( nPos != STRING_NOTFOUND )
-                {
-                    xub_StrLen nLen = rGeneralArray.GetString(0).Len();
-                    if ( sPageTitle.GetChar( nPos + nLen ) == ' ' )
-                        nLen++;
-                    else if ( nPos + nLen == sPageTitle.Len() &&
-                                sPageTitle.GetChar( nPos + nLen ) == ' ' )
-                    {
-                        nPos++;
-                        nLen++;
-                    }
-                    sPageTitle.Erase( nPos, nLen );
-                }
-                if(sPageTitle.Len() > 0)
-                    sNewTitle = sPageTitle;
             }
             if ( nPageId != RID_SVXPAGE_SSO || isSSOEnabled )
             {