CWS-TOOLING: integrate CWS aw075

2009-08-12 18:26:05 +0200 aw  r274912 : #i97672# use SelectionMaximumLuminancePercent to limit the hilight color to be not too invisible
2009-08-12 18:25:53 +0200 aw  r274911 : #i97672# use SelectionMaximumLuminancePercent to limit the hilight color to be not too invisible
2009-08-12 18:25:20 +0200 aw  r274910 : #i97672# Added SelectionMaximumLuminancePercent to decide which maximum luminance for the selection color to accept from the system
2009-08-12 18:00:17 +0200 aw  r274908 : #i97672# added SelectionMaximumLuminancePercent which limits the luminance of the system's selection color to a maximum luminance (default is 70)
2009-08-11 14:01:07 +0200 aw  r274859 : #i104150# take over values from transparence percent field even when disabled
2009-08-11 13:59:33 +0200 aw  r274858 : #i103500# corrected the transparent SC overlay pixel alignment
2009-08-11 12:42:46 +0200 jsk  r274854 : #i103937# Added two new controls to options/view page for transparency and opacity
2009-08-10 16:20:02 +0200 aw  r274823 : #i97672# Adapting MF_SELECTION to #i35956#
2009-08-04 17:50:42 +0200 aw  r274626 : #i102109# need to use AlphaMask instead of Bitmap
2009-08-04 17:03:25 +0200 aw  r274624 : #i103982# corrected OutlinerParaObject owvership in GetBackgroundTextForwarder()
2009-08-04 12:18:11 +0200 aw  r274614 : #i97672# corrected warning due to member initialisation
2009-08-03 11:54:16 +0200 aw  r274571 : #i99268# corrected SdrExchangeView::GetObjGraphic
2009-07-31 14:22:57 +0200 aw  r274529 : #i101520# added support for not correct 3d polygons for 3D polygon object which is used over API from chart directly
2009-07-31 13:25:20 +0200 aw  r274527 : #i97672# added disabling selection options when system does not support them; slightly corrected positions
2009-07-31 13:20:32 +0200 aw  r274526 : #i102706# Do not merge closed polygons when converting MetaFiles to SdrObjects
2009-07-30 18:03:07 +0200 aw  r274499 : #i102175# corrected 1870 degree rotation situation for MetaFile paints
2009-07-30 17:06:31 +0200 aw  r274496 : #i103709# corrected HitTest for callouts and DrawingLayer text objects
2009-07-29 18:55:22 +0200 aw  r274465 : #i102956# corrected CutFindProcessor to back-transform all found cuts to the starting 3D coordinate system
2009-07-29 13:38:40 +0200 aw  r274448 : #i103720# corrected mpAsynchLoadEvent usage
2009-07-29 12:48:12 +0200 aw  r274447 : #i96762# cleanup: spaces
2009-07-28 19:11:31 +0200 aw  r274427 : #97672# first version of reworked selection with changeable transparency and frame
2009-07-28 19:09:39 +0200 aw  r274425 : #97672# first version of reworked selection with changeable transparency and frame
2009-07-28 19:09:27 +0200 aw  r274424 : #97672# first version of reworked selection with changeable transparency and frame
2009-07-28 19:09:14 +0200 aw  r274423 : #97672# first version of reworked selection with changeable transparency and frame
2009-07-28 19:08:59 +0200 aw  r274422 : #97672# first version of reworked selection with changeable transparency and frame
2009-07-28 19:08:47 +0200 aw  r274421 : #97672# first version of reworked selection with changeable transparency and frame
2009-07-28 15:44:50 +0200 aw  r274411 : #i102556# corrected TextLayouterDevice::getTextBoundRect implementation and usage; empty Rectangles were not handled correctly
2009-07-23 17:48:36 +0200 aw  r274277 : #i102063# implemented in-between OLE content holder (SdrOleContentPrimitive2D) and it's decomposition. Cleaned up diverse OLE graphic preparations
2009-07-22 12:55:12 +0200 aw  r274227 : #i102109# extended OutputDevice::DrawTransparent (the version with TransparenceGradient) to work correctly with AntiAliased content
2009-07-21 13:31:12 +0200 aw  r274191 : #i102611# changed scaling of Z-Range for Z-Buffer for ZBufferProcessor3D
2009-07-20 20:06:46 +0200 aw  r274155 : #i103500# moved OverlayObjectCell back to use discrete coordinates for rectangle list
2009-07-16 17:33:26 +0200 aw  r274065 : #i103530# corrected parameter preparation for MetaFile::Rotate call

