openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1579184 [14/33] - in /openoffice/branches/alg_writerframes: ./ ext_sources/ extras/l10n/source/de/ extras/l10n/source/es/ extras/l10n/source/eu/ extras/l10n/source/hi/ extras/l10n/source/kk/ extras/l10n/source/lt/ extras/l10n/source/nb/ ex...
Date Wed, 19 Mar 2014 10:15:07 GMT
Modified: openoffice/branches/alg_writerframes/main/accessibility/source/extended/accessibleiconchoicectrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/accessibility/source/extended/accessibleiconchoicectrl.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/accessibility/source/extended/accessibleiconchoicectrl.cxx (original)
+++ openoffice/branches/alg_writerframes/main/accessibility/source/extended/accessibleiconchoicectrl.cxx Wed Mar 19 10:14:42 2014
@@ -235,7 +235,7 @@ namespace accessibility
 		ensureAlive();
 
         ::rtl::OUString sName = getCtrl()->GetAccessibleName();
-        if ( sName.getLength() == 0 )
+        if ( sName.isEmpty() )
             sName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IconChoiceControl" ) );
         return sName;
 	}

Modified: openoffice/branches/alg_writerframes/main/accessibility/source/extended/textwindowaccessibility.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/accessibility/source/extended/textwindowaccessibility.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/accessibility/source/extended/textwindowaccessibility.cxx (original)
+++ openoffice/branches/alg_writerframes/main/accessibility/source/extended/textwindowaccessibility.cxx Wed Mar 19 10:14:42 2014
@@ -1955,7 +1955,7 @@ Document::changeParagraphText(::sal_uLon
         m_rView.DeleteSelected();
     if (bPaste)
         m_rView.Paste();
-    else if (rText.getLength() != 0)
+    else if ( !rText.isEmpty() )
         m_rView.InsertText(rText);
 }
 

Modified: openoffice/branches/alg_writerframes/main/accessibility/source/standard/accessiblemenuitemcomponent.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/accessibility/source/standard/accessiblemenuitemcomponent.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/accessibility/source/standard/accessiblemenuitemcomponent.cxx (original)
+++ openoffice/branches/alg_writerframes/main/accessibility/source/standard/accessiblemenuitemcomponent.cxx Wed Mar 19 10:14:42 2014
@@ -205,7 +205,7 @@ void OAccessibleMenuItemComponent::SetAc
 	{
 		sal_uInt16 nItemId = m_pParent->GetItemId( m_nItemPos );
 		sName = m_pParent->GetAccessibleName( nItemId );
-		if ( sName.getLength() == 0 )
+		if ( sName.isEmpty() )
 			sName = m_pParent->GetItemText( nItemId );
 		sName = OutputDevice::GetNonMnemonicString( sName );
 		

Modified: openoffice/branches/alg_writerframes/main/accessibility/source/standard/vclxaccessiblebox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/accessibility/source/standard/vclxaccessiblebox.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/accessibility/source/standard/vclxaccessiblebox.cxx (original)
+++ openoffice/branches/alg_writerframes/main/accessibility/source/standard/vclxaccessiblebox.cxx Wed Mar 19 10:14:42 2014
@@ -116,6 +116,7 @@ void VCLXAccessibleBox::ProcessWindowEve
 {
 	switch ( rVclWindowEvent.GetId() )
 	{
+		case VCLEVENT_DROPDOWN_SELECT:
 		case VCLEVENT_LISTBOX_SELECT:
 		case VCLEVENT_LISTBOX_FOCUSITEMCHANGED:
 
@@ -187,7 +188,7 @@ void VCLXAccessibleBox::ProcessWindowEve
 		                if ( xText.is() )
 				{
 					::rtl::OUString sText = xText->getSelectedText();
-					if ( !sText.getLength() )
+					if ( sText.isEmpty() )
 						sText = xText->getText();
 		                    pList->UpdateSelection_Acc (sText, m_bIsDropDownBox);
 					//if(m_bIsDropDownBox && !pList->IsInDropDown())
@@ -240,7 +241,7 @@ void VCLXAccessibleBox::ProcessWindowEve
                 if ( xText.is() )
 				{
 					::rtl::OUString sText = xText->getSelectedText();
-					if ( !sText.getLength() )
+					if ( sText.isEmpty() )
 						sText = xText->getText();
                     pList->UpdateSelection (sText);
 				}
@@ -574,7 +575,7 @@ void VCLXAccessibleBox::FillAccessibleSt
 				sText = pSubEdit->GetText();
 			nEntryCount = pComboBox->GetEntryCount();
 		}
-		if (sText.getLength() == 0 && nEntryCount >0)
+		if ( sText.isEmpty() && nEntryCount > 0 )
 			rStateSet.AddState(AccessibleStateType::INDETERMINATE);
 	}
 	else if (m_aBoxType == LISTBOX && m_bIsDropDownBox == true)

Modified: openoffice/branches/alg_writerframes/main/accessibility/source/standard/vclxaccessiblelist.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/accessibility/source/standard/vclxaccessiblelist.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/accessibility/source/standard/vclxaccessiblelist.cxx (original)
+++ openoffice/branches/alg_writerframes/main/accessibility/source/standard/vclxaccessiblelist.cxx Wed Mar 19 10:14:42 2014
@@ -363,6 +363,7 @@ void VCLXAccessibleList::ProcessWindowEv
 {
 	switch ( rVclWindowEvent.GetId() )
       {
+		case VCLEVENT_DROPDOWN_SELECT:
 		case VCLEVENT_LISTBOX_SELECT:
 			if ( !m_bDisableProcessEvent )
 				UpdateSelection_Impl_Acc(b_IsDropDownList);

Modified: openoffice/branches/alg_writerframes/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx (original)
+++ openoffice/branches/alg_writerframes/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx Wed Mar 19 10:14:42 2014
@@ -148,14 +148,14 @@ VCLXAccessibleToolBoxItem::~VCLXAccessib
 //				sRet += String( RTL_CONSTASCII_USTRINGPARAM( " " ) );
 //			sRet += sWinText;
 //		}
-		if (  sRet.getLength() == 0 )
+		if (  sRet.isEmpty() )
 		{
 			Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId );
 			if ( m_nRole == AccessibleRole::PANEL && pItemWindow && pItemWindow->GetAccessible().is() &&
 				 pItemWindow->GetAccessible()->getAccessibleContext().is() )
 			{
 				::rtl::OUString sWinText = pItemWindow->GetAccessible()->getAccessibleContext()->getAccessibleName();
-				 if ( sWinText.getLength() > 0 ) 
+				 if ( !sWinText.isEmpty() )
 					sRet = sWinText;
 			}
 		}
@@ -642,7 +642,7 @@ awt::FontDescriptor SAL_CALL VCLXAccessi
             sRet = m_pToolBox->GetHelpText( m_nItemId );
         else
             sRet = m_pToolBox->GetQuickHelpText( m_nItemId );
-		if ( !sRet.getLength() )
+		if ( sRet.isEmpty() )
 			// no help text set, so use item text
 			sRet = m_pToolBox->GetItemText( m_nItemId );
 	}

Modified: openoffice/branches/alg_writerframes/main/animations/source/animcore/animcore.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/animations/source/animcore/animcore.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/animations/source/animcore/animcore.cxx (original)
+++ openoffice/branches/alg_writerframes/main/animations/source/animcore/animcore.cxx Wed Mar 19 10:14:42 2014
@@ -2078,7 +2078,19 @@ void AnimationNode::fireChangeListener()
 		}
 	}
 
-	if( mpParent )
+    // #i123585# check mpParent, it is extracted from mxParent (see AnimationNode::setParent)
+    // and may be invalid when mxParent got deleted in the meantime
+    if(mpParent)
+    {
+        Reference< XInterface > xCheckReference(mxParent);
+
+        if(!xCheckReference.is())
+        {
+            mpParent = 0;
+        }
+    }
+
+    if( mpParent )
 		mpParent->fireChangeListener();
 }
 

Modified: openoffice/branches/alg_writerframes/main/apple_remote/AppleRemote.m
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/apple_remote/AppleRemote.m?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/apple_remote/AppleRemote.m (original)
+++ openoffice/branches/alg_writerframes/main/apple_remote/AppleRemote.m Wed Mar 19 10:14:42 2014
@@ -59,7 +59,7 @@ const char* AppleRemoteDeviceName = "App
 	if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) 
     {
         #ifdef DEBUG
-            NSLog( @"setting 10.4 cookies" );
+            NSLog( @"Apple Remote: setting 10.4 cookies" );
         #endif
 
 		// 10.4.x Tiger
@@ -78,7 +78,7 @@ const char* AppleRemoteDeviceName = "App
     else if( floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_5 )
     {
         #ifdef DEBUG
-            NSLog( @"setting 10.5 cookies" );
+            NSLog( @"Apple Remote: setting 10.5 cookies" );
         #endif
 		// 10.5.x Leopard
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"31_29_28_19_18_"];
@@ -96,7 +96,7 @@ const char* AppleRemoteDeviceName = "App
     else
     {
         #ifdef DEBUG
-            NSLog( @"setting 10.6 cookies" );
+            NSLog( @"Apple Remote: setting OSX>=10.6 cookies" );
         #endif
         // 10.6.x Snow Leopard
         [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"33_31_30_21_20_2_"];

Modified: openoffice/branches/alg_writerframes/main/apple_remote/GlobalKeyboardDevice.m
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/apple_remote/GlobalKeyboardDevice.m?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/apple_remote/GlobalKeyboardDevice.m (original)
+++ openoffice/branches/alg_writerframes/main/apple_remote/GlobalKeyboardDevice.m Wed Mar 19 10:14:42 2014
@@ -111,7 +111,7 @@ static OSStatus hotKeyEventHandler(Event
 			break;			
 		default: 
 #ifdef DEBUG
-			NSLog(@"Unknown global keyboard defaults key for remote button identifier %d", remoteButtonIdentifier);
+			NSLog( @"Apple Remote: Unknown global keyboard defaults key for button identifier %d", remoteButtonIdentifier);
 #endif
             break;
 	}

Modified: openoffice/branches/alg_writerframes/main/apple_remote/HIDRemoteControlDevice.m
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/apple_remote/HIDRemoteControlDevice.m?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/apple_remote/HIDRemoteControlDevice.m (original)
+++ openoffice/branches/alg_writerframes/main/apple_remote/HIDRemoteControlDevice.m Wed Mar 19 10:14:42 2014
@@ -274,7 +274,7 @@ cleanup:	
 	/*
 	if (previousRemainingCookieString) {
 		cookieString = [previousRemainingCookieString stringByAppendingString: cookieString];
-		NSLog(@"New cookie string is %@", cookieString);
+		NSLog( @"Apple Remote: New cookie string is %@", cookieString);
 		[previousRemainingCookieString release], previousRemainingCookieString=nil;							
 	}*/
 	if (cookieString == nil || [cookieString length] == 0) return;
@@ -310,7 +310,7 @@ cleanup:	
 		[self handleEventWithCookieString: lastSubCookieString sumOfValues:0];
 	    }
 	    if ([cookieString length] > 0) {
-		NSLog(@"Unknown button for cookiestring %@", cookieString);
+		NSLog( @"Apple Remote: Unknown button for cookiestring %@", cookieString);
 	    }		
 	}
 }
@@ -331,7 +331,7 @@ Will be called for any event of any type
 */
 static void QueueCallbackFunction(void* target,  IOReturn result, void* refcon, void* sender) {	
 	if (target < 0) {
-		NSLog(@"QueueCallbackFunction called with invalid target!");
+		NSLog( @"Apple Remote: QueueCallbackFunction called with invalid target!");
 		return;
 	}
 	NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -373,7 +373,7 @@ static void QueueCallbackFunction(void* 
 	ioReturnValue = IOObjectGetClass(hidDevice, className);
 	
 	if (ioReturnValue != kIOReturnSuccess) {
-		NSLog(@"Error: Failed to get class name.");
+		NSLog( @"Apple Remote: Error: Failed to get RemoteControlDevice class name.");
 		return NULL;
 	}
 	
@@ -388,7 +388,7 @@ static void QueueCallbackFunction(void* 
 		plugInResult = (*plugInInterface)->QueryInterface(plugInInterface, CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID), (LPVOID) &hidDeviceInterface);
 		
 		if (plugInResult != S_OK) {
-			NSLog(@"Error: Couldn't create HID class device interface");
+			NSLog( @"Apple Remote: Error: Couldn't create HID class device interface");
 		}
 		// Release
 		if (plugInInterface) (*plugInInterface)->Release(plugInInterface);
@@ -481,13 +481,13 @@ static void QueueCallbackFunction(void* 
 					(*queue)->start(queue);	
 					return YES;
 				} else {
-					NSLog(@"Error when setting event callback");
+					NSLog( @"Apple Remote: Error when setting event callback");
 				}
 			} else {
-				NSLog(@"Error when creating async event source");
+				NSLog( @"Apple Remote: Error when creating async event source");
 			}
 		} else {
-			NSLog(@"Error when opening device");
+			NSLog( @"Apple Remote: Error when opening device");
 		}
 	} else if (ioReturnValue == kIOReturnExclusiveAccess) {
 		// the device is used exclusive by another application

Modified: openoffice/branches/alg_writerframes/main/apple_remote/RemoteControl.m
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/apple_remote/RemoteControl.m?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/apple_remote/RemoteControl.m (original)
+++ openoffice/branches/alg_writerframes/main/apple_remote/RemoteControl.m Wed Mar 19 10:14:42 2014
@@ -51,7 +51,7 @@ NSString* kTargetApplicationIdentifier =
 	if ( (self = [super init]) ) {
 		delegate = [_remoteControlDelegate retain];
 #ifdef DEBUG
-        NSLog(@"RemoteControl initWithDelegate ok");
+        NSLog( @"Apple RemoteControl initWithDelegate ok");
 #endif
     }
 	return self;
@@ -64,7 +64,7 @@ NSString* kTargetApplicationIdentifier =
 
 - (void) setListeningToRemote: (BOOL) value {
 #ifdef DEBUG
-        NSLog(@"setListeningToRemote ok");
+        NSLog( @"Apple RemoteControl setListeningToRemote ok");
 #endif
 }
 - (BOOL) isListeningToRemote {
@@ -73,12 +73,12 @@ NSString* kTargetApplicationIdentifier =
 
 - (void) startListening: (id) sender {
 #ifdef DEBUG
-            NSLog(@"startListening ok");
+            NSLog( @"Apple RemoteControl startListening ok");
 #endif
 }
 - (void) stopListening: (id) sender {
 #ifdef DEBUG
-            NSLog(@"stopListening ok");
+            NSLog( @"Apple RemoteControl stopListening ok");
 #endif
 }
 
@@ -90,14 +90,13 @@ NSString* kTargetApplicationIdentifier =
 
 - (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier {
 #ifdef DEBUG
-   NSLog(@"sending event for button identifier \n");
+   NSLog( @"Apple RemoteControl: sending event for button identifier\n");
 #endif
 	return YES;
 }
 
 + (void) sendDistributedNotification: (NSString*) notificationName targetBundleIdentifier: (NSString*) targetIdentifier
 {
-    if ( (self = [super init]) ) {
     NSDictionary* userInfo = [NSDictionary dictionaryWithObjectsAndKeys: [NSString stringWithCString:[self remoteControlDeviceName] encoding:NSASCIIStringEncoding],
                             kRemoteControlDeviceName /* key = RemoteControlDeviceName  -> OK */,
                             [[NSBundle mainBundle] bundleIdentifier] /* value = org.openoffice.script -> OK */,
@@ -106,36 +105,37 @@ NSString* kTargetApplicationIdentifier =
                             kTargetApplicationIdentifier /*targetBundleIdentifier -> does not appear, since the peer is nil*/,
                             nil];
 #ifdef DEBUG
+    NSLog( @"Apple Remote: sendDistributedNotification ...");
     // Debug purpose: returns all the existing dictionary keys. 
-    NSString *s;
-    NSEnumerator *e = [userInfo keyEnumerator];
-    while ( (s = [e nextObject]) ) {
-        NSLog(@"key = %@ ",s);
+    NSEnumerator* itKey = [userInfo keyEnumerator];
+    NSEnumerator* itVal = [userInfo objectEnumerator];
+    for(;;) {
+        NSString* sKey = [itKey nextObject];
+        NSString* sVal = [itVal nextObject];
+        if( !sKey && !sVal)
+            break;
+        if( !sKey) sKey = @"nil";
+	if( !sVal) sVal = @"nil";
+        NSLog( @"\tARdict[\"%@\"] = \"%@\"",sKey,sVal);
     }
-    NSEnumerator *f = [userInfo objectEnumerator ];
-    while ( (s = [f nextObject]) ) {
-        NSLog(@"value = %@ ",s);
-    }
-    NSLog(@"sendDistributedNotification ...");
 #endif
 
 	[[NSDistributedNotificationCenter defaultCenter] postNotificationName:notificationName
 																   object:nil
 																 userInfo:userInfo
 													   deliverImmediately:YES];	
-    }
 }
 
 + (void) sendFinishedNotifcationForAppIdentifier: (NSString*) identifier {
     [self sendDistributedNotification:FINISHED_USING_REMOTE_CONTROL_NOTIFICATION targetBundleIdentifier:identifier];
 #ifdef DEBUG
-    NSLog(@"sendFinishedNotifcationForAppIdentifier ...");
+    NSLog( @"Apple RemoteControl: sendFinishedNotifcationForAppIdentifier ...");
 #endif
 }
 + (void) sendRequestForRemoteControlNotification {
     [self sendDistributedNotification:REQUEST_FOR_REMOTE_CONTROL_NOTIFCATION targetBundleIdentifier:nil];
 #ifdef DEBUG
-    NSLog(@"sendRequestForRemoteControlNotification ...");
+    NSLog( @"Apple RemoteControl: sendRequestForRemoteControlNotification ...");
 #endif
 }
 

Modified: openoffice/branches/alg_writerframes/main/apple_remote/RemoteControlContainer.m
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/apple_remote/RemoteControlContainer.m?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/apple_remote/RemoteControlContainer.m (original)
+++ openoffice/branches/alg_writerframes/main/apple_remote/RemoteControlContainer.m Wed Mar 19 10:14:42 2014
@@ -36,10 +36,10 @@
 	if ( (self = [super initWithDelegate:_remoteControlDelegate]) ) {
 		remoteControls = [[NSMutableArray alloc] init];
 #ifdef DEBUG
-        NSLog(@"RemoteControlContainer initWithDelegate ok");
+        NSLog( @"Apple Remote: ControlContainer initWithDelegate ok");
 	}
     else {
-        NSLog(@"RemoteControlContainer initWithDelegate failed");
+        NSLog( @"Apple Remote: RemoteControlContainer initWithDelegate failed");
 #endif
     }
 
@@ -62,7 +62,7 @@
     }
 #ifdef DEBUG
     else {
-        NSLog(@"RemoteControlContainer instantiateAndAddRemoteControlDeviceWithClass failed");
+        NSLog( @"Apple Remote: ControlContainer instantiateAndAddRemoteControlDeviceWithClass failed");
         toReturn = NO;	
     }
 #endif
@@ -78,7 +78,7 @@
 	[self didChangeValueForKey:@"listeningToRemote"];
 #ifdef DEBUG
 	// debug purpose
-    NSLog(@"reset... (after listening to remote)");
+    NSLog( @"Apple Remote: reset... (after listening)");
 #endif
 }
 
@@ -105,7 +105,7 @@
 
 - (void) startListening: (id) sender {
 #ifdef DEBUG
-	NSLog(@"startListening to events... ");
+	NSLog(@"Apple Remote: start listening to events... ");
 #endif
 	int i;
 	for(i=0; i < [remoteControls count]; i++) {
@@ -114,7 +114,7 @@
 }
 - (void) stopListening: (id) sender {
 #ifdef DEBUG
-	NSLog(@"stopListening to events... ");
+	NSLog(@"Apple Remote: stopListening to events... ");
 #endif
 	int i;
 	for(i=0; i < [remoteControls count]; i++) {

Modified: openoffice/branches/alg_writerframes/main/apple_remote/RemoteMainController.m
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/apple_remote/RemoteMainController.m?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/apple_remote/RemoteMainController.m (original)
+++ openoffice/branches/alg_writerframes/main/apple_remote/RemoteMainController.m Wed Mar 19 10:14:42 2014
@@ -37,7 +37,7 @@
 // Sample Code 3: Multi Click Behavior and Hold Event Simulation
 // -------------------------------------------------------------------------------------------
 
-@implementation MainController
+@implementation AppleRemoteMainController
 
 - (id) init {
     self = [super init];  // because we redefined our own init instead of use the fu..nny awakeFromNib 
@@ -73,11 +73,11 @@
         // to give the binding mechanism a chance to see the change of the attribute
         [self setValue: container forKey: @"remoteControl"];	
 #ifdef DEBUG
-            NSLog(@"MainController init done");
+            NSLog(@"AppleRemoteMainController init done");
 #endif
     }
     else 
-        NSLog(@"MainController init failed");
+        NSLog(@"AppleRemoteMainController init failed");
     return self;
 }
 
@@ -105,7 +105,7 @@
 #endif
     if (pressedDown)
     {
-        pressed = @"(pressed)";
+        pressed = @"(AppleRemoteMainController: button pressed)";
 
 #ifdef DEBUG
         switch(buttonIdentifier) 
@@ -124,14 +124,14 @@
             case kRemoteButtonMenu_Hold:    buttonName = @"Menu (long)";            break;  // MEDIA_COMMAND_MENU_HOLD
             case kRemoteControl_Switched:   buttonName = @"Remote Control Switched";break;
 
-            default:    NSLog(@"Unmapped event for button %d", buttonIdentifier);   break;
+            default:    NSLog( @"AppleRemoteMainController: Unmapped event for button %d", buttonIdentifier);   break;
         }
 #endif
         [ self postTheEvent:buttonIdentifier modifierFlags: 0 ];
     }
     else // not pressed
     {
-        pressed = @"(released)";
+        pressed = @"(AppleRemoteMainController: button released)";
     }
 
 #ifdef DEBUG
@@ -164,4 +164,4 @@
 	return remoteControlBehavior;
 }
 
-@end
\ No newline at end of file
+@end

Modified: openoffice/branches/alg_writerframes/main/apple_remote/inc/RemoteMainController.h
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/apple_remote/inc/RemoteMainController.h?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/apple_remote/inc/RemoteMainController.h (original)
+++ openoffice/branches/alg_writerframes/main/apple_remote/inc/RemoteMainController.h Wed Mar 19 10:14:42 2014
@@ -37,7 +37,7 @@
 
 //static void sendTheEvent( unichar, int );
 
-@interface MainController : NSObject {
+@interface AppleRemoteMainController : NSObject {
 @public // else remoteControl is not reachable from GetSalData()->mpMainController
 	RemoteControl* remoteControl;
 @private

Modified: openoffice/branches/alg_writerframes/main/automation/source/server/recorder.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/automation/source/server/recorder.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/automation/source/server/recorder.cxx (original)
+++ openoffice/branches/alg_writerframes/main/automation/source/server/recorder.cxx Wed Mar 19 10:14:42 2014
@@ -114,7 +114,7 @@ void MacroRecorder::LogVCL( rtl::OString
 Window* MacroRecorder::GetParentWithID( Window* pThis )
 {
     Window *pOverlap = pThis->GetWindow( WINDOW_OVERLAP );
-    while ( pOverlap != pThis && !pThis->GetUniqueOrHelpId().getLength() && pThis->GET_REAL_PARENT() )
+    while ( pOverlap != pThis && pThis->GetUniqueOrHelpId().isEmpty() && pThis->GET_REAL_PARENT() )
         pThis = pThis->GET_REAL_PARENT();
     return pThis;
 }
@@ -330,7 +330,7 @@ IMPL_LINK( MacroRecorder, EventListener,
 					case VCLEVENT_BUTTON_CLICK:
                         Window* pParent = pWin->GetParent();
                         sal_Bool bDone = sal_False;
-                        if ( pParent->IsDialog() && !pWin->GetUniqueOrHelpId().getLength() )
+                        if ( pParent->IsDialog() && pWin->GetUniqueOrHelpId().isEmpty() )
                         {
                             switch ( pParent->GetType() )
                             {
@@ -413,7 +413,7 @@ IMPL_LINK( MacroRecorder, EventListener,
                         }
 						if ( m_bRecord )
 						{
-							if ( !bSendData && pWin->GetUniqueOrHelpId().getLength() )
+							if ( !bSendData && !pWin->GetUniqueOrHelpId().isEmpty() )
 							{
 								StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click );
 								bSendData = sal_True;
@@ -536,7 +536,7 @@ IMPL_LINK( MacroRecorder, EventListener,
                                 // compare to 1 for floating ToolBoxes
 								if ( m_bRecord )
 								{
-									if ( !pWin->GetUniqueOrHelpId().getLength() /* || pWin->GetUniqueOrHelpId().Matches( 1 ) */ )
+									if ( pWin->GetUniqueOrHelpId().isEmpty() /* || pWin->GetUniqueOrHelpId().Matches( 1 ) */ )
 										// generate direct Button access
 										StatementList::pRet->GenReturn( RET_MacroRecorder, Str2Id( pTB->GetItemCommand( pTB->GetCurItemId() ) ), (comm_USHORT)(M_Click) );
 									else

Modified: openoffice/branches/alg_writerframes/main/automation/source/server/statemnt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/automation/source/server/statemnt.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/automation/source/server/statemnt.cxx (original)
+++ openoffice/branches/alg_writerframes/main/automation/source/server/statemnt.cxx Wed Mar 19 10:14:42 2014
@@ -868,7 +868,7 @@ void StatementCommand::WriteControlData(
 				break;
 
 			default:
-				if ( ( pBase->GetUniqueOrHelpId().getLength() == 0 ) && !( nConf & DH_MODE_ALLWIN ) )
+				if ( pBase->GetUniqueOrHelpId().isEmpty() && !( nConf & DH_MODE_ALLWIN ) )
 					bSkip = sal_True;
 				break;
 		}
@@ -2087,7 +2087,7 @@ void StatementCommand::Translate()
 			{
 				Window* pNew = pTranslationWindow->GetWindow( WINDOW_CLIENT );
 				// Bei Dockingwindoes das kanze Geraffel von Docking Floating ├╝berspringen
-				while ( IsDialog( pNew ) && !pNew->GetUniqueOrHelpId().getLength() && pNew->GetChildCount() == 1 )
+				while ( IsDialog( pNew ) && pNew->GetUniqueOrHelpId().isEmpty() && pNew->GetChildCount() == 1 )
 					pNew = pNew->GetChild( 0 );
 				pTranslationWindow = pNew;
 			}

Modified: openoffice/branches/alg_writerframes/main/avmedia/source/framework/mediacontrol.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/avmedia/source/framework/mediacontrol.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/avmedia/source/framework/mediacontrol.cxx (original)
+++ openoffice/branches/alg_writerframes/main/avmedia/source/framework/mediacontrol.cxx Wed Mar 19 10:14:42 2014
@@ -307,7 +307,7 @@ void MediaControl::execute( const MediaI
 
 void MediaControl::implUpdateToolboxes()
 {
-	const bool bValidURL = ( maItem.getURL().getLength() > 0 );
+	const bool bValidURL = !maItem.getURL().isEmpty();
 	
 	maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_INSERT, bValidURL );
 	maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_PLAY, bValidURL );
@@ -386,7 +386,7 @@ void MediaControl::implUpdateToolboxes()
 
 void MediaControl::implUpdateTimeSlider()
 {
-	if( !maItem.getURL().getLength() || !IsEnabled() )
+	if( maItem.getURL().isEmpty() || !IsEnabled() )
 		maTimeSlider.Disable();
 	else
 	{
@@ -413,7 +413,7 @@ void MediaControl::implUpdateTimeSlider(
 
 void MediaControl::implUpdateVolumeSlider()
 {
-	if( !maItem.getURL().getLength() || !IsEnabled() )
+	if( maItem.getURL().isEmpty() || !IsEnabled() )
 		maVolumeSlider.Disable();
 	else
 	{
@@ -430,7 +430,7 @@ void MediaControl::implUpdateVolumeSlide
 
 void MediaControl::implUpdateTimeField( double fCurTime )
 {
-    if( maItem.getURL().getLength() > 0 )
+    if( !maItem.getURL().isEmpty() )
 	{
 		String				aTimeString;
 		

Modified: openoffice/branches/alg_writerframes/main/avmedia/source/framework/mediacontrol.src
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/avmedia/source/framework/mediacontrol.src?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/avmedia/source/framework/mediacontrol.src (original)
+++ openoffice/branches/alg_writerframes/main/avmedia/source/framework/mediacontrol.src Wed Mar 19 10:14:42 2014
@@ -81,21 +81,21 @@ String AVMEDIA_STR_ZOOM 		
 
 String AVMEDIA_STR_ZOOM_50 	
 {
-	Text[en-US] = "50%";
+	Text[en-US] = "50 %";
 };
 
 // ------------------------------------------------------------------------------
 
 String AVMEDIA_STR_ZOOM_100 	
 {
-	Text[en-US] = "100%";
+	Text[en-US] = "100 %";
 };
 
 // ------------------------------------------------------------------------------
 
 String AVMEDIA_STR_ZOOM_200 	
 {
-	Text[en-US] = "200%";
+	Text[en-US] = "200 %";
 };
 
 // ------------------------------------------------------------------------------

Modified: openoffice/branches/alg_writerframes/main/avmedia/source/framework/soundhandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/avmedia/source/framework/soundhandler.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/avmedia/source/framework/soundhandler.cxx (original)
+++ openoffice/branches/alg_writerframes/main/avmedia/source/framework/soundhandler.cxx Wed Mar 19 10:14:42 2014
@@ -415,7 +415,7 @@ void SAL_CALL SoundHandler::dispatch( co
     ::rtl::OUString               sURL       = aDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString());
 
     if (
-        (sURL.getLength()           ) &&
+        !sURL.isEmpty() &&
         (avmedia::MediaWindow::isMediaURL(sURL))
        )
     {

Modified: openoffice/branches/alg_writerframes/main/avmedia/source/gstreamer/gstplayer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/avmedia/source/gstreamer/gstplayer.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/avmedia/source/gstreamer/gstplayer.cxx (original)
+++ openoffice/branches/alg_writerframes/main/avmedia/source/gstreamer/gstplayer.cxx Wed Mar 19 10:14:42 2014
@@ -209,7 +209,7 @@ Player* Player::create( const ::rtl::OUS
 {
     Player* pPlayer = NULL;
 
-    if( rURL.getLength() )
+    if( !rURL.isEmpty() )
     {
         // safely initialize GLib threading framework
         try

Modified: openoffice/branches/alg_writerframes/main/avmedia/source/quicktime/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/avmedia/source/quicktime/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/avmedia/source/quicktime/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/avmedia/source/quicktime/makefile.mk Wed Mar 19 10:14:42 2014
@@ -25,7 +25,11 @@ PRJ=..$/..
 PRJNAME=avmedia
 TARGET=avmediaQuickTime
 
-.IF "$(GUIBASE)"=="aqua"
+# the QuickTime API has been deprecated since OSX 10.5 and has been removed in the OSX SDK 10.7
+.IF ("$(GUIBASE)" != "aqua") || ("${MACOSX_DEPLOYMENT_TARGET:s/.//}" >= "106")
+dummy:
+	@echo " Nothing to build for GUIBASE=$(GUIBASE) and OSX$(MACOSX_DEPLOYMENT_TARGET)"
+.ELSE
 
 # --- Settings ----------------------------------
 
@@ -41,12 +45,13 @@ CFLAGSCXX+=$(OBJCXXFLAGS)
 
 SLOFILES= \
 		$(SLO)$/quicktimeuno.obj  \
+		$(SLO)$/framegrabber.obj        \
 		$(SLO)$/manager.obj       \
 		$(SLO)$/window.obj        \
-		$(SLO)$/framegrabber.obj        \
 		$(SLO)$/player.obj
 
 EXCEPTIONSFILES= \
+		$(SLO)$/framegrabber.obj        \
 		$(SLO)$/quicktimeuno.obj
 
 SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
@@ -75,9 +80,6 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component
 
 .INCLUDE : target.mk
 
-.ELSE
-dummy:
-	@echo " Nothing to build for GUIBASE=$(GUIBASE)"
 .ENDIF
 
 ALLTAR : $(MISC)/avmediaQuickTime.component
@@ -87,3 +89,4 @@ $(MISC)/avmediaQuickTime.component .ERRR
     $(XSLTPROC) --nonet --stringparam uri \
         '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
         $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
+

Modified: openoffice/branches/alg_writerframes/main/avmedia/source/quicktime/player.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/avmedia/source/quicktime/player.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/avmedia/source/quicktime/player.cxx (original)
+++ openoffice/branches/alg_writerframes/main/avmedia/source/quicktime/player.cxx Wed Mar 19 10:14:42 2014
@@ -451,7 +451,7 @@ uno::Reference< media::XFrameGrabber > S
   uno::Reference< media::XFrameGrabber > xRet;
   OSL_TRACE ("Player::createFrameGrabber");
 
-  if( maURL.getLength() > 0 )
+  if( !maURL.isEmpty() )
   {
       FrameGrabber* pGrabber = new FrameGrabber( mxMgr );
       

Modified: openoffice/branches/alg_writerframes/main/avmedia/source/viewer/mediawindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/avmedia/source/viewer/mediawindow.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/avmedia/source/viewer/mediawindow.cxx (original)
+++ openoffice/branches/alg_writerframes/main/avmedia/source/viewer/mediawindow.cxx Wed Mar 19 10:14:42 2014
@@ -406,7 +406,7 @@ bool MediaWindow::executeMediaURLDialog(
     {
         for( sal_Int32 nIndex = 0; nIndex >= 0; )
         {
-            if( aAllTypes.getLength() )
+            if( !aAllTypes.isEmpty() )
                 aAllTypes += aSeparator;
 
             ( aAllTypes += aWildcard ) += aFilters[ i ].second.getToken( 0, ';', nIndex );
@@ -422,7 +422,7 @@ bool MediaWindow::executeMediaURLDialog(
 
         for( sal_Int32 nIndex = 0; nIndex >= 0; )
         {
-            if( aTypes.getLength() )
+            if( !aTypes.isEmpty() )
                 aTypes += aSeparator;
 
             ( aTypes += aWildcard ) += aFilters[ i ].second.getToken( 0, ';', nIndex );
@@ -440,10 +440,10 @@ bool MediaWindow::executeMediaURLDialog(
         const INetURLObject aURL( aDlg.GetPath() );
         rURL = aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
     }
-    else if( rURL.getLength() )
+    else if( !rURL.isEmpty() )
         rURL = ::rtl::OUString();
 
-    return( rURL.getLength() > 0 );
+    return !rURL.isEmpty();
 }
 
 // -------------------------------------------------------------------------

Modified: openoffice/branches/alg_writerframes/main/avmedia/source/win/framegrabber.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/avmedia/source/win/framegrabber.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/avmedia/source/win/framegrabber.cxx (original)
+++ openoffice/branches/alg_writerframes/main/avmedia/source/win/framegrabber.cxx Wed Mar 19 10:14:42 2014
@@ -112,7 +112,7 @@ bool FrameGrabber::create( const ::rtl::
     else
         maURL = ::rtl::OUString();
 
-    return( maURL.getLength() > 0 );
+    return !maURL.isEmpty();
 }
 
 // ------------------------------------------------------------------------------

Modified: openoffice/branches/alg_writerframes/main/avmedia/source/win/player.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/avmedia/source/win/player.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/avmedia/source/win/player.cxx (original)
+++ openoffice/branches/alg_writerframes/main/avmedia/source/win/player.cxx Wed Mar 19 10:14:42 2014
@@ -552,7 +552,7 @@ uno::Reference< media::XFrameGrabber > S
 
     uno::Reference< media::XFrameGrabber > xRet;
 
-    if( maURL.getLength() > 0 )
+    if( !maURL.isEmpty() )
     {
         FrameGrabber* pGrabber = new FrameGrabber( mxMgr );
         

Modified: openoffice/branches/alg_writerframes/main/basctl/sdi/baside.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basctl/sdi/baside.sdi?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basctl/sdi/baside.sdi (original)
+++ openoffice/branches/alg_writerframes/main/basctl/sdi/baside.sdi Wed Mar 19 10:14:42 2014
@@ -101,6 +101,12 @@ shell BasicIDEShell
 		StateMethod = GetState;
 	]
 
+	SID_SELECTALL
+	[
+		ExecMethod	= ExecuteCurrent;
+		StateMethod = GetState;
+	]
+
 	SID_SEARCH_ITEM
 	[
 		ExecMethod	= ExecuteCurrent;

Modified: openoffice/branches/alg_writerframes/main/basctl/source/basicide/baside2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basctl/source/basicide/baside2.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basctl/source/basicide/baside2.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basctl/source/basicide/baside2.cxx Wed Mar 19 10:14:42 2014
@@ -370,7 +370,7 @@ sal_Bool ModulWindow::BasicExecute()
 			if ( !pMethod )
 			{
 				if ( aDocument.isInVBAMode() )
-					return ( BasicIDE::ChooseMacro( uno::Reference< frame::XModel >(), sal_False, rtl::OUString() ).getLength() > 0 ) ? sal_True : sal_False;
+					return ( BasicIDE::ChooseMacro( uno::Reference< frame::XModel >(), sal_False, rtl::OUString() ).isEmpty() == false ) ? sal_True : sal_False;
 				else
 					pMethod = (SbMethod*)xModule->Find( String( RTL_CONSTASCII_USTRINGPARAM( "Main" ) ), SbxCLASS_METHOD );
 			}
@@ -1132,6 +1132,14 @@ void __EXPORT ModulWindow::ExecuteComman
 			GetBreakPointWindow().Invalidate();
 		}
 		break;
+		case SID_SELECTALL:
+		{
+			TextSelection aSel( TextPaM( 0, 0 ), TextPaM( TEXT_PARA_ALL, 0xFFFF ) );
+			TextView * pView = GetEditView();
+			pView->SetSelection( aSel );
+			pView->GetWindow()->GrabFocus();
+		}
+		break;
 	}
 }
 
@@ -1198,6 +1206,12 @@ void __EXPORT ModulWindow::GetState( Sfx
 				}
 			}
 			break;
+			case SID_SELECTALL:
+			{
+				if ( !GetEditView() )
+					rSet.DisableItem( nWh );
+			}
+			break;
 		}
 	}
 }

Modified: openoffice/branches/alg_writerframes/main/basctl/source/basicide/baside2b.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basctl/source/basicide/baside2b.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basctl/source/basicide/baside2b.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basctl/source/basicide/baside2b.cxx Wed Mar 19 10:14:42 2014
@@ -431,9 +431,7 @@ void __EXPORT EditorWindow::KeyInput( co
 	sal_Bool bWasModified = pEditEngine->IsModified();
 	if ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify() )
 	{
-		if ( ( rKEvt.GetKeyCode().GetCode() == KEY_A) && rKEvt.GetKeyCode().IsMod1() )
-			pEditView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFFFFFF, 0xFFFF ) ) );
-		else if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y ) && rKEvt.GetKeyCode().IsMod1() )
+		if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y ) && rKEvt.GetKeyCode().IsMod1() )
 			bDone = sal_True; // CTRL-Y schlucken, damit kein Vorlagenkatalog
 		else
 		{

Modified: openoffice/branches/alg_writerframes/main/basctl/source/basicide/baside3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basctl/source/basicide/baside3.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basctl/source/basicide/baside3.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basctl/source/basicide/baside3.cxx Wed Mar 19 10:14:42 2014
@@ -431,6 +431,12 @@ void __EXPORT DialogWindow::GetState( Sf
                     rSet.DisableItem( nWh );
             }
 			break;
+			
+			case SID_SELECTALL:
+			{
+				rSet.DisableItem( nWh );
+			}
+			break;
 		}
 	}
 }

Modified: openoffice/branches/alg_writerframes/main/basctl/source/basicide/bastype2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basctl/source/basicide/bastype2.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basctl/source/basicide/bastype2.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basctl/source/basicide/bastype2.cxx Wed Mar 19 10:14:42 2014
@@ -781,7 +781,7 @@ void BasicTreeListBox::GetRootEntryBitma
             }
         }
 
-        if ( sFactoryURL.getLength() )
+        if ( !sFactoryURL.isEmpty() )
         {
             rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ), 
                 sal_False /* small */, 

Modified: openoffice/branches/alg_writerframes/main/basctl/source/basicide/localizationmgr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basctl/source/basicide/localizationmgr.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basctl/source/basicide/localizationmgr.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basctl/source/basicide/localizationmgr.cxx Wed Mar 19 10:14:42 2014
@@ -183,7 +183,7 @@ void LocalizationMgr::implEnableDisableR
 	aPureIdStr += aDot;
 	aPureIdStr += aDialogName;
 	aPureIdStr += aDot;
-	if( aCtrlName.getLength() )
+	if( !aCtrlName.isEmpty() )
 	{
 		aPureIdStr += aCtrlName;
 		aPureIdStr += aDot;
@@ -243,7 +243,7 @@ sal_Int32 LocalizationMgr::implHandleCon
 					// Replace string by id, add id+string to StringResource
 					if( eMode == SET_IDS )
 					{
-						bool bEscAlreadyExisting = (aPropStr.getLength() && aPropStr.getStr()[0] == '&' );
+						bool bEscAlreadyExisting = (!aPropStr.isEmpty() && aPropStr.getStr()[0] == '&' );
 						if( bEscAlreadyExisting )
 							continue;
 
@@ -436,7 +436,7 @@ sal_Int32 LocalizationMgr::implHandleCon
 						for ( i = 0; i < nPropStringCount; ++i )
 						{
 							::rtl::OUString aPropStr = pPropStrings[i];
-							bool bEscAlreadyExisting = (aPropStr.getLength() && aPropStr.getStr()[0] == '&' );
+							bool bEscAlreadyExisting = (!aPropStr.isEmpty() && aPropStr.getStr()[0] == '&' );
 							if( bEscAlreadyExisting )
 							{
 								pIdStrings[i] = aPropStr;

Modified: openoffice/branches/alg_writerframes/main/basctl/source/basicide/scriptdocument.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basctl/source/basicide/scriptdocument.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basctl/source/basicide/scriptdocument.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basctl/source/basicide/scriptdocument.cxx Wed Mar 19 10:14:42 2014
@@ -1002,7 +1002,7 @@ namespace basctl
                 }
             }
 
-            if ( aFileURL.getLength() )
+            if ( !aFileURL.isEmpty() )
             {
                 ::osl::DirectoryItem aFileItem;
                 ::osl::FileStatus aFileStatus( FileStatusMask_FileURL );
@@ -1164,7 +1164,7 @@ namespace basctl
     ScriptDocument ScriptDocument::getDocumentWithURLOrCaption( const ::rtl::OUString& _rUrlOrCaption )
     {
         ScriptDocument aDocument( getApplicationScriptDocument() );
-        if ( _rUrlOrCaption.getLength() == 0 )
+        if ( _rUrlOrCaption.isEmpty() )
             return aDocument;
 
         docs::Documents aDocuments;
@@ -1521,7 +1521,7 @@ namespace basctl
     LibraryLocation ScriptDocument::getLibraryLocation( const ::rtl::OUString& _rLibName ) const
     {
         LibraryLocation eLocation = LIBRARY_LOCATION_UNKNOWN;
-        if ( _rLibName.getLength() )
+        if ( !_rLibName.isEmpty() )
         {
             if ( isDocument() )
             {

Modified: openoffice/branches/alg_writerframes/main/basctl/source/dlged/dlged.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basctl/source/dlged/dlged.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basctl/source/dlged/dlged.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basctl/source/dlged/dlged.cxx Wed Mar 19 10:14:42 2014
@@ -514,7 +514,7 @@ void DlgEditor::MouseButtonUp( const Mou
 {
 	sal_Bool bRet = pFunc->MouseButtonUp( rMEvt );
 
-	if( (eMode == DLGED_INSERT) )
+	if( eMode == DLGED_INSERT )
 		bCreateOK = bRet;
 }
 

Modified: openoffice/branches/alg_writerframes/main/basctl/source/dlged/dlgedobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basctl/source/dlged/dlgedobj.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basctl/source/dlged/dlgedobj.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basctl/source/dlged/dlgedobj.cxx Wed Mar 19 10:14:42 2014
@@ -518,7 +518,7 @@ void SAL_CALL DlgEdObj::NameChange( cons
 		Reference< container::XNameAccess > xNameAcc((GetDlgEdForm()->GetUnoControlModel()), UNO_QUERY);
 		if ( xNameAcc.is() && xNameAcc->hasByName(aOldName) )
 		{	
-			if ( !xNameAcc->hasByName(aNewName) && aNewName.getLength() != 0 )
+			if ( !xNameAcc->hasByName(aNewName) && !aNewName.isEmpty() )
 			{
 				// remove the control by the old name and insert the control by the new name in the container 
 				Reference< container::XNameContainer > xCont(xNameAcc, UNO_QUERY );

Modified: openoffice/branches/alg_writerframes/main/basegfx/inc/basegfx/tools/b2dclipstate.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basegfx/inc/basegfx/tools/b2dclipstate.hxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basegfx/inc/basegfx/tools/b2dclipstate.hxx (original)
+++ openoffice/branches/alg_writerframes/main/basegfx/inc/basegfx/tools/b2dclipstate.hxx Wed Mar 19 10:14:42 2014
@@ -38,7 +38,7 @@ namespace basegfx
 
     namespace tools
     {
-        class ImplB2DClipState;
+        struct ImplB2DClipState;
 
         /** This class provides an optimized, symbolic clip state for graphical output
 

Modified: openoffice/branches/alg_writerframes/main/basic/source/basmgr/basmgr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basic/source/basmgr/basmgr.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basic/source/basmgr/basmgr.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basic/source/basmgr/basmgr.cxx Wed Mar 19 10:14:42 2014
@@ -270,7 +270,7 @@ void SAL_CALL BasMgrContainerListenerImp
 void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const ContainerEvent& Event )
 	throw( RuntimeException )
 {
-	sal_Bool bLibContainer = ( maLibName.getLength() == 0 );
+	sal_Bool bLibContainer = maLibName.isEmpty();
 	::rtl::OUString aName;
 	Event.Accessor >>= aName;
 
@@ -326,7 +326,7 @@ void SAL_CALL BasMgrContainerListenerImp
 
 	// Replace not possible for library container
 #ifdef DBG_UTIL
-	sal_Bool bLibContainer = ( maLibName.getLength() == 0 );
+	sal_Bool bLibContainer = maLibName.isEmpty();
 #endif
     DBG_ASSERT( !bLibContainer, "library container fired elementReplaced()");
 
@@ -356,7 +356,7 @@ void SAL_CALL BasMgrContainerListenerImp
 
     mpMgr->mpImpl->mbModifiedByLibraryContainer = sal_True;
 
-	sal_Bool bLibContainer = ( maLibName.getLength() == 0 );
+	sal_Bool bLibContainer = maLibName.isEmpty();
 	if( bLibContainer )
 	{
 		StarBASIC* pLib = mpMgr->GetLib( aName );

Modified: openoffice/branches/alg_writerframes/main/basic/source/basmgr/vbahelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basic/source/basmgr/vbahelper.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basic/source/basmgr/vbahelper.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basic/source/basmgr/vbahelper.cxx Wed Mar 19 10:14:42 2014
@@ -220,7 +220,7 @@ void enableContainerWindowsOfAllDocument
 
 void registerCurrentDirectory( const uno::Reference< frame::XModel >& rxModel, const ::rtl::OUString& rPath )
 {
-    if( rPath.getLength() > 0 )
+    if( !rPath.isEmpty() )
     {
         CurrDirPool& rPool = StaticCurrDirPool::get();
         ::osl::MutexGuard aGuard( rPool.maMutex );
@@ -228,7 +228,7 @@ void registerCurrentDirectory( const uno
         {
             uno::Reference< frame::XModuleManager > xModuleManager( lclCreateModuleManager(), uno::UNO_SET_THROW );
             ::rtl::OUString aIdentifier = xModuleManager->identify( rxModel );
-            if( aIdentifier.getLength() > 0 )
+            if( !aIdentifier.isEmpty() )
                 rPool.maCurrDirs[ aIdentifier ] = rPath;
         }
         catch( uno::Exception& )

Modified: openoffice/branches/alg_writerframes/main/basic/source/classes/image.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basic/source/classes/image.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basic/source/classes/image.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basic/source/classes/image.cxx Wed Mar 19 10:14:42 2014
@@ -298,7 +298,7 @@ sal_Bool SbiImage::Save( SvStream& r, sa
 		SbiCloseRecord( r, nPos );
 	}
 	// Source?
-	if( aOUSource.getLength() && SbiGood( r ) )
+	if( !aOUSource.isEmpty() && SbiGood( r ) )
 	{
 		nPos = SbiOpenRecord( r, B_SOURCE, 1 );
         String aTmp;

Modified: openoffice/branches/alg_writerframes/main/basic/source/classes/sbunoobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basic/source/classes/sbunoobj.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basic/source/classes/sbunoobj.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basic/source/classes/sbunoobj.cxx Wed Mar 19 10:14:42 2014
@@ -333,7 +333,7 @@ void implAppendExceptionMsg( ::rtl::OUSt
     lcl_indent( _inout_rBuffer, _nLevel );
     _inout_rBuffer.appendAscii( "Type: " );
 
-    if ( _rExceptionType.getLength() == 0 )
+    if ( _rExceptionType.isEmpty() )
         _inout_rBuffer.appendAscii( "Unknown" );
     else
         _inout_rBuffer.append( _rExceptionType );
@@ -1773,7 +1773,7 @@ bool checkUnoObjectType( SbUnoObject* pU
 				{
 					rtl::OUString sTypeName;
 					xInv->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("$GetTypeName") ) ) >>= sTypeName;
-					if ( sTypeName.getLength() == 0 || sTypeName.equals(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IDispatch") ) ) )
+					if ( sTypeName.isEmpty() || sTypeName.equals(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IDispatch") ) ) )
 						// can't check type, leave it pass
 						result = true;	
 					else
@@ -2298,7 +2298,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadca
 														bBlockConversionToSmallestType );
 
 							::rtl::OUString aParamName = pNames[iSbx];
-							if( aParamName.getLength() )
+							if( !aParamName.isEmpty() )
 							{
 								oleautomation::NamedArgument aNamedArgument;
 								aNamedArgument.Name = aParamName;
@@ -2755,7 +2755,7 @@ SbxVariable* SbUnoObject::Find( const St
 			if( mxExactName.is() )
 			{
 				::rtl::OUString aUExactName = mxExactName->getExactName( aUName );
-				if( aUExactName.getLength() )
+				if( !aUExactName.isEmpty() )
 					aUName = aUExactName;
 			}
 			if( mxUnoAccess->hasProperty( aUName, PropertyConcept::ALL - PropertyConcept::DANGEROUS ) )
@@ -2831,7 +2831,7 @@ SbxVariable* SbUnoObject::Find( const St
 			if( mxExactNameInvocation.is() )
 			{
 				::rtl::OUString aUExactName = mxExactNameInvocation->getExactName( aUName );
-				if( aUExactName.getLength() )
+				if( !aUExactName.isEmpty() )
 					aUName = aUExactName;
 			}
 
@@ -4778,7 +4778,7 @@ bool SbModule::createCOMWrapperForIface(
 		SbxVariable* pVar = pModIfaces->Get( i );
 		::rtl::OUString aIfaceName = pVar->GetName();
 
-		if( aIfaceName.getLength() != 0 )
+		if( !aIfaceName.isEmpty() )
 		{
 			::rtl::OUString aPureIfaceName = aIfaceName;
 			sal_Int32 indexLastDot = aIfaceName.lastIndexOf('.');

Modified: openoffice/branches/alg_writerframes/main/basic/source/comp/sbcomp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basic/source/comp/sbcomp.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basic/source/comp/sbcomp.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basic/source/comp/sbcomp.cxx Wed Mar 19 10:14:42 2014
@@ -589,7 +589,7 @@ void dbg_traceStep( SbModule* pModule, s
 	const TraceTextData& rTraceTextData = itInner->second;
 	const rtl::OString& rStr_STMNT = rTraceTextData.m_aTraceStr_STMNT;
 	bool bSTMT = false;
-	if( rStr_STMNT.getLength() )
+	if( !rStr_STMNT.isEmpty() )
 		bSTMT = true;
 
 	char TimeBuffer[200];
@@ -619,7 +619,7 @@ void dbg_traceStep( SbModule* pModule, s
 
 	nIndent += GnIndentForPCode;
 	const rtl::OString& rStr_PCode = rTraceTextData.m_aTraceStr_PCode;
-	if( rStr_PCode.getLength() )
+	if( !rStr_PCode.isEmpty() )
 	{
 		lcl_lineOut( rStr_PCode.getStr(), lcl_getSpaces( nIndent ),
 			bPrintTimeStamp ? TimeBuffer : NULL );

Modified: openoffice/branches/alg_writerframes/main/basic/source/runtime/dllmgr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basic/source/runtime/dllmgr.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basic/source/runtime/dllmgr.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basic/source/runtime/dllmgr.cxx Wed Mar 19 10:14:42 2014
@@ -577,7 +577,7 @@ SbError call(
 SbError getProcData(HMODULE handle, rtl::OUString const & name, ProcData * proc)
 {
     OSL_ASSERT(proc != 0);
-    if (name.getLength() != 0 && name[0] == '@') { //TODO: "@" vs. "#"???
+    if ( !name.isEmpty() && name[0] == '@' ) { //TODO: "@" vs. "#"???
         sal_Int32 n = name.copy(1).toInt32(); //TODO: handle bad input
         if (n <= 0 || n > 0xFFFF) {
             return ERRCODE_BASIC_BAD_ARGUMENT; //TODO: more specific errcode?

Modified: openoffice/branches/alg_writerframes/main/basic/source/runtime/iosys.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basic/source/runtime/iosys.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basic/source/runtime/iosys.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basic/source/runtime/iosys.cxx Wed Mar 19 10:14:42 2014
@@ -274,7 +274,7 @@ sal_Bool needSecurityRestrictions( void 
 			const Reference< XBridge >& rxBridge = pBridges[ i ];
 			::rtl::OUString aDescription = rxBridge->getDescription();
 			::rtl::OUString aPortalUser = findUserInDescription( aDescription );
-			if( aPortalUser.getLength() > 0 )
+			if( !aPortalUser.isEmpty() )
 			{
 				// User Found, compare to system user
 				if( aPortalUser == aSystemUser )

Modified: openoffice/branches/alg_writerframes/main/basic/source/runtime/methods.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basic/source/runtime/methods.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basic/source/runtime/methods.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basic/source/runtime/methods.cxx Wed Mar 19 10:14:42 2014
@@ -169,7 +169,7 @@ String getFullPath( const String& aRelPa
 	INetURLObject aURLObj( aRelPath );
 	aFileURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
 
-	if( !aFileURL.getLength() )
+	if( aFileURL.isEmpty() )
 	{
 		File::getFileURLFromSystemPath( aRelPath, aFileURL );
 	}
@@ -283,7 +283,7 @@ RTLFUNC(Error)
 		if ( bVBA && rPar.Count() > 1 )
 		{
 			com::sun::star::uno::Reference< ooo::vba::XErrObject > xErrObj( SbxErrObject::getUnoErrObject() );
-			if ( xErrObj.is() && xErrObj->getNumber() == nCode && xErrObj->getDescription().getLength() )
+			if ( xErrObj.is() && xErrObj->getNumber() == nCode && !xErrObj->getDescription().isEmpty() )
 				tmpErrMsg = xErrObj->getDescription();
 		}
 		rPar.Get( 0 )->PutString( tmpErrMsg );

Modified: openoffice/branches/alg_writerframes/main/basic/source/runtime/methods1.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basic/source/runtime/methods1.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basic/source/runtime/methods1.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basic/source/runtime/methods1.cxx Wed Mar 19 10:14:42 2014
@@ -1597,9 +1597,9 @@ RTLFUNC(ConvertToUrl)
 		String aStr = rPar.Get(1)->GetString();
         INetURLObject aURLObj( aStr, INET_PROT_FILE );
 	    ::rtl::OUString aFileURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
-	    if( !aFileURL.getLength() )
+	    if( aFileURL.isEmpty() )
             ::osl::File::getFileURLFromSystemPath( aFileURL, aFileURL );
-	    if( !aFileURL.getLength() )
+	    if( aFileURL.isEmpty() )
             aFileURL = aStr;
 		rPar.Get(0)->PutString( String(aFileURL) );
 	}
@@ -1617,7 +1617,7 @@ RTLFUNC(ConvertFromUrl)
 		String aStr = rPar.Get(1)->GetString();
 	    ::rtl::OUString aSysPath;
 	    ::osl::File::getSystemPathFromFileURL( aStr, aSysPath );
-	    if( !aSysPath.getLength() )
+	    if( aSysPath.isEmpty() )
             aSysPath = aStr;
 		rPar.Get(0)->PutString( String(aSysPath) );
 	}

Modified: openoffice/branches/alg_writerframes/main/basic/source/runtime/step2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basic/source/runtime/step2.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basic/source/runtime/step2.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basic/source/runtime/step2.cxx Wed Mar 19 10:14:42 2014
@@ -424,7 +424,7 @@ void SbiRuntime::SetupArgs( SbxVariable*
 							rtl::OUString sDefaultMethod;
 							if ( xDfltMethod.is() )
 								sDefaultMethod = xDfltMethod->getDefaultMethodName();
-							if ( sDefaultMethod.getLength() )
+							if ( !sDefaultMethod.isEmpty() )
 							{
 								SbxVariable* meth = pUnoObj->Find( sDefaultMethod, SbxCLASS_METHOD );
 								if( meth != NULL )
@@ -592,7 +592,7 @@ SbxVariable* SbiRuntime::CheckArray( Sbx
                             else if( xIndexAccess.is() )
                                 sDefaultMethod = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getByIndex" ) );
 
-                            if ( sDefaultMethod.getLength() )
+                            if ( !sDefaultMethod.isEmpty() )
                             {
                                 SbxVariable* meth = pUnoObj->Find( sDefaultMethod, SbxCLASS_METHOD );
                                 SbxVariableRef refTemp = meth;

Modified: openoffice/branches/alg_writerframes/main/basic/source/uno/namecont.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basic/source/uno/namecont.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basic/source/uno/namecont.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basic/source/uno/namecont.cxx Wed Mar 19 10:14:42 2014
@@ -605,7 +605,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
     meInitMode = DEFAULT;
     INetURLObject aInitUrlInetObj( maInitialDocumentURL );
     OUString aInitFileName = aInitUrlInetObj.GetMainURL( INetURLObject::NO_DECODE );
-    if( aInitFileName.getLength() )
+    if( !aInitFileName.isEmpty() )
     {
         // We need a BasicManager to avoid problems
         StarBASIC* pBas = new StarBASIC();
@@ -834,7 +834,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
 
 			    // Check storage URL
 			    OUString aStorageURL = rLib.aStorageURL;
-			    if( !bStorage && !aStorageURL.getLength() && nPass == 0 )
+			    if( !bStorage && aStorageURL.isEmpty() && nPass == 0 )
 			    {
 					String aLibraryPath;
 					if( meInitMode == CONTAINER_INIT_FILE )
@@ -1239,7 +1239,7 @@ void SfxLibraryContainer::implScanExtens
 	rtl::OUString aLibURL;
 
 	bool bPureDialogLib = false;
-	while( (aLibURL = aScriptIt.nextBasicOrDialogLibrary( bPureDialogLib )).getLength() > 0 )
+	while( (aLibURL = aScriptIt.nextBasicOrDialogLibrary( bPureDialogLib )).isEmpty() == false )
 	{
 		if( bPureDialogLib && maInfoFileName.equalsAscii( "script" ) )
 			continue;
@@ -1351,7 +1351,7 @@ OUString SfxLibraryContainer::createAppL
     ( SfxLibrary* pLib, const OUString& aName )
 {
 	OUString aLibDirPath = pLib->maStorageURL;
-	if( !aLibDirPath.getLength() )
+	if( aLibDirPath.isEmpty() )
     {
 		INetURLObject aInetObj( String(maLibraryPath).GetToken(1) );
 		aInetObj.insertName( aName, sal_True, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
@@ -1976,7 +1976,7 @@ void SfxLibraryContainer::storeLibraries
 
     // if we did an in-place save into a storage (i.e. a save into the storage we were already based on),
     // then we need to clean up the temporary storage we used for this
-    if ( bInplaceStorage && sTempTargetStorName.getLength() )
+    if ( bInplaceStorage && !sTempTargetStorName.isEmpty() )
     {
         OSL_ENSURE( xSourceLibrariesStor.is(), "SfxLibrariesContainer::storeLibraries_impl: unexpected: we should have a source storage here!" );
         try
@@ -3119,7 +3119,7 @@ void SfxLibrary::impl_removeWithoutCheck
 	implSetModified( sal_True );
 
     // Remove element file
-	if( maStorageURL.getLength() )
+	if( !maStorageURL.isEmpty() )
 	{
 		INetURLObject aElementInetObj( maStorageURL );
 		aElementInetObj.insertName( _rElementName, sal_False,
@@ -3254,7 +3254,7 @@ rtl::OUString ScriptExtensionIterator::n
 {
 	rtl::OUString aRetLib;
 
-	while( !aRetLib.getLength() && m_eState != END_REACHED )
+	while( aRetLib.isEmpty() && m_eState != END_REACHED )
 	{
 		switch( m_eState )
 		{

Modified: openoffice/branches/alg_writerframes/main/basic/source/uno/scriptcont.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/basic/source/uno/scriptcont.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/basic/source/uno/scriptcont.cxx (original)
+++ openoffice/branches/alg_writerframes/main/basic/source/uno/scriptcont.cxx Wed Mar 19 10:14:42 2014
@@ -304,7 +304,7 @@ Any SAL_CALL SfxScriptLibraryContainer::
     // TODO: Check language
 	// aMod.aLanguage
 	// aMod.aName ignored
-	if( aMod.aModuleType.getLength() > 0 )
+	if( !aMod.aModuleType.isEmpty() )
 	{
         /*  If in VBA compatibility mode, force creation of the VBA Globals
             object. Each application will create an instance of its own
@@ -474,8 +474,8 @@ void SAL_CALL SfxScriptLibraryContainer:
     if( OldPassword == NewPassword )
         return;
 
-    sal_Bool bOldPassword = ( OldPassword.getLength() > 0 );
-    sal_Bool bNewPassword = ( NewPassword.getLength() > 0 );
+    sal_Bool bOldPassword = !OldPassword.isEmpty();
+    sal_Bool bNewPassword = !NewPassword.isEmpty();
 	sal_Bool bStorage = mxStorage.is() && !pImplLib->mbLink;
 
     if( pImplLib->mbReadOnly || (bOldPassword && !pImplLib->mbPasswordProtected) )
@@ -1264,7 +1264,7 @@ bool SfxScriptLibrary::containsValidModu
 {
 	OUString sModuleText;
     aElement >>= sModuleText;
-	return ( sModuleText.getLength() > 0 );
+	return ( !sModuleText.isEmpty() );
 }
 
 bool SAL_CALL SfxScriptLibrary::isLibraryElementValid( ::com::sun::star::uno::Any aElement ) const

Modified: openoffice/branches/alg_writerframes/main/binaryurp/source/bridge.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/binaryurp/source/bridge.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/binaryurp/source/bridge.cxx (original)
+++ openoffice/branches/alg_writerframes/main/binaryurp/source/bridge.cxx Wed Mar 19 10:14:42 2014
@@ -327,7 +327,7 @@ css::uno::UnoInterfaceReference Bridge::
     rtl::OUString const & oid, css::uno::TypeDescription const & type)
 {
     OSL_ASSERT(type.is());
-    if (oid.getLength() == 0) {
+    if ( oid.isEmpty() ) {
         return css::uno::UnoInterfaceReference();
     }
     css::uno::UnoInterfaceReference obj(findStub(oid, type));
@@ -410,7 +410,7 @@ rtl::OUString Bridge::registerOutgoingIn
 css::uno::UnoInterfaceReference Bridge::findStub(
     rtl::OUString const & oid, css::uno::TypeDescription const & type)
 {
-    OSL_ASSERT(oid.getLength() != 0 && type.is());
+    OSL_ASSERT(!oid.isEmpty() && type.is());
     osl::MutexGuard g(mutex_);
     Stubs::iterator i(stubs_.find(oid));
     if (i != stubs_.end()) {
@@ -432,7 +432,7 @@ css::uno::UnoInterfaceReference Bridge::
 void Bridge::releaseStub(
     rtl::OUString const & oid, css::uno::TypeDescription const & type)
 {
-    OSL_ASSERT(oid.getLength() != 0 && type.is());
+    OSL_ASSERT(!oid.isEmpty() && type.is());
     css::uno::UnoInterfaceReference obj;
     bool unused;
     {
@@ -796,7 +796,7 @@ Bridge::~Bridge() {
 css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
     rtl::OUString const & sInstanceName) throw (css::uno::RuntimeException)
 {
-    if (sInstanceName.getLength() == 0) {
+    if ( sInstanceName.isEmpty() ) {
         throw css::uno::RuntimeException(
             rtl::OUString(
                 RTL_CONSTASCII_USTRINGPARAM(

Modified: openoffice/branches/alg_writerframes/main/binaryurp/source/bridgefactory.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/binaryurp/source/bridgefactory.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/binaryurp/source/bridgefactory.cxx (original)
+++ openoffice/branches/alg_writerframes/main/binaryurp/source/bridgefactory.cxx Wed Mar 19 10:14:42 2014
@@ -75,7 +75,7 @@ void BridgeFactory::removeBridge(
     OSL_ASSERT(bridge.is());
     rtl::OUString n(bridge->getName());
     osl::MutexGuard g(*this);
-    if (n.getLength() == 0) {
+    if ( n.isEmpty() ) {
         BridgeList::iterator i(
             std::find(unnamed_.begin(), unnamed_.end(), bridge));
         if (i != unnamed_.end()) {
@@ -149,7 +149,7 @@ css::uno::Reference< css::bridge::XBridg
                 static_cast< cppu::OWeakObject * >(this), -1);
         }
         b.set(new Bridge(this, sName, aConnection, anInstanceProvider));
-        if (sName.getLength() == 0) {
+        if ( sName.isEmpty() ) {
             unnamed_.push_back(
                 css::uno::Reference< css::bridge::XBridge >(b.get()));
         } else {

Modified: openoffice/branches/alg_writerframes/main/binaryurp/source/marshal.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/binaryurp/source/marshal.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/binaryurp/source/marshal.cxx (original)
+++ openoffice/branches/alg_writerframes/main/binaryurp/source/marshal.cxx Wed Mar 19 10:14:42 2014
@@ -162,7 +162,7 @@ void Marshal::writeOid(
 {
     bool found;
     sal_uInt16 idx;
-    if (oid.getLength() == 0) {
+    if ( oid.isEmpty() ) {
         found = true;
         idx = cache::ignore;
     } else {

Modified: openoffice/branches/alg_writerframes/main/binaryurp/source/reader.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/binaryurp/source/reader.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/binaryurp/source/reader.cxx (original)
+++ openoffice/branches/alg_writerframes/main/binaryurp/source/reader.cxx Wed Mar 19 10:14:42 2014
@@ -210,7 +210,7 @@ void Reader::readMessage(Unmarshal & unm
     rtl::OUString oid;
     if (newOid) {
         oid = unmarshal.readOid();
-        if (oid.getLength() == 0) {
+        if ( oid.isEmpty() ) {
             throw css::io::IOException(
                 rtl::OUString(
                     RTL_CONSTASCII_USTRINGPARAM(
@@ -219,7 +219,7 @@ void Reader::readMessage(Unmarshal & unm
         }
         lastOid_ = oid;
     } else {
-        if (lastOid_.getLength() == 0) {
+        if ( lastOid_.isEmpty() ) {
             throw css::uno::RuntimeException(
                 rtl::OUString(
                     RTL_CONSTASCII_USTRINGPARAM(

Modified: openoffice/branches/alg_writerframes/main/binaryurp/source/unmarshal.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/binaryurp/source/unmarshal.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/binaryurp/source/unmarshal.cxx (original)
+++ openoffice/branches/alg_writerframes/main/binaryurp/source/unmarshal.cxx Wed Mar 19 10:14:42 2014
@@ -244,8 +244,8 @@ rtl::OUString Unmarshal::readOid() {
         }
     }
     sal_uInt16 idx = readCacheIndex();
-    if (oid.getLength() == 0 && idx != cache::ignore) {
-        if (state_.oidCache[idx].getLength() == 0) {
+    if (oid.isEmpty() && idx != cache::ignore) {
+        if ( state_.oidCache[idx].isEmpty() ) {
             throw css::io::IOException(
                 rtl::OUString(
                     RTL_CONSTASCII_USTRINGPARAM(

Modified: openoffice/branches/alg_writerframes/main/binaryurp/source/writer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/binaryurp/source/writer.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/binaryurp/source/writer.cxx (original)
+++ openoffice/branches/alg_writerframes/main/binaryurp/source/writer.cxx Wed Mar 19 10:14:42 2014
@@ -210,7 +210,7 @@ void Writer::sendRequest(
     std::vector< BinaryAny > const & inArguments, bool currentContextMode,
     css::uno::UnoInterfaceReference const & currentContext)
 {
-    OSL_ASSERT(tid.getLength() != 0 && oid.getLength() != 0 && member.is());
+    OSL_ASSERT(tid.getLength() != 0 && !oid.isEmpty() && member.is());
     css::uno::TypeDescription t(type);
     sal_Int32 functionId = 0;
     bool forceSynchronous = false;

Propchange: openoffice/branches/alg_writerframes/main/boost/boost-os2.patch
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 19 10:14:42 2014
@@ -0,0 +1,5 @@
+/openoffice/branches/AOO400/main/boost/boost-os2.patch:1503684
+/openoffice/branches/ia2/main/boost/boost-os2.patch:1417739-1541842
+/openoffice/branches/ooxml-osba/main/boost/boost-os2.patch:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
+/openoffice/branches/rejuvenate01/main/boost/boost-os2.patch:1480411,1534063,1534098,1549902
+/openoffice/trunk/main/boost/boost-os2.patch:1569065-1578966

Modified: openoffice/branches/alg_writerframes/main/boost/boost_1_55_0.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/boost/boost_1_55_0.patch?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/boost/boost_1_55_0.patch (original)
+++ openoffice/branches/alg_writerframes/main/boost/boost_1_55_0.patch Wed Mar 19 10:14:42 2014
@@ -162,3 +162,52 @@
          }
  
          ////////////////////////////////////////////////////////////////////////
+--- misc/build/boost_1_55_0/boost/bind/arg.hpp	2011-02-02 14:56:49 +0100
++++ misc/build/boost_1_55_0/boost/bind/arg.hpp	2014-02-10 14:56:49 +0100
+@@ -34,7 +34,8 @@
+     template< class T > arg( T const & /* t */ )
+     {
+         // static assert I == is_placeholder<T>::value
+-        typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ];
++        char X_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ];
++        (void)&X_must_be_placeholder[0];
+     }
+ };
+ 
+--- misc/boost_1_55_0/boost/tuple/detail/tuple_basic.hpp	2011-01-02 21:25:11 +0100
++++ misc/build/boost_1_55_0/boost/tuple/detail/tuple_basic.hpp	2014-02-10 14:56:13 +0100
+@@ -225,7 +225,6 @@
+ get(const cons<HT, TT>& c BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int, N)) {
+   typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE
+       apply<cons<HT, TT> > impl;
+-  typedef BOOST_DEDUCED_TYPENAME impl::type cons_element;
+   return impl::call(c).head;
+ }
+ 
+--- misc/boost_1_55_0/boost/concept/detail/general.hpp	2010-06-08 21:31:13 +0200
++++ misc/build/boost_1_55_0/boost/concept/detail/general.hpp	2014-03-13 17:20:13 +0100
+@@ -65,10 +65,10 @@
+   
+ # endif
+ 
+-#  define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr )             \
+-    typedef ::boost::concepts::detail::instantiate<          \
+-    &::boost::concepts::requirement_<ModelFnPtr>::failed>    \
+-      BOOST_PP_CAT(boost_concept_check,__LINE__)
++#define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr )             \
++    ::boost::concepts::detail::instantiate<               \
++    &::boost::concepts::requirement_<ModelFnPtr>::failed> \
++      BOOST_PP_CAT(boost_concept_check,__LINE__)()
+ 
+ }}
+ 
+--- misc/boost_1_55_0/boost/spirit/home/classic/core/primitives/primitives.hpp	2014-03-12 14:02:51 +0100
++++ misc/build/boost_1_55_0/boost/spirit/home/classic/core/primitives/primitives.hpp	2008-06-22 17:05:38 +0200
+@@ -47,7 +47,6 @@
+         typename parser_result<self_t, ScannerT>::type
+         parse(ScannerT const& scan) const
+         {
+-            typedef typename parser_result<self_t, ScannerT>::type result_t;
+             typedef typename ScannerT::value_t value_t;
+             typedef typename ScannerT::iterator_t iterator_t;
+ 

Modified: openoffice/branches/alg_writerframes/main/boost/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/boost/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/boost/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/boost/makefile.mk Wed Mar 19 10:14:42 2014
@@ -47,6 +47,9 @@ all:
 TARFILE_NAME=boost_1_55_0
 TARFILE_MD5=d6eef4b4cacb2183f2bf265a5a03a354
 PATCH_FILES= $(TARFILE_NAME).patch
+.IF "$(GUI)"=="OS2"
+PATCH_FILES+=boost-os2.patch
+.ENDIF
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=

Modified: openoffice/branches/alg_writerframes/main/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx (original)
+++ openoffice/branches/alg_writerframes/main/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx Wed Mar 19 10:14:42 2014
@@ -75,7 +75,7 @@ static OString toUNOname( const OString 
 	{
 		if( *pRTTI == ':' || ! *pRTTI )
 		{
-			if( aRet.getLength() )
+			if( !aRet.isEmpty() )
 				aRet += ".";
 			aRet += rRTTIname.copy( pLast - pOrg, pRTTI - pLast );
 			while( *pRTTI == ':' )
@@ -109,7 +109,7 @@ static OString toRTTIname( const OString
 
 static OString toRTTImangledname( const OString & rRTTIname )
 {
-	if( ! rRTTIname.getLength() )
+	if( rRTTIname.isEmpty() )
 		return OString();
 
 	OStringBuffer aRet( rRTTIname.getLength()*2 );

Modified: openoffice/branches/alg_writerframes/main/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx (original)
+++ openoffice/branches/alg_writerframes/main/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx Wed Mar 19 10:14:42 2014
@@ -77,7 +77,7 @@ static OString toUNOname( const OString 
 	{
 		if( *pRTTI == ':' || ! *pRTTI )
 		{
-			if( aRet.getLength() )
+			if( !aRet.isEmpty() )
 				aRet += ".";
 			aRet += rRTTIname.copy( pLast - pOrg, pRTTI - pLast );
 			while( *pRTTI == ':' )
@@ -111,7 +111,7 @@ static OString toRTTIname( const OString
 
 static OString toRTTImangledname( const OString & rRTTIname )
 {
-	if( ! rRTTIname.getLength() )
+	if( rRTTIname.isEmpty() )
 		return OString();
 
 	OStringBuffer aRet( rRTTIname.getLength()*2 );

Modified: openoffice/branches/alg_writerframes/main/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx (original)
+++ openoffice/branches/alg_writerframes/main/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx Wed Mar 19 10:14:42 2014
@@ -45,7 +45,15 @@ namespace
 {
 
 //==================================================================================================
-static void callVirtualMethod(
+void callVirtualMethod(
+    void * pAdjustedThisPtr,
+    sal_Int32 nVtableIndex,
+    void * pRegisterReturn,
+    typelib_TypeClass eReturnType,
+    sal_Int32 * pStackLongs,
+    sal_Int32 nStackLongs ) __attribute__((noinline));
+
+void callVirtualMethod(
     void * pAdjustedThisPtr,
     sal_Int32 nVtableIndex,
     void * pRegisterReturn,
@@ -67,6 +75,13 @@ static void callVirtualMethod(
     void * stackptr;
 	asm volatile (
         "mov   %%esp, %6\n\t"
+       // preserve potential 128bit stack alignment
+        "and   $0xfffffff0, %%esp\n\t"
+        "mov   %0, %%eax\n\t"
+        "lea   -4(,%%eax,4), %%eax\n\t"
+        "and   $0xf, %%eax\n\t"
+        "sub   $0xc, %%eax\n\t"
+        "add   %%eax, %%esp\n\t"
 		// copy values
 		"mov   %0, %%eax\n\t"
 		"mov   %%eax, %%edx\n\t"

Modified: openoffice/branches/alg_writerframes/main/bridges/source/cpp_uno/shared/vtablefactory.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/bridges/source/cpp_uno/shared/vtablefactory.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/bridges/source/cpp_uno/shared/vtablefactory.cxx (original)
+++ openoffice/branches/alg_writerframes/main/bridges/source/cpp_uno/shared/vtablefactory.cxx Wed Mar 19 10:14:42 2014
@@ -255,9 +255,9 @@ bool VtableFactory::createBlock(Block &b
     if (aSecurity.getHomeDir(strURLDirectory))
         osl::File::getSystemPathFromFileURL(strURLDirectory, strDirectory);
 
-    for (int i = strDirectory.getLength() == 0 ? 1 : 0; i < 2; ++i)
+    for (int i = strDirectory.isEmpty() ? 1 : 0; i < 2; ++i)
     {
-        if (!strDirectory.getLength())
+        if (strDirectory.isEmpty())
             strDirectory = rtl::OUString::createFromAscii("/tmp");
 
         strDirectory += rtl::OUString::createFromAscii("/.execoooXXXXXX");

Modified: openoffice/branches/alg_writerframes/main/bridges/source/jni_uno/jni_data.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/bridges/source/jni_uno/jni_data.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/bridges/source/jni_uno/jni_data.cxx (original)
+++ openoffice/branches/alg_writerframes/main/bridges/source/jni_uno/jni_data.cxx Wed Mar 19 10:14:42 2014
@@ -1800,7 +1800,7 @@ void Bridge::map_to_java(
                 // polymorphic struct types:
                 rtl::OUString const & name = rtl::OUString::unacquired(
                     &pAny->pType->pTypeName);
-                OSL_ASSERT(name.getLength() > 0);
+                OSL_ASSERT(!name.isEmpty());
                 if (name[name.getLength() - 1] == '>')
                 {
                     // Box up in com.sun.star.uno.Any:

Modified: openoffice/branches/alg_writerframes/main/canvas/source/cairo/cairo_textlayout.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/canvas/source/cairo/cairo_textlayout.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/canvas/source/cairo/cairo_textlayout.cxx (original)
+++ openoffice/branches/alg_writerframes/main/canvas/source/cairo/cairo_textlayout.cxx Wed Mar 19 10:14:42 2014
@@ -333,7 +333,7 @@ namespace cairocanvas
 		   before we were depending on unmodified current point which I believed was preserved by save/restore */
 		cairo_move_to( pCairo, 0, 0 );
 		useFont( pCairo );
-		cairo_show_text( pCairo, aUTF8String );
+		cairo_show_text( pCairo, aUTF8String.getStr() );
 		cairo_restore( pCairo );
 
         return true;

Modified: openoffice/branches/alg_writerframes/main/canvas/source/vcl/canvascustomsprite.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/canvas/source/vcl/canvascustomsprite.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/canvas/source/vcl/canvascustomsprite.cxx (original)
+++ openoffice/branches/alg_writerframes/main/canvas/source/vcl/canvascustomsprite.cxx Wed Mar 19 10:14:42 2014
@@ -81,7 +81,14 @@ namespace vclcanvas
         pBackBuffer->setSize( aSize );
 
         // create mask backbuffer, with one bit color depth #122485# use full depth to avoid problem with 1bit depth, get AAed masks
-        BackBufferSharedPtr pBackBufferMask( new BackBuffer( rOutDevProvider->getOutDev() ) ); // , true ) ); // #122485#
+        BackBufferSharedPtr pBackBufferMask( 
+#if defined LINUX || defined FREEBSD || defined NETBSD
+            // #122485# no 1bit buffers on Linuxes, 1bit Vdev seems to work no longer
+            new BackBuffer( rOutDevProvider->getOutDev() ) );
+#else
+            // 1bit mask buffer for all others
+            new BackBuffer( rOutDevProvider->getOutDev(), true ) );
+#endif
         pBackBufferMask->setSize( aSize );
 
         // TODO(F1): Implement alpha vdev (could prolly enable

Modified: openoffice/branches/alg_writerframes/main/canvas/source/vcl/spritehelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/canvas/source/vcl/spritehelper.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/canvas/source/vcl/spritehelper.cxx (original)
+++ openoffice/branches/alg_writerframes/main/canvas/source/vcl/spritehelper.cxx Wed Mar 19 10:14:42 2014
@@ -159,7 +159,13 @@ namespace vclcanvas
 
 					// bitmasks are much faster than alphamasks on some platforms
 					// so convert to bitmask if useful
-#ifndef QUARTZ
+#if defined LINUX || defined FREEBSD || defined NETBSD || defined QUARTZ
+                    // #122485# allow more than 1bit masks for Linux and Mac,
+                    // but reduce to mono now
+                    aMask.MakeMono(255);
+#else
+                    // #122485# assert when mask uses more than 1bit and reduce
+                    // to mono
                     if( aMask.GetBitCount() != 1 )
                     {
                         OSL_ENSURE(false,

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/accessibility/AccessibleTextHelper.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/accessibility/AccessibleTextHelper.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/accessibility/AccessibleTextHelper.cxx Wed Mar 19 10:14:42 2014
@@ -75,10 +75,10 @@ void SAL_CALL AccessibleTextHelper::init
         aArguments[1] >>= xEventSource;
         aArguments[2] >>= xWindow;
     }
-    OSL_ENSURE( aCID.getLength() > 0, "Empty CID" );
+    OSL_ENSURE( !aCID.isEmpty(), "Empty CID" );
     OSL_ENSURE( xEventSource.is(), "Empty Event Source" );
     OSL_ENSURE( xWindow.is(), "Empty Window" );
-    if( !xEventSource.is() || aCID.getLength() == 0 )
+    if( !xEventSource.is() || aCID.isEmpty() )
         return;
 
     // /-- solar

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx Wed Mar 19 10:14:42 2014
@@ -666,7 +666,7 @@ OUString SAL_CALL DiagramWrapper::getDia
         aRet = lcl_getDiagramType( aTemplateAndService.second );
     }
 
-    if( !aRet.getLength())
+    if( aRet.isEmpty() )
     {
         // none of the standard templates matched
         // use first chart type
@@ -674,10 +674,10 @@ OUString SAL_CALL DiagramWrapper::getDia
         if( xChartType.is() )
         {
             aRet = xChartType->getChartType();
-            if( aRet.getLength() )
+            if( !aRet.isEmpty() )
                 aRet = lcl_getOldChartTypeName( aRet );
         }
-        if( !aRet.getLength())
+        if( aRet.isEmpty() )
             aRet = C2U( "com.sun.star.chart.BarDiagram" );
     }
 



Mime
View raw message