[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - accessibility/source automation/source avmedia/source basctl/source basic/source binaryurp/source bridges/source

2014-02-04 Thread Herbert Dürr 
 accessibility/source/extended/accessibleiconchoicectrl.cxx|2 -
 accessibility/source/extended/textwindowaccessibility.cxx |2 -
 accessibility/source/standard/accessiblemenuitemcomponent.cxx |2 -
 accessibility/source/standard/vclxaccessiblebox.cxx   |6 ++--
 accessibility/source/standard/vclxaccessibletoolboxitem.cxx   |6 ++--
 automation/source/server/recorder.cxx |8 ++---
 automation/source/server/statemnt.cxx |4 +-
 avmedia/source/framework/mediacontrol.cxx |8 ++---
 avmedia/source/framework/soundhandler.cxx |2 -
 avmedia/source/gstreamer/gstplayer.cxx|2 -
 avmedia/source/quicktime/player.cxx   |2 -
 avmedia/source/viewer/mediawindow.cxx |8 ++---
 avmedia/source/win/framegrabber.cxx   |2 -
 avmedia/source/win/player.cxx |2 -
 basctl/source/basicide/baside2.cxx|2 -
 basctl/source/basicide/bastype2.cxx   |2 -
 basctl/source/basicide/localizationmgr.cxx|6 ++--
 basctl/source/basicide/scriptdocument.cxx |6 ++--
 basctl/source/dlged/dlgedobj.cxx  |2 -
 basic/source/basmgr/basmgr.cxx|6 ++--
 basic/source/basmgr/vbahelper.cxx |4 +-
 basic/source/classes/image.cxx|2 -
 basic/source/classes/sbunoobj.cxx |   12 
 basic/source/comp/sbcomp.cxx  |4 +-
 basic/source/runtime/dllmgr.cxx   |2 -
 basic/source/runtime/iosys.cxx|2 -
 basic/source/runtime/methods.cxx  |4 +-
 basic/source/runtime/methods1.cxx |6 ++--
 basic/source/runtime/step2.cxx|4 +-
 basic/source/uno/namecont.cxx |   14 +-
 basic/source/uno/scriptcont.cxx   |8 ++---
 binaryurp/source/bridge.cxx   |8 ++---
 binaryurp/source/bridgefactory.cxx|4 +-
 binaryurp/source/marshal.cxx  |2 -
 binaryurp/source/reader.cxx   |4 +-
 binaryurp/source/unmarshal.cxx|4 +-
 binaryurp/source/writer.cxx   |2 -
 bridges/source/cpp_uno/cc50_solaris_intel/except.cxx  |4 +-
 bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx  |4 +-
 bridges/source/cpp_uno/shared/vtablefactory.cxx   |4 +-
 bridges/source/jni_uno/jni_data.cxx   |2 -
 41 files changed, 90 insertions(+), 90 deletions(-)

New commits:
commit 87204b0f4062ef8fc8f138ad15f4378da609d4e2
Author: Herbert Dürr h...@apache.org
Date:   Tue Feb 4 08:48:47 2014 +

#i123862# use O*String's isEmpty() method to check for emptiness in modules 
starting with 'b'

Patch-by: j.nitsc...@ok.de
Review-by: h...@apache.org

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index b417c54..02cb392 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -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 );
 }
diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index adc3294..c03d0bd 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -781,7 +781,7 @@ void BasicTreeListBox::GetRootEntryBitmaps( const 
ScriptDocument rDocument, Ima
 }
 }
 
-if ( sFactoryURL.getLength() )
+if ( !sFactoryURL.isEmpty() )
 {
 rImage = SvFileInformationManager::GetFileImage( INetURLObject( 
sFactoryURL ),
 sal_False /* small */,
diff --git a/basctl/source/basicide/localizationmgr.cxx 
b/basctl/source/basicide/localizationmgr.cxx
index 6bb156b..94f44ac 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -183,7

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

2013-11-15 Thread Oliver-Rainer Wittmann 
 accessibility/source/standard/vclxaccessiblelist.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ddf54d685f05d6be26f609df42461d14da857442
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Fri Nov 15 11:58:27 2013 +

revert unnecessary change to curl patch file for Windows made by the 
introduction of ia2 as it breaks the on Windows when using a git-clone

part 1 of the revert: removing svn:eol-style property
commit e2f90c93c97f3cf137c348ed302c6470f398aa70
Author: Herbert Dürr h...@apache.org
Date:   Fri Nov 15 11:03:37 2013 +

#i107914# fix build breaker on 64bit platforms introduced by ia2

diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx 
b/accessibility/source/standard/vclxaccessiblelist.cxx
index 1cff9aa..6453c72 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -369,7 +369,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const 
VclWindowEvent rVclWindowEve
 break;
 case VCLEVENT_LISTBOX_FOCUSITEMCHANGED:
 if ( !m_bDisableProcessEvent )
-
UpdateFocus_Impl_Acc((sal_uInt16)reinterpret_castsal_uInt32(rVclWindowEvent.GetData()),b_IsDropDownList);
+
UpdateFocus_Impl_Acc((sal_uInt16)reinterpret_castsal_uIntPtr(rVclWindowEvent.GetData()),b_IsDropDownList);
 break;
 case VCLEVENT_WINDOW_GETFOCUS:
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits