[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cppcanvas/source vcl/aqua

[Armin Le Grand]

 cppcanvas/source/mtfrenderer/implrenderer.cxx |   14 ++++++++++++++
 vcl/aqua/source/window/salframeview.mm        |    7 +++----
 2 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 2d1c3f406b3390587bd800d05a07e8349b4582f5
Author: Armin Le Grand <alg at apache.org>
Date:   Mon Jun 3 14:55:13 2013 +0000

    i120994 Corrected Line/FillColor OnOff state handling

diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index a3a2717..2e284c6 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1496,6 +1496,13 @@ namespace cppcanvas
                                            getState( rStates ).lineColor,
                                            rCanvas );
                         }
+                        else
+                        {
+                            // #120994# Do switch on/off LineColor, even when a overriding one is set
+                            bool bSetting(static_cast<MetaLineColorAction*>(pCurrAct)->IsSetting());
+
+                            getState( rStates ).isLineColorSet = bSetting;
+                        }
                         break;
 
                     case META_FILLCOLOR_ACTION:
@@ -1506,6 +1513,13 @@ namespace cppcanvas
                                            getState( rStates ).fillColor,
                                            rCanvas );
                         }
+                        else
+                        {
+                            // #120994# Do switch on/off FillColor, even when a overriding one is set
+                            bool bSetting(static_cast<MetaFillColorAction*>(pCurrAct)->IsSetting());
+
+                            getState( rStates ).isFillColorSet = bSetting;
+                        }
                         break;
 
                     case META_TEXTCOLOR_ACTION:
commit 8ea45f79845ed80d5af1aadaf7af0fc3f9c4c1e6
Author: Herbert Dürr <hdu at apache.org>
Date:   Mon Jun 3 14:08:48 2013 +0000

    #i121406# #i119006# fix NSWindow's performSelector:withObject type
    
    NSWindow uses the type-casted plain integers
    instead of the boxed number objects (aka NSNumber)

diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index cb22309..e748433 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -169,15 +169,14 @@ static AquaSalFrame* getMouseContainerFrame()
     const SEL setCollectionBehavior = @selector(setCollectionBehavior:);
     if( bAllowFullScreen && [pNSWindow respondsToSelector: setCollectionBehavior])
     {
-        NSNumber* bMode = [NSNumber numberWithInt:(bAllowFullScreen ? NSWindowCollectionBehaviorFullScreenPrimary : NSWindowCollectionBehaviorFullScreenAuxiliary)];
-        [pNSWindow performSelector:setCollectionBehavior withObject:bMode];
+        const int bMode= (bAllowFullScreen ? NSWindowCollectionBehaviorFullScreenPrimary : NSWindowCollectionBehaviorFullScreenAuxiliary);
+        [pNSWindow performSelector:setCollectionBehavior withObject:(id)bMode];
     }
 
     // disable OSX>=10.7 window restoration until we support it directly
     const SEL setRestorable = @selector(setRestorable:);
     if( [pNSWindow respondsToSelector: setRestorable]) {
-        NSNumber* bNO = [NSNumber numberWithBool:NO];
-        [pNSWindow performSelector:setRestorable withObject:bNO];
+        [pNSWindow performSelector:setRestorable withObject:(id)NO];
     }
 
     return pNSWindow;