apple_remote/AppleRemote.m | 3 ++
apple_remote/HIDRemoteControlDevice.m | 12 ++++++++-
apple_remote/MultiClickRemoteBehavior.m | 2 -
apple_remote/RemoteMainController.m | 9 ------
apple_remote/inc/RemoteControl.h | 5 +++
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 4 ++-
editeng/source/editeng/impedit3.cxx | 21 ++++++++++++++++
sd/source/ui/app/sdxfer.cxx | 4 ++-
sd/source/ui/view/sdview2.cxx | 4 ++-
solenv/bin/modules/installer/ziplist.pm | 12 +++++++--
10 files changed, 60 insertions(+), 16 deletions(-)
New commits:
commit c1a2a6cb5698de6461335a527bdc5ada609668d4
Author: Thorsten Behrens <tbehr...@suse.com>
Date: Mon Dec 5 12:59:16 2011 +0100
Determine Packager properly, and use fallback if none.
This fixes the more strict rpmbuild checking that requires a non-
empty Packager name.
diff --git a/solenv/bin/modules/installer/ziplist.pm
b/solenv/bin/modules/installer/ziplist.pm
index cbbe663..d205a10 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -634,14 +634,22 @@ sub set_manufacturer
my ($allvariables) = @_;
my $manufacturer;
- if ( $ENV{'OOO_VENDOR'} ne "" )
+ if( defined $ENV{'OOO_VENDOR'} && $ENV{'OOO_VENDOR'} ne "" )
{
$manufacturer = $ENV{'OOO_VENDOR'};
}
- else
+ if( defined $ENV{'USERNAME'} && $ENV{'USERNAME'} ne "" )
{
$manufacturer = $ENV{'USERNAME'};
}
+ if( defined $ENV{'USER'} && $ENV{'USER'} ne "" )
+ {
+ $manufacturer = $ENV{'USER'};
+ }
+ else
+ {
+ $manufacturer = "default";
+ }
$installer::globals::manufacturer = $manufacturer;
$installer::globals::longmanufacturer = $manufacturer;
commit 9d40293f147212120ce2a2e960c1ef23168a428b
Author: Armin Le Grand <armin.le.gr...@oracle.com>
Date: Sat Dec 3 19:47:30 2011 +0100
aw084: #i108052# Added code to mimic old behaviour and call user layout
link when empty paragraph is rendered
# HG changeset patch
# User Armin Le Grand <armin.le.gr...@oracle.com>
# Date 1300894213 -3600
# Node ID 773a354b3c4694565fa5ef4588c21c6b2b2eed7f
# Parent 1e5618c51d1690a7c619f75d6b79c220c39854f8
aw084: #i108052# Added code to mimic old behaviour and call user layout
link when empty paragraph is rendered
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 7c0ae49..6f8cd93 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2911,6 +2911,27 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
Rectangle aClipRec, Point aSta
// Over the Portions of the line ...
// --------------------------------------------------
sal_uInt16 nIndex = pLine->GetStart();
+
+ // #i108052# When stripping a callback for empty
paragraphs is needed. This
+ // was somehow lost/removed/killed by making the
TextPortions with empty
+ // paragraph to type PORTIONKIND_TAB instead of
PORTIONKIND_TEXT. Adding here
+ // since I could not find out who and why this has changed.
+ if(bStripOnly && pLine->GetStartPortion() ==
pLine->GetEndPortion())
+ {
+ const Color
aOverlineColor(pOutDev->GetOverlineColor());
+ const Color
aTextLineColor(pOutDev->GetTextLineColor());
+
+ GetEditEnginePtr()->DrawingText(
+ aTmpPos, String(), 0, 0, 0,
+ aTmpFont, n, nIndex, 0,
+ 0,
+ 0,
+ false, true, false, // support for EOL/EOP TEXT
comments
+ 0,
+ aOverlineColor,
+ aTextLineColor);
+ }
+
for ( sal_uInt16 y = pLine->GetStartPortion(); y <=
pLine->GetEndPortion(); y++ )
{
DBG_ASSERT( pPortion->GetTextPortions().Count(), "Line
without Textportion in Paint!" );
commit ef4066bb19a2c139261d6be6ceb1a98c37ece2d1
Author: Armin Le Grand <armin.le.gr...@oracle.com>
Date: Sat Dec 3 18:30:24 2011 +0100
aw084: #i116802# Removing DBG_UNHANDLED_EXCEPTION since there is a valuable
alternative alailable and not a general error happening
# HG changeset patch
# User Armin Le Grand <armin.le.gr...@oracle.com>
# Date 1300120426 -3600
# Node ID 1e5618c51d1690a7c619f75d6b79c220c39854f8
# Parent 9d821e77ed393c984738cf3e829a8c94a681828f
aw084: #i116802# Removing DBG_UNHANDLED_EXCEPTION since there is a valuable
alternative alailable and not a general error happening
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 85d4b43..201e041 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -408,7 +408,9 @@ namespace drawinglayer
}
catch(const uno::Exception&)
{
- DBG_UNHANDLED_EXCEPTION();
+ // #i116763# removing since there is a good
alternative when the xControlView
+ // is not found and it is allowed to happen
+ // DBG_UNHANDLED_EXCEPTION();
// process recursively and use the decomposition as
Bitmap
process(rCandidate.get2DDecomposition(getViewInformation2D()));
commit d999ae100029641a3e21fc27d800f040c92b3ad5
Author: Armin Le Grand <armin.le.gr...@oracle.com>
Date: Sat Dec 3 18:30:11 2011 +0100
aw084: #i112978# use GetAllMarkedBoundRect instead of GetAllMarkedRect to
get fat line support
# HG changeset patch
# User Armin Le Grand <armin.le.gr...@oracle.com>
# Date 1300116633 -3600
# Node ID 9d821e77ed393c984738cf3e829a8c94a681828f
# Parent 20c5c9384888da33596d864251881e6e46bdd339
aw084: #i112978# use GetAllMarkedBoundRect instead of GetAllMarkedRect to
get fat line support
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index fb704a0..317c9f2 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -339,7 +339,9 @@ void SdTransferable::CreateData()
if( 1 == mpSdDrawDocumentIntern->GetPageCount() )
{
- Point aOrigin( ( maVisArea = mpSdViewIntern->GetAllMarkedRect()
).TopLeft() );
+ // #112978# need to use GetAllMarkedBoundRect instead of
GetAllMarkedRect to get
+ // fat lines correctly
+ Point aOrigin( ( maVisArea =
mpSdViewIntern->GetAllMarkedBoundRect() ).TopLeft() );
Size aVector( -aOrigin.X(), -aOrigin.Y() );
for( sal_uLong nObj = 0, nObjCount = pPage->GetObjCount(); nObj <
nObjCount; nObj++ )
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index ae61aa6..bd3a8d6 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -133,7 +133,9 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent
pTransferable->SetWorkDocument( (SdDrawDocument*) GetAllMarkedModel() );
mpDoc->CreatingDataObj( NULL );
- const Rectangle aMarkRect( GetAllMarkedRect() );
+ // #112978# need to use GetAllMarkedBoundRect instead of GetAllMarkedRect
to get
+ // fat lines correctly
+ const Rectangle aMarkRect( GetAllMarkedBoundRect() );
TransferableObjectDescriptor aObjDesc;
String aDisplayName;
SdrOle2Obj* pSdrOleObj = NULL;
commit 2aa52a0ae0493d6d767c57ef4975da37e9f8da10
Author: ericb2 <eri...@apache.org>
Date: Sun Oct 30 22:59:38 2011 +0000
Propragating the modif in the implementation (MultiClickRemoteBehavior.m)
* found under MIT-style license at svn rev 1195274
(http://svn.apache.org/viewvc?view=revision&revision=1195274)
diff --git a/apple_remote/MultiClickRemoteBehavior.m
b/apple_remote/MultiClickRemoteBehavior.m
index 03b2497..d0fd34c 100644
--- a/apple_remote/MultiClickRemoteBehavior.m
+++ b/apple_remote/MultiClickRemoteBehavior.m
@@ -75,7 +75,7 @@ const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL = 0.4;
}
- (void) setClickCountingEnabled: (BOOL) value {
if (value) {
- [self setClickCountEnabledButtons: kRemoteButtonPlus |
kRemoteButtonMinus | kRemoteButtonPlay | kRemoteButtonLeft | kRemoteButtonRight
| kRemoteButtonMenu];
+ [self setClickCountEnabledButtons: kRemoteButtonPlus |
kRemoteButtonMinus | kRemoteButtonPlay | kRemoteButtonLeft | kRemoteButtonRight
| kRemoteButtonMenu | kMetallicRemote2009ButtonPlay |
kMetallicRemote2009ButtonMiddlePlay];
} else {
[self setClickCountEnabledButtons: 0];
}
commit 7874d95ea30e0931b7817fc4a788c3a85f279e22
Author: ericb2 <eri...@apache.org>
Date: Sun Oct 30 22:58:59 2011 +0000
Removing never tested Keyspan remote (RemoteMainController.m)
* found under MIT-style license at svn rev 1195273
(http://svn.apache.org/viewvc?view=revision&revision=1195273)
diff --git a/apple_remote/RemoteMainController.m
b/apple_remote/RemoteMainController.m
index e884e4e..c3da7bb 100644
--- a/apple_remote/RemoteMainController.m
+++ b/apple_remote/RemoteMainController.m
@@ -63,15 +63,6 @@
#endif
}
- if ( [container instantiateAndAddRemoteControlDeviceWithClass:
[KeyspanFrontRowControl class]] != 0 ) {
-#ifdef DEBUG
- NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass:
[KeyspanFrontRowControl class]] successfull");
- }
- else {
- NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass:
[KeyspanFrontRowControl class]] failed");
-#endif
- }
-
if ( [container instantiateAndAddRemoteControlDeviceWithClass:
[GlobalKeyboardDevice class]] != 0 ) {
#ifdef DEBUG
NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass:
[GlobalKeyboardDevice class]] successfull");
commit aaf218d025326ef54dcbc724b33666d7ddcff187
Author: ericb2 <eri...@apache.org>
Date: Sun Oct 30 22:57:34 2011 +0000
Propragating the modif in the implementation (HIDRemoteControlDevice.m)
* found under MIT-style at svn rev 1195272
(http://svn.apache.org/viewvc?view=revision&revision=1195272)
diff --git a/apple_remote/HIDRemoteControlDevice.m
b/apple_remote/HIDRemoteControlDevice.m
index 9421590..2cd7506 100644
--- a/apple_remote/HIDRemoteControlDevice.m
+++ b/apple_remote/HIDRemoteControlDevice.m
@@ -281,7 +281,17 @@ cleanup:
NSNumber* buttonId = [[self cookieToButtonMapping] objectForKey:
cookieString];
if (buttonId != nil) {
- [self sendRemoteButtonEvent: [buttonId intValue] pressedDown:
(sumOfValues>0)];
+ switch ( (int)buttonId )
+ {
+ case kMetallicRemote2009ButtonPlay:
+ case kMetallicRemote2009ButtonMiddlePlay:
+ buttonId = [NSNumber numberWithInt:kRemoteButtonPlay];
+ break;
+ default:
+ break;
+ }
+ [self sendRemoteButtonEvent: [buttonId intValue] pressedDown:
(sumOfValues>0)];
+
} else {
// let's see if a number of events are stored in the cookie
string. this does
// happen when the main thread is too busy to handle all
incoming events in time.
commit b50bb4d3058456efeaaeee336f491d6447716845
Author: ericb2 <eri...@apache.org>
Date: Sun Oct 30 22:56:44 2011 +0000
Propragating the modif in the implementation (AppleRemote.m)
* found under MIT-style at svn rev 1195271
(http://svn.apache.org/viewvc?view=revision&revision=1195271)
diff --git a/apple_remote/AppleRemote.m b/apple_remote/AppleRemote.m
index a65cc64..95d8835 100644
--- a/apple_remote/AppleRemote.m
+++ b/apple_remote/AppleRemote.m
@@ -105,6 +105,9 @@ const char* AppleRemoteDeviceName = "AppleIRController";
[_cookieToButtonMapping setObject:[NSNumber
numberWithInt:kRemoteButtonMenu_Hold] forKey:@"33_21_20_2_33_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber
numberWithInt:kRemoteButtonPlay_Hold]
forKey:@"37_33_21_20_2_37_33_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber
numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
+ [_cookieToButtonMapping setObject:[NSNumber
numberWithInt:kMetallicRemote2009ButtonPlay]
forKey:@"33_21_20_8_2_33_21_20_8_2_"];
+ [_cookieToButtonMapping setObject:[NSNumber
numberWithInt:kMetallicRemote2009ButtonMiddlePlay]
forKey:@"33_21_20_3_2_33_21_20_3_2_"];
+ [_cookieToButtonMapping setObject:[NSNumber
numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
}
}
commit 7afb9c0e39bf3d706ec277b44ef64d2a1445920a
Author: ericb2 <eri...@apache.org>
Date: Sun Oct 30 22:55:10 2011 +0000
Adding missing constants for new metallic remote that Apple introduced in
2009
* found under MIT-style at svn rev 1195270
(http://svn.apache.org/viewvc?view=revision&revision=1195270)
diff --git a/apple_remote/inc/RemoteControl.h b/apple_remote/inc/RemoteControl.h
index a39f53b..4476af2 100644
--- a/apple_remote/inc/RemoteControl.h
+++ b/apple_remote/inc/RemoteControl.h
@@ -75,6 +75,11 @@ typedef enum _RemoteControlEventIdentifier {
// special events (not supported by all devices)
kRemoteControl_Switched =1<<13,
+
+ // New values for the "metallic" Remote (2009 model)
+ kMetallicRemote2009ButtonPlay =1<<14,
+ kMetallicRemote2009ButtonMiddlePlay =1<<15
+
} RemoteControlEventIdentifier;
@interface NSObject(RemoteControlDelegate)
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