2 files changed, 204 insertions, 2 deletions

diff --git a/svtools/inc/svtools/optionsdrawinglayer.hxx b/svtools/inc/svtools/optionsdrawinglayer.hxx
index e0b287002f34..120cccfa4232 100644
--- a/svtools/inc/svtools/optionsdrawinglayer.hxx
+++ b/svtools/inc/svtools/optionsdrawinglayer.hxx
@@ -190,6 +190,15 @@ class SVL_DLLPUBLIC SvtOptionsDrawinglayer
            void        SetQuadratic3DRenderLimit(sal_uInt32 nNew);
            void        SetQuadraticFormControlRenderLimit(sal_uInt32 nNew);
 
+        // #i97672# selection settings
+        sal_Bool    IsTransparentSelection() const;
+        sal_uInt16  GetTransparentSelectionPercent() const;
+        sal_uInt16  GetSelectionMaximumLuminancePercent() const;
+
+        void        SetTransparentSelection( sal_Bool bState );
+        void        SetTransparentSelectionPercent( sal_uInt16 nPercent );
+        void        SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent );
+
     //-------------------------------------------------------------------------------------------------------------
     //  private methods
     //-------------------------------------------------------------------------------------------------------------
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index 125827d17faf..abb044c7863e 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -92,6 +92,11 @@ using namespace ::com::sun::star::uno   ;
 #define DEFAULT_QUADRATIC3DRENDERLIMIT              1000000
 #define DEFAULT_QUADRATICFORMCONTROLRENDERLIMIT     45000
 
+// #i97672# selection settings
+#define DEFAULT_TRANSPARENTSELECTION                sal_True
+#define DEFAULT_TRANSPARENTSELECTIONPERCENT         75
+#define DEFAULT_SELECTIONMAXIMUMLUMINANCEPERCENT    70
+
 #define PROPERTYNAME_OVERLAYBUFFER      OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer"    ))
 #define PROPERTYNAME_PAINTBUFFER        OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer"      ))
 #define PROPERTYNAME_STRIPE_COLOR_A     OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorA"     ))
@@ -125,6 +130,11 @@ using namespace ::com::sun::star::uno   ;
 #define PROPERTYNAME_QUADRATIC3DRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("Quadratic3DRenderLimit"))
 #define PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("QuadraticFormControlRenderLimit"))
 
+// #i97672# selection settings
+#define PROPERTYNAME_TRANSPARENTSELECTION OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelection"))
+#define PROPERTYNAME_TRANSPARENTSELECTIONPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelectionPercent"))
+#define PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("SelectionMaximumLuminancePercent"))
+
 #define PROPERTYHANDLE_OVERLAYBUFFER                0
 #define PROPERTYHANDLE_PAINTBUFFER                  1
 #define PROPERTYHANDLE_STRIPE_COLOR_A               2
@@ -158,7 +168,12 @@ using namespace ::com::sun::star::uno   ;
 #define PROPERTYHANDLE_QUADRATIC3DRENDERLIMIT           22
 #define PROPERTYHANDLE_QUADRATICFORMCONTROLRENDERLIMIT  23
 
-#define PROPERTYCOUNT                               24
+// #i97672# selection settings
+#define PROPERTYHANDLE_TRANSPARENTSELECTION             24
+#define PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT      25
+#define PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT 26
+
+#define PROPERTYCOUNT                               27
 
 class SvtOptionsDrawinglayer_Impl : public ConfigItem
 {
@@ -248,6 +263,15 @@ public:
     void        SetQuadratic3DRenderLimit(sal_uInt32 nNew);
     void        SetQuadraticFormControlRenderLimit(sal_uInt32 nNew);
 
+    // #i97672# selection settings
+    sal_Bool    IsTransparentSelection() const;
+    sal_uInt16  GetTransparentSelectionPercent() const;
+    sal_uInt16  GetSelectionMaximumLuminancePercent() const;
+
+    void        SetTransparentSelection( sal_Bool bState );
+    void        SetTransparentSelectionPercent( sal_uInt16 nPercent );
+    void        SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent );
+
 //-------------------------------------------------------------------------------------------------------------
 //  private methods
 //-------------------------------------------------------------------------------------------------------------
@@ -295,6 +319,11 @@ private:
         sal_uInt32  m_nQuadratic3DRenderLimit;
         sal_uInt32  m_nQuadraticFormControlRenderLimit;
 
+        // #i97672# selection settings
+        sal_uInt16  m_nTransparentSelectionPercent;
+        sal_uInt16  m_nSelectionMaximumLuminancePercent;
+        sal_Bool    m_bTransparentSelection;
+
         // local values
         bool        m_bAllowAA : 1;
         bool        m_bAllowAAChecked : 1;
@@ -342,6 +371,11 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() :
     m_nQuadratic3DRenderLimit(DEFAULT_QUADRATIC3DRENDERLIMIT),
     m_nQuadraticFormControlRenderLimit(DEFAULT_QUADRATICFORMCONTROLRENDERLIMIT),
 
+    // #i97672# selection settings
+    m_nTransparentSelectionPercent(DEFAULT_TRANSPARENTSELECTIONPERCENT),
+    m_nSelectionMaximumLuminancePercent(DEFAULT_SELECTIONMAXIMUMLUMINANCEPERCENT),
+    m_bTransparentSelection(DEFAULT_TRANSPARENTSELECTION),
+
     // local values
     m_bAllowAA(true),
     m_bAllowAAChecked(false)
@@ -537,6 +571,27 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() :
                 seqValues[nProperty] >>= m_nQuadraticFormControlRenderLimit;
             }
             break;
+
+            // #i97672# selection settings
+            case PROPERTYHANDLE_TRANSPARENTSELECTION:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\TransparentSelection\"?" );
+                seqValues[nProperty] >>= m_bTransparentSelection;
+            }
+            break;
+
+            case PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_SHORT), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\TransparentSelectionPercent\"?" );
+                seqValues[nProperty] >>= m_nTransparentSelectionPercent;
+            }
+
+            case PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_SHORT), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\SelectionMaximumLuminancePercent\"?" );
+                seqValues[nProperty] >>= m_nSelectionMaximumLuminancePercent;
+            }
+            break;
         }
     }
 }
@@ -661,6 +716,19 @@ void SvtOptionsDrawinglayer_Impl::Commit()
             case PROPERTYHANDLE_QUADRATICFORMCONTROLRENDERLIMIT:
                 aSeqValues[nProperty] <<= m_nQuadraticFormControlRenderLimit;
             break;
+
+            // #i97672# selection settings
+            case PROPERTYHANDLE_TRANSPARENTSELECTION:
+                aSeqValues[nProperty] <<= m_bTransparentSelection;
+            break;
+
+            case PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT:
+                aSeqValues[nProperty] <<= m_nTransparentSelectionPercent;
+            break;
+
+            case PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT:
+                aSeqValues[nProperty] <<= m_nSelectionMaximumLuminancePercent;
+            break;
         }
     }
 
@@ -1065,6 +1133,49 @@ void SvtOptionsDrawinglayer_Impl::SetQuadraticFormControlRenderLimit(sal_uInt32
     }
 }
 
+// #i97672# selection settings
+sal_Bool SvtOptionsDrawinglayer_Impl::IsTransparentSelection() const
+{
+    return m_bTransparentSelection;
+}
+
+void SvtOptionsDrawinglayer_Impl::SetTransparentSelection( sal_Bool bState )
+{
+    if(m_bTransparentSelection != bState)
+    {
+        m_bTransparentSelection = bState;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetTransparentSelectionPercent( sal_uInt16 nPercent )
+{
+    if(m_nTransparentSelectionPercent != nPercent)
+    {
+        m_nTransparentSelectionPercent = nPercent;
+        SetModified();
+    }
+}
+
+sal_uInt16 SvtOptionsDrawinglayer_Impl::GetTransparentSelectionPercent() const
+{
+    return m_nTransparentSelectionPercent;
+}
+
+void SvtOptionsDrawinglayer_Impl::SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent )
+{
+    if(m_nSelectionMaximumLuminancePercent != nPercent)
+    {
+        m_nSelectionMaximumLuminancePercent = nPercent;
+        SetModified();
+    }
+}
+
+sal_uInt16 SvtOptionsDrawinglayer_Impl::GetSelectionMaximumLuminancePercent() const
+{
+    return m_nSelectionMaximumLuminancePercent;
+}
+
 //*****************************************************************************************************************
 //  private method
 //*****************************************************************************************************************
@@ -1104,7 +1215,12 @@ Sequence< OUString > SvtOptionsDrawinglayer_Impl::impl_GetPropertyNames()
         PROPERTYNAME_RENDERDECORATEDTEXTDIRECT,
         PROPERTYNAME_RENDERSIMPLETEXTDIRECT,
         PROPERTYNAME_QUADRATIC3DRENDERLIMIT,
-        PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT
+        PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT,
+
+        // #i97672# selection settings
+        PROPERTYNAME_TRANSPARENTSELECTION,
+        PROPERTYNAME_TRANSPARENTSELECTIONPERCENT,
+        PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT
     };
 
     // Initialize return sequence with these list ...
@@ -1486,6 +1602,83 @@ void SvtOptionsDrawinglayer::SetQuadraticFormControlRenderLimit(sal_uInt32 nNew)
     m_pDataContainer->SetQuadraticFormControlRenderLimit( nNew );
 }
 
+// #i97672# selection settings
+sal_Bool SvtOptionsDrawinglayer::IsTransparentSelection() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsTransparentSelection();
+}
+
+void SvtOptionsDrawinglayer::SetTransparentSelection( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetTransparentSelection( bState );
+}
+
+sal_uInt16 SvtOptionsDrawinglayer::GetTransparentSelectionPercent() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    sal_uInt16 aRetval(m_pDataContainer->GetTransparentSelectionPercent());
+
+    // crop to range [10% .. 90%]
+    if(aRetval < 10)
+    {
+        aRetval = 10;
+    }
+
+    if(aRetval > 90)
+    {
+        aRetval = 90;
+    }
+
+    return aRetval;
+}
+
+void SvtOptionsDrawinglayer::SetTransparentSelectionPercent( sal_uInt16 nPercent )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+
+    // crop to range [10% .. 90%]
+    if(nPercent < 10)
+    {
+        nPercent = 10;
+    }
+
+    if(nPercent > 90)
+    {
+        nPercent = 90;
+    }
+
+    m_pDataContainer->SetTransparentSelectionPercent( nPercent );
+}
+
+sal_uInt16 SvtOptionsDrawinglayer::GetSelectionMaximumLuminancePercent() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    sal_uInt16 aRetval(m_pDataContainer->GetSelectionMaximumLuminancePercent());
+
+    // crop to range [0% .. 100%]
+    if(aRetval > 90)
+    {
+        aRetval = 90;
+    }
+
+    return aRetval;
+}
+
+void SvtOptionsDrawinglayer::SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+
+    // crop to range [0% .. 100%]
+    if(nPercent > 90)
+    {
+        nPercent = 90;
+    }
+
+    m_pDataContainer->SetSelectionMaximumLuminancePercent( nPercent );
+}
+
 //*****************************************************************************************************************
 //  private method
 //*****************************************************************************************************************