date:20111210

[Libreoffice-commits] .: basctl/source

2011-12-10 Thread Ivan Timofeev

 basctl/source/basicide/basicrenderable.cxx |4 ++--
 basctl/source/basicide/baside2.cxx |2 +-
 basctl/source/basicide/bastype2.cxx|2 +-
 basctl/source/basicide/localizationmgr.cxx |6 +++---
 basctl/source/basicide/moduldl2.cxx|2 +-
 basctl/source/basicide/scriptdocument.cxx  |6 +++---
 basctl/source/dlged/dlgedobj.cxx   |2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 1688a9d9235dd2ee4f3b9497308efd41f7a3fb6f
Author: Olivier Hallot 
Date:   Fri Dec 9 22:23:22 2011 -0200

Fix for fdo43460 Part II getLength to isEmpty

Part II
Module
basctl

diff --git a/basctl/source/basicide/basicrenderable.cxx 
b/basctl/source/basicide/basicrenderable.cxx
index 1da202f..d2de323 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -120,7 +120,7 @@ sal_Int32 SAL_CALL BasicRenderable::getRendererCount (
 if( nContent == 1 )
 {
 rtl::OUString aPageRange( getStringValue( "PageRange" ) );
-if( aPageRange.getLength() )
+if( !aPageRange.isEmpty() )
 {
 StringRangeEnumerator aRangeEnum( aPageRange, 0, nCount-1 
);
 sal_Int32 nSelCount = aRangeEnum.size();
@@ -179,7 +179,7 @@ void SAL_CALL BasicRenderable::render (
 if( nContent == 1 )
 {
 rtl::OUString aPageRange( getStringValue( "PageRange" ) );
-if( aPageRange.getLength() )
+if( !aPageRange.isEmpty() )
 {
 sal_Int32 nPageCount = mpWindow->countPages( pPrinter );
 StringRangeEnumerator aRangeEnum( aPageRange, 0, 
nPageCount-1 );
diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index d1a1589..cf245ca 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -341,7 +341,7 @@ sal_Bool ModulWindow::BasicExecute()
 if ( !pMethod )
 {
 // If not in a method then prompt the user
-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() );
 }
 if ( pMethod )
 {
diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index c3ce38a..abacd01 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -773,7 +773,7 @@ void BasicTreeListBox::GetRootEntryBitmaps( const 
ScriptDocument& rDocument, Ima
 }
 }
 
-if ( sFactoryURL.getLength() )
+if ( !sFactoryURL.isEmpty() )
 {
 rImage = SvFileInformationManager::GetFileImage( INetURLObject( 
sFactoryURL ), sal_False );
 }
diff --git a/basctl/source/basicide/localizationmgr.cxx 
b/basctl/source/basicide/localizationmgr.cxx
index cf034d8..59f2316 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -185,7 +185,7 @@ void 
LocalizationMgr::implEnableDisableResourceForAllLibraryDialogs( HandleResou
 aPureIdStr += aDot;
 aPureIdStr += aDialogName;
 aPureIdStr += aDot;
-if( aCtrlName.getLength() )
+if( !aCtrlName.isEmpty() )
 {
 aPureIdStr += aCtrlName;
 aPureIdStr += aDot;
@@ -245,7 +245,7 @@ sal_Int32 
LocalizationMgr::implHandleControlResourceProperties
 // 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;
 
@@ -435,7 +435,7 @@ sal_Int32 
LocalizationMgr::implHandleControlResourceProperties
 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;
diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index ebc662c..c8960a4 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1332,7 +1332,7 @@ void LibPage::ExportAsPackage(

[Libreoffice-commits] .: basic/source

2011-12-10 Thread Ivan Timofeev

 basic/source/basmgr/vbahelper.cxx |4 ++--
 basic/source/classes/image.cxx|2 +-
 basic/source/classes/sbunoobj.cxx |   24 
 basic/source/runtime/iosys.cxx|2 +-
 basic/source/runtime/methods.cxx  |   10 +-
 basic/source/runtime/methods1.cxx |6 +++---
 basic/source/runtime/step2.cxx|4 ++--
 basic/source/sbx/sbxobj.cxx   |4 ++--
 basic/source/sbx/sbxstr.cxx   |2 +-
 basic/source/uno/namecont.cxx |   18 +-
 basic/source/uno/scriptcont.cxx   |   10 +-
 11 files changed, 43 insertions(+), 43 deletions(-)

New commits:
commit 91d4fe75eed800fd37211555b09cac0af3b1d640
Author: Olivier Hallot 
Date:   Sat Dec 10 13:35:14 2011 -0200

Fix for fdo43460 Part III getLength to isEmpty

Part III
Module
basic

diff --git a/basic/source/basmgr/vbahelper.cxx 
b/basic/source/basmgr/vbahelper.cxx
index 352aae1..f581a90 100644
--- a/basic/source/basmgr/vbahelper.cxx
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -223,7 +223,7 @@ void enableContainerWindowsOfAllDocuments( const 
uno::Reference< frame::XModel >
 
 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 );
@@ -231,7 +231,7 @@ void registerCurrentDirectory( const uno::Reference< 
frame::XModel >& rxModel, c
 {
 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(const uno::Exception& )
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index a1d7332..2e24903 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -287,7 +287,7 @@ sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
 SbiCloseRecord( r, nPos );
 }
 // Source?
-if( aOUSource.getLength() && SbiGood( r ) )
+if( !aOUSource.isEmpty() && SbiGood( r ) )
 {
 nPos = SbiOpenRecord( r, B_SOURCE, 1 );
 String aTmp;
diff --git a/basic/source/classes/sbunoobj.cxx 
b/basic/source/classes/sbunoobj.cxx
index 5f979e8..605de05 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -128,7 +128,7 @@ bool SbUnoObject::getDefaultPropName( SbUnoObject* pUnoObj, 
::rtl::OUString& sDf
 if ( xDefaultProp.is() )
 {
 sDfltProp = xDefaultProp->getDefaultPropertyName();
-if ( sDfltProp.getLength() )
+if ( !sDfltProp.isEmpty() )
 result = true;
 }
 return result;
@@ -344,7 +344,7 @@ void implAppendExceptionMsg( ::rtl::OUStringBuffer& 
_inout_rBuffer, const Except
 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 );
@@ -1572,7 +1572,7 @@ void processAutomationParams( SbxArray* pParams, 
Sequence< Any >& args, bool bOL
 bBlockConversionToSmallestType );
 
 ::rtl::OUString aParamName = pNames[iSbx];
-if( aParamName.getLength() )
+if( !aParamName.isEmpty() )
 {
 oleautomation::NamedArgument aNamedArgument;
 aNamedArgument.Name = aParamName;
@@ -1687,7 +1687,7 @@ rtl::OUString Impl_GetInterfaceInfo( const Reference< 
XInterface >& x, const Ref
 if( pUnoObj )
 {
 aName = pUnoObj->GetClassName();
-if( !aName.getLength() )
+if( aName.isEmpty() )
 {
 Any aToInspectObj = pUnoObj->getUnoAny();
 TypeClass eType = aToInspectObj.getValueType().getTypeClass();
@@ -1708,7 +1708,7 @@ rtl::OUString Impl_GetInterfaceInfo( const Reference< 
XInterface >& x, const Ref
 ::rtl::OUString getDbgObjectName( SbUnoObject* pUnoObj )
 {
 ::rtl::OUString aName = getDbgObjectNameImpl( pUnoObj );
-if( !aName.getLength() )
+if( aName.isEmpty() )
 aName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown"));
 
 ::rtl::OUStringBuffer aRet;
@@ -1787,7 +1787,7 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const 
::rtl::OUString& rClass )
 {
 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() || sTypeNam

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

2011-12-10 Thread Eike Rathke

 sc/source/core/tool/interpr1.cxx |   41 +++
 1 file changed, 41 insertions(+)

New commits:
commit f7e552b202dc1d155f731e3da18737ea6c13e75f
Author: Eike Rathke 
Date:   Sat Dec 10 20:29:06 2011 +0100

fixed fdo#43700 ROWS(), COLUMNS() and SHEETS() don't work with external 
references

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 862e92b..a76d2b6 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -4174,6 +4174,20 @@ void ScInterpreter::ScColumns()
 }
 }
 break;
+case svExternalSingleRef:
+PopError();
+nVal++;
+break;
+case svExternalDoubleRef:
+{
+sal_uInt16 nFileId;
+String aTabName;
+ScComplexRefData aRef;
+PopExternalDoubleRef( nFileId, aTabName, aRef);
+nVal += static_cast(aRef.Ref2.nTab - aRef.Ref1.nTab 
+ 1) *
+static_cast(aRef.Ref2.nCol - aRef.Ref1.nCol + 
1);
+}
+break;
 default:
 PopError();
 SetError(errIllegalParameter);
@@ -4218,6 +4232,20 @@ void ScInterpreter::ScRows()
 }
 }
 break;
+case svExternalSingleRef:
+PopError();
+nVal++;
+break;
+case svExternalDoubleRef:
+{
+sal_uInt16 nFileId;
+String aTabName;
+ScComplexRefData aRef;
+PopExternalDoubleRef( nFileId, aTabName, aRef);
+nVal += static_cast(aRef.Ref2.nTab - aRef.Ref1.nTab 
+ 1) *
+static_cast(aRef.Ref2.nRow - aRef.Ref1.nRow + 
1);
+}
+break;
 default:
 PopError();
 SetError(errIllegalParameter);
@@ -4258,6 +4286,19 @@ void ScInterpreter::ScTables()
 PopError();
 nVal++;
 break;
+case svExternalSingleRef:
+PopError();
+nVal++;
+break;
+case svExternalDoubleRef:
+{
+sal_uInt16 nFileId;
+String aTabName;
+ScComplexRefData aRef;
+PopExternalDoubleRef( nFileId, aTabName, aRef);
+nVal += static_cast(aRef.Ref2.nTab - 
aRef.Ref1.nTab + 1);
+}
+break;
 default:
 PopError();
 SetError( errIllegalParameter );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-12-10 Thread Eike Rathke

 sc/source/core/tool/interpr1.cxx |   41 +++
 1 file changed, 41 insertions(+)

New commits:
commit 53b3df94dbd44b220f6531fe1cf2c83f3b1849d0
Author: Eike Rathke 
Date:   Sat Dec 10 20:29:06 2011 +0100

fixed fdo#43700 ROWS(), COLUMNS() and SHEETS() don't work with external 
references

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 862e92b..a76d2b6 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -4174,6 +4174,20 @@ void ScInterpreter::ScColumns()
 }
 }
 break;
+case svExternalSingleRef:
+PopError();
+nVal++;
+break;
+case svExternalDoubleRef:
+{
+sal_uInt16 nFileId;
+String aTabName;
+ScComplexRefData aRef;
+PopExternalDoubleRef( nFileId, aTabName, aRef);
+nVal += static_cast(aRef.Ref2.nTab - aRef.Ref1.nTab 
+ 1) *
+static_cast(aRef.Ref2.nCol - aRef.Ref1.nCol + 
1);
+}
+break;
 default:
 PopError();
 SetError(errIllegalParameter);
@@ -4218,6 +4232,20 @@ void ScInterpreter::ScRows()
 }
 }
 break;
+case svExternalSingleRef:
+PopError();
+nVal++;
+break;
+case svExternalDoubleRef:
+{
+sal_uInt16 nFileId;
+String aTabName;
+ScComplexRefData aRef;
+PopExternalDoubleRef( nFileId, aTabName, aRef);
+nVal += static_cast(aRef.Ref2.nTab - aRef.Ref1.nTab 
+ 1) *
+static_cast(aRef.Ref2.nRow - aRef.Ref1.nRow + 
1);
+}
+break;
 default:
 PopError();
 SetError(errIllegalParameter);
@@ -4258,6 +4286,19 @@ void ScInterpreter::ScTables()
 PopError();
 nVal++;
 break;
+case svExternalSingleRef:
+PopError();
+nVal++;
+break;
+case svExternalDoubleRef:
+{
+sal_uInt16 nFileId;
+String aTabName;
+ScComplexRefData aRef;
+PopExternalDoubleRef( nFileId, aTabName, aRef);
+nVal += static_cast(aRef.Ref2.nTab - 
aRef.Ref1.nTab + 1);
+}
+break;
 default:
 PopError();
 SetError( errIllegalParameter );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - basctl/source

2011-12-10 Thread August Sodora

 basctl/source/basicide/basobj2.cxx|   12 ++--
 basctl/source/basicide/basobj3.cxx|8 
 basctl/source/basicide/bastypes.cxx   |4 +---
 basctl/source/basicide/scriptdocument.cxx |   20 ++--
 basctl/source/inc/basobj.hxx  |   12 ++--
 basctl/source/inc/bastypes.hxx|2 +-
 6 files changed, 28 insertions(+), 30 deletions(-)

New commits:
commit 90939a7b3d9d6511a4086deea6b7a11adf30df47
Author: August Sodora 
Date:   Sat Dec 10 03:01:35 2011 -0500

String->OUString

diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index a68a0d8..c23b22f 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -58,7 +58,7 @@ const char* pRegName = "BasicIDETabBar";
 TYPEINIT0( IDEBaseWindow )
 TYPEINIT1( SbxItem, SfxPoolItem );
 
-IDEBaseWindow::IDEBaseWindow( Window* pParent, const ScriptDocument& 
rDocument, String aLibName, String aName )
+IDEBaseWindow::IDEBaseWindow( Window* pParent, const ScriptDocument& 
rDocument, ::rtl::OUString aLibName, ::rtl::OUString aName )
 :Window( pParent, WinBits( WB_3DLOOK ) )
 ,m_aDocument( rDocument )
 ,m_aLibName( aLibName )
@@ -70,8 +70,6 @@ IDEBaseWindow::IDEBaseWindow( Window* pParent, const 
ScriptDocument& rDocument,
 nStatus = 0;
 }
 
-
-
 IDEBaseWindow::~IDEBaseWindow()
 {
 DBG_DTOR( IDEBaseWindow, 0 );
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index e61f311..ac298cf 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -140,7 +140,7 @@ protected:
 
 public:
 TYPEINFO();
-IDEBaseWindow( Window* pParent, const ScriptDocument& 
rDocument, String aLibName, String aName );
+IDEBaseWindow( Window* pParent, const ScriptDocument& rDocument, 
::rtl::OUString aLibName, ::rtl::OUString aName );
 virtual ~IDEBaseWindow();
 
 voidInit();
commit 313deb9782819f68b69d25629aa79476ff98e90a
Author: August Sodora 
Date:   Sat Dec 10 02:59:29 2011 -0500

String->OUString

diff --git a/basctl/source/basicide/scriptdocument.cxx 
b/basctl/source/basicide/scriptdocument.cxx
index 2794520..e75affa 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -986,9 +986,9 @@ namespace basctl
 ::rtl::OUString aSearchURL1( RTL_CONSTASCII_USTRINGPARAM( 
"share/basic" ) );
 ::rtl::OUString aSearchURL2( RTL_CONSTASCII_USTRINGPARAM( 
"share/uno_packages" ) );
 ::rtl::OUString aSearchURL3( RTL_CONSTASCII_USTRINGPARAM( 
"share/extensions" ) );
-if( aCanonicalFileURL.indexOf( aSearchURL1 ) != -1 ||
-aCanonicalFileURL.indexOf( aSearchURL2 ) != -1 ||
-aCanonicalFileURL.indexOf( aSearchURL3 ) != -1 )
+if( aCanonicalFileURL.indexOf( aSearchURL1 ) >= 0 ||
+aCanonicalFileURL.indexOf( aSearchURL2 ) >= 0 ||
+aCanonicalFileURL.indexOf( aSearchURL3 ) >= 0 )
 bIsShared = true;
 }
 }
@@ -1315,7 +1315,7 @@ namespace basctl
 while ( !bValid )
 {
 aObjectName = aBaseName;
-aObjectName += String::CreateFromInt32( i );
+aObjectName += ::rtl::OUString::valueOf( i );
 
 if ( aUsedNamesCheck.find( aObjectName ) == aUsedNamesCheck.end() )
 bValid = sal_True;
@@ -1521,9 +1521,9 @@ namespace basctl
 {
 switch ( _eType )
 {
-case LIBRARY_TYPE_MODULE:   aTitle = String( IDEResId( 
RID_STR_USERMACROS ) ); break;
-case LIBRARY_TYPE_DIALOG:   aTitle = String( IDEResId( 
RID_STR_USERDIALOGS ) ); break;
-case LIBRARY_TYPE_ALL:  aTitle = String( IDEResId( 
RID_STR_USERMACROSDIALOGS ) ); break;
+case LIBRARY_TYPE_MODULE:   aTitle = ResId::toString( 
IDEResId( RID_STR_USERMACROS ) ); break;
+case LIBRARY_TYPE_DIALOG:   aTitle = ResId::toString( 
IDEResId( RID_STR_USERDIALOGS ) ); break;
+case LIBRARY_TYPE_ALL:  aTitle = ResId::toString( 
IDEResId( RID_STR_USERMACROSDIALOGS ) ); break;
 default:
 break;
 }
@@ -1532,9 +1532,9 @@ namespace basctl
 {
 switch ( _eType )
 {
-case LIBRARY_TYPE_MODULE:   aTitle = String( IDEResId( 
RID_STR_SHAREMACROS ) ); break;
-case LIBRARY_TYPE_DIALOG:   aTitle = String( IDEResId( 
RID_STR_SHAREDIALOGS ) ); break;
-case LIBRARY_TYPE_ALL:  aTitle = String( IDEResId( 
RID_STR_SHAREMACROSDIALOGS ) ); break;
+case LIBRARY_TYPE_MODULE:   aTitle = ResId::toString( 
IDEResId( RID_STR_SHAREMACROS ) ); break;
+case LIBRARY_TYPE_DIALOG:   aTitle = ResId::toString

[Libreoffice-commits] .: basctl/source

2011-12-10 Thread August Sodora

 basctl/source/basicide/objdlg.cxx |   28 +---
 1 file changed, 13 insertions(+), 15 deletions(-)

New commits:
commit ac65f9c8884d134e35b96a586acf695e49b84635
Author: August Sodora 
Date:   Sat Dec 10 15:44:59 2011 -0500

Remove unnecessary includes

diff --git a/basctl/source/basicide/objdlg.cxx 
b/basctl/source/basicide/objdlg.cxx
index fe7bf99..59172c1 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -26,24 +26,22 @@
  *
  /
 
-
-#include 
-
-
-#include 
+#include "basidesh.hrc"
+#include "objdlg.hrc"
+
+#include "basidesh.hxx"
+#include "iderdll.hxx"
+#include "iderdll2.hxx"
+#include "objdlg.hxx"
+
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
-#include 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
 
 ObjectTreeListBox::ObjectTreeListBox( Window* pParent, const ResId& rRes )
 : BasicTreeListBox( pParent, rRes )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - cairo/cairo solenv/gdb sw/source

2011-12-10 Thread Michael Stahl

 cairo/cairo/makefile.mk|6 ++--
 solenv/gdb/libreoffice/sw.py   |   38 -
 sw/source/core/doc/docdde.cxx  |4 +-
 sw/source/core/doc/docdesc.cxx |   21 --
 sw/source/core/doc/docedt.cxx  |   61 -
 5 files changed, 84 insertions(+), 46 deletions(-)

New commits:
commit b277d9a57e566c03f74dc6d82f2c0fe323eb83c2
Author: Michael Stahl 
Date:   Sat Dec 10 20:58:57 2011 +0100

sw: tweak comment translations:

5aff8df5 and ed870efe

diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index 8a148cd..2d37606 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -301,7 +301,7 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, 
SwPaM*& rpPam,
 
 const CharClass& rCC = GetAppCharClass();
 
-// Extension for areas: not only link bookmarks/areas
+// Extension for sections: not only link bookmarks/sections
 // but also frames (text!), tables, outlines:
 if( STRING_NOTFOUND != nPos )
 {
@@ -356,7 +356,7 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, 
SwPaM*& rpPam,
 rOutlNds.Seek_Entry( pNd, &nTmpPos );
 rpRange = new SwNodeRange( aPos.nNode, 0, aPos.nNode );
 
-// look for the area's end, now
+// look for the section's end, now
 for( ++nTmpPos;
 nTmpPos < rOutlNds.Count() &&
 nLvl < rOutlNds[ nTmpPos ]->GetTxtNode()->
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index d17980e..2284b72 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -212,7 +212,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
&rChged )
 if( rChged.GetNumType().GetNumberingType() != 
pDesc->GetNumType().GetNumberingType() )
 {
 pDesc->SetNumType( rChged.GetNumType() );
-// Notify page number fields, that NumFormat has changed
+// Notify page number fields that NumFormat has changed
 GetSysFldType( RES_PAGENUMBERFLD )->UpdateFlds();
 GetSysFldType( RES_REFPAGEGETFLD )->UpdateFlds();
 
@@ -251,7 +251,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
&rChged )
 pDesc->GetLeft().SetFmtAttr( pDesc->GetMaster().GetHeader() );
 }
 else if ( rHead.IsActive() )
-{   // Left gets it's own header if the Format doesn't alrady have one.
+{   // Left gets its own header if the Format doesn't alrady have one.
 // If it already has one and it points to the same Section as the
 // Right one, it needs to get an own Header.
 // The content is evidently copied.
@@ -275,8 +275,9 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
&rChged )
 SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), "Header",
 GetDfltFrmFmt() );
 ::lcl_DescSetAttr( *pRight, *pFmt, sal_False );
-// The area which the right header attribute is pointing to is 
copied,
-// and the Index to the StartNode is set to the left header 
attribute.
+// The section which the right header attribute is pointing
+// is copied, and the Index to the StartNode is set to
+// the left header attribute.
 SwNodeIndex aTmp( GetNodes().GetEndOfAutotext() );
 SwStartNode* pSttNd = GetNodes().MakeEmptySection( aTmp, 
SwHeaderStartNode );
 SwNodeRange aRange( aRCnt.GetCntntIdx()->GetNode(), 0,
@@ -311,7 +312,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
&rChged )
 // Left shares the Header with the Master.
 pDesc->GetLeft().SetFmtAttr( pDesc->GetMaster().GetFooter() );
 else if ( rFoot.IsActive() )
-{   // Left gets it's own Footer if the Format does not already have one.
+{   // Left gets its own Footer if the Format does not already have one.
 // If the Format already has a Footer and it points to the same 
section as the Right one,
 // it needs to get an own one.
 // The content is evidently copied.
@@ -335,8 +336,9 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
&rChged )
 SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), "Footer",
 GetDfltFrmFmt() );
 ::lcl_DescSetAttr( *pRight, *pFmt, sal_False );
-// The Area to which the right header attribute is pointing to 
is being copied
-// and the Index to the StartNode is set to the left header 
attribute.
+// The section to which the right footer attribute is pointing
+// is copied, and the Index to the StartNode is set to
+// the left footer attribute.
 SwNodeIndex aTmp( GetNodes().GetEndOfAutotext() );
 SwStartN

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - cairo/cairo solenv/gdb

2011-12-10 Thread Michael Stahl

 cairo/cairo/makefile.mk  |6 +++---
 solenv/gdb/libreoffice/sw.py |   38 --
 2 files changed, 39 insertions(+), 5 deletions(-)

New commits:
commit 7b96bd74978ff61c0ada8a724ae327181ce51fc7
Author: Michael Stahl 
Date:   Sat Dec 10 19:32:21 2011 +0100

solenv: pimp the gdb nodes array pretty printer
(cherry picked from commit 9f050aa772dd8d0b26dac4ef52fb5a5bd2825d4a)

diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py
index 2e07538..8f25522 100644
--- a/solenv/gdb/libreoffice/sw.py
+++ b/solenv/gdb/libreoffice/sw.py
@@ -48,7 +48,7 @@ class SwPaMPrinter(object):
 
 def to_string(self):
 return "%s" % (self.typename)
-
+
 def children(self):
 point = self.value['m_pPoint'].dereference()
 mark = self.value['m_pMark'].dereference()
@@ -86,18 +86,52 @@ class BigPtrArrayPrinter(object):
 self.block_count = array['nBlock']
 self.block_pos = 0
 self.block = None
+self.indent = ""
+self.max_indent = ""
 self._next_block(False)
 self._check_invariant()
 
 def __iter__(self):
 return self
 
+def _node_value(self, node):
+cur_indent = self.indent
+if str(node.dynamic_type.target()) == "SwTxtNode":
+# accessing this is completely non-obvious...
+# also, node.dynamic_cast(node.dynamic_type) is null?
+value = "TextNode " + \
+str(node.cast(node.dynamic_type).dereference()['m_Text'])
+elif str(node.dynamic_type.target()) == "SwOLENode":
+value = " OLENode "
+elif str(node.dynamic_type.target()) == "SwGrfNode":
+value = " GrfNode "
+elif str(node.dynamic_type.target()) == "SwSectionNode":
+value = " SectionNode "
+self.indent += " "
+elif str(node.dynamic_type.target()) == "SwTableNode":
+value = "   TableNode "
+self.indent += " "
+elif str(node.dynamic_type.target()) == "SwStartNode":
+value = "   StartNode "
+self.indent += " "
+elif str(node.dynamic_type.target()) == "SwEndNode":
+value = " EndNode "
+self.indent = self.indent[:-1]
+cur_indent = self.indent
+elif str(node.dynamic_type.target()) == "SwDummySectionNode":
+value = "DummySctNode "
+#return "\n[%s%4d%s] %s %s" % (cur_indent, self.pos, \
+#self.max_indent[len(cur_indent):], node, 
value)
+return "\n[%4d] %s%s%s %s" % (self.pos, cur_indent, \
+node, self.max_indent[len(cur_indent):], value)
+
 def next(self):
 if self.pos == self.count:
 raise StopIteration()
 
 name = str(self.pos)
-value = self.block['pData'][self.pos - self.block['nStart']]
+node = self.block['pData'][self.pos - self.block['nStart']]
+value =  self._node_value(node)
 if self.pos == self.block['nEnd']:
 self._next_block()
 self.pos += 1
commit 57f4258e93aeed47bf8305602ae1acd2a20154b1
Author: Michael Stahl 
Date:   Sat Dec 10 00:23:42 2011 +0100

cairo: fix RPATH:

The cairo configure script is called with -Wl,-rpath,"12345ORIGIN"
with funny results so tweak the quoting so that the $$ makes it through...
(cherry picked from commit 408672d41b261b33fb3bbc272d25815dda0e2663)

diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index fda29af..1eccae5 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -126,9 +126,9 @@ OUT2INC+=src$/cairo-quartz.h
 .ELSE
 # --- Unix -
 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-cairo_LDFLAGS+=-Wl,-rpath,'ORIGIN:ORIGIN/../ure-link/lib' 
-Wl,-z,noexecstack
+cairo_LDFLAGS+=-Wl,-rpath,\ORIGIN:\ORIGIN/../ure-link/lib 
-Wl,-z,noexecstack
 .ELIF "$(OS)$(COM)"=="SOLARISC52"
-cairo_LDFLAGS+=-Wl,-R'ORIGIN:ORIGIN/../ure-link/lib'
+cairo_LDFLAGS+=-Wl,-R\ORIGIN:\ORIGIN/../ure-link/lib
 .ENDIF  # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
 
 .IF "$(SYSBASE)"!=""
@@ -206,7 +206,7 @@ cairo_CFLAGS+=-g
 CONFIGURE_FLAGS+= STRIP=" "
 .ENDIF
 
-CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc 
$(cairo_CFLAGS)" LDFLAGS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib 
$(cairo_LDFLAGS)" CPPFLAGS="$(cairo_CPPFLAGS)"
+CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc 
$(cairo_CFLAGS)" LDFLAGS='-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib 
$(cairo_LDFLAGS)' CPPFLAGS="$(cairo_CPPFLAGS)"
 
 .ENDIF
 
___
Libreoffice-commits mailing lis

[Libreoffice-commits] .: 3 commits - basctl/source crashrep/source desktop/util desktop/win32 desktop/WinResTarget_sbase.mk desktop/WinResTarget_scalc.mk desktop/WinResTarget_sdraw.mk desktop/WinResTa

2011-12-10 Thread Andras Timar

 basctl/source/basicide/bastypes.cxx   |2 
 crashrep/source/win32/rcheader.txt|8 
 desktop/WinResTarget_sbase.mk |1 
 desktop/WinResTarget_scalc.mk |1 
 desktop/WinResTarget_sdraw.mk |2 
 desktop/WinResTarget_simpress.mk  |1 
 desktop/WinResTarget_smath.mk |1 
 desktop/WinResTarget_soffice.mk   |1 
 desktop/WinResTarget_sweb.mk  |1 
 desktop/WinResTarget_swriter.mk   |1 
 desktop/util/officeloader.rc  |   11 -
 desktop/win32/source/applauncher/launcher.rc  |7 
 instsetoo_native/util/openoffice.lst  |   10 -
 solenv/bin/modules/installer/windows/msiglobal.pm |   20 --
 solenv/inc/_tg_shl.mk |   10 +
 solenv/inc/minor.mk   |6 
 solenv/inc/shlinfo.rc |   13 -
 solenv/inc/tg_shl.mk  |1 
 solenv/inc/tg_wntx64.mk   |2 
 solenv/inc/verinfo.hrc|  201 --
 solenv/inc/version.hrc|   34 ---
 solenv/inc/version.lst|   34 ---
 solenv/makefile.mk|   13 -
 solenv/prj/d.lst  |1 
 24 files changed, 67 insertions(+), 315 deletions(-)

New commits:
commit 6a43a6c1fe56e5b63e5f330f87feada6479f8119
Author: Andras Timar 
Date:   Sat Dec 10 22:10:35 2011 +0100

use PACKAGEVERSION as the base of MSI ProductVersion

Formerly PRODUCTVERSION was used but that did not contain
the microversion digit. It is better to have it in MSI
ProductVersion, because a higher build number of a lower
microversion looked newer from the MSI point of view, and
update failed.

MSI ProductVersion is now major.minor.micro.build, e.g.
3.6.1.1206 (build number is taken from minor.mk)

diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index a90698a..43e6ee3 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1805,27 +1805,11 @@ sub set_msiproductversion
 {
 my ( $allvariables ) = @_;
 
-my $productversion = $allvariables->{'PRODUCTVERSION'};
-
-if (( $productversion =~ /^\s*\d+\s*$/ ) && ( $productversion > 255 )) { 
$productversion = $productversion%256; }
+my $productversion = $allvariables->{'PACKAGEVERSION'};
 
 if ( $productversion =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ )
 {
-$productversion = $1 . "\." . $2 . $3 . "\." . 
$installer::globals::buildid;
-}
-elsif  ( $productversion =~ /^\s*(\d+)\.(\d+)\s*$/ )
-{
-$productversion = $1 . "\." . $2 . "\." . $installer::globals::buildid;
-}
-else
-{
-my $productminor = "00";
-if (( $allvariables->{'PACKAGEVERSION'} ) && ( 
$allvariables->{'PACKAGEVERSION'} ne "" ))
-{
-if ( $allvariables->{'PACKAGEVERSION'} =~ 
/^\s*(\d+)\.(\d+)\.(\d+)\s*$/ ) { $productminor = $2; }
-}
-
-$productversion = $productversion . "\." . $productminor . "\." . 
$installer::globals::buildid;
+$productversion = $1 . "\." . $2 . "\." . $3 . "\." . 
$installer::globals::buildid;
 }
 
 $installer::globals::msiproductversion = $productversion;
commit 3fbedc3e8f65c91999dcee42daa8312e387dcf40
Author: Andras Timar 
Date:   Sat Dec 10 16:47:02 2011 +0100

enhance VersionInfo resource of Windows excutables

+ added ProductName (a required parameter), It is LibreOffice
+ CompanyName is configurable, it is $(OOO_VENDOR), that is set
  --with-vendor configure switch. If not set, then CompanyName is
  empty string which is fine, too.
+ Binary file version and FileVersion string show the same value,
  and version number is sane: main version + subversion + microversion
  + build number, such as 3.5.0.0
+ LegalCopyright text is the same as in the About box, year range
  can be set in minor.mk
- removed archaic and overcomplicated version number calculating macros
- removed version.lst, copied relevant content to minor.mk
- removed binary RCDATA resources, I don't think they were of any use

diff --git a/crashrep/source/win32/rcheader.txt 
b/crashrep/source/win32/rcheader.txt
index 0bf2cd4..02241d5 100755
--- a/crashrep/source/win32/rcheader.txt
+++ b/crashrep/source/win32/rcheader.txt
@@ -37,8 +37,6 @@
 #define IDC_STATIC (-1)
 #endif
 
-#define VER_FIRSTYEAR  2003
-
 #include "version.hrc"
 
 #ifdef FONTSIZE
@@ -54,8 +52,8 @@
 // ---
 
 VS_VERSION_INFO versioninfo
-   fileversionVERSION, SUBVERSION, VERVARIANT, VER_COUNT
-   productversion V

[Libreoffice-commits] .: configure.in fontconfig/fontconfig-2.8.0.patch fontconfig/makefile.mk fontconfig/prj freetype/freetype-2.4.8.patch freetype/makefile.mk freetype/prj ooo.lst.in vcl/prj

2011-12-10 Thread Tor Lillqvist

 configure.in  |6 +++
 fontconfig/fontconfig-2.8.0.patch |   49 ++
 fontconfig/makefile.mk|   61 ++
 fontconfig/prj/build.lst  |3 +
 fontconfig/prj/d.lst  |4 ++
 freetype/freetype-2.4.8.patch |   11 ++
 freetype/makefile.mk  |   59 
 freetype/prj/build.lst|3 +
 freetype/prj/d.lst|8 
 ooo.lst.in|3 +
 vcl/prj/build.lst |2 -
 11 files changed, 207 insertions(+), 2 deletions(-)

New commits:
commit 75aacd87bbbddb860efb57f046c84e4f107a8839
Author: Tor Lillqvist 
Date:   Sun Dec 11 00:08:39 2011 +0200

Download and build FreeType and fontconfig for Android

It will probably be simplest to just use FreeType on Android,
too. (Android uses it itself, but doesn't provide its API publicly.)

Probably fontconfig, too, although there shouldn't be much
configuration per se that a LibreOffice-baed app would have to do at
run-time; it will have to bundle all fonts it is going to use anyway,
I think, so all font information is known a priori. But maybe in the
future there will be user-installable system fonts on Android, or
something.

diff --git a/configure.in b/configure.in
index 0228af5..71b644f 100644
--- a/configure.in
+++ b/configure.in
@@ -263,6 +263,10 @@ linux-androideabi*)
 AC_MSG_ERROR([You need to set the $var environment variable in a 
cross-compilation for Android. See README.cross for an example.])
 fi
 done
+
+BUILD_TYPE="$BUILD_TYPE FONTCONFIG FREETYPE"
+FREETYPE_TARBALL=dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2
+FONTCONFIG_TARBALL=77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz
 ;;
 
 *)
@@ -282,6 +286,8 @@ AC_SUBST(OSVERSION)
 AC_SUBST(PTHREAD_CFLAGS)
 AC_SUBST(PTHREAD_LIBS)
 
+AC_SUBST(FREETYPE_TARBALL)
+AC_SUBST(FONTCONFIG_TARBALL)
 
 ###
 # Extensions switches --enable/--disable
diff --git a/fontconfig/fontconfig-2.8.0.patch 
b/fontconfig/fontconfig-2.8.0.patch
new file mode 100644
index 000..5b5cdce
--- /dev/null
+++ b/fontconfig/fontconfig-2.8.0.patch
@@ -0,0 +1,49 @@
+--- misc/build/fontconfig-2.8.0/config.sub
 misc/build/fontconfig-2.8.0/config.sub
+@@ -120,7 +120,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  nto-qnx* | linux-androideabi* | linux-gnu* | linux-dietlibc | linux-newlib* 
| linux-uclibc* | \
+   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+@@ -1272,7 +1272,7 @@
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+-| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++| -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | 
-aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+--- misc/build/fontconfig-2.8.0/configure
 misc/build/fontconfig-2.8.0/configure
+@@ -14073,7 +14073,7 @@
+   no)
+   ;;
+   *)
+-  EXPAT_LIBS="-L$expat_lib -lexpat"
++  EXPAT_LIBS="-L$expat_lib -lexpat_xmlparse 
-lexpat_xmltok"
+   ;;
+   esac
+ 
+--- misc/build/fontconfig-2.8.0/src/fcxml.c
 misc/build/fontconfig-2.8.0/src/fcxml.c
+@@ -1123,6 +1123,7 @@
+  * Have to swap the decimal point to match the current locale
+  * if that locale doesn't use 0x2e
+  */
++#ifndef __ANDROID__
+ if ((dot = strchr (s, 0x2e)) &&
+   (locale_data = localeconv ()) &&
+   (locale_data->decimal_point[0] != 0x2e ||
+@@ -1158,6 +1158,7 @@
+   }
+ }
+ else
++#endif
+   v = strtod (s, end);
+ return v;
+ }
diff --git a/fontconfig/makefile.mk b/fontconfig/makefile.mk
new file mode 100644
index 000..55c561a
--- /dev/null
+++ b/fontconfig/makefile.mk
@@ -0,0 +1,61 @@
+#*
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Gen

[Libreoffice-commits] .: 2 commits - basctl/source

2011-12-10 Thread August Sodora

 basctl/source/basicide/moduldl2.cxx |  249 
 basctl/source/basicide/moduldlg.hxx |   20 +-
 2 files changed, 128 insertions(+), 141 deletions(-)

New commits:
commit 9776c3c4dc2bcae811a7d86c4a83ff7437ac7358
Author: August Sodora 
Date:   Sat Dec 10 17:57:49 2011 -0500

String->OUString

diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index be83c82..60f01a9 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -62,6 +62,7 @@
 #include "com/sun/star/packages/manifest/XManifestWriter.hpp"
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -287,31 +288,30 @@ sal_Bool BasicCheckBox::EditingEntry( SvLBoxEntry* 
pEntry, Selection& )
 DBG_ASSERT( pEntry, "Kein Eintrag?" );
 
 // check, if Standard library
-String aLibName = GetEntryText( pEntry, 0 );
-if ( aLibName.EqualsIgnoreCaseAscii( "Standard" ) )
+::rtl::OUString aLibName = GetEntryText( pEntry, 0 );
+if ( aLibName.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"Standard" ) ) )
 {
-ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( 
RID_STR_CANNOTCHANGENAMESTDLIB ) ) ).Execute();
+ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( 
RID_STR_CANNOTCHANGENAMESTDLIB ) ) ).Execute();
 return sal_False;
 }
 
 // check, if library is readonly
-::rtl::OUString aOULibName( aLibName );
 Reference< script::XLibraryContainer2 > xModLibContainer( 
m_aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
 Reference< script::XLibraryContainer2 > xDlgLibContainer( 
m_aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
-if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) 
&& xModLibContainer->isLibraryReadOnly( aOULibName ) && 
!xModLibContainer->isLibraryLink( aOULibName ) ) ||
- ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) 
&& xDlgLibContainer->isLibraryReadOnly( aOULibName ) && 
!xDlgLibContainer->isLibraryLink( aOULibName ) ) )
+if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) && 
xModLibContainer->isLibraryReadOnly( aLibName ) && 
!xModLibContainer->isLibraryLink( aLibName ) ) ||
+ ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && 
xDlgLibContainer->isLibraryReadOnly( aLibName ) && 
!xDlgLibContainer->isLibraryLink( aLibName ) ) )
 {
-ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( 
RID_STR_LIBISREADONLY ) ) ).Execute();
+ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( 
RID_STR_LIBISREADONLY ) ) ).Execute();
 return sal_False;
 }
 
 // i24094: Password verification necessary for renaming
 sal_Bool bOK = sal_True;
-if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && 
!xModLibContainer->isLibraryLoaded( aOULibName ) )
+if ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) && 
!xModLibContainer->isLibraryLoaded( aLibName ) )
 {
 // check password
 Reference< script::XLibraryContainerPassword > xPasswd( 
xModLibContainer, UNO_QUERY );
-if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aOULibName ) 
&& !xPasswd->isLibraryPasswordVerified( aOULibName ) )
+if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aLibName ) 
&& !xPasswd->isLibraryPasswordVerified( aLibName ) )
 {
 ::rtl::OUString aPassword;
 Reference< script::XLibraryContainer > xModLibContainer1( 
xModLibContainer, UNO_QUERY );
@@ -336,20 +336,16 @@ sal_Bool BasicCheckBox::EditedEntry( SvLBoxEntry* pEntry, 
const String& rNewText
 {
 try
 {
-::rtl::OUString aOUOldName( aCurText );
-::rtl::OUString aOUNewName( rNewText );
+::rtl::OUString aOldName( aCurText );
+::rtl::OUString aNewName( rNewText );
 
 Reference< script::XLibraryContainer2 > xModLibContainer( 
m_aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
 if ( xModLibContainer.is() )
-{
-xModLibContainer->renameLibrary( aOUOldName, aOUNewName );
-}
+xModLibContainer->renameLibrary( aOldName, aNewName );
 
 Reference< script::XLibraryContainer2 > xDlgLibContainer( 
m_aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
 if ( xDlgLibContainer.is() )
-{
-xDlgLibContainer->renameLibrary( aOUOldName, aOUNewName );
-}
+xDlgLibContainer->renameLibrary( aOldName, aNewName );
 
 BasicIDE::MarkDocumentModified( m_aDocument );
 SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
@@ -361,7 +357,7 @@ sal_Bool BasicCheckBox::EditedEntry( SvLBoxEntry* pEntry, 
const String& rNewText
 }
 catch (const container::ElementExistException& )
 {
-ErrorBox( this, W

[Libreoffice-commits] .: 2 commits - freetype/prj vcl/Module_vcl.mk

2011-12-10 Thread Tor Lillqvist

 freetype/prj/d.lst |8 
 vcl/Module_vcl.mk  |6 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 76a27791fc715e612242a7a60a449efc82d4c0f8
Author: Tor Lillqvist 
Date:   Sun Dec 11 01:16:11 2011 +0200

Build Library_vclplug_svp for Android, too

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 0a91f87..47da575 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -79,4 +79,10 @@ $(eval $(call gb_Module_add_targets,vcl,\
 ))
 endif
 
+ifeq ($(GUIBASE),android)
+$(eval $(call gb_Module_add_targets,vcl,\
+Library_vclplug_svp \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
commit 0f43b8d39ba44521ad0f9bc1c3a7eaeb3c9d6f5c
Author: Tor Lillqvist 
Date:   Sun Dec 11 01:06:16 2011 +0200

Don't bother with a freetype2 subdirectory for headers after all

diff --git a/freetype/prj/d.lst b/freetype/prj/d.lst
index 17cc4f8..428e6a0 100644
--- a/freetype/prj/d.lst
+++ b/freetype/prj/d.lst
@@ -2,7 +2,7 @@
 
 ..\%__SRC%\misc\build\freetype*\builds\unix\freetype-config %_DEST%\bin
 
-mkdir: %_DEST%\inc\external\freetype2\freetype\config
-..\%__SRC%\misc\build\freetype*\include\ft2build.h 
%_DEST%\inc\external\freetype2
-..\%__SRC%\misc\build\freetype*\include\freetype\*.h 
%_DEST%\inc\external\freetype2\freetype
-..\%__SRC%\misc\build\freetype*\include\freetype\config\*.h 
%_DEST%\inc\external\freetype2\freetype\config
+mkdir: %_DEST%\inc\external\freetype\config
+..\%__SRC%\misc\build\freetype*\include\ft2build.h %_DEST%\inc\external
+..\%__SRC%\misc\build\freetype*\include\freetype\*.h 
%_DEST%\inc\external\freetype
+..\%__SRC%\misc\build\freetype*\include\freetype\config\*.h 
%_DEST%\inc\external\freetype\config
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - basctl/source

2011-12-10 Thread August Sodora

 basctl/source/basicide/moduldlg.cxx |  118 +++-
 1 file changed, 52 insertions(+), 66 deletions(-)

New commits:
commit 5414ac4348d8a36db39764691518b451f9ba4843
Author: August Sodora 
Date:   Sat Dec 10 18:43:58 2011 -0500

String->OUString

diff --git a/basctl/source/basicide/moduldlg.cxx 
b/basctl/source/basicide/moduldlg.cxx
index 35c6274..954f016 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -59,8 +59,6 @@ ExtBasicTreeListBox::ExtBasicTreeListBox( Window* pParent, 
const ResId& rRes )
 {
 }
 
-
-
 ExtBasicTreeListBox::~ExtBasicTreeListBox()
 {
 }
@@ -76,11 +74,11 @@ sal_Bool ExtBasicTreeListBox::EditingEntry( SvLBoxEntry* 
pEntry, Selection& )
 {
 BasicEntryDescriptor aDesc( GetEntryDescriptor( pEntry ) );
 ScriptDocument aDocument( aDesc.GetDocument() );
-::rtl::OUString aOULibName( aDesc.GetLibName() );
+::rtl::OUString aLibName( aDesc.GetLibName() );
 Reference< script::XLibraryContainer2 > xModLibContainer( 
aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
 Reference< script::XLibraryContainer2 > xDlgLibContainer( 
aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
-if ( !( ( xModLibContainer.is() && xModLibContainer->hasByName( 
aOULibName ) && xModLibContainer->isLibraryReadOnly( aOULibName ) ) ||
-( xDlgLibContainer.is() && xDlgLibContainer->hasByName( 
aOULibName ) && xDlgLibContainer->isLibraryReadOnly( aOULibName ) ) ) )
+if ( !( ( xModLibContainer.is() && xModLibContainer->hasByName( 
aLibName ) && xModLibContainer->isLibraryReadOnly( aLibName ) ) ||
+( xDlgLibContainer.is() && xDlgLibContainer->hasByName( 
aLibName ) && xDlgLibContainer->isLibraryReadOnly( aLibName ) ) ) )
 {
 // allow editing only for libraries, which are not readonly
 bRet = sal_True;
@@ -96,7 +94,7 @@ sal_Bool ExtBasicTreeListBox::EditedEntry( SvLBoxEntry* 
pEntry, const String& rN
 sal_Bool bValid = BasicIDE::IsValidSbxName( rNewText );
 if ( !bValid )
 {
-ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( 
RID_STR_BADSBXNAME ) ) ).Execute();
+ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( 
RID_STR_BADSBXNAME ) ) ).Execute();
 return sal_False;
 }
 
@@ -110,7 +108,7 @@ sal_Bool ExtBasicTreeListBox::EditedEntry( SvLBoxEntry* 
pEntry, const String& rN
 DBG_ASSERT( aDocument.isValid(), "ExtBasicTreeListBox::EditedEntry: no 
document!" );
 if ( !aDocument.isValid() )
 return sal_False;
-String aLibName( aDesc.GetLibName() );
+::rtl::OUString aLibName( aDesc.GetLibName() );
 BasicEntryType eType( aDesc.GetType() );
 
 bool bSuccess = ( eType == OBJ_TYPE_MODULE )
@@ -155,19 +153,19 @@ DragDropMode ExtBasicTreeListBox::NotifyStartDrag( 
TransferDataContainer&, SvLBo
 nMode_ = SV_DRAGDROP_CTRL_COPY;
 BasicEntryDescriptor aDesc( GetEntryDescriptor( pEntry ) );
 ScriptDocument aDocument( aDesc.GetDocument() );
-::rtl::OUString aOULibName( aDesc.GetLibName() );
+::rtl::OUString aLibName( aDesc.GetLibName() );
 // allow MOVE mode only for libraries, which are not readonly
 Reference< script::XLibraryContainer2 > xModLibContainer( 
aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
 Reference< script::XLibraryContainer2 > xDlgLibContainer( 
aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
-if ( !( ( xModLibContainer.is() && xModLibContainer->hasByName( 
aOULibName ) && xModLibContainer->isLibraryReadOnly( aOULibName ) ) ||
-( xDlgLibContainer.is() && xDlgLibContainer->hasByName( 
aOULibName ) && xDlgLibContainer->isLibraryReadOnly( aOULibName ) ) ) )
+if ( !( ( xModLibContainer.is() && xModLibContainer->hasByName( 
aLibName ) && xModLibContainer->isLibraryReadOnly( aLibName ) ) ||
+( xDlgLibContainer.is() && xDlgLibContainer->hasByName( 
aLibName ) && xDlgLibContainer->isLibraryReadOnly( aLibName ) ) ) )
 {
 // Only allow copy for localized libraries
 bool bAllowMove = true;
-if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( 
aOULibName ) )
+if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( 
aLibName ) )
 {
 // Get StringResourceManager
-Reference< container::XNameContainer > xDialogLib( 
aDocument.getLibrary( E_DIALOGS, aOULibName, sal_True ) );
+Reference< container::XNameContainer > xDialogLib( 
aDocument.getLibrary( E_DIALOGS, aLibName, sal_True ) );
 Reference< XStringResourceManager > xSourceMgr =
 LocalizationMgr::getStringResourceFromDialogLibrary( 
xDialogLib );

[Libreoffice-commits] .: basic/source

2011-12-10 Thread August Sodora

 basic/source/inc/object.hxx |   99 
 1 file changed, 99 deletions(-)

New commits:
commit 1274558accebed03b2400b5a6da90ff4e2db55c7
Author: August Sodora 
Date:   Sat Dec 10 18:51:59 2011 -0500

Remove unused header

diff --git a/basic/source/inc/object.hxx b/basic/source/inc/object.hxx
deleted file mode 100644
index bf9440c..000
--- a/basic/source/inc/object.hxx
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef _SAMPLE_OBJECT_HXX
-#define _SAMPLE_OBJECT_HXX
-
-#include 
-#include 
-#include 
-
-// 1) Properties:
-//Name  R/O
-//Value a double-value, R/W
-// 2) Methods:
-//Display   display a text
-//Squareargument * argument
-//Event call of a Basic-program
-// 3) Sub-objects:
-//a collection named "elements". The access is implemented as
-//property (for the whole object) and as method (for single
-//elements, is passed through).
-// This implementation is an example for a table controlled
-// version that can contain many elements.
-// The collection is located in COLLECTN.*, the collection's
-// objects in COLLELEM.*
-
-class SampleObject : public SbxObject
-{
-using SbxVariable::GetInfo;
-// Definition of a table entry. This is done here because
-// methods and properties can be declared private that way.
-#if defined ( ICC ) || defined ( C50 )
-public:
-#endif
-typedef void( SampleObject::*pMeth )
-( SbxVariable* pThis, SbxArray* pArgs, sal_Bool bWrite );
-#if defined ( ICC )
-private:
-#endif
-
-struct Methods {
-const char* pName;  // name of an entry
-SbxDataType eType;  // data type
-pMeth pFunc;
-short nArgs;// arguments and flags
-};
-static Methods aMethods[];  // method table
-
-// methods
-void Display( SbxVariable*, SbxArray*, sal_Bool );
-void Event( SbxVariable*, SbxArray*, sal_Bool );
-void Square( SbxVariable*, SbxArray*, sal_Bool );
-void Create( SbxVariable*, SbxArray*, sal_Bool );
-// fill infoblock
-SbxInfo* GetInfo( short nIdx );
-// Broadcaster Notification
-virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
- const SfxHint& rHint, const TypeId& rHintType );
-public:
-SampleObject( const String& );
-
-virtual SbxVariable* Find( const String&, SbxClassType );
-};
-
-
-class SampleObjectFac : public SbxFactory
-{
-public:
-virtual SbxObject* CreateObject( const String& );
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerfilter/source

2011-12-10 Thread Miklos Vajna

 writerfilter/source/dmapper/DomainMapper.cxx |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit dc78a1c44c478dc7abb25ff5cbbb7477348f0dd1
Author: Miklos Vajna 
Date:   Sun Dec 11 00:54:19 2011 +0100

dmapper: when parsing NS_ooxml::LN_CT_Spacing_lineRule, pTopContext may be 
nil

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index d2fc018..4bbba6d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1020,8 +1020,14 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 #define SINGLE_LINE_SPACING 240
 style::LineSpacing aSpacing;
 PropertyMapPtr pTopContext = m_pImpl->GetTopContext();
-PropertyMap::iterator aLineSpacingIter = 
pTopContext->find(PropertyDefinition( PROP_PARA_LINE_SPACING, true ) );
-if( aLineSpacingIter != pTopContext->end())
+bool bFound = false;
+PropertyMap::iterator aLineSpacingIter;
+if (pTopContext)
+{
+aLineSpacingIter = pTopContext->find(PropertyDefinition( 
PROP_PARA_LINE_SPACING, true ) );
+bFound = aLineSpacingIter != pTopContext->end();
+}
+if (bFound)
 {
 aLineSpacingIter->second >>= aSpacing;
 }
@@ -1053,7 +1059,8 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 else // 
NS_ooxml::LN_Value_wordprocessingml_ST_LineSpacingRule_exact
 aSpacing.Mode = style::LineSpacingMode::FIX;
 }
-pTopContext->Insert(PROP_PARA_LINE_SPACING, true, uno::makeAny( 
aSpacing ));
+if (pTopContext)
+pTopContext->Insert(PROP_PARA_LINE_SPACING, true, 
uno::makeAny( aSpacing ));
 }
 break;
 case NS_ooxml::LN_CT_Ind_start:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/source

2011-12-10 Thread August Sodora

 basic/source/comp/buffer.cxx |   32 
 basic/source/inc/buffer.hxx  |2 --
 2 files changed, 34 deletions(-)

New commits:
commit c64efb1dd5721c3ed4d4aa20b8ef6dcf42592400
Author: August Sodora 
Date:   Sat Dec 10 19:00:35 2011 -0500

Remove unused code

diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx
index 4512dbf..ca0e4b2 100644
--- a/basic/source/comp/buffer.cxx
+++ b/basic/source/comp/buffer.cxx
@@ -98,25 +98,6 @@ sal_Bool SbiBuffer::Check( sal_uInt16 n )
 return sal_True;
 }
 
-// Conditioning of the buffer onto the passed Byte limit
-
-void SbiBuffer::Align( sal_Int32 n )
-{
-if( nOff % n ) {
-sal_uInt32 nn =( ( nOff + n ) / n ) * n;
-if( nn <= UP_LIMIT )
-{
-nn = nn - nOff;
-if( Check( static_cast(nn) ) )
-{
-memset( pCur, 0, nn );
-pCur += nn;
-nOff = nOff + nn;
-}
-}
-}
-}
-
 // Patch of a Location
 
 void SbiBuffer::Patch( sal_uInt32 off, sal_uInt32 val )
@@ -233,17 +214,4 @@ sal_Bool SbiBuffer::operator +=( const String& n )
 else return sal_False;
 }
 
-sal_Bool SbiBuffer::Add( const void* p, sal_uInt16 len )
-{
-if( Check( len ) )
-{
-memcpy( pCur, p, len );
-pCur += len;
-nOff = nOff + len;
-return sal_True;
-} else return sal_False;
-}
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/buffer.hxx b/basic/source/inc/buffer.hxx
index db4d5c8..1fd36b2 100644
--- a/basic/source/inc/buffer.hxx
+++ b/basic/source/inc/buffer.hxx
@@ -47,8 +47,6 @@ public:
~SbiBuffer();
 void Patch( sal_uInt32, sal_uInt32 );
 void Chain( sal_uInt32 );
-void Align( sal_Int32 );
-sal_Bool Add( const void*, sal_uInt16 );
 sal_Bool operator += (const String&);   // save basic-string
 sal_Bool operator += (sal_Int8);// save character
 sal_Bool operator += (sal_Int16);   // save integer
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - set_soenv.in solenv/bin solenv/inc

2011-12-10 Thread Tor Lillqvist

 set_soenv.in |   11 -
 solenv/bin/deliver.pl|1 
 solenv/bin/make_installer.pl |   11 -
 solenv/bin/modules/installer/control.pm  |  174 ---
 solenv/bin/modules/installer/followme.pm |1 
 solenv/bin/modules/installer/windows/property.pm |3 
 solenv/bin/modules/installer/worker.pm   |   40 -
 solenv/inc/_tg_shl.mk|   90 ---
 solenv/inc/installationtest.mk   |4 
 solenv/inc/settings.mk   |3 
 solenv/inc/target.mk |2 
 solenv/inc/tg_java.mk|2 
 solenv/inc/tg_shl.mk |9 -
 solenv/inc/wntmsc.mk |4 
 14 files changed, 13 insertions(+), 342 deletions(-)

New commits:
commit 803d1ee787c9742eedf14681cbf61a0ae42dcb29
Author: Tor Lillqvist 
Date:   Sun Dec 11 03:37:02 2011 +0200

Drop Hamburg RE updatepack stuff that we have no clue about anyway

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 4142561..2bfdac8 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -134,8 +134,6 @@ installer::parameter::control_required_parameter();
 if (!($installer::globals::languages_defined_in_productlist)) { 
installer::languages::analyze_languagelist(); }
 installer::parameter::outputparameter();
 
-installer::control::check_updatepack();
-
 $installer::globals::build = uc($installer::globals::build);# using 
"SRC680" instead of "src680"
 
 ##
@@ -659,8 +657,7 @@ for ( my $n = 0; $n <= 
$#installer::globals::languageproducts; $n++ )
 $installer::globals::globalinfo_copied = 1;
 
 my $logminor = "";
-if ( $installer::globals::updatepack ) { $logminor = 
$installer::globals::lastminor; }
-else { $logminor = $installer::globals::minor; }
+$logminor = $installer::globals::minor;
 
 my $loglanguagestring = $$languagestringref;
 my $loglanguagestring_orig = $loglanguagestring;
@@ -690,12 +687,6 @@ for ( my $n = 0; $n <= 
$#installer::globals::languageproducts; $n++ )
 
 $installer::globals::exitlog = $loggingdir;
 
-##
-# Determining the ship location, if this is an update pack
-##
-
-if ( $installer::globals::updatepack ) { $shipinstalldir = 
installer::control::determine_ship_directory($languagestringref); }
-
 ###
 # Reading an existing msi database, to prepare update and patch
 ###
diff --git a/solenv/bin/modules/installer/control.pm 
b/solenv/bin/modules/installer/control.pm
index 72d76ef..b0824ef 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -390,180 +390,6 @@ sub check_logfile
 }
 
 #
-# Determining the ship installation directory
-#
-
-sub determine_ship_directory
-{
-my ($languagesref) = @_;
-
-if (!( $ENV{'SHIPDRIVE'} )) { installer::exiter::exit_program("ERROR: 
SHIPDRIVE must be set for updater!", "determine_ship_directory"); }
-
-my $shipdrive = $ENV{'SHIPDRIVE'};
-
-my $languagestring = $$languagesref;
-
-if (length($languagestring) > $installer::globals::max_lang_length )
-{
-my $number_of_languages = 
installer::systemactions::get_number_of_langs($languagestring);
-chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ 
.*//g"`);
-my $id = substr($shorter, 0, 8); # taking only the first 8 digits
-$languagestring = "lang_" . $number_of_languages . "_id_" . $id;
-}
-
-my $productstring = $installer::globals::product;
-my $productsubdir = "";
-
-if ( $productstring =~ /^\s*(.+?)\_\_(.+?)\s*$/ )
-{
-$productstring = $1;
-$productsubdir = $2;
-}
-
-if ( $installer::globals::languagepack ) { $productstring = $productstring 
. "_languagepack"; }
-if ( $installer::globals::helppack ) { $productstring = $productstring . 
"_helppack"; }
-if ( $installer::globals::patch ) { $productstring = $productstring . 
"_patch"; }
-
-my $destdir = $shipdrive . $installer::globals::separator . 
$installer::globals::compiler .
-$installer::globals::productextension . 
$installer::globals::separator .
-$productstring . $installer::globals::separator;
-
-if ( $productsubdir ) { $destdir = $destdir . $productsubdir . 
$installer::globals::separator; }
-
-$destdir = $destdir . $installer::globals::installertypedir . 
$installer::globals::separator .
-$

[Libreoffice-commits] .: configure.in

2011-12-10 Thread Tor Lillqvist

 configure.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 78ceb50f27a7e148088411e7c2b0bcc67749b2f4
Author: Tor Lillqvist 
Date:   Sun Dec 11 03:42:07 2011 +0200

Fix typo

diff --git a/configure.in b/configure.in
index c91c2b1..951ab60 100644
--- a/configure.in
+++ b/configure.in
@@ -1922,11 +1922,11 @@ if test "$enable_ccache" = "yes" -o \( "$enable_ccache" 
= "" -a "$enable_icecrea
 fi
 fi
 else
-AC_MSG_NOTICE([Automatic ccache detection ingored: CXX is 
pre-defined])
+AC_MSG_NOTICE([Automatic ccache detection ignored: CXX is 
pre-defined])
 CCACHE=""
 fi
 else
-AC_MSG_NOTICE([Automatic ccache detection ingored: CC is pre-defined])
+AC_MSG_NOTICE([Automatic ccache detection ignored: CC is pre-defined])
 CCACHE=""
 fi
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin

2011-12-10 Thread Tor Lillqvist

 solenv/bin/make_installer.pl |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e07efd070d22cc7c540ffda55043ab7277d46a3e
Author: Tor Lillqvist 
Date:   Sun Dec 11 03:49:42 2011 +0200

Add comment about OxygenOffice's use of XPD

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 2bfdac8..9dfe9b5 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -476,6 +476,8 @@ installer::logger::print_message( "... analyzing scpactions 
... \n" );
 my $scpactionsinproductarrayref = 
installer::setupscript::get_all_items_from_script($setupscriptref, "ScpAction");
 if ( $installer::globals::globallogging ) { 
installer::files::save_array_of_hashes($loggingdir . "productscpactions1.log", 
$scpactionsinproductarrayref); }
 
+# Note: Don't clean away XPD installer stuff before verified whether
+# OxygenOffice still uses it or not, see insesetoo_native/util/openoffice.lst
 if (( ! $allvariableshashref->{'XPDINSTALLER'} ) || ( ! 
$installer::globals::isxpdplatform ))
 {
 $scpactionsinproductarrayref = 
installer::scriptitems::remove_Xpdonly_Items($scpactionsinproductarrayref);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-12-10 Thread Lionel Elie Mamane

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 76fac398dd71364302a261a18d8015fd250543cd
Author: Korrawit Pruegsanusak 
Date:   Sat Dec 3 22:13:29 2011 +0700

--with-theme is without trailing s

Signed-off-by: Lionel Elie Mamane 

diff --git a/configure.in b/configure.in
index 951ab60..26e2fd8 100644
--- a/configure.in
+++ b/configure.in
@@ -8039,7 +8039,7 @@ WITH_THEMES=""
 for theme in $with_theme; do
 case $theme in
 default|crystal|hicontrast|oxygen|tango) : ;;
-*) AC_MSG_ERROR([Unknown value for --with-themes: $theme]) ;;
+*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
 esac
 WITH_THEMES="$WITH_THEMES $theme"
 SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[[:lower:]]' '[[:upper:]]'`"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basic/source

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Libreoffice-commits] .: sc/source

[Libreoffice-commits] .: 3 commits - basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: 3 commits - cairo/cairo solenv/gdb sw/source

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - cairo/cairo solenv/gdb

[Libreoffice-commits] .: 3 commits - basctl/source crashrep/source desktop/util desktop/win32 desktop/WinResTarget_sbase.mk desktop/WinResTarget_scalc.mk desktop/WinResTarget_sdraw.mk desktop/WinResTa

[Libreoffice-commits] .: configure.in fontconfig/fontconfig-2.8.0.patch fontconfig/makefile.mk fontconfig/prj freetype/freetype-2.4.8.patch freetype/makefile.mk freetype/prj ooo.lst.in vcl/prj

[Libreoffice-commits] .: 2 commits - basctl/source

[Libreoffice-commits] .: 2 commits - freetype/prj vcl/Module_vcl.mk

[Libreoffice-commits] .: 2 commits - basctl/source

[Libreoffice-commits] .: basic/source

[Libreoffice-commits] .: writerfilter/source

[Libreoffice-commits] .: basic/source

[Libreoffice-commits] .: 4 commits - set_soenv.in solenv/bin solenv/inc

[Libreoffice-commits] .: configure.in

[Libreoffice-commits] .: solenv/bin

[Libreoffice-commits] .: configure.in

20 matches

Site Navigation

Mail list logo

Footer information