basic/source/comp/symtbl.cxx | 2 - chart2/source/controller/accessibility/AccessibleBase.cxx | 2 - cui/source/tabpages/tpgradnt.cxx | 2 - desktop/source/app/app.cxx | 2 - editeng/source/editeng/impedit.cxx | 2 - filter/source/graphicfilter/ieps/ieps.cxx | 2 - framework/source/services/desktop.cxx | 2 - framework/source/services/frame.cxx | 2 - include/svtools/ruler.hxx | 2 - m4/ax_boost_base.m4 | 2 - package/source/zippackage/ZipPackageFolder.cxx | 2 - qadevOOo/runner/helper/ProcessHandler.java | 2 - qadevOOo/runner/util/utils.java | 2 - sc/inc/formularesult.hxx | 2 - sd/source/ui/inc/ViewShellManager.hxx | 2 - sw/inc/frmfmt.hxx | 2 - sw/inc/printdata.hxx | 2 - sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 4 ++ sw/source/core/docnode/ndcopy.cxx | 2 - sw/source/core/text/txtfly.cxx | 2 - sw/source/core/text/widorp.cxx | 2 - sw/source/core/unocore/SwXTextDefaults.cxx | 4 +- sw/source/core/unocore/unoobj2.cxx | 2 - sw/source/filter/ww8/docxattributeoutput.cxx | 26 ++++++++++---- wizards/source/euro/Common.xba | 4 +- wizards/source/importwizard/Main.xba | 2 - wizards/source/tools/Misc.xba | 4 +- xmloff/source/chart/SchXMLExport.cxx | 2 - 28 files changed, 53 insertions(+), 35 deletions(-)
New commits: commit 457e0aef522583675247029e77cb212fb65d6cd1 Author: Jan Holesovsky <ke...@collabora.com> Date: Fri Oct 4 20:21:55 2013 +0200 DOCX styles: Check that we roundtrip rPrDefaults. Change-Id: I3aef9fdedf9877d1243940c429e05ff36f7fa760 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 223f26f..f771ef9 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -1402,6 +1402,10 @@ void Test::testStyleInheritance() assertXPath(pXmlStyles, "/w:styles/w:style[2]", "styleId", "Heading1"); // w:ind was copied from the parent (Normal) style without a good reason. assertXPath(pXmlStyles, "/w:styles/w:style[2]/w:pPr/w:ind", 0); + + // Check that we output real content of rPrDefault + assertXPath(pXmlStyles, "/w:styles/w:docDefaults/w:rPrDefault/w:rPr/w:rFonts", "ascii", "Times New Roman"); + assertXPath(pXmlStyles, "/w:styles/w:docDefaults/w:rPrDefault/w:rPr/w:lang", "bidi", "ar-SA"); } void Test::testSmartart() commit 9f8fb9fce00caf1672844444a737a6477e34c9cb Author: Jan Holesovsky <ke...@collabora.com> Date: Fri Oct 4 20:10:01 2013 +0200 DOCX styles: Output real rPrDefault's. Not complete - to be checked which of the properties are we supposed to output; so far we support only w:rFont and w:lang. Change-Id: I142dd075735ba2c5cb1022768bfecf793148078f diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index d215e25..8e3c1c3 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2358,13 +2358,27 @@ void DocxAttributeOutput::StartStyles() void DocxAttributeOutput::DocDefaults( ) { - // To-Do : fill the '<w:docDefaults>' node with actual data - // Write the '<w:docDefaults>' section here - m_pSerializer->startElementNS( XML_w, XML_docDefaults, FSEND ); - m_pSerializer->singleElementNS( XML_w, XML_rPrDefault, FSEND ); - m_pSerializer->singleElementNS( XML_w, XML_pPrDefault, FSEND ); - m_pSerializer->endElementNS( XML_w, XML_docDefaults ); + m_pSerializer->startElementNS(XML_w, XML_docDefaults, FSEND); + + // Output the default run properties + m_pSerializer->startElementNS(XML_w, XML_rPrDefault, FSEND); + StartRunProperties(); + + // TODO find out which run properties do we want to write + const RES_CHRATR aDefaultRunProperties[] = { + RES_CHRATR_FONT, RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_FONT, + RES_CHRATR_LANGUAGE, RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CTL_LANGUAGE, + }; + for (size_t i = 0; i < SAL_N_ELEMENTS(aDefaultRunProperties); ++i) + OutputItem(m_rExport.pDoc->GetDefault(aDefaultRunProperties[i])); + + EndRunProperties(NULL); + m_pSerializer->endElementNS(XML_w, XML_rPrDefault); + + // TODO should we output some paragraph properties too? + m_pSerializer->singleElementNS(XML_w, XML_pPrDefault, FSEND); + m_pSerializer->endElementNS(XML_w, XML_docDefaults); } void DocxAttributeOutput::EndStyles( sal_uInt16 /*nNumberOfStyles*/ ) commit ad7b757a25d90e995606947ee639d5b620c267a2 Author: Jan Holesovsky <ke...@collabora.com> Date: Fri Oct 4 16:57:18 2013 +0200 'ist' -> 'is' here and there. Change-Id: I0a463c38214b95582db2c7b3979367255426c14e diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx index fccc044..2b8190c 100644 --- a/basic/source/comp/symtbl.cxx +++ b/basic/source/comp/symtbl.cxx @@ -388,7 +388,7 @@ sal_uInt32 SbiSymDef::Define() return nChain; } -// A symbol definition may have its own pool. This is the caseDies ist +// A symbol definition may have its own pool. This is the case // for objects and procedures (local variable) SbiSymPool& SbiSymDef::GetPool() diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 74cf3cc..9550bea 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -716,7 +716,7 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds() SolarMutexGuard aSolarGuard; aRect = pWindow->LogicToPixel( aRect ); - // aLogicRect ist relative to the page, but we need a value relative + // aLogicRect is relative to the page, but we need a value relative // to the parent object awt::Point aParentLocOnScreen; uno::Reference< XAccessibleComponent > xParent( getAccessibleParent(), uno::UNO_QUERY ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index ca00363..6a2a70b 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -800,7 +800,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl) m_pLbGradientType->SelectEntryPos( sal::static_int_cast< sal_uInt16 >( eXGS ) ); - // if the entry is not in the listbox ist, + // if the entry is not in the listbox, // colors are added temporarily m_pLbColorFrom->SetNoSelection(); m_pLbColorFrom->SelectEntry( pGradient->GetStartColor() ); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index c062956..4c36cd3 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1121,7 +1121,7 @@ sal_Bool impl_callRecoveryUI(sal_Bool bEmergencySave , /* * Save all open documents so they will be reopened - * the next time the application ist started + * the next time the application is started * * returns sal_True if at least one document could be saved... * diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 0b33f13..035eacb 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -1672,7 +1672,7 @@ void ImpEditView::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSo else { // other EditEngine ... - if (pEditEngine->HasText()) // #88630# SC ist removing the content when switching the task + if (pEditEngine->HasText()) // #88630# SC is removing the content when switching the task DeleteSelected(); } } diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 3f3ba2e..a85294d 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -45,7 +45,7 @@ class FilterConfigItem; |* |* Description Checks if there is a string(pDest) of length nSize |* inside the memory area pSource which is nComp bytes long. -|* Check is NON-CASE-SENSITIVE. The return value ist the +|* Check is NON-CASE-SENSITIVE. The return value is the |* address where the string is found or NULL |* *************************************************************************/ diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 1064c2a..324bd73 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -951,7 +951,7 @@ void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css @short try to find a frame with special parameters @descr This method searches for a frame with the specified name. Frames may contain other frames (e.g. a frameset) and may - be contained in other frames. This hierarchie ist searched by + be contained in other frames. This hierarchie is searched by this method. First some special names are taken into account, i.e. "", "_self", "_top", "_parent" etc. The FrameSearchFlags are ignored diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 463c8a7..f3209b3 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -712,7 +712,7 @@ void SAL_CALL Frame::setName( const OUString& sName ) throw( css::uno::RuntimeEx @short search for frames @descr This method searches for a frame with the specified name. Frames may contain other frames (e.g. a frameset) and may - be contained in other frames. This hierarchie ist searched by + be contained in other frames. This hierarchie is searched by this method. First some special names are taken into account, i.e. "", "_self", "_top", "_blank" etc. The nSearchFlags are ignored diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 8f34c23..8ce7559 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -151,7 +151,7 @@ has to be passed. In the array, the following values have to be initialized: RULER_BORDER_VARIABLE Not all of the column spacings are equal RULER_BORDER_TABLE - Table border. Whenever this style ist set, the column + Table border. Whenever this style is set, the column width must be 0. RULER_BORDER_SNAP Auxiliary line. Whenever this style is set, the diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4 index 0dead6d..7a0cf52 100644 --- a/m4/ax_boost_base.m4 +++ b/m4/ax_boost_base.m4 @@ -96,7 +96,7 @@ if test "x$want_boost" = "xyes"; then fi dnl first we check the system location for boost libraries - dnl this location ist chosen if boost libraries are installed with the --layout=system option + dnl this location is chosen if boost libraries are installed with the --layout=system option dnl or if you install boost with RPM if test "$ac_boost_path" != ""; then BOOST_CPPFLAGS="-I$ac_boost_path/include" diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index 976c230..0c46959 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -115,7 +115,7 @@ sal_Bool ZipPackageFolder::LookForUnexpectedODF12Streams( const OUString& aPath } else if ( !rInfo.pStream->IsFromManifest() ) { - // the stream is not in META-INF and ist notregistered in manifest.xml, + // the stream is not in META-INF and is not registered in manifest.xml, // check whether it is an internal part of the package format if ( !aPath.isEmpty() || rShortName != "mimetype" ) { diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java index 7e7b7c7..c70dd1d 100644 --- a/qadevOOo/runner/helper/ProcessHandler.java +++ b/qadevOOo/runner/helper/ProcessHandler.java @@ -420,7 +420,7 @@ public class ProcessHandler if (!this.isFinished()) { - dbg("runCommand Process ist not finished but there are no changes in output stream."); + dbg("runCommand Process is not finished but there are no changes in output stream."); this.kill(); } } diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java index c91b42b..46a359d 100644 --- a/qadevOOo/runner/util/utils.java +++ b/qadevOOo/runner/util/utils.java @@ -862,7 +862,7 @@ public class utils { } /** - * String.replaceAll() ist available since Java 1.4 but the runner must be buldabale with Java 1.3 + * String.replaceAll() is available since Java 1.4 but the runner must be buldabale with Java 1.3 * @param originalString * @param searchString * @param replaceString diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx index 4f13524..d1c235f 100644 --- a/sc/inc/formularesult.hxx +++ b/sc/inc/formularesult.hxx @@ -94,7 +94,7 @@ public: /** Sets a direct double if token type is formula::svDouble, or mbEmpty if formula::svEmptyCell, else token. If p is NULL, that is set as well, effectively resulting in GetType()==svUnknown. If the already existing result is - ScMatrixFormulaCellToken, the upper left ist set to token. + ScMatrixFormulaCellToken, the upper left is set to token. ATTENTION! formula::FormulaToken had to be allocated using 'new' and if of type formula::svDouble and no RefCount was set may not be used after this call diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx index 2b18218..f4ba346 100644 --- a/sd/source/ui/inc/ViewShellManager.hxx +++ b/sd/source/ui/inc/ViewShellManager.hxx @@ -147,7 +147,7 @@ public: only shells that are higher on the stack are its object bars. Call this method after a focus change to bring a view mode view - shell and ist associated tool bar shells to the top of the + shell and is associated tool bar shells to the top of the stack. The mbKeepMainViewShellOnTop flag is not obeyed. diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 0d3eba5..7abed6c 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -93,7 +93,7 @@ public: const SwContact *FindContactObj() const { return ((SwFrmFmt*)this)->FindContactObj(); } - /** @return the SdrObject, that ist connected to the ContactObject. + /** @return the SdrObject, that is connected to the ContactObject. Only DrawFrmFmts are connected to the "real SdrObject". FlyFrmFmts are connected to a Master and all FlyFrms has the "real SdrObject". "Real SdrObject" has position and a Z-order. */ diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index e92c164..05aa4c1 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -125,7 +125,7 @@ public: bPrintTextPlaceholder == rData.bPrintTextPlaceholder; } - /** Note: in the context where this class ist used the pointers should always be valid + /** Note: in the context where this class is used the pointers should always be valid during the lifetime of this object */ const SwPrintUIOptions & GetPrintUIOptions() const { return *m_pPrintUIOptions; } const SwRenderData & GetRenderData() const { return *m_pRenderData; } diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index 9d73cd8..9cd58f5 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -230,7 +230,7 @@ typedef std::vector<_MapTblFrmFmt> _MapTblFrmFmts; SwCntntNode* SwTxtNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const { // the Copy-Textnode is the Node with the Text, the Copy-Attrnode is the - // node with the collection and hard attributes. Normally ist the same + // node with the collection and hard attributes. Normally is the same // node, but if insert a glossary without formatting, then the Attrnode // is the prev node of the destionation position in dest. document. SwTxtNode* pCpyTxtNd = (SwTxtNode*)this; diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 65bf05e..5cd468f 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -795,7 +795,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, // their influence ends at the borders of the FlyCnt! // If we are currently formatting the text of the FlyCnt, then // it has to get out of the way of the Frm anchored at paragraph! - // pCurrFrm ist the anchor of pNew? + // pCurrFrm is the anchor of pNew? // #i26945# const SwFrm* pTmp = _pAnchoredObj->GetAnchorFrm(); if( pTmp == pCurrFrm ) diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx index ee84a79..3548f78 100644 --- a/sw/source/core/text/widorp.cxx +++ b/sw/source/core/text/widorp.cxx @@ -44,7 +44,7 @@ /************************************************************************* * inline IsNastyFollow() *************************************************************************/ -// A Follow on the same page as its master ist nasty. +// A Follow on the same page as its master is nasty. inline sal_Bool IsNastyFollow( const SwTxtFrm *pFrm ) { OSL_ENSURE( !pFrm->IsFollow() || !pFrm->GetPrev() || diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx index 2173594..539cac4 100644 --- a/sw/source/core/unocore/SwXTextDefaults.cxx +++ b/sw/source/core/unocore/SwXTextDefaults.cxx @@ -102,13 +102,13 @@ void SAL_CALL SwXTextDefaults::setPropertyValue( const OUString& rPropertyName, rtl::Reference< SwDocStyleSheet > xStyle( new SwDocStyleSheet( *(SwDocStyleSheet*)pStyle ) ); if (RES_PARATR_DROP == pMap->nWID) { - pDrop = (SwFmtDrop*)rItem.Clone(); // because rItem ist const... + pDrop = (SwFmtDrop*)rItem.Clone(); // because rItem is const... pDrop->SetCharFmt(xStyle->GetCharFmt()); m_pDoc->SetDefault(*pDrop); } else // RES_TXTATR_CHARFMT == pMap->nWID { - pCharFmt = (SwFmtCharFmt*)rItem.Clone(); // because rItem ist const... + pCharFmt = (SwFmtCharFmt*)rItem.Clone(); // because rItem is const... pCharFmt->SetCharFmt(xStyle->GetCharFmt()); m_pDoc->SetDefault(*pCharFmt); } diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index d938fc8..e93189e 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -779,7 +779,7 @@ void SwXTextRange::Impl::Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew { const_cast<SwModify*>(GetRegisteredIn())->Remove(this); } - // or if the range has been removed but the depend ist still + // or if the range has been removed but the depend is still // connected then the depend must be removed else if (bAlreadyRegistered && !GetRegisteredIn() && m_ObjectDepend.GetRegisteredIn()) diff --git a/wizards/source/euro/Common.xba b/wizards/source/euro/Common.xba index 8de005b..94a8b198b 100644 --- a/wizards/source/euro/Common.xba +++ b/wizards/source/euro/Common.xba @@ -160,7 +160,7 @@ Dim oFormatofObject() as Object Exit Function End If If FieldinArray(CurrSymbolList(),2,oFormatofObject.CurrencySymbol) Then - ' If the Currencysymbol of the object ist the one needed, then check the Currency extension + ' If the Currencysymbol of the object is the one needed, then check the Currency extension sFormatCurrExt = oFormatofObject.CurrencyExtension If FieldInList(CurExtension(),2,sFormatCurrExt) Then @@ -286,4 +286,4 @@ Sub EndStatusLine() DialogModel.ProgressBar.ProgressValue = 100 End If End Sub -</script:module> \ No newline at end of file +</script:module> diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba index 37475a0..46be949 100644 --- a/wizards/source/importwizard/Main.xba +++ b/wizards/source/importwizard/Main.xba @@ -26,7 +26,7 @@ Public ImportDialogArea as Object Public oFactoryKey as Object Public bShowLogFile as Boolean -' If the ProgressPage ist already on Top The Dialog will be immediately closed when this flag is +' If the ProgressPage is already on Top The Dialog will be immediately closed when this flag is ' set to False Public bConversionIsRunning as Boolean Public RetValue as Integer diff --git a/wizards/source/tools/Misc.xba b/wizards/source/tools/Misc.xba index c789892..94b9c30 100644 --- a/wizards/source/tools/Misc.xba +++ b/wizards/source/tools/Misc.xba @@ -141,7 +141,7 @@ End Function Function OpenDocument(DocPath as String, Args(), Optional bDisposable as Boolean) Dim oComponents as Object Dim oComponent as Object - ' Search if one of the active Components ist the one that you search for + ' Search if one of the active Components is the one that you search for oComponents = StarDesktop.Components.CreateEnumeration While oComponents.HasmoreElements oComponent = oComponents.NextElement @@ -165,7 +165,7 @@ End Function Function TaskonDesktop(DocPath as String) as Boolean Dim oComponents as Object Dim oComponent as Object - ' Search if one of the active Components ist the one that you search for + ' Search if one of the active Components is the one that you search for oComponents = StarDesktop.Components.CreateEnumeration While oComponents.HasmoreElements oComponent = oComponents.NextElement diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 710a72f..aa05e7b 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -144,7 +144,7 @@ public: for writing the corresponding attributes at series All attributes contained in xAttrList are written at the chart element, - which ist the outer element of a chart. So these attributes can easily + which is the outer element of a chart. So these attributes can easily be parsed again by the container */ void exportChart( com::sun::star::uno::Reference< _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits