From e89d148fdacbc8ed5aa0f61471ec52fbea218cfe Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Tue, 19 Apr 2011 14:38:09 -0400 Subject: Fixed indentation mis-match. --- sc/source/ui/docshell/docsh5.cxx | 60 ++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 368a1f39edd3..1bd3bfecbd53 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -924,37 +924,37 @@ sal_Bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bCopy, s } sal_Bool bVbaEnabled = aDocument.IsInVBAMode(); - if ( bVbaEnabled ) - { - String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) ); - Reference< XLibraryContainer > xLibContainer = GetBasicContainer(); - Reference< XVBACompatibility > xVBACompat( xLibContainer, UNO_QUERY ); - - if ( xVBACompat.is() ) - { - aLibName = xVBACompat->getProjectName(); - } - - SCTAB nTabToUse = nDestTab; - if ( nDestTab == SC_TAB_APPEND ) - nTabToUse = aDocument.GetMaxTableNumber() - 1; - String sCodeName; - String sSource; - Reference< XNameContainer > xLib; - if( xLibContainer.is() ) - { - com::sun::star::uno::Any aLibAny = xLibContainer->getByName( aLibName ); - aLibAny >>= xLib; - } - if( xLib.is() ) - { - rtl::OUString sRTLSource; - xLib->getByName( sSrcCodeName ) >>= sRTLSource; - sSource = sRTLSource; - } - VBA_InsertModule( aDocument, nTabToUse, sCodeName, sSource ); - } + if ( bVbaEnabled ) + { + String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) ); + Reference< XLibraryContainer > xLibContainer = GetBasicContainer(); + Reference< XVBACompatibility > xVBACompat( xLibContainer, UNO_QUERY ); + + if ( xVBACompat.is() ) + { + aLibName = xVBACompat->getProjectName(); + } + + SCTAB nTabToUse = nDestTab; + if ( nDestTab == SC_TAB_APPEND ) + nTabToUse = aDocument.GetMaxTableNumber() - 1; + String sCodeName; + String sSource; + Reference< XNameContainer > xLib; + if( xLibContainer.is() ) + { + com::sun::star::uno::Any aLibAny = xLibContainer->getByName( aLibName ); + aLibAny >>= xLib; + } + if( xLib.is() ) + { + rtl::OUString sRTLSource; + xLib->getByName( sSrcCodeName ) >>= sRTLSource; + sSource = sRTLSource; } + VBA_InsertModule( aDocument, nTabToUse, sCodeName, sSource ); + } + } Broadcast( ScTablesHint( SC_TAB_COPIED, nSrcTab, nDestTab ) ); } else -- cgit v1.2.3 From 17c9b3e6f1c5360a8c9764e29061876a41ac15a2 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Tue, 19 Apr 2011 15:28:02 -0400 Subject: fdo#33341: Copy print ranges when copying sheet. --- sc/inc/table.hxx | 2 ++ sc/source/core/data/documen2.cxx | 3 +++ sc/source/core/data/table1.cxx | 44 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 5e22e5b1c9b8..26cb8a846263 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -912,6 +912,8 @@ private: */ void MaybeAddExtraColumn(SCCOL& rCol, SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY); + void CopyPrintRange(const ScTable& rTable); + /** * Use this to iterate through non-empty visible cells in a single column. */ diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index c9db6e5b428b..2188a458a855 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -904,6 +904,9 @@ sal_Bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pO pTab[nNewPos]->SetPageStyle( pTab[nOldPos]->GetPageStyle() ); pTab[nNewPos]->SetPendingRowHeights( pTab[nOldPos]->IsPendingRowHeights() ); + + // Copy the custom print range if exists. + pTab[nNewPos]->CopyPrintRange(*pTab[nOldPos]); } else SetAutoCalc( bOldAutoCalc ); diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 583dc3f1d086..290e2dc3e144 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -1627,6 +1627,50 @@ void ScTable::MaybeAddExtraColumn(SCCOL& rCol, SCROW nRow, OutputDevice* pDev, d rCol = nNewCol; } +namespace { + +class SetTableIndex : public ::std::unary_function +{ + SCTAB mnTab; +public: + SetTableIndex(SCTAB nTab) : mnTab(nTab) {} + + void operator() (ScRange& rRange) const + { + rRange.aStart.SetTab(mnTab); + rRange.aEnd.SetTab(mnTab); + } +}; + +} + +void ScTable::CopyPrintRange(const ScTable& rTable) +{ + // The table index shouldn't be used when the print range is used, but + // just in case set the correct table index. + + aPrintRanges = rTable.aPrintRanges; + ::std::for_each(aPrintRanges.begin(), aPrintRanges.end(), SetTableIndex(nTab)); + + bPrintEntireSheet = rTable.bPrintEntireSheet; + + delete pRepeatColRange; + if (rTable.pRepeatColRange) + { + pRepeatColRange = new ScRange(*rTable.pRepeatColRange); + pRepeatColRange->aStart.SetTab(nTab); + pRepeatColRange->aEnd.SetTab(nTab); + } + + delete pRepeatRowRange; + if (rTable.pRepeatRowRange) + { + pRepeatRowRange = new ScRange(*rTable.pRepeatRowRange); + pRepeatRowRange->aStart.SetTab(nTab); + pRepeatRowRange->aEnd.SetTab(nTab); + } +} + void ScTable::DoColResize( SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd ) { for (SCCOL nCol=nCol1; nCol<=nCol2; nCol++) -- cgit v1.2.3 From 5df4ea0137b7f843c835a94cd82bceb8fd59ecc9 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Tue, 19 Apr 2011 16:35:13 -0400 Subject: Don't forget to NULL the pointer after deleting the instance. --- sc/source/core/data/table1.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 290e2dc3e144..d4c194676471 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -1655,6 +1655,7 @@ void ScTable::CopyPrintRange(const ScTable& rTable) bPrintEntireSheet = rTable.bPrintEntireSheet; delete pRepeatColRange; + pRepeatColRange = NULL; if (rTable.pRepeatColRange) { pRepeatColRange = new ScRange(*rTable.pRepeatColRange); @@ -1663,6 +1664,7 @@ void ScTable::CopyPrintRange(const ScTable& rTable) } delete pRepeatRowRange; + pRepeatRowRange = NULL; if (rTable.pRepeatRowRange) { pRepeatRowRange = new ScRange(*rTable.pRepeatRowRange); -- cgit v1.2.3 From a7f85daf7a06dc86c676f2094e40fffe3931cfca Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Wed, 20 Apr 2011 00:13:42 -0400 Subject: fdo#36365: Watch out for NULL pointer de-referencing. This causes print preview to crash under certain circumstances. --- sc/source/ui/view/output.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index b1143ced0b10..b69f2ace659a 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -1222,6 +1222,9 @@ void ScOutputData::DrawFrame() // draw only rows with set RowInfo::bChanged flag size_t nRow1 = nFirstRow; drawinglayer::processor2d::BaseProcessor2D* pProcessor = CreateProcessor2D(); + if (!pProcessor) + return; + while( nRow1 <= nLastRow ) { while( (nRow1 <= nLastRow) && !pRowInfo[ nRow1 ].bChanged ) ++nRow1; @@ -1631,9 +1634,12 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) drawinglayer::processor2d::BaseProcessor2D* ScOutputData::CreateProcessor2D( ) { - basegfx::B2DRange aViewRange; + ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer(); + if (!pDrawLayer) + return NULL; - SdrPage *pDrawPage = pDoc->GetDrawLayer()->GetPage( static_cast< sal_uInt16 >( nTab ) ); + basegfx::B2DRange aViewRange; + SdrPage *pDrawPage = pDrawLayer->GetPage( static_cast< sal_uInt16 >( nTab ) ); const drawinglayer::geometry::ViewInformation2D aNewViewInfos( basegfx::B2DHomMatrix( ), pDev->GetViewTransformation(), -- cgit v1.2.3 From b8502c8251b0760f1bf03c968974f1fe3f288ae2 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Wed, 20 Apr 2011 00:40:52 -0400 Subject: fdo#36288: Fixed a crasher on Base. The return type was probably unintentionally converted to sal_Int16 from sal_uInt16, and it didn't check for "column not found" condition. --- svx/source/fmcomp/gridctrl.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index e6b050024d1d..580fa90f7b1c 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -1722,7 +1722,10 @@ sal_uInt16 DbGridControl::AppendColumn(const XubString& rName, sal_uInt16 nWidth //------------------------------------------------------------------------------ void DbGridControl::RemoveColumn(sal_uInt16 nId) { - sal_Int16 nIndex = GetModelColumnPos(nId); + sal_uInt16 nIndex = GetModelColumnPos(nId); + if (nIndex == GRID_COLUMN_NOT_FOUND) + return; + DbGridControl_Base::RemoveColumn(nId); delete m_aColumns[ nIndex ]; @@ -1737,7 +1740,7 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId) DbGridControl_Base::ColumnMoved(nId); // remove the col from the model - sal_Int16 nOldModelPos = GetModelColumnPos(nId); + sal_uInt16 nOldModelPos = GetModelColumnPos(nId); #ifdef DBG_UTIL DbGridColumn* pCol = m_aColumns[ (sal_uInt32)nOldModelPos ]; DBG_ASSERT(!pCol->IsHidden(), "DbGridControl::ColumnMoved : moved a hidden col ? how this ?"); -- cgit v1.2.3 From f433a86839499662cfc1356882b0538f01d850b6 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Tue, 19 Apr 2011 14:34:20 +0100 Subject: some docx field import/export tweaks import/export ( USERNAME / USERINITIALS ) - supported now and alligned with binary import import/export ( AUTHOR / DocumentProperty.Author ) - AUTHOR is now imported as DocumentInfo.Created, DocProperty.Author is imported as a custom property, DocumentInfo.Created is exported as AUTHOR fix docx export of COMMENTS fix docx import of CREATEDATE, fix docx import of DocProperty.CreateTime fix docx import of DocProperty.LastSavedTime fix docx import of DocProperty.TotalEditingTime ( format still not right ) --- writerfilter/source/dmapper/DomainMapper_Impl.cxx | 87 ++++++++++++++--------- writerfilter/source/dmapper/DomainMapper_Impl.hxx | 3 +- 2 files changed, 54 insertions(+), 36 deletions(-) diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 49237d08cf79..57bbba26fcac 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1642,15 +1642,16 @@ void DomainMapper_Impl::SetNumberFormat( const ::rtl::OUString& rCommand, lang::Locale aCurrentLocale = aUSLocale; GetCurrentLocale( aCurrentLocale ); ::rtl::OUString sFormat = ConversionHelper::ConvertMSFormatStringToSO( sFormatString, aCurrentLocale, bHijri); - //get the number formatter and convert the string to a format value try { uno::Reference< util::XNumberFormatsSupplier > xNumberSupplier( m_xTextDocument, uno::UNO_QUERY_THROW ); - long nKey = xNumberSupplier->getNumberFormats()->addNewConverted( sFormat, aUSLocale, aCurrentLocale ); + sal_Int32 nKey = xNumberSupplier->getNumberFormats()->addNewConverted( sFormat, aUSLocale, aCurrentLocale ); xPropertySet->setPropertyValue( PropertyNameSupplier::GetPropertyNameSupplier().GetName(PROP_NUMBER_FORMAT), uno::makeAny( nKey )); + xPropertySet->getPropertyValue( + PropertyNameSupplier::GetPropertyNameSupplier().GetName(PROP_NUMBER_FORMAT ) ) >>= nKey; } catch(const uno::Exception&) { @@ -1844,7 +1845,7 @@ if(!bFilled) {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTONUM")), "SetExpression", "SetExpression", FIELD_AUTONUM }, {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTONUMLGL")), "SetExpression", "SetExpression", FIELD_AUTONUMLGL }, {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTONUMOUT")), "SetExpression", "SetExpression", FIELD_AUTONUMOUT }, - {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTHOR")), "Author", "", FIELD_AUTHOR }, + {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTHOR")), "DocInfo.CreateAuthor", "", FIELD_AUTHOR }, {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE")), "DateTime", "", FIELD_DATE }, {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COMMENTS")), "DocInfo.Description", "", FIELD_COMMENTS }, {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATEDATE")), "DocInfo.CreateDateTime", "", FIELD_CREATEDATE }, @@ -1886,9 +1887,11 @@ if(!bFilled) {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TEMPLATE")), "TemplateName", "", FIELD_TEMPLATE}, {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME")), "DateTime", "", FIELD_TIME }, {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TITLE")), "DocInfo.Title", "", FIELD_TITLE }, - {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("USERINITIALS")), "ExtendedUser", "", FIELD_USERINITIALS}, + {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("USERINITIALS")), "Author", "", FIELD_USERINITIALS }, // {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("USERADDRESS")), "", "", FIELD_USERADDRESS }, -// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("USERNAME")), "ExtendedUser", "", FIELD_USERNAME } + {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("USERNAME")), "Author", "", FIELD_USERNAME }, + + {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TOC")), "com.sun.star.text.ContentIndex", "", FIELD_TOC}, {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TC")), "com.sun.star.text.ContentIndexMark", "", FIELD_TC}, {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUMCHARS")), "CharacterCount", "", FIELD_NUMCHARS}, @@ -2006,12 +2009,25 @@ void DomainMapper_Impl::handleAuthor (FieldContextPtr pContext, PropertyNameSupplier& rPropNameSupplier, uno::Reference< uno::XInterface > & /*xFieldInterface*/, - uno::Reference< beans::XPropertySet > xFieldProperties) + uno::Reference< beans::XPropertySet > xFieldProperties, + FieldId eFieldId ) { - xFieldProperties->setPropertyValue - ( rPropNameSupplier.GetName(PROP_FULL_NAME), uno::makeAny( true )); + if ( eFieldId != FIELD_USERINITIALS ) + xFieldProperties->setPropertyValue + ( rPropNameSupplier.GetName(PROP_FULL_NAME), uno::makeAny( true )); + + sal_Int32 nLen = sizeof( " AUTHOR" ); + if ( eFieldId != FIELD_AUTHOR ) + { + if ( eFieldId == FIELD_USERINITIALS ) + nLen = sizeof( " USERINITIALS" ); + else if ( eFieldId == FIELD_USERNAME ) + nLen = sizeof( " USERNAME" ); + } + ::rtl::OUString sParam = - lcl_ExtractParameter(pContext->GetCommand(), sizeof(" AUTHOR") ); + lcl_ExtractParameter(pContext->GetCommand(), nLen ); + if(sParam.getLength()) { xFieldProperties->setPropertyValue( @@ -2036,6 +2052,7 @@ void DomainMapper_Impl::handleAuthor { #define SET_ARABIC 0x01 #define SET_FULL_NAME 0x02 + #define SET_DATE 0x04 struct DocPropertyMap { const sal_Char* pDocPropertyName; @@ -2044,20 +2061,19 @@ void DomainMapper_Impl::handleAuthor }; static const DocPropertyMap aDocProperties[] = { - {"Author", "Author", SET_FULL_NAME}, - {"CreateTime", "DocInfo.CreateDateTime", 0}, + {"CreateTime", "DocInfo.CreateDateTime", SET_DATE}, {"Characters", "CharacterCount", SET_ARABIC}, {"Comments", "DocInfo.Description", 0}, {"Keywords", "DocInfo.KeyWords", 0}, {"LastPrinted", "DocInfo.PrintDateTime", 0}, {"LastSavedBy", "DocInfo.ChangeAuthor", 0}, - {"LastSavedTime", "DocInfo.ChangeDateTime", 0}, + {"LastSavedTime", "DocInfo.ChangeDateTime", SET_DATE}, {"Paragraphs", "ParagraphCount", SET_ARABIC}, {"RevisionNumber", "DocInfo.Revision", 0}, {"Subject", "DocInfo.Subject", 0}, {"Template", "TemplateName", 0}, {"Title", "DocInfo.Title", 0}, - {"TotalEditingTime", "DocInfo.EditTime", 9}, + {"TotalEditingTime", "DocInfo.EditTime", 0}, {"Words", "WordCount", SET_ARABIC} //other available DocProperties: @@ -2111,11 +2127,19 @@ void DomainMapper_Impl::handleAuthor xFieldProperties->setPropertyValue( rPropNameSupplier.GetName(PROP_FULL_NAME), uno::makeAny( true )); + else if(0 != (aDocProperties[nMap].nFlags & SET_DATE)) + { + xFieldProperties->setPropertyValue( + rPropNameSupplier.GetName(PROP_IS_DATE), + uno::makeAny( true )); + SetNumberFormat( pContext->GetCommand(), xFieldProperties ); + } } } #undef SET_ARABIC #undef SET_FULL_NAME +#undef SET_DATE } void DomainMapper_Impl::handleToc @@ -2432,7 +2456,9 @@ void DomainMapper_Impl::CloseFieldCommand() handleAutoNum(pContext, rPropNameSupplier, xFieldInterface, xFieldProperties); break; case FIELD_AUTHOR : - handleAuthor(pContext, rPropNameSupplier, xFieldInterface, xFieldProperties); + case FIELD_USERNAME : + case FIELD_USERINITIALS : + handleAuthor(pContext, rPropNameSupplier, xFieldInterface, xFieldProperties, aIt->second.eFieldId ); break; case FIELD_DATE: { @@ -2449,16 +2475,23 @@ void DomainMapper_Impl::CloseFieldCommand() case FIELD_COMMENTS : { ::rtl::OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" COMMENTS") ); - if(sParam.getLength()) - { - xFieldProperties->setPropertyValue( - rPropNameSupplier.GetName( PROP_IS_FIXED ), uno::makeAny( true )); + // A parameter with COMMENTS shouldn't set fixed + // ( or at least the binary filter doesn't ) + // If we set fixed then we wont export a field cmd. + // Additionally the para in COMMENTS is more like an + // instruction to set the document property comments + // with the param ( e.g. each COMMENT with a param will + // overwrite the Comments document property + // #TODO implement the above too + xFieldProperties->setPropertyValue( + rPropNameSupplier.GetName( PROP_IS_FIXED ), uno::makeAny( false )); //PROP_CURRENT_PRESENTATION is set later anyway - } } break; case FIELD_CREATEDATE : { + xFieldProperties->setPropertyValue( + rPropNameSupplier.GetName( PROP_IS_DATE ), uno::makeAny( true )); SetNumberFormat( pContext->GetCommand(), xFieldProperties ); } break; @@ -2694,24 +2727,8 @@ void DomainMapper_Impl::CloseFieldCommand() } } break; - case FIELD_USERINITIALS: - { - xFieldProperties->setPropertyValue( - rPropNameSupplier.GetName(PROP_USER_DATA_TYPE), uno::makeAny( text::UserDataPart::SHORTCUT )); - //todo: if initials are provided - set them as fixed content - ::rtl::OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" USERINITIALS") ); - if(sParam.getLength()) - { - xFieldProperties->setPropertyValue( - rPropNameSupplier.GetName( PROP_IS_FIXED ), uno::makeAny( true )); - //PROP_CURRENT_PRESENTATION is set later anyway - } - } - break; case FIELD_USERADDRESS : //todo: user address collects street, city ... break; - case FIELD_USERNAME : //todo: user name is firstname + lastname - break; case FIELD_TOC: handleToc(pContext, rPropNameSupplier, xFieldInterface, xFieldProperties, ::rtl::OUString::createFromAscii(aIt->second.cFieldServiceName)); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 80b05960ab83..60ccc230b43d 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -510,7 +510,8 @@ public: (FieldContextPtr pContext, PropertyNameSupplier& rPropNameSupplier, uno::Reference< uno::XInterface > & xFieldInterface, - uno::Reference< beans::XPropertySet > xFieldProperties); + uno::Reference< beans::XPropertySet > xFieldProperties, + FieldId eFieldId); void handleDocProperty (FieldContextPtr pContext, PropertyNameSupplier& rPropNameSupplier, -- cgit v1.2.3 From ed68bd23c0542e4e34fe51eb9854b7772d7b2cfe Mon Sep 17 00:00:00 2001 From: Noel Power Date: Tue, 19 Apr 2011 14:35:52 +0100 Subject: some docx field import/export tweaks import/export ( USERNAME / USERINITIALS ) - supported now and alligned with binary import import/export ( AUTHOR / DocumentProperty.Author ) - AUTHOR is now imported as DocumentInfo.Created, DocProperty.Author is imported as a custom property, DocumentInfo.Created is exported as AUTHOR fix docx export of COMMENTS fix docx import of CREATEDATE, fix docx import of DocProperty.CreateTime fix docx import of DocProperty.LastSavedTime fix docx import of DocProperty.TotalEditingTime ( format still not right ) --- sw/source/filter/ww8/ww8atr.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 9a51005d08b7..9448cca6b6e8 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -2629,7 +2629,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField ) case RES_AUTHORFLD: { ww::eField eFld = - (AF_SHORTCUT & nSubType ? ww::eUSERINITIALS : ww::eUSERNAME); + (AF_SHORTCUT & pFld->GetFormat() ? ww::eUSERINITIALS : ww::eUSERNAME); GetExport().OutputField(pFld, eFld, FieldString(eFld)); } break; -- cgit v1.2.3 From eed8e0b62e6c8b2c973df38acb4a454be58e3cc4 Mon Sep 17 00:00:00 2001 From: Hanno Meyer-Thurow Date: Wed, 20 Apr 2011 15:30:08 +0200 Subject: make the installation dir better configurable install to %libdir% intead of %prefix% as it is usual for other projects; use the usual DESTDIR instead of OODESTDIR Note that the default installation path is /usr/local/lib/libreoffice; it can be redefined by --prefix, --libdir, --with-install-dirname configure options Some of these changes contributed by Petr Mladek --- Makefile.in | 10 +++++++--- configure.in | 22 ++++++++++++++++++++++ solenv/bin/ooinstall | 6 +++--- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 54e93cfae54b..37c138982756 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,6 +8,10 @@ else GBUILD_OPT:=--gmake endif +prefix = @prefix@ +exec_prefix = @exec_prefix@ +libdir = @libdir@ + all: Makefile dmake/dmake@EXEEXT@ src.downloaded @. ./*[Ee]nv.[Ss]et.sh && \ @@ -16,11 +20,11 @@ all: Makefile dmake/dmake@EXEEXT@ src.downloaded install: @. ./*[Ee]nv.[Ss]et.sh && \ - echo "Installing in $${prefix:-@prefix@}..." && \ - ooinstall "$${prefix:-@prefix@}" && \ + echo "Installing in $${libdir:-@libdir@}/@INSTALL_DIRNAME@..." && \ + ooinstall "$${libdir:-@libdir@}/@INSTALL_DIRNAME@" && \ echo "" && \ echo "Installation finished, you can now execute:" && \ - echo "$${prefix:-@prefix@}/program/soffice" + echo "$${libdir:-@libdir@}/@INSTALL_DIRNAME@/program/soffice" dev-install: @. ./*[Ee]nv.[Ss]et.sh && \ diff --git a/configure.in b/configure.in index 18de3ffa733b..8cbcd74888ee 100755 --- a/configure.in +++ b/configure.in @@ -1207,6 +1207,20 @@ AC_ARG_WITH(vendor, ], ,) +AC_ARG_WITH(install-dirname, + AS_HELP_STRING([--with-install-dirname], + [Specify the directory name of the core LibO install dir. The final + installation path is defined by /. + The default value is "libreoffice" and the default installation + patch is /usr/lib/libreoffice. + + FIXME: It affects only the installation by "make install" and not the + generated installation sets.]) + [ + Usage: --with-install-dirname=lo-3.4.2 + ], +,) + AC_ARG_WITH(unix-wrapper, AS_HELP_STRING([--with-unix-wrapper], [Redefines the name of the UNIX wrapper that will be used in the desktop @@ -7817,6 +7831,14 @@ else fi AC_SUBST(UNIXWRAPPERNAME) +INSTALL_DIRNAME=libreoffice +AC_MSG_CHECKING([for install dirname]) +if test -n "$with_install_dirname" -a "$with_install_dirname" != "no" -a "$with_install_dirname" != "yes" ; then + INSTALL_DIRNAME="$with_install_dirname" +fi +AC_MSG_RESULT([$INSTALL_DIRNAME]) +AC_SUBST(INSTALL_DIRNAME) + AC_MSG_CHECKING([whether to statically link to Gtk]) if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then ENABLE_STATIC_GTK="TRUE" diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index 2a2d2ad2c91e..83717fa68e1e 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -67,9 +67,9 @@ my @larr = grep { $_ ne '' } split(/ /, $langs); $langs = join (",", @larr); $destdir=''; -if ( defined $ENV{OODESTDIR} && - $ENV{OODESTDIR} ne "" ) { - $destdir = "-destdir \"$ENV{OODESTDIR}\""; +if ( defined $ENV{DESTDIR} && + $ENV{DESTDIR} ne "" ) { + $destdir = "-destdir \"$ENV{DESTDIR}\""; } $strip=''; -- cgit v1.2.3 From 75c72d86b7de4cfa69a08e12cffd86ede1f35e78 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Wed, 20 Apr 2011 16:14:29 +0200 Subject: don't link soffice.bin and stuff back into src tree This is 7e585ded0f1cce41fd3dec6146526d07783d2d38 again, removed in 981e63a40a5918135f3547c849394a36f8012af9, probably by mistake. With the linking it's possible that soffice.bin becomes the wrapper script that ends up calling itself recursively. --- solenv/bin/linkoo | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index 7c96b6a01b3b..19921b236941 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -332,21 +332,6 @@ sub link_pagein_files() print "\n"; } -# link installed files back into src tree: -sub link_soffice_bin_files() -{ - my $dest; - my $src = "$OOO_INSTALL/" . $brand_program_dir; - - print "soffice files"; - $dest = "$OOO_BUILD/desktop/$TARGET/bin"; - do_link ($src, $dest, 'soffice', 'soffice.bin', 1); - do_link ($src, $dest, 'bootstraprc', 'bootstraprc', 1); - do_link ("$OOO_INSTALL", "$OOO_BUILD/desktop/$TARGET", 'share', 'share', 1); - - print "\n"; -} - for my $a (@ARGV) { # options @@ -394,7 +379,6 @@ link_iso_res(); link_types_rdb(); link_oovbaapi_rdb(); link_pagein_files(); -link_soffice_bin_files(); if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") { my $ooenv; -- cgit v1.2.3 From e85640d0bb44fba44ed167c9f37f641ab81bd5ab Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sat, 16 Apr 2011 21:56:39 +0200 Subject: do not ship Letter Wizard templates twice fdo#35722 --- scp2/source/ooo/file_extra_ooo.scp | 6 ------ scp2/source/ooo/module_hidden_ooo.scp | 11 ----------- scp2/source/ooo/module_lang_template.scp | 1 - 3 files changed, 18 deletions(-) diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 03458fc48fbe..7cf102c91cd8 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -375,12 +375,6 @@ File gid_File_Extra_Tplwizletter Name = "tplwizletter.zip"; End -File gid_File_Extra_Tplwizletter_Lang - Dir = gid_Dir_Template_Wizard_Letter; - ARCHIVE_TXT_FILE_BODY; - EXTRA_ALL_LANG(tplwizletter,zip); -End - File gid_File_Extra_Tplwizfax_Lang Dir = gid_Dir_Template_Wizard_Fax; TXT_FILE_BODY; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index e6a3ba7f9ded..c27d21d2ea2d 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -512,17 +512,6 @@ Module gid_Module_Root_Files_6 gid_File_Extra_Tpllayoutimpr, gid_File_Extra_Tplwizbitmap, gid_File_Extra_Tplwizletter, - gid_File_Extra_Tplwizletter_en_US, - gid_File_Extra_Tplwizletter_de, - gid_File_Extra_Tplwizletter_fr, - gid_File_Extra_Tplwizletter_es, - gid_File_Extra_Tplwizletter_it, - gid_File_Extra_Tplwizletter_pt_BR, - gid_File_Extra_Tplwizletter_sv, - gid_File_Extra_Tplwizletter_ja, - gid_File_Extra_Tplwizletter_ko, - gid_File_Extra_Tplwizletter_zh_CN, - gid_File_Extra_Tplwizletter_zh_TW, gid_File_Extra_Tplwizmemo_Lang, gid_File_Extra_Autotextuser_Lang, gid_File_Extra_Dir_Fonts, diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index 8c24b6d9482d..6825ed26b81e 100644 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -35,7 +35,6 @@ Module gid_Module_Langpack_Basis_Template gid_File_Extra_Tplwizagenda_Lang, gid_File_Extra_Tplwizdesktop_Lang, gid_File_Extra_Tplwizfax_Lang, - gid_File_Extra_Tplwizletter_Lang, gid_File_Extra_Tplwizreport_Lang, gid_File_Extra_Tplwizstyles_Lang, gid_File_Extra_Wordbook, -- cgit v1.2.3 From 0be571d9a673ab48fc7d3a94541c5720e0845016 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sat, 16 Apr 2011 21:58:56 +0200 Subject: do not ship Letter Wizard templates twice fdo#35722 --- .../wizards/letter/LetterWizardDialogImpl.java | 54 +--------------------- 1 file changed, 1 insertion(+), 53 deletions(-) diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java index 295d900bdec6..482e4a82c07d 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java @@ -1116,14 +1116,6 @@ public class LetterWizardDialogImpl extends LetterWizardDialog { "", "" }; - String[] nameList1 = - { - "", "" - }; - String[] nameList1b = - { - "", "" - }; String[] nameList2 = { "", "" @@ -1146,47 +1138,13 @@ public class LetterWizardDialogImpl extends LetterWizardDialog sMainPath = FileAccess.deleteLastSlashfromUrl(sMainPath); sLetterPath = sMainPath + sLetterSubPath; - //sLetterLangPackPath = FileAccess.combinePaths(xMSF, sTemplatePath, sLetterSubPath); XInterface xInterface = (XInterface) xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess"); com.sun.star.ucb.XSimpleFileAccess xSimpleFileAccess = (com.sun.star.ucb.XSimpleFileAccess) UnoRuntime.queryInterface(com.sun.star.ucb.XSimpleFileAccess.class, xInterface); - nameList1 = xSimpleFileAccess.getFolderContents(sMainPath, true); nameList2 = xSimpleFileAccess.getFolderContents(sLetterPath, true); - for (int i = 0; i < nameList1.length; i++) - { - String theFileName = FileAccess.getFilename(nameList1[i]); - if (!theFileName.equalsIgnoreCase("wizard")) - { - sLocLetterPath = FileAccess.deleteLastSlashfromUrl(nameList1[i] + sLetterSubPath); - try - { - nameList1b = xSimpleFileAccess.getFolderContents(sLocLetterPath, true); - for (int j = 0; j < nameList1b.length; j++) - { - String theFileNameb = FileAccess.getFilename(nameList1b[j]); - allPaths.add(nameList1[i] + sLetterSubPath + theFileNameb); - } - } - catch (Exception e) - { - //if the path is invalid an exception is thrown - try the fallback below then - } - } - } for (int i = 0; i < nameList2.length; i++) { - boolean found = false; - for (int t = 0; t < nameList1.length; t++) - { - if (FileAccess.getFilename(nameList2[i]).equalsIgnoreCase(FileAccess.getFilename(nameList1[t]))) - { - found = true; - } - } - if (!found) - { - allPaths.add(nameList2[i]); - } + allPaths.add(nameList2[i]); } nameList = allPaths.toArray(); @@ -1248,12 +1206,6 @@ public class LetterWizardDialogImpl extends LetterWizardDialog NormsVector.add(cIsoCode); NormsPathVector.add((String) nameList[i]); LanguageLabelsVector.add(lc.getLanguageString(MSID)); - /* - Norms[z] = cIsoCode; - NormPaths[z] = (String) nameList[i]; - LanguageLabels[z] = lc.getLanguageString(MSID); - z++; - **/ } } @@ -1267,10 +1219,6 @@ public class LetterWizardDialogImpl extends LetterWizardDialog LanguageLabels = new String[LanguageLabelsVector.size()]; LanguageLabelsVector.toArray(LanguageLabels); - //Norms = new String[nameList.length]; - //NormPaths = new String[nameList.length]; - //LanguageLabels = new String[Norms.length]; - setControlProperty("lstLetterNorm", "StringItemList", LanguageLabels); } -- cgit v1.2.3 From 14d735f714a9ec86e9cd3b1011f8c9915cbee6e6 Mon Sep 17 00:00:00 2001 From: Robert Dargaud Date: Wed, 20 Apr 2011 00:14:25 +0200 Subject: fix fdo#36399 - ScrollBar display bug on dialog boxes --- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 553ec6c85e0f..8d9f37a431cf 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -987,7 +987,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1; if (!rNativeContentRegion.GetHeight()) rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1; - + returnVal = sal_True; } if( (nType == CTRL_MENUBAR) && (nPart == PART_ENTIRE_CONTROL) ) { -- cgit v1.2.3 From e60843d62d0a9b38b2f74bee34c898bdecd2730c Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Wed, 20 Apr 2011 16:42:09 +0200 Subject: set default install dirname from AC_PACKAGE_NAME idea by Hanno Meyer-Thurow --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 8cbcd74888ee..64f88ec4f5c5 100755 --- a/configure.in +++ b/configure.in @@ -7831,7 +7831,7 @@ else fi AC_SUBST(UNIXWRAPPERNAME) -INSTALL_DIRNAME=libreoffice +INSTALL_DIRNAME=`echo AC_PACKAGE_NAME | tr [[:upper:]] [[:lower:]]` AC_MSG_CHECKING([for install dirname]) if test -n "$with_install_dirname" -a "$with_install_dirname" != "no" -a "$with_install_dirname" != "yes" ; then INSTALL_DIRNAME="$with_install_dirname" -- cgit v1.2.3 From bef3653901375b732ea094c7746cbe0a3b4a9293 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 14 Apr 2011 19:41:41 +0200 Subject: Only accelerators in Edit popup on Windows and KDE The new style setting AcceleratorsInContextMenus defaults to True and is disabled for GNOME and OSX. Fixes: fdo#36239 --- vcl/aqua/source/window/salframe.cxx | 1 + vcl/inc/vcl/settings.hxx | 5 +++++ vcl/source/app/settings.cxx | 3 +++ vcl/source/control/edit.cxx | 18 +++++++++++------- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 1 + 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 9c136fba262e..afe6ee6d0130 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -1320,6 +1320,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings ) // images in menus false for MacOSX aStyleSettings.SetPreferredUseImagesInMenus( false ); + aStyleSettings.SetAcceleratorsInContextMenus( sal_False ); rSettings.SetStyleSettings( aStyleSettings ); diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx index cc5b44169ff6..c35815506b98 100644 --- a/vcl/inc/vcl/settings.hxx +++ b/vcl/inc/vcl/settings.hxx @@ -434,6 +434,7 @@ private: sal_uLong mnSymbolsStyle; sal_uLong mnPreferredSymbolsStyle; sal_uInt16 mnSkipDisabledInMenus; + sal_Bool mnAcceleratorsInContextMenus; Wallpaper maWorkspaceGradient; const void* mpFontOptions; }; @@ -735,6 +736,10 @@ public: { CopyData(); mpData->mnSkipDisabledInMenus = bSkipDisabledInMenus; } sal_Bool GetSkipDisabledInMenus() const { return (sal_Bool) mpData->mnSkipDisabledInMenus; } + void SetAcceleratorsInContextMenus( sal_Bool bAcceleratorsInContextMenus ) + { CopyData(); mpData->mnAcceleratorsInContextMenus = bAcceleratorsInContextMenus; } + sal_Bool GetAcceleratorsInContextMenus() const + { return mpData->mnAcceleratorsInContextMenus; } void SetCairoFontOptions( const void *pOptions ) { CopyData(); mpData->mpFontOptions = pOptions; } diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 75fd77bbaf73..a55fec63e8b1 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -529,6 +529,7 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) : mnUseImagesInMenus = rData.mnUseImagesInMenus; mbPreferredUseImagesInMenus = rData.mbPreferredUseImagesInMenus; mnSkipDisabledInMenus = rData.mnSkipDisabledInMenus; + mnAcceleratorsInContextMenus = rData.mnAcceleratorsInContextMenus; mnToolbarIconSize = rData.mnToolbarIconSize; mnSymbolsStyle = rData.mnSymbolsStyle; mnPreferredSymbolsStyle = rData.mnPreferredSymbolsStyle; @@ -617,6 +618,7 @@ void ImplStyleData::SetStandardStyles() mnUseFlatMenues = 0; mbPreferredUseImagesInMenus = sal_True; mnSkipDisabledInMenus = (sal_uInt16)sal_False; + mnAcceleratorsInContextMenus = sal_True; Gradient aGrad( GRADIENT_LINEAR, DEFAULT_WORKSPACE_GRADIENT_START_COLOR, DEFAULT_WORKSPACE_GRADIENT_END_COLOR ); maWorkspaceGradient = Wallpaper( aGrad ); @@ -1077,6 +1079,7 @@ sal_Bool StyleSettings::operator ==( const StyleSettings& rSet ) const (mpData->mnUseImagesInMenus == rSet.mpData->mnUseImagesInMenus) && (mpData->mbPreferredUseImagesInMenus == rSet.mpData->mbPreferredUseImagesInMenus) && (mpData->mnSkipDisabledInMenus == rSet.mpData->mnSkipDisabledInMenus) && + (mpData->mnAcceleratorsInContextMenus == rSet.mpData->mnAcceleratorsInContextMenus) && (mpData->maFontColor == rSet.mpData->maFontColor )) return sal_True; else diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 41d5ca198cf2..a28c43346720 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2933,13 +2933,17 @@ PopupMenu* Edit::CreatePopupMenu() return new PopupMenu(); PopupMenu* pPopup = new PopupMenu( ResId( SV_RESID_MENU_EDIT, *pResMgr ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_UNDO, KeyCode( KEYFUNC_UNDO ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_CUT, KeyCode( KEYFUNC_CUT ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_COPY, KeyCode( KEYFUNC_COPY ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_PASTE, KeyCode( KEYFUNC_PASTE ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_DELETE, KeyCode( KEYFUNC_DELETE ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_SELECTALL, KeyCode( KEY_A, sal_False, sal_True, sal_False, sal_False ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_INSERTSYMBOL, KeyCode( KEY_S, sal_True, sal_True, sal_False, sal_False ) ); + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); + if ( rStyleSettings.GetAcceleratorsInContextMenus() ) + { + pPopup->SetAccelKey( SV_MENU_EDIT_UNDO, KeyCode( KEYFUNC_UNDO ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_CUT, KeyCode( KEYFUNC_CUT ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_COPY, KeyCode( KEYFUNC_COPY ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_PASTE, KeyCode( KEYFUNC_PASTE ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_DELETE, KeyCode( KEYFUNC_DELETE ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_SELECTALL, KeyCode( KEY_A, sal_False, sal_True, sal_False, sal_False ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_INSERTSYMBOL, KeyCode( KEY_S, sal_True, sal_True, sal_False, sal_False ) ); + } return pPopup; } diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 8d9f37a431cf..0c89fe00394c 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -3337,6 +3337,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) // menu disabled entries handling aStyleSet.SetSkipDisabledInMenus( sal_True ); + aStyleSet.SetAcceleratorsInContextMenus( sal_False ); // menu colors GtkStyle* pMenuStyle = gtk_widget_get_style( gWidgetData[m_nScreen].gMenuWidget ); GtkStyle* pMenuItemStyle = gtk_rc_get_style( gWidgetData[m_nScreen].gMenuItemMenuWidget ); -- cgit v1.2.3 From 535bee89a2f5aab6f997688313e47343cef298ea Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Wed, 20 Apr 2011 17:28:54 +0200 Subject: fix L10N_MODULE path on Windows --- solenv/inc/settings.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index fc9860a01931..356bda2c9d90 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -809,7 +809,11 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR) .EXPORT : SOLARBINDIR +.IF "$(GUI)" == "WNT" +L10N_MODULE*=$(shell cygpath -m $(SRC_ROOT)/translations) +.ELSE L10N_MODULE*=$(SRC_ROOT)/translations +.ENDIF ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so .IF "$(WITH_LANG)"!="" -- cgit v1.2.3 From 899cecdc4102f7dd6c12ca1cb5f34fb516e44a23 Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Thu, 21 Apr 2011 12:55:48 +0200 Subject: disable the testCVE unittest for now because it breaks in some cases --- sc/qa/unit/ucalc.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 4d15f31a6371..531528436ae5 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -276,7 +276,9 @@ public: CPPUNIT_TEST(testGraphicsInGroup); CPPUNIT_TEST(testStreamValid); CPPUNIT_TEST(testFunctionLists); +#if 0 // Disable because in some cases this test breaks CPPUNIT_TEST(testCVEs); +#endif CPPUNIT_TEST(testToggleRefFlag); CPPUNIT_TEST_SUITE_END(); -- cgit v1.2.3 From 8dc7fcfb5e5a8de2411d2bb29f450cabc3690859 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Thu, 21 Apr 2011 17:41:42 +0200 Subject: fix detection of first-page header/footer (previous commit,bnc#654230) --- sw/source/filter/ww8/wrtw8sty.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 17716b65cc05..0f93dd67b669 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -1648,7 +1648,6 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt bOutFirstPage = false; } - // left-/right chain of pagedescs ? if ( pPd->GetFollow() && pPd != pPd->GetFollow() && pPd->GetFollow()->GetFollow() == pPd && @@ -1714,10 +1713,10 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdFirstPgFmt, WW8_HEADER_FIRST ); MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdFirstPgFmt, WW8_FOOTER_FIRST ); } - // write other headers/footers only if it's not the first page - I'm not quite sure + // write other headers/footers only if it's not on the first page - I'm not quite sure // this is technically correct, but it avoids first-page headers/footers // extending to all pages (bnc#654230) - if( pPdFmt != pPdFirstPgFmt ) + if( !titlePage || pPdFmt != pPdFirstPgFmt ) { MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdFmt, WW8_HEADER_ODD ); MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdFmt, WW8_FOOTER_ODD ); -- cgit v1.2.3 From d5bbd70673a2d5c6f8937428b97111e9c13fd21f Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Thu, 21 Apr 2011 20:57:24 +0200 Subject: Fix typo; NF_KEY_FALSE should be "FALSE". --- svl/source/numbers/zforscan.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index d87157b211d2..b4bc52b09f70 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -153,7 +153,7 @@ void ImpSvNumberformatScan::InitSpecialKeyword( NfKeywordIndex eIdx ) const if ( !sKeyword[NF_KEY_FALSE].Len() ) { DBG_ERRORFILE( "InitSpecialKeyword: FALSE_WORD?" ); - ((ImpSvNumberformatScan*)this)->sKeyword[NF_KEY_FALSE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "TRUE" ) ); + ((ImpSvNumberformatScan*)this)->sKeyword[NF_KEY_FALSE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "FALSE" ) ); } break; default: -- cgit v1.2.3 From 7341d8f71dcb4bc75664e027202336428a173d9b Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Fri, 22 Apr 2011 11:29:22 +0200 Subject: Disable BrOffice branding for official builds (fdo#36262) --- distro-configs/LibreOfficeLinux.conf | 1 - distro-configs/LibreOfficeMacOSX.conf | 1 - distro-configs/LibreOfficeOpenBSD.conf | 1 - distro-configs/LibreOfficeWin32.conf | 1 - distro-configs/LibreOfficeWin64.conf | 1 - 5 files changed, 5 deletions(-) diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index 799540dc7e19..4a5960795ef5 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -37,7 +37,6 @@ --enable-ext-pdfimport --enable-epm --enable-cairo ---enable-broffice --enable-binfilter --disable-xrender-link --disable-unix-qstart diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf index 0b69a481c23e..207a715eee10 100644 --- a/distro-configs/LibreOfficeMacOSX.conf +++ b/distro-configs/LibreOfficeMacOSX.conf @@ -10,4 +10,3 @@ --enable-ext-wiki-publisher --enable-ext-report-builder --with-extension-integration ---enable-broffice diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index 336892fbd73b..340805ac7f94 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -11,7 +11,6 @@ --disable-unix-qstart --disable-xrender-link --enable-binfilter ---enable-broffice --enable-cairo --enable-gnome-vfs --enable-gstreamer diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index dd96ffd9d4f0..050bb7caa088 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -5,6 +5,5 @@ --without-agfa-monotype-fonts --with-nlpsolver --with-java-target-version=1.5 ---enable-broffice --disable-xrender-link --disable-activex-component diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf index c8a2647fe620..1a9ce954f2ab 100644 --- a/distro-configs/LibreOfficeWin64.conf +++ b/distro-configs/LibreOfficeWin64.conf @@ -2,6 +2,5 @@ --without-agfa-monotype-fonts --with-java-target-version=1.5 --enable-cl-x64 ---enable-broffice --disable-xrender-link --disable-activex-component -- cgit v1.2.3 From 8c67ee188ea40676d9b7b52a573aca06acd2757e Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Fri, 22 Apr 2011 15:20:18 +0200 Subject: do not enable BrOffice branding by default (fdo#36262) --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 64f88ec4f5c5..0ab2237de005 100755 --- a/configure.in +++ b/configure.in @@ -274,7 +274,7 @@ AC_ARG_ENABLE(broffice, AS_HELP_STRING([--disable-broffice], [When disabled, broffice specific branding artwork for use in the pt_BR locale is removed, giving uniform branding.]), -,enable_broffice=yes) +,enable_broffice=no) AC_ARG_ENABLE(cairo, AS_HELP_STRING([--disable-cairo], -- cgit v1.2.3 From ff5662e330da54c31760d7edbc27b98132b0926c Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Fri, 22 Apr 2011 15:57:41 +0200 Subject: testtool-more-defaults.diff: make testtool work out-of-the-box tweaked existing defaults such that running testtool from inside a dev install works out-of-the-box. Additionally passing SRC_ROOT from build env to testtool --- automation/source/testtool/objtest.cxx | 62 +++++++++++++++++++++++++++++++++ automation/source/testtool/testtool.ini | 1 - 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index 7569c69f3be3..e08dd7c5faeb 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -479,6 +479,68 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d GetHostConfig(); GetTTPortConfig(); GetUnoPortConfig(); + + aConf.SetGroup("Crashreporter"); + + String aUP; + GETSET( aUP, "UseProxy", "false" ); + String aPS; + GETSET( aPS, "ProxyServer", "" ); + String aPP; + GETSET( aPP, "ProxyPort", "" ); + String aAC; + GETSET( aAC, "AllowContact", "false" ); + String aRA; + GETSET( aRA, "ReturnAddress", "" ); + + OUString sPath; + if( osl_getExecutableFile( (rtl_uString**)&sPath ) == osl_Process_E_None) + { + sPath = sPath.copy(7); // strip file:// + + int i = sPath.lastIndexOf('/'); + if (i >= 0) + i = sPath.lastIndexOf('/', i-1 ); + + if (i >= 0) + { + sPath = sPath.copy(0, i); + ByteString bsPath( sPath.getStr(), sPath.getLength(), + RTL_TEXTENCODING_UTF8 ); + + aConf.SetGroup( "OOoProgramDir" ); + String aOPD; + // testtool is installed in Basis3.x/program/ dir nowadays + bsPath += "/../program"; + GETSET( aOPD, "Current", bsPath); + + ByteString aSrcRoot(getenv("SRC_ROOT")); + aConf.SetGroup( "_profile_Default" ); + if (aSrcRoot.Len()) + { + String aPBD; + aSrcRoot += "/testautomation"; + GETSET( aPBD, "BaseDir", aSrcRoot ); + + String aPHD; + aSrcRoot += "/global/hid"; + GETSET( aPHD, "HIDDir", aSrcRoot ); + } + else + { + String aPBD; + bsPath += "/qatesttool"; + GETSET( aPBD, "BaseDir", bsPath ); + + String aPHD; + bsPath += "/global/hid"; + GETSET( aPHD, "HIDDir", bsPath ); + } + + String aLD; + GETSET( aLD, "LogBaseDir", ByteString( "/tmp" ) ); + } + } } #define MAKE_TT_KEYWORD( cName, aType, aResultType, nID ) \ diff --git a/automation/source/testtool/testtool.ini b/automation/source/testtool/testtool.ini index ff2e43f5c0f6..7b77654eed58 100644 --- a/automation/source/testtool/testtool.ini +++ b/automation/source/testtool/testtool.ini @@ -9,7 +9,6 @@ CurrentProfile=_profile_Default [OOoProgramDir] Type=Path -Current=. [Crashreporter] UseProxy=false -- cgit v1.2.3 From bfdee0010ad8502d11fe494f5d6d960a5034dd10 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Fri, 22 Apr 2011 16:08:26 +0200 Subject: dbaccess-default-varchar-lenght.diff: default VARCHAR length to 100 (i#62664) --- dbaccess/source/ui/tabledesign/FieldDescriptions.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index a307f0766766..914d33c3d7a5 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -39,7 +39,7 @@ #include "UITools.hxx" #include -#define DEFAULT_VARCHAR_PRECSION 50 +#define DEFAULT_VARCHAR_PRECSION 100 #define DEFAULT_OTHER_PRECSION 16 #define DEFAULT_NUMERIC_PRECSION 5 #define DEFAULT_NUMERIC_SCALE 0 -- cgit v1.2.3 From 4b932956bdf2b345810100a86491e6cae3f1eb8f Mon Sep 17 00:00:00 2001 From: Kalman Szalai - KAMI Date: Fri, 22 Apr 2011 16:32:24 +0200 Subject: Add initial configure and download stuffs for extra things OxygenOffice related --- configure.in | 16 ++++++++++- ooo.lst | 87 -------------------------------------------------------- ooo.lst.in | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 88 deletions(-) delete mode 100644 ooo.lst create mode 100644 ooo.lst.in diff --git a/configure.in b/configure.in index 64f88ec4f5c5..c33c01829c13 100755 --- a/configure.in +++ b/configure.in @@ -7381,13 +7381,16 @@ AC_MSG_CHECKING([whether to include extra galleries]) if test "z$enable_extra_gallery" = "z" -o "z$enable_extra_gallery" = "zno" ; then AC_MSG_RESULT([no]) WITH_EXTRA_GALLERY=NO + OOOP_GALLERY_PACK="" else AC_MSG_RESULT([yes]) WITH_EXTRA_GALLERY=YES BUILD_TYPE="$BUILD_TYPE EXTRA_GALLERY" - SCPDEFS="$SCPDEFS -DWITH_EXTRA_GALLERY" + SCPDEFS="$SCPDEFS -DWITH_EXTRA_GALLERY" + OOOP_GALLERY_PACK="af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip" fi AC_SUBST(WITH_EXTRA_GALLERY) +AC_SUBST(OOOP_GALLERY_PACK) dnl =================================================================== dnl Test whether to include extra templates @@ -7396,13 +7399,16 @@ AC_MSG_CHECKING([whether to include extra templates]) if test "z$enable_extra_template" = "z" -o "z$enable_extra_template" = "zno" ; then AC_MSG_RESULT([no]) WITH_EXTRA_TEMPLATE=NO + OOOP_TEMPLATES_PACK="" else AC_MSG_RESULT([yes]) WITH_EXTRA_TEMPLATE=YES BUILD_TYPE="$BUILD_TYPE EXTRA_TEMPLATE" SCPDEFS="$SCPDEFS -DWITH_EXTRA_TEMPLATE" + OOOP_TEMPLATES_PACK="1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip" fi AC_SUBST(WITH_EXTRA_TEMPLATE) +AC_SUBST(OOOP_TEMPLATES_PACK) dnl =================================================================== dnl Test whether to include extra samples @@ -7411,13 +7417,16 @@ AC_MSG_CHECKING([whether to include extra samples]) if test "z$enable_extra_sample" = "z" -o "z$enable_extra_sample" = "zno" ; then AC_MSG_RESULT([no]) WITH_EXTRA_SAMPLE=NO + OOOP_SAMPLES_PACK="" else AC_MSG_RESULT([yes]) WITH_EXTRA_SAMPLE=YES BUILD_TYPE="$BUILD_TYPE EXTRA_SAMPLE" SCPDEFS="$SCPDEFS -DWITH_EXTRA_SAMPLE" + OOOP_SAMPLES_PACK="a6bccacf44914969e6e7b2f8faf4132c-OOOP-samples-pack-2.7.0.0.zip" fi AC_SUBST(WITH_EXTRA_SAMPLE) +AC_SUBST(OOOP_SAMPLES_PACK) dnl =================================================================== dnl Test whether to include extra fonts @@ -7426,13 +7435,16 @@ AC_MSG_CHECKING([whether to include extra fonts]) if test "z$enable_extra_font" = "z" -o "z$enable_extra_font" = "zno" ; then AC_MSG_RESULT([no]) WITH_EXTRA_FONT=NO + OOOP_FONTS_PACK="" else AC_MSG_RESULT([yes]) WITH_EXTRA_FONT=YES BUILD_TYPE="$BUILD_TYPE EXTRA_FONT" SCPDEFS="$SCPDEFS -DWITH_EXTRA_FONT" + OOOP_FONTS_PACK="a10aa597411643326e27d7fc128af12d-OOOP-fonts-pack-2.9.0.0.zip" fi AC_SUBST(WITH_EXTRA_FONT) +AC_SUBST(OOOP_FONTS_PACK) dnl =================================================================== dnl Test whether to enable ActiveX embedding @@ -7986,6 +7998,8 @@ else echo > set_soenv.last fi +AC_OUTPUT([ooo.lst]) + AC_OUTPUT([set_soenv Makefile bin/repo-list]) # touch the config timestamp file set_soenv.stamp diff --git a/ooo.lst b/ooo.lst deleted file mode 100644 index 979f049f9ba3..000000000000 --- a/ooo.lst +++ /dev/null @@ -1,87 +0,0 @@ -http://hg.services.openoffice.org/binaries -48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz -63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz -09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz -0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt -128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz -17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip -1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz -18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz -1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html -26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz -284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz -2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz -2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz -2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz -ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz -35c94d2df8893241173de1d16b6034c0-swingExSrc.zip -35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip -39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip -3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz -3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz -48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt -48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz -4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz -4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz -599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz -7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz -7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz -798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip -ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz -8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar -bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz -a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz -a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html -a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip -af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz -bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1 -c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz -ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz -d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip -d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz -dbd5f3b47ed13132f04c685d608a7547-jpeg-6b.tar.gz -e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt -e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2 -e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz -ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz -ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz -ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz -fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt -fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz -fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz -37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip -831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip -067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz -3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip -3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip -8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip -97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip -ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip -d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip -db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip -eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip -f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip -ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip -ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz -http://download.go-oo.org/src -314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz -451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt -47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2 -90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 -debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz -0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz -71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz -5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2 -5ff846847dab351604ad859e2fd4ed3c-libwpd-0.9.1.tar.bz2 -9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2 -7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2 -f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 -9ed97fce60a9a65852402248a6659492-hunspell-1.3.1.tar.gz -0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz -http://download.go-oo.org/extern -185d60944ea767075d27247c3162b3bc-unowinreg.dll -b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 -http://www.numbertext.org/linux -881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip diff --git a/ooo.lst.in b/ooo.lst.in new file mode 100644 index 000000000000..0c43f1fda28c --- /dev/null +++ b/ooo.lst.in @@ -0,0 +1,93 @@ +http://hg.services.openoffice.org/binaries +48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz +63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz +09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz +0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt +128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz +17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz +18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz +1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz +24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html +26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz +284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz +2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz +2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz +2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz +ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz +35c94d2df8893241173de1d16b6034c0-swingExSrc.zip +35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip +39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip +3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz +3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz +48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt +48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz +4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz +4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz +599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz +7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz +7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz +798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip +ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz +8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar +bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz +a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz +a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html +a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip +ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip +af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz +bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1 +c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz +ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz +d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip +d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz +dbd5f3b47ed13132f04c685d608a7547-jpeg-6b.tar.gz +e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt +e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2 +e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz +ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz +ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz +ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz +fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt +fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz +fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz +37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip +831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip +067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz +3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip +3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip +8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip +97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip +ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip +d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip +db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip +eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip +f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip +ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip +ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz +http://download.go-oo.org/src +314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz +451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt +47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2 +90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 +debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz +0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz +71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz +5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2 +5ff846847dab351604ad859e2fd4ed3c-libwpd-0.9.1.tar.bz2 +9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2 +7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2 +f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 +9ed97fce60a9a65852402248a6659492-hunspell-1.3.1.tar.gz +0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz +http://download.go-oo.org/extern +185d60944ea767075d27247c3162b3bc-unowinreg.dll +b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 +http://www.numbertext.org/linux +881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip +http://ooo.itc.hu/oxygenoffice/download/libreoffice/ +@OOOP_GALLERY_PACK@ +@OOOP_TEMPLATES_PACK@ +@OOOP_FONTS_PACK@ +@OOOP_SAMPLES_PACK@ + -- cgit v1.2.3 From 0e9faf7a0f8c76b50d9a9354d5fab5d1ad4af821 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Fri, 22 Apr 2011 16:51:58 +0200 Subject: sd-toolbar-advanced-shapes.diff: used advanced Ellipse and Rectangle shapes they allow to wrap text according to the shape which is a very nice feature (bnc#171052) --- sd/uiconfig/sdraw/toolbar/toolbar.xml | 4 ++-- sd/uiconfig/simpress/toolbar/toolbar.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sd/uiconfig/sdraw/toolbar/toolbar.xml b/sd/uiconfig/sdraw/toolbar/toolbar.xml index 34ebb18ad4e2..9bd802585f6f 100644 --- a/sd/uiconfig/sdraw/toolbar/toolbar.xml +++ b/sd/uiconfig/sdraw/toolbar/toolbar.xml @@ -5,8 +5,8 @@ - - + + diff --git a/sd/uiconfig/simpress/toolbar/toolbar.xml b/sd/uiconfig/simpress/toolbar/toolbar.xml index 62d33c1fc729..25bffb7e72bb 100644 --- a/sd/uiconfig/simpress/toolbar/toolbar.xml +++ b/sd/uiconfig/simpress/toolbar/toolbar.xml @@ -5,8 +5,8 @@ - - + + -- cgit v1.2.3 From ac0b7fc916d3dc8214d615504ba7962db7ad92f5 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Fri, 22 Apr 2011 17:07:23 +0200 Subject: svx-shapes-default-word-wrap-enable.diff: wrap text in shapes by default it is a very nice feature and preferred behavior (bnc#171052) --- svx/source/svdraw/svdattr.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 1e38fb7167ca..d480cc45bab5 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -150,7 +150,7 @@ SdrItemPool::SdrItemPool( mppLocalPoolDefaults[SDRATTR_CUSTOMSHAPE_ADJUSTMENT -SDRATTR_START]=new SdrCustomShapeAdjustmentItem; mppLocalPoolDefaults[SDRATTR_XMLATTRIBUTES -SDRATTR_START]=new SvXMLAttrContainerItem( SDRATTR_XMLATTRIBUTES ); mppLocalPoolDefaults[SDRATTR_TEXT_USEFIXEDCELLHEIGHT -SDRATTR_START]=new SdrTextFixedCellHeightItem; - mppLocalPoolDefaults[SDRATTR_TEXT_WORDWRAP -SDRATTR_START]=new SdrTextWordWrapItem; + mppLocalPoolDefaults[SDRATTR_TEXT_WORDWRAP -SDRATTR_START]=new SdrTextWordWrapItem( sal_True ); mppLocalPoolDefaults[SDRATTR_TEXT_AUTOGROWSIZE -SDRATTR_START]=new SdrTextAutoGrowSizeItem; mppLocalPoolDefaults[SDRATTR_EDGEKIND -SDRATTR_START]=new SdrEdgeKindItem; mppLocalPoolDefaults[SDRATTR_EDGENODE1HORZDIST-SDRATTR_START]=new SdrEdgeNode1HorzDistItem(nDefEdgeDist); -- cgit v1.2.3 From c6956e02b8557be63be2444a0beb9e37ea9379e9 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Fri, 22 Apr 2011 17:33:22 +0200 Subject: svx-honour-customshape-capabilities.diff (bnc#395372) this bug started to be visible after enabling wordwrap in shapes (bnc#171052) --- svx/source/svdraw/svdoashp.cxx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 57304b85f1fe..2b3a3d965969 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -1668,6 +1668,16 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { rInfo.bCanConvToContour = aInfo.bCanConvToContour; } + + if(rInfo.bShearAllowed != aInfo.bShearAllowed) + { + rInfo.bShearAllowed = aInfo.bShearAllowed; + } + + if(rInfo.bEdgeRadiusAllowed != aInfo.bEdgeRadiusAllowed) + { + rInfo.bEdgeRadiusAllowed = aInfo.bEdgeRadiusAllowed; + } } } } -- cgit v1.2.3 From 85c2c4cbd544d5eaf05982c22021d12faeba17ea Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Fri, 22 Apr 2011 11:57:36 -0400 Subject: Fixed address input box to work in R1C1 mode. Previously, typing a valid address in the address input box while in R1C1 mode caused an invalid range error. This commit fixes it. --- sc/source/ui/app/inputwin.cxx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 6a93fc130e02..c03799aa6ffe 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1662,6 +1662,10 @@ void ScPosWnd::DoEnter() ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); if ( pViewSh ) { + ScViewData* pViewData = pViewSh->GetViewData(); + ScDocShell* pDocShell = pViewData->GetDocShell(); + ScDocument* pDoc = pDocShell->GetDocument(); + ScNameInputType eType = lcl_GetInputType( aText ); if ( eType == SC_NAME_INPUT_BAD_NAME || eType == SC_NAME_INPUT_BAD_SELECTION ) { @@ -1670,9 +1674,6 @@ void ScPosWnd::DoEnter() } else if ( eType == SC_NAME_INPUT_DEFINE ) { - ScViewData* pViewData = pViewSh->GetViewData(); - ScDocShell* pDocShell = pViewData->GetDocShell(); - ScDocument* pDoc = pDocShell->GetDocument(); ScRangeName* pNames = pDoc->GetRangeName(); ScRange aSelection; if ( pNames && !pNames->findByName(aText) && @@ -1695,7 +1696,12 @@ void ScPosWnd::DoEnter() } else { - // for all selection types, excecute the SID_CURRENTCELL slot + // for all selection types, excecute the SID_CURRENTCELL slot. + // Note that SID_CURRENTCELL always expects address to be + // in Calc A1 format. Convert the text. + ScRange aRange; + aRange.ParseAny(aText, pDoc, pDoc->GetAddressConvention()); + aRange.Format(aText, SCR_ABS_3D, pDoc, ::formula::FormulaGrammar::CONV_OOO); SfxStringItem aPosItem( SID_CURRENTCELL, aText ); SfxBoolItem aUnmarkItem( FN_PARAM_1, sal_True ); // remove existing selection -- cgit v1.2.3 From ac5a0bf3c59828128f43153d481abb1865c767f6 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Fri, 22 Apr 2011 20:53:57 -0400 Subject: Excel only allows strings that are up to 32767 chars long (0x7FFF). And if we exceed this limit even in one cell, Excel refuses to load the whole document. --- sc/source/filter/inc/xlstring.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sc/source/filter/inc/xlstring.hxx b/sc/source/filter/inc/xlstring.hxx index 15adf3f919d9..c431a594ad1a 100644 --- a/sc/source/filter/inc/xlstring.hxx +++ b/sc/source/filter/inc/xlstring.hxx @@ -46,7 +46,7 @@ const XclStrFlags EXC_STR_NOHEADER = 0x0010; /// Export: Don't write // ---------------------------------------------------------------------------- const sal_uInt16 EXC_STR_MAXLEN_8BIT = 0x00FF; -const sal_uInt16 EXC_STR_MAXLEN = 0xFFFF; +const sal_uInt16 EXC_STR_MAXLEN = 0x7FFF; const sal_uInt8 EXC_STRF_16BIT = 0x01; const sal_uInt8 EXC_STRF_FAREAST = 0x04; -- cgit v1.2.3 From 6c06f7b0924d7b061bed39699880d75039380a7d Mon Sep 17 00:00:00 2001 From: Kalman Szalai - KAMI Date: Sat, 23 Apr 2011 09:30:22 +0200 Subject: Reintroduce OxygenOffice distro confs --- distro-configs/OxygenOfficeLinux.conf | 77 +++++++++++++++++++++++++++++++++++ distro-configs/OxygenOfficeWin32.conf | 44 ++++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 distro-configs/OxygenOfficeLinux.conf create mode 100644 distro-configs/OxygenOfficeWin32.conf diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf new file mode 100644 index 000000000000..f63faba2d506 --- /dev/null +++ b/distro-configs/OxygenOfficeLinux.conf @@ -0,0 +1,77 @@ +--with-vendor=OxygenOffice Professional Team +--with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0 +--enable-binfilter +--enable-vba +--enable-build-mozilla +--without-system-mozilla +--with-package-format=rpm deb +--enable-epm +--enable-cups +--disable-symbols +--enable-systray +--with-epm=internal +--disable-kde +--disable-kde4 +--enable-gtk +--enable-evolution2 +--enable-lockdown +--without-unix-wrapper +--with-fonts +--enable-extra-gallery +--enable-extra-template +--enable-extra-sample +--enable-extra-font +--with-lang=en-US hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs-CZ ko sl +--enable-opengl +--enable-dbus +--enable-gnome-vfs +--with-extension-integration +--enable-ext-wiki-publisher +--enable-ext-report-builder +--enable-ext-presenter-minimizer +--enable-ext-presenter-console +--enable-ext-pdfimport +--enable-ext-scripting-beanshell +--enable-ext-scripting-javascript +--enable-ext-scripting-python +--enable-ext-google-docs +--enable-ext-hunart +--enable-ext-lightproof +--enable-ext-nlpsolver +--enable-ext-numbertext +--enable-ext-typo +--enable-ext-watch-window +--enable-ext-diagram +--enable-ext-validator +--enable-ext-barcode +--disable-ext-oooblogger +--with-sun-templates +--without-system-poppler +--enable-neon +--without-system-stdlibs +--with-jdk-home=/usr/local/jdk1.6.0_23/ +--without-system-dicts +--without-system-xrender-headers +--without-system-zlib +--without-system-stdlibs +--without-system-python +--without-system-poppler +--without-system-openssl +--without-system-mozilla +--without-system-mesa-headers +--without-system-libxslt +--without-system-libxml +--without-system-jpeg +--without-system-jars +--without-system-cairo +--without-junit +--with-helppack-integration +--with-linker-hash-style=both +--enable-odk +--enable-gstreamer +--enable-cairo +--enable-graphite +--enable-dependency-tracking +--enable-mozilla +--with-system-mozilla=mozilla +--with-openldap diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf new file mode 100644 index 000000000000..9f2429713eee --- /dev/null +++ b/distro-configs/OxygenOfficeWin32.conf @@ -0,0 +1,44 @@ +--with-vendor=OxygenOffice Professional Team +--with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0 +--enable-binfilter +--enable-vba +--disable-build-mozilla +--disable-symbols +--enable-systray +--with-fonts +--enable-extra-gallery +--enable-extra-template +--enable-extra-sample +--enable-extra-font +--with-lang=hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs-CZ ko sl +--with-extension-integration +--enable-ext-wiki-publisher +--enable-ext-report-builder +--enable-ext-presenter-minimizer +--enable-ext-presenter-console +--enable-ext-pdfimport +--enable-ext-scripting-beanshell +--enable-ext-scripting-javascript +--enable-ext-scripting-python +--enable-ext-google-docs +--enable-ext-hunart +--enable-ext-lightproof +--enable-ext-nlpsolver +--enable-ext-numbertext +--enable-ext-typo +--enable-ext-watch-window +--enable-ext-diagram +--enable-ext-validator +--enable-ext-barcode +--disable-ext-oooblogger +--with-sun-templates +--disable-cairo +--with-jdk-home=/usr/local/jdk1.6.0_23/ +--without-junit +--with-helppack-integration +--enable-cairo +--enable-graphite +--enable-dependency-tracking +--enable-mozilla +--with-system-mozilla=mozilla +--with-openldap -- cgit v1.2.3 From 4e42e93deb4efe4285858afbb0cfaafc5a6d093d Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sun, 24 Apr 2011 22:33:24 +0200 Subject: add/update NLPSolver translations from Pootle --- nlpsolver/locale/NLPSolverCommon_et.properties | 22 +++++++++++++++++ nlpsolver/locale/NLPSolverCommon_tr.properties | 22 +++++++++++++++++ .../locale/NLPSolverStatusDialog_et.properties | 28 ++++++++++++++++++++++ .../locale/NLPSolverStatusDialog_fr.properties | 4 ++-- .../locale/NLPSolverStatusDialog_tr.properties | 28 ++++++++++++++++++++++ 5 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 nlpsolver/locale/NLPSolverCommon_et.properties create mode 100644 nlpsolver/locale/NLPSolverCommon_tr.properties create mode 100644 nlpsolver/locale/NLPSolverStatusDialog_et.properties create mode 100644 nlpsolver/locale/NLPSolverStatusDialog_tr.properties diff --git a/nlpsolver/locale/NLPSolverCommon_et.properties b/nlpsolver/locale/NLPSolverCommon_et.properties new file mode 100644 index 000000000000..49a4bdfd5440 --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_et.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Mittenegatiivsete muutujate eeldamine +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=S\u00FClemi suurus +NLPSolverCommon.Properties.LibrarySize=Teegi suurus +NLPSolverCommon.Properties.LearningCycles=\u00D5ppimists\u00FCklite arv +NLPSolverCommon.Properties.GuessVariableRange=Muutujapiiride oletamine +NLPSolverCommon.Properties.VariableRangeThreshold=Muutujapiiride l\u00E4vi (oletamisel) +NLPSolverCommon.Properties.UseACRComparator=ACR komparaatori kasutamine (BCH asemel) +NLPSolverCommon.Properties.UseRandomStartingPoint=Juhusliku alguspunkti kasutamine +NLPSolverCommon.Properties.StagnationLimit=Seisakuraja +NLPSolverCommon.Properties.Tolerance=Seisakutolerants +NLPSolverCommon.Properties.EnhancedSolverStatus=Lahendaja t\u00E4iendatud oleku kuvamine +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Agent Switch Rate (DE t\u00F5en\u00E4osus) +NLPSolverCommon.Properties.DEFactor=DE: skaleerimistegur (0-1,2) +NLPSolverCommon.Properties.DECR=DE: ristumist\u00F5en\u00E4osus (0-1) +NLPSolverCommon.Properties.PSC1=PS: kognitiivsuskonstant +NLPSolverCommon.Properties.PSC2=PS: sotsiaalkonstant +NLPSolverCommon.Properties.PSWeight=PS: ahenemiskoefitsient +NLPSolverCommon.Properties.PSCL=PS: mutatsioonit\u00F5en\u00E4osus (0-0,005) diff --git a/nlpsolver/locale/NLPSolverCommon_tr.properties b/nlpsolver/locale/NLPSolverCommon_tr.properties new file mode 100644 index 000000000000..87d2929d4f0f --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_tr.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Negatif olmayan De\u011Fi\u015Fkenleri Varsay +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Y\u0131\u011F\u0131n\u0131n Boyutu +NLPSolverCommon.Properties.LibrarySize=K\u00FCt\u00FCphanenin Boyutu +NLPSolverCommon.Properties.LearningCycles=\u00D6\u011Frenme Evreleri +NLPSolverCommon.Properties.GuessVariableRange=De\u011Fi\u015Fken \u00D6l\u00E7\u00FCs\u00FC Tahmini +NLPSolverCommon.Properties.VariableRangeThreshold=De\u011Fi\u015Fken \u00D6l\u00E7\u00FCs\u00FC S\u0131n\u0131r\u0131 (tahmin ediyorken) +NLPSolverCommon.Properties.UseACRComparator=ACR Kar\u015F\u0131la\u015Ft\u0131r\u0131c\u0131s\u0131n\u0131 kullan (BCH'nin yerine) +NLPSolverCommon.Properties.UseRandomStartingPoint=Rasgele ba\u015Flama noktas\u0131 kullan +NLPSolverCommon.Properties.StagnationLimit=Durgunluk S\u0131n\u0131r\u0131 +NLPSolverCommon.Properties.Tolerance=Durgunluk Tolerans\u0131 +NLPSolverCommon.Properties.EnhancedSolverStatus=Geli\u015Ftirilmi\u015F \u00E7\u00F6z\u00FCc\u00FC durumunu g\u00F6ster +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Arac\u0131 Ge\u00E7i\u015F Oran\u0131 (DE Olas\u0131l\u0131\u011F\u0131) +NLPSolverCommon.Properties.DEFactor=DE: \u00D6l\u00E7\u00FCleme Fakt\u00F6r\u00FC (0-1.2) +NLPSolverCommon.Properties.DECR=DE: A\u015Fma Olas\u0131l\u0131\u011F\u0131 (0-1) +NLPSolverCommon.Properties.PSC1=PS: Bili\u015Fsel Sabit +NLPSolverCommon.Properties.PSC2=PS: Sosyal Sabit +NLPSolverCommon.Properties.PSWeight=PS: \u0130n\u015Fa Fakt\u00F6r\u00FC +NLPSolverCommon.Properties.PSCL=PS: T\u00FCrde\u011Fi\u015Fim Olas\u0131l\u0131\u011F\u0131 (0-0.005) diff --git a/nlpsolver/locale/NLPSolverStatusDialog_et.properties b/nlpsolver/locale/NLPSolverStatusDialog_et.properties new file mode 100644 index 000000000000..ffc1e7a1abb3 --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_et.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Lahendaja olek +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Praegune lahendus: +NLPSolverStatusDialog.Controls.lblIteration=Iteratsioon: +NLPSolverStatusDialog.Controls.lblStagnation=Seisak: +NLPSolverStatusDialog.Controls.lblRuntime=T\u00F6\u00F6 kestus: +NLPSolverStatusDialog.Controls.btnStop=Peata +NLPSolverStatusDialog.Controls.btnOK=Sobib +NLPSolverStatusDialog.Controls.btnContinue=J\u00E4tka +#Messages +NLPSolverStatusDialog.Message.StopIteration=Saavutati iteratsioonide maksimaalne arv. +NLPSolverStatusDialog.Message.StopStagnation=Protsess peatati seisaku t\u00F5ttu. +NLPSolverStatusDialog.Message.StopUser=Kasutaja katkestas protsessi. +NLPSolverStatusDialog.Message.CurrentIteration=Protsess peatati %d. iteratsioonil %d-st. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=nanosekundit +NLPSolverStatusDialog.Time.Microseconds=mikrosekundit +NLPSolverStatusDialog.Time.Milliseconds=millisekundit +NLPSolverStatusDialog.Time.Second=sekund +NLPSolverStatusDialog.Time.Seconds=sekundit +NLPSolverStatusDialog.Time.Minute=minut +NLPSolverStatusDialog.Time.Minutes=minutit +NLPSolverStatusDialog.Time.Hour=tund +NLPSolverStatusDialog.Time.Hours=tundi +NLPSolverStatusDialog.Time.Day=p\u00E4ev +NLPSolverStatusDialog.Time.Days=p\u00E4eva diff --git a/nlpsolver/locale/NLPSolverStatusDialog_fr.properties b/nlpsolver/locale/NLPSolverStatusDialog_fr.properties index de6c1a9de7a9..bdd7028fbb3b 100644 --- a/nlpsolver/locale/NLPSolverStatusDialog_fr.properties +++ b/nlpsolver/locale/NLPSolverStatusDialog_fr.properties @@ -2,7 +2,7 @@ #Dialog NLPSolverStatusDialog.Dialog.Caption=\u00C9tat du solveur #Controls -NLPSolverStatusDialog.Controls.lblSolution=Solution actuelle : +NLPSolverStatusDialog.Controls.lblSolution=Solution actuelle : NLPSolverStatusDialog.Controls.lblIteration=It\u00E9ration : NLPSolverStatusDialog.Controls.lblStagnation=Stagnation : NLPSolverStatusDialog.Controls.lblRuntime=Dur\u00E9e d'ex\u00E9cution : @@ -17,7 +17,7 @@ NLPSolverStatusDialog.Message.CurrentIteration=Processus arr\u00EAt\u00E9 \u00E0 #Time formatting NLPSolverStatusDialog.Time.Nanoseconds=Nanosecondes NLPSolverStatusDialog.Time.Microseconds=Microsecondes -NLPSolverStatusDialog.Time.Milliseconds=Millisecondes +NLPSolverStatusDialog.Time.Milliseconds=Millisecondes NLPSolverStatusDialog.Time.Second=Seconde NLPSolverStatusDialog.Time.Seconds=Secondes NLPSolverStatusDialog.Time.Minute=Minute diff --git a/nlpsolver/locale/NLPSolverStatusDialog_tr.properties b/nlpsolver/locale/NLPSolverStatusDialog_tr.properties new file mode 100644 index 000000000000..1570c061abff --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_tr.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=\u00C7\u00F6z\u00FCmleyici Durumu +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Ge\u00E7erli \u00C7\u00F6z\u00FCm: +NLPSolverStatusDialog.Controls.lblIteration=Tekrarlama: +NLPSolverStatusDialog.Controls.lblStagnation=Durgunluk: +NLPSolverStatusDialog.Controls.lblRuntime=\u00C7al\u0131\u015Fma zaman\u0131 +NLPSolverStatusDialog.Controls.btnStop=Dur +NLPSolverStatusDialog.Controls.btnOK=Tamam +NLPSolverStatusDialog.Controls.btnContinue=Devam Et +#Messages +NLPSolverStatusDialog.Message.StopIteration=En fazla yinelemeye ula\u015F\u0131ld\u0131. +NLPSolverStatusDialog.Message.StopStagnation=Durgunluk nedeniyle i\u015Flem durduruldu. +NLPSolverStatusDialog.Message.StopUser=Kullan\u0131c\u0131 m\u00FCdahalesi nedeniyle i\u015Flem durduruldu. +NLPSolverStatusDialog.Message.CurrentIteration=\u0130\u015Flem %d %d yinelemede durduruldu +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nanosaniye +NLPSolverStatusDialog.Time.Microseconds=Mikrosaniyeler +NLPSolverStatusDialog.Time.Milliseconds=Milisaniye +NLPSolverStatusDialog.Time.Second=Saniye +NLPSolverStatusDialog.Time.Seconds=Saniyeler +NLPSolverStatusDialog.Time.Minute=Dakika +NLPSolverStatusDialog.Time.Minutes=Dakika +NLPSolverStatusDialog.Time.Hour=Saat +NLPSolverStatusDialog.Time.Hours=Saat +NLPSolverStatusDialog.Time.Day=G\u00FCn +NLPSolverStatusDialog.Time.Days=G\u00FCn -- cgit v1.2.3 From b7572a5344006d6fca5f9599aed07a400dd90b96 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sun, 24 Apr 2011 12:30:48 -0500 Subject: we need to generate ooo.lst before we use it.... --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 89aaf3a35fa0..4d41723c6535 100755 --- a/configure.in +++ b/configure.in @@ -5096,6 +5096,8 @@ else AC_MSG_RESULT([no]) fi +AC_OUTPUT([ooo.lst]) + if test "$BUILD_MOZAB" = "TRUE"; then if test "$_os" = "WINNT"; then if test "$WITH_MINGW" != "yes"; then @@ -7998,8 +8000,6 @@ else echo > set_soenv.last fi -AC_OUTPUT([ooo.lst]) - AC_OUTPUT([set_soenv Makefile bin/repo-list]) # touch the config timestamp file set_soenv.stamp -- cgit v1.2.3 From 9698bb97a9a0e03fda6fc7c6f5077d9eb6052e3f Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Mon, 25 Apr 2011 12:34:16 -0400 Subject: Fixed layout problem on Windows. It was not entirely platform independent. --- sc/source/ui/dbgui/dpuiglobal.hxx | 1 - sc/source/ui/dbgui/fieldwnd.cxx | 9 +++++++-- sc/source/ui/dbgui/pvlaydlg.cxx | 22 +++++++++++++++++++--- sc/source/ui/inc/fieldwnd.hxx | 1 + sc/source/ui/inc/pvlaydlg.hxx | 2 ++ 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/sc/source/ui/dbgui/dpuiglobal.hxx b/sc/source/ui/dbgui/dpuiglobal.hxx index b64875030bcf..d27d8278d83b 100644 --- a/sc/source/ui/dbgui/dpuiglobal.hxx +++ b/sc/source/ui/dbgui/dpuiglobal.hxx @@ -33,7 +33,6 @@ #define OUTER_MARGIN_VER 4 #define DATA_FIELD_BTN_GAP 2 // must be an even number #define ROW_FIELD_BTN_GAP 2 // must be an even number -#define FIELD_BTN_WIDTH 81 #define FIELD_BTN_HEIGHT 23 #define SELECT_FIELD_BTN_SPACE 2 #define FIELD_AREA_GAP 3 // gap between row/column/data/page areas diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx index 32ba4a949769..061900ce5e4d 100644 --- a/sc/source/ui/dbgui/fieldwnd.cxx +++ b/sc/source/ui/dbgui/fieldwnd.cxx @@ -611,6 +611,11 @@ void ScDPFieldControlBase::DrawInvertSelection() InvertTracking(aSel, SHOWTRACK_SMALL | SHOWTRACK_WINDOW); } +Size ScDPFieldControlBase::GetStdFieldBtnSize() const +{ + return mpDlg->GetStdFieldBtnSize(); +} + bool ScDPFieldControlBase::IsShortenedText( size_t nIndex ) const { const FieldNames& rFields = GetFieldNames(); @@ -726,7 +731,7 @@ Point ScDPHorFieldControl::GetFieldPosition( size_t nIndex ) Size ScDPHorFieldControl::GetFieldSize() const { - return Size(FIELD_BTN_WIDTH, FIELD_BTN_HEIGHT); + return GetStdFieldBtnSize(); } bool ScDPHorFieldControl::GetFieldIndex( const Point& rPos, size_t& rnIndex ) @@ -1032,7 +1037,7 @@ Point ScDPRowFieldControl::GetFieldPosition(size_t nIndex) Size ScDPRowFieldControl::GetFieldSize() const { - return Size(FIELD_BTN_WIDTH, FIELD_BTN_HEIGHT); + return GetStdFieldBtnSize(); } bool ScDPRowFieldControl::GetFieldIndex( const Point& rPos, size_t& rnIndex ) diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index d7109d1f7315..f280af43f7e0 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -1132,6 +1132,14 @@ void ScDPLayoutDlg::NotifyRemoveField( ScDPFieldType eType, size_t nFieldIndex ) RemoveField( eType, nFieldIndex ); } +Size ScDPLayoutDlg::GetStdFieldBtnSize() const +{ + // This size is static but is platform dependent. The field button size + // is calculated relative to the size of the OK button. + double w = static_cast(aBtnOk.GetSizePixel().Width()) * 0.70; + return Size(static_cast(w), FIELD_BTN_HEIGHT); +} + void ScDPLayoutDlg::Deactivate() { /* If the dialog has been deactivated (click into document), the LoseFocus @@ -1290,10 +1298,18 @@ Point ScDPLayoutDlg::DlgPos2WndPos( const Point& rPt, Window& rWnd ) void ScDPLayoutDlg::CalcWndSizes() { + // The pivot.src file only specifies the positions of the controls. Here, + // we calculate appropriate size of each control based on how they are + // positioned relative to each other. + // row/column/data area sizes - long nFldW = FIELD_BTN_WIDTH; - long nFldH = FIELD_BTN_HEIGHT; - aWndData.SetSizePixel(Size(338, 185)); + long nFldW = GetStdFieldBtnSize().Width(); + long nFldH = GetStdFieldBtnSize().Height(); + + aWndData.SetSizePixel( + Size(aWndSelect.GetPosPixel().X() - aWndData.GetPosPixel().X() - FIELD_AREA_GAP*4, + 185)); + aWndPage.SetSizePixel( Size(aWndData.GetSizePixel().Width() + 85, aWndCol.GetPosPixel().Y() - aWndPage.GetPosPixel().Y() - FIELD_AREA_GAP)); diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx index 78358557444c..edd8aec6a568 100644 --- a/sc/source/ui/inc/fieldwnd.hxx +++ b/sc/source/ui/inc/fieldwnd.hxx @@ -195,6 +195,7 @@ protected: void AppendPaintable(Window* p); void DrawPaintables(); void DrawInvertSelection(); + Size GetStdFieldBtnSize() const; /** @return The new selection index after moving to the given direction. */ virtual size_t CalcNewFieldIndex( SCsCOL nDX, SCsROW nDY ) const = 0; diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx index 19176e7fdc61..875f25dbcde1 100644 --- a/sc/source/ui/inc/pvlaydlg.hxx +++ b/sc/source/ui/inc/pvlaydlg.hxx @@ -104,6 +104,8 @@ public: void NotifyMoveFieldToEnd ( ScDPFieldType eToType ); void NotifyRemoveField ( ScDPFieldType eType, size_t nFieldIndex ); + Size GetStdFieldBtnSize() const; + protected: virtual void Deactivate(); -- cgit v1.2.3 From c3740ff1646a15823b19b9e703af04a3c52c44b5 Mon Sep 17 00:00:00 2001 From: Hanno Meyer-Thurow Date: Mon, 25 Apr 2011 22:04:55 +0200 Subject: Update '--disable-python' to disable only Python UNO API. * configure.in: --- configure.in | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index 4d41723c6535..6c7a8b60d0dc 100755 --- a/configure.in +++ b/configure.in @@ -4158,6 +4158,11 @@ AC_MSG_CHECKING([whether to enable Python 2.x UNO API]) if test "$enable_python" != "no"; then AC_MSG_RESULT([yes]) BUILD_TYPE="$BUILD_TYPE PYUNO" +else + AC_MSG_RESULT([no]) + DISABLE_PYTHON=TRUE + AC_SUBST(DISABLE_PYTHON) +fi AC_MSG_CHECKING([which python to use]) if test "$_os" = "WINNT"; then @@ -4210,12 +4215,6 @@ AC_SUBST(PYTHON_CFLAGS) AC_SUBST(PYTHON_LIBS) HOME=`echo $HOME | $SED 's:\\\\:/:g'` AC_SUBST(HOME) -dnl disable python -else - AC_MSG_RESULT([no]) - DISABLE_PYTHON=TRUE - AC_SUBST(DISABLE_PYTHON) -fi dnl =================================================================== dnl Check for system translate-toolkit -- cgit v1.2.3 From 07e038661fcbd9083e7d5a6617a6747001336638 Mon Sep 17 00:00:00 2001 From: Hanno Meyer-Thurow Date: Mon, 25 Apr 2011 22:05:18 +0200 Subject: Update '--disable-python' to disable only Python UNO API. * scripting/source/pyprov/makefile.mk: --- scripting/source/pyprov/makefile.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk index fa43858021bb..a96c3f30e47f 100755 --- a/scripting/source/pyprov/makefile.mk +++ b/scripting/source/pyprov/makefile.mk @@ -35,7 +35,8 @@ TARGET=pyprov .INCLUDE : settings.mk # --- Targets ------------------------------------------------------ -.IF "$(DISABLE_PYTHON)" != "TRUE" +# mailmerge is put in an extra services.rdb +# simply do not fiddle with that. cws sb123, sb129 ALL : ALLTAR \ $(DLLDEST)$/officehelper.py \ $(DLLDEST)$/mailmerge.py @@ -68,9 +69,3 @@ COMPONENT_FILES=$(EXTENSIONDIR)$/pythonscript.py .INCLUDE : target.mk .ENDIF - -.ELSE - -.INCLUDE : target.mk - -.ENDIF -- cgit v1.2.3 From 39ec5e3c3a7b61cb3accba346950dfa75863ecd5 Mon Sep 17 00:00:00 2001 From: Hanno Meyer-Thurow Date: Mon, 25 Apr 2011 22:05:31 +0200 Subject: Update '--disable-python' to disable only Python UNO API. * postprocess/packcomponents/makefile.mk: --- postprocess/packcomponents/makefile.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 0f97b77864fa..1a60d20443e2 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -140,7 +140,6 @@ my_components = \ placeware \ preload \ protocolhandler \ - pythonloader \ res \ rpt \ rptui \ @@ -193,6 +192,10 @@ my_components = \ xsltfilter \ xstor +.IF "$(DISABLE_PYTHON)" != "TRUE" +my_components += pythonloader +.ENDIF + .IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX" my_components += splash .ENDIF -- cgit v1.2.3 From 4fdd2b4f9d1a834f1786a56d455c9c01dc710390 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Mon, 25 Apr 2011 21:24:46 -0400 Subject: Move it up a bit more to get it to build with --disable-mozilla. --- configure.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 6c7a8b60d0dc..8ba8d4ff917d 100755 --- a/configure.in +++ b/configure.in @@ -4910,6 +4910,8 @@ fi AC_SUBST(WITH_LDAP) AC_SUBST(WITH_OPENLDAP) +AC_OUTPUT([ooo.lst]) + dnl =================================================================== dnl Check for system mozilla dnl =================================================================== @@ -5095,7 +5097,6 @@ else AC_MSG_RESULT([no]) fi -AC_OUTPUT([ooo.lst]) if test "$BUILD_MOZAB" = "TRUE"; then if test "$_os" = "WINNT"; then -- cgit v1.2.3 From bca3f94088b7769dd068a4d144034ea029eb53a2 Mon Sep 17 00:00:00 2001 From: Dimitri Duc Date: Mon, 25 Apr 2011 15:02:50 +0200 Subject: Fixed incorrect bracket format. --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 8ba8d4ff917d..8624333bf2e2 100755 --- a/configure.in +++ b/configure.in @@ -2912,7 +2912,7 @@ elif test "$enable_ccache_skip" = "auto" ; then save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS --ccache-skip -O2" dnl an empty program will do, we're checking the compiler flags - AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[]), + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [use_ccache=yes], [use_ccache=no]) if test $use_ccache = yes ; then AC_MSG_RESULT([yes, will enable --ccache-skip]) -- cgit v1.2.3 From ff0fec92604d003305b2251c6e4a95bbef84e981 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 26 Apr 2011 09:32:22 +0100 Subject: fixed problem with return value in ScVbaWorksheet::createSheetCopyInNewDoc --- sc/source/ui/vba/excelvbahelper.cxx | 87 +++++++++++++++++++++++++++++++++++++ sc/source/ui/vba/excelvbahelper.hxx | 2 + sc/source/ui/vba/vbaworkbooks.cxx | 82 +--------------------------------- sc/source/ui/vba/vbaworksheet.cxx | 16 +++++-- sc/source/ui/vba/vbaworksheets.cxx | 6 ++- 5 files changed, 108 insertions(+), 85 deletions(-) diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index 4f49aab539c4..d98f1ac7ee1e 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -39,6 +39,13 @@ #include "token.hxx" #include "tokenarray.hxx" +#include +#include +#include +#include +#include +#include + using namespace ::com::sun::star; using namespace ::ooo::vba; @@ -460,6 +467,86 @@ getUnoSheetModuleObj( const uno::Reference< frame::XModel >& xModel, SCTAB nTab return getUnoSheetModuleObj( xSheet ); } +void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& xDoc ) +{ + uno::Reference< frame::XModel > xModel( xDoc, uno::UNO_QUERY ); + ScDocShell* pShell = excel::getDocShell( xModel ); + if ( pShell ) + { + String aPrjName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) ); + pShell->GetBasicManager()->SetName( aPrjName ); + + /* Set library container to VBA compatibility mode. This will create + the VBA Globals object and store it in the Basic manager of the + document. */ + uno::Reference xLibContainer = pShell->GetBasicContainer(); + uno::Reference xVBACompat( xLibContainer, uno::UNO_QUERY_THROW ); + xVBACompat->setVBACompatibilityMode( sal_True ); + + if( xLibContainer.is() ) + { + if( !xLibContainer->hasByName( aPrjName ) ) + xLibContainer->createLibrary( aPrjName ); + uno::Any aLibAny = xLibContainer->getByName( aPrjName ); + uno::Reference< container::XNameContainer > xLib; + aLibAny >>= xLib; + if( xLib.is() ) + { + uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW ); + uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW); + uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY_THROW ); + // set up the module info for the workbook and sheets in the nealy created + // spreadsheet + ScDocument* pDoc = pShell->GetDocument(); + String sCodeName = pDoc->GetCodeName(); + if ( sCodeName.Len() == 0 ) + { + sCodeName = String( RTL_CONSTASCII_USTRINGPARAM("ThisWorkbook") ); + pDoc->SetCodeName( sCodeName ); + } + + std::vector< rtl::OUString > sDocModuleNames; + sDocModuleNames.push_back( sCodeName ); + + for ( SCTAB index = 0; index < pDoc->GetTableCount(); index++) + { + String aName; + pDoc->GetCodeName( index, aName ); + sDocModuleNames.push_back( aName ); + } + + std::vector::iterator it_end = sDocModuleNames.end(); + + for ( std::vector::iterator it = sDocModuleNames.begin(); it != it_end; ++it ) + { + script::ModuleInfo sModuleInfo; + + uno::Any aName= xVBACodeNamedObjectAccess->getByName( *it ); + sModuleInfo.ModuleObject.set( aName, uno::UNO_QUERY ); + sModuleInfo.ModuleType = script::ModuleType::DOCUMENT; + xVBAModuleInfo->insertModuleInfo( *it, sModuleInfo ); + if( xLib->hasByName( *it ) ) + xLib->replaceByName( *it, uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n") ) ) ); + else + xLib->insertByName( *it, uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n" ) ) ) ); + } + } + } + + /* Trigger the Workbook_Open event, event processor will register + itself as listener for specific events. */ + try + { + uno::Reference< script::vba::XVBAEventProcessor > xVbaEvents( pShell->GetDocument()->GetVbaEventProcessor(), uno::UNO_SET_THROW ); + uno::Sequence< uno::Any > aArgs; + xVbaEvents->processVbaEvent( script::vba::VBAEventId::WORKBOOK_OPEN, aArgs ); + } + catch( uno::Exception& ) + { + } + } +} + SfxItemSet* ScVbaCellRangeAccess::GetDataSet( ScCellRangesBase* pRangeObj ) { diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 296b80862d8c..9befc1548357 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -76,6 +77,7 @@ ScDocShell* GetDocShellFromRange( const css::uno::Reference< css::uno::XInterfac ScDocShell* GetDocShellFromRanges( const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges ) throw ( css::uno::RuntimeException ); ScDocument* GetDocumentFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException ); css::uno::Reference< css::frame::XModel > GetModelFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException ); +void setUpDocumentModules( const css::uno::Reference< css::sheet::XSpreadsheetDocument >& xDoc ); // ============================================================================ diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 86b24c3dec92..39f6f66db091 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -70,86 +70,6 @@ using namespace ::com::sun::star; const sal_Int16 CUSTOM_CHAR = 5; -void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& xDoc ) -{ - uno::Reference< frame::XModel > xModel( xDoc, uno::UNO_QUERY ); - ScDocShell* pShell = excel::getDocShell( xModel ); - if ( pShell ) - { - String aPrjName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) ); - pShell->GetBasicManager()->SetName( aPrjName ); - - /* Set library container to VBA compatibility mode. This will create - the VBA Globals object and store it in the Basic manager of the - document. */ - uno::Reference xLibContainer = pShell->GetBasicContainer(); - uno::Reference xVBACompat( xLibContainer, uno::UNO_QUERY_THROW ); - xVBACompat->setVBACompatibilityMode( sal_True ); - - if( xLibContainer.is() ) - { - if( !xLibContainer->hasByName( aPrjName ) ) - xLibContainer->createLibrary( aPrjName ); - uno::Any aLibAny = xLibContainer->getByName( aPrjName ); - uno::Reference< container::XNameContainer > xLib; - aLibAny >>= xLib; - if( xLib.is() ) - { - uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW ); - uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY_THROW ); - // set up the module info for the workbook and sheets in the nealy created - // spreadsheet - ScDocument* pDoc = pShell->GetDocument(); - String sCodeName = pDoc->GetCodeName(); - if ( sCodeName.Len() == 0 ) - { - sCodeName = String( RTL_CONSTASCII_USTRINGPARAM("ThisWorkbook") ); - pDoc->SetCodeName( sCodeName ); - } - - std::vector< rtl::OUString > sDocModuleNames; - sDocModuleNames.push_back( sCodeName ); - - uno::Reference xSheets( xDoc->getSheets(), uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > sSheets( xSheets->getElementNames() ); - - for ( sal_Int32 index=0; index < sSheets.getLength() ; ++index ) - { - sDocModuleNames.push_back( sSheets[ index ] ); - } - - std::vector::iterator it_end = sDocModuleNames.end(); - - for ( std::vector::iterator it = sDocModuleNames.begin(); it != it_end; ++it ) - { - script::ModuleInfo sModuleInfo; - - sModuleInfo.ModuleObject.set( xVBACodeNamedObjectAccess->getByName( *it ), uno::UNO_QUERY ); - sModuleInfo.ModuleType = script::ModuleType::DOCUMENT; - xVBAModuleInfo->insertModuleInfo( *it, sModuleInfo ); - if( xLib->hasByName( *it ) ) - xLib->replaceByName( *it, uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n") ) ) ); - else - xLib->insertByName( *it, uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n" ) ) ) ); - } - } - } - - /* Trigger the Workbook_Open event, event processor will register - itself as listener for specific events. */ - try - { - uno::Reference< script::vba::XVBAEventProcessor > xVbaEvents( pShell->GetDocument()->GetVbaEventProcessor(), uno::UNO_SET_THROW ); - uno::Sequence< uno::Any > aArgs; - xVbaEvents->processVbaEvent( script::vba::VBAEventId::WORKBOOK_OPEN, aArgs ); - } - catch( uno::Exception& ) - { - } - } -} - static uno::Any getWorkbook( uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSpreadsheetDocument > &xDoc, const uno::Reference< XHelperInterface >& xParent ) { @@ -254,7 +174,7 @@ ScVbaWorkbooks::Add( const uno::Any& Template ) throw (uno::RuntimeException) } // need to set up the document modules ( and vba mode ) here - setUpDocumentModules( xSpreadDoc ); + excel::setUpDocumentModules( xSpreadDoc ); if( xSpreadDoc.is() ) return getWorkbook( mxContext, xSpreadDoc, mxParent ); return uno::Any(); diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index f3c5bb18efe2..87fb2e9a07e3 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -72,6 +72,13 @@ #include #include +#include +#include +#include +#include +#include +#include + #include //zhangyun showdataform @@ -245,12 +252,15 @@ ScVbaWorksheet::createSheetCopyInNewDoc(rtl::OUString aCurrSheetName) excel::implnPaste(xModel); } uno::Reference xSpreadDoc( xModel, uno::UNO_QUERY_THROW ); + excel::setUpDocumentModules(xSpreadDoc); uno::Reference xSheets( xSpreadDoc->getSheets(), uno::UNO_QUERY_THROW ); uno::Reference xIndex( xSheets, uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSpreadsheet > xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); - //#TODO #FIXME - //get proper parent for Worksheet - return new ScVbaWorksheet( NULL, mxContext, xSheet, xModel ); + + ScDocShell* pShell = excel::getDocShell( xModel ); + String aCodeName; + pShell->GetDocument()->GetCodeName( 0, aCodeName ); + return uno::Reference< excel::XWorksheet >( getUnoDocModule( aCodeName, pShell ), uno::UNO_QUERY_THROW ); } css::uno::Reference< ov::excel::XWorksheet > diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 80b6537d865c..e2c436b13966 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -447,8 +447,12 @@ ScVbaWorksheets::Copy ( const uno::Any& Before, const uno::Any& After) throw (cs xSheet = pSrcSheet->createSheetCopyInNewDoc(xSrcSheet->getName()); nItem = 1; } + else + { + nItem=0; + } - for (nItem = 0; nItem < nElems; ++nItem ) + for (; nItem < nElems; ++nItem ) { xSrcSheet = Sheets[nItem]; ScVbaWorksheet* pSrcSheet = excel::getImplFromDocModuleWrapper( xSrcSheet ); -- cgit v1.2.3 From 48a54070b42c55d53a4c9f2c28271e17c967d170 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 21 Apr 2011 11:26:34 +0300 Subject: Stopgap fixes for the crash on exit, fdo#36301 Hacks just intended as debugging aids, suggested by caolan. But as this does prevent the crash, I removed the debugging printfs and assertions, and commit as we don't have any proper fix anyway. --- configmgr/source/components.cxx | 5 +++++ configmgr/source/rootaccess.cxx | 9 +++++++++ sfx2/source/appl/app.cxx | 7 ++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 108e08fa7a12..e20ddad2eb45 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -510,12 +510,16 @@ css::beans::Optional< css::uno::Any > Components::getExternalValue( return value; } +int tempHACK = 0; + Components::Components( css::uno::Reference< css::uno::XComponentContext > const & context): context_(context) { lock_ = lock(); + tempHACK = 1; + OSL_ASSERT(context.is()); RTL_LOGFILE_TRACE_AUTHOR("configmgr", "sb", "begin parsing"); parseXcsXcuLayer( @@ -594,6 +598,7 @@ Components::Components( Components::~Components() { flushModifications(); + tempHACK = 0; } void Components::parseFileLeniently( diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx index ef5982e3a56d..90e5675b35a3 100644 --- a/configmgr/source/rootaccess.cxx +++ b/configmgr/source/rootaccess.cxx @@ -284,6 +284,8 @@ void RootAccess::removeChangesListener( } } +extern int tempHACK; + void RootAccess::commitChanges() throw (css::lang::WrappedTargetException, css::uno::RuntimeException) { @@ -291,6 +293,13 @@ void RootAccess::commitChanges() Broadcaster bc; { osl::MutexGuard g(*lock_); + + // OSL_ENSURE(tempHACK, "fucktastic!, seriously busted lifecycles\n"); + if (!tempHACK) + { + return; + } + checkLocalizedPropertyAccess(); int finalizedLayer; Modifications globalMods; diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index b954e9f5e7a9..7e660132988e 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -153,6 +153,7 @@ using namespace ::com::sun::star; // Static member SfxApplication* SfxApplication::pApp = NULL; static BasicDLL* pBasic = NULL; +static SfxHelp* pSfxHelp = NULL; class SfxPropertyHandler : public PropertyHandler { @@ -305,7 +306,6 @@ SfxApplication* SfxApplication::GetOrCreate() ::framework::SetIsDockingWindowVisible( IsDockingWindowVisible ); ::framework::SetActivateToolPanel( &SfxViewFrame::ActivateToolPanel ); - SfxHelp* pSfxHelp = new SfxHelp; Application::SetHelp( pSfxHelp ); if ( SvtHelpOptions().IsHelpTips() ) Help::EnableQuickHelp(); @@ -352,6 +352,8 @@ SfxApplication::SfxApplication() #endif #endif + pSfxHelp = new SfxHelp; + pBasic = new BasicDLL; StarBASIC::SetGlobalErrorHdl( LINK( this, SfxApplication, GlobalBasicErrorHdl_Impl ) ); RTL_LOGFILE_CONTEXT_TRACE( aLog, "} initialize DDE" ); @@ -365,6 +367,9 @@ SfxApplication::~SfxApplication() SfxModule::DestroyModules_Impl(); + delete pSfxHelp; + Application::SetHelp( NULL ); + // delete global options SvtViewOptions::ReleaseOptions(); delete pBasic; -- cgit v1.2.3 From ed7b1f1802309cb46b7bc0af77aa084d7e66a797 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 26 Apr 2011 15:03:31 +0200 Subject: do not package transitions-ogl.xml twice (fdo#36493) --- scp2/source/impress/module_impress.scp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp index abfdb1537041..e3313c821db4 100644 --- a/scp2/source/impress/module_impress.scp +++ b/scp2/source/impress/module_impress.scp @@ -44,10 +44,7 @@ Module gid_Module_Prg_Impress_Bin Styles = (HIDDEN_ROOT); Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware, gid_File_Share_Registry_Impress_Xcd, - gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml, - #if defined ENABLE_OPENGL - gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, - #endif + gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml, gid_File_Tmp_Userinstall_Impress_Inf); End -- cgit v1.2.3 From b23846d15e5f64ddfc4f198991f51427a822042a Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 26 Apr 2011 17:08:19 +0200 Subject: bump product version to 3.4.0-beta3, release number to 3 --- instsetoo_native/util/openoffice.lst | 16 ++++++++-------- solenv/inc/minor.mk | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 38a5cc5b4658..d318d584a5c2 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -57,7 +57,7 @@ LibreOffice PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta2 + SHORT_PRODUCTEXTENSION beta3 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 @@ -125,7 +125,7 @@ LibreOffice_wJRE PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta2 + SHORT_PRODUCTEXTENSION beta3 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 @@ -189,7 +189,7 @@ LibreOffice_Dev PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta2 + SHORT_PRODUCTEXTENSION beta3 BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION @@ -266,7 +266,7 @@ URE PRODUCTEXTENSION BRANDPACKAGEVERSION 3 LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta2 + SHORT_PRODUCTEXTENSION beta3 LICENSENAME LGPL SETSTATICPATH 1 NOVERSIONINDIRNAME 1 @@ -305,7 +305,7 @@ LibreOffice_SDK PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta2 + SHORT_PRODUCTEXTENSION beta3 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3 @@ -351,7 +351,7 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta2 + SHORT_PRODUCTEXTENSION beta3 BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION SDK @@ -404,7 +404,7 @@ OxygenOffice PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta2 + SHORT_PRODUCTEXTENSION beta3 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 @@ -473,7 +473,7 @@ OxygenOffice_wJRE PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta2 + SHORT_PRODUCTEXTENSION beta3 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 6d45a96930c9..f3346e78066b 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m103(Build:2) -BUILD=2 +RSCREVISION=300m103(Build:3) +BUILD=3 LAST_MINOR=m103 SOURCEVERSION=DEV300 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3