CWS-TOOLING: integrate CWS sw31bf08_DEV300

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

3 files changed, 26 insertions, 22 deletions

diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
index e88eebb8d908..17814b7c7089 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 c50abdf026b0..e644cc58d7b8 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 7b13286ebd36..7491b2bb1cc5 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 )
             {