diff --git a/offapi/com/sun/star/form/component/DataForm.idl b/offapi/com/sun/star/form/component/DataForm.idl index b3026d4cb2c9..758bd8bbd456 100644 --- a/offapi/com/sun/star/form/component/DataForm.idl +++ b/offapi/com/sun/star/form/component/DataForm.idl @@ -69,7 +69,7 @@ published service DataForm

One main difference between XLoadable::load() and com::sun::star::sdbc::XRowSet::execute() is that if you use the former, the row set is positioned on the first record, while in the latter case - it is position before the it.

+ it is positioned before it.

*/ interface com::sun::star::form::XLoadable; @@ -126,7 +126,7 @@ published service DataForm the corresponding master field.
Alternatively, you could simply base your form on the table invoices, and add the column name cust_ref to the DetailFields. In this case, - and implicit filter clause WHERE cust_ref = :<new_param_name> will + an implicit filter clause WHERE cust_ref = :<new_param_name> will be created, and the artificial parameter will be filled from the corresponding master field.
If a string in this property denotes both a column name and a parameter name, it diff --git a/offapi/com/sun/star/report/XReportComponent.idl b/offapi/com/sun/star/report/XReportComponent.idl index 54ea5030e7fc..b609b8950398 100644 --- a/offapi/com/sun/star/report/XReportComponent.idl +++ b/offapi/com/sun/star/report/XReportComponent.idl @@ -141,7 +141,7 @@ interface XReportComponent the corresponding master field.
Alternatively, you could simply base your report on the table invoices, and add the column name cust_ref to the DetailFields. In this case, - and implicit filter clause WHERE cust_ref = :<new_param_name> will + an implicit filter clause WHERE cust_ref = :<new_param_name> will be created, and the artificial parameter will be filled from the corresponding master field.
If a string in this property denotes both a column name and a parameter name, it diff --git a/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl b/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl index be3ecf4f090e..55fbc3c83ef2 100644 --- a/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl +++ b/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl @@ -39,7 +39,7 @@ published service HierarchyDataReadWriteAccess must remove data members. However, the mandatory data members (Title, TargetURL, Children) must never be removable. -

Replacing and getting values must be supported be every data node. +

Replacing and getting values must be supported by every data node. */ interface com::sun::star::container::XNameContainer; diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 712ae3863062..26c8e6cd75e8 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1172,7 +1172,7 @@ - If true, Calc preserves previous content of cells when pasting empty ones. If false, Calc delete content of previous cells. + If true, Calc preserves previous content of cells when pasting empty ones. If false, Calc deletes content of previous cells. true @@ -1286,7 +1286,7 @@ - If true, Calc preserves previous content of cells when pasting empty ones. If false, Calc delete content of previous cells. + If true, Calc preserves previous content of cells when pasting empty ones. If false, Calc deletes content of previous cells. false @@ -1959,7 +1959,7 @@ - Insert link for the cell, instead of text fields in a cell.(Excel interopability options) + Insert link for the cell, instead of text fields in a cell.(Excel interoperability options) false diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index b124ca447d63..3b70c74e86ad 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -638,7 +638,7 @@ Specifies the maximum allowed luminance the system's selection - color may have. When the colorfetched from the system is brighter + color may have. When the color fetched from the system is brighter (luminance is bigger), it will be scaled to a luminance of exactly this given value. - The file name of the mask bitmap. Use red for pixel outside of + The file name of the mask bitmap. Use red for pixels outside of the border and blue for inside pixels. @@ -90,8 +90,8 @@ - Color that is used as replacement for the bitmap when the later - can for some reason not be used. + Color that is used as replacement for the bitmap when the latter + cannot be used for some reason. diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx index 941d2f158a7d..c4ec6427344b 100644 --- a/oox/source/drawingml/chart/chartspaceconverter.cxx +++ b/oox/source/drawingml/chart/chartspaceconverter.cxx @@ -318,23 +318,23 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern if ( mrModel.mbPivotChart ) { PropertySet aProps( getChartDocument() ); - aProps.setProperty( PROP_DisableDataTableDialog , true ); - aProps.setProperty( PROP_DisableComplexChartTypes , true ); + aProps.setProperty( PROP_DisableDataTableDialog, true ); + aProps.setProperty( PROP_DisableComplexChartTypes, true ); } - if(!mrModel.maSheetPath.isEmpty() ) + if (!mrModel.maSheetPath.isEmpty()) { Reference< css::chart::XChartDocument > xChartDoc( getChartDocument(), UNO_QUERY ); PropertySet aProps( xChartDoc->getDiagram() ); - aProps.setProperty( PROP_ExternalData , uno::Any(mrModel.maSheetPath) ); + aProps.setProperty( PROP_ExternalData, uno::Any(mrModel.maSheetPath) ); } if (mrModel.mbDate1904) { - util::DateTime aNullDate(0,0,0,0,1,1,1904, false); + util::DateTime aNullDate(0, 0, 0, 0, 1, 1, 1904, false); Any aAny; aAny <<= aNullDate; Reference< css::chart::XChartDocument > xChartDoc( getChartDocument(), UNO_QUERY ); - Reference< beans::XPropertySet > xDocPropSet(xChartDoc, UNO_QUERY ); + Reference< beans::XPropertySet > xDocPropSet(xChartDoc, UNO_QUERY); xDocPropSet->setPropertyValue(u"NullDate"_ustr, aAny); } } diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx index 35f9c90daded..8b9d6d1a7741 100644 --- a/oox/source/drawingml/chart/plotareaconverter.cxx +++ b/oox/source/drawingml/chart/plotareaconverter.cxx @@ -217,7 +217,7 @@ void AxesSetConverter::convertFromModel( const Reference< XDiagram >& rxDiagram, // convert all chart type groups, this converts all series data and formatting for (auto const& typeGroup : aTypeGroups) typeGroup->convertFromModel( rxDiagram, xCoordSystem, - nAxesSetIdx,bSupportsVaryColorsByPoint ); + nAxesSetIdx, bSupportsVaryColorsByPoint ); // convert all axes (create missing axis models) ModelRef< AxisModel > xXAxis = lclGetOrCreateAxis( mrModel.maAxes, @@ -653,6 +653,6 @@ void PlotAreaConverter::convertPositionFromModel() } } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index c33a8497ed90..2c65bbe3bb64 100644 --- a/oox/source/drawingml/chart/titleconverter.cxx +++ b/oox/source/drawingml/chart/titleconverter.cxx @@ -259,7 +259,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram, cssc2::LegendPosition eLegendPos = cssc2::LegendPosition_LINE_END; cssc::ChartLegendExpansion eLegendExpand = cssc::ChartLegendExpansion_CUSTOM; RelativePosition eRelPos; - bool bTopRight=false; + bool bTopRight = false; switch( mrModel.mnPosition ) { case XML_l: @@ -272,9 +272,9 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram, break; case XML_tr: // top-right not supported eRelPos.Primary = 1; - eRelPos.Secondary =0; + eRelPos.Secondary = 0; eRelPos.Anchor = Alignment_TOP_RIGHT; - bTopRight=true; + bTopRight = true; break; case XML_t: eLegendPos = cssc2::LegendPosition_PAGE_START; @@ -285,7 +285,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram, eLegendExpand = cssc::ChartLegendExpansion_WIDE; break; } - bool bManualLayout=false; + bool bManualLayout = false; // manual positioning and size if( mrModel.mxLayout ) { @@ -303,7 +303,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram, aPropSet.setProperty( PROP_Expansion, eLegendExpand ); if (bTopRight && !bManualLayout) - aPropSet.setProperty( PROP_RelativePosition , Any(eRelPos)); + aPropSet.setProperty( PROP_RelativePosition, Any(eRelPos)); aPropSet.setProperty(PROP_Overlay, mrModel.mbOverlay); diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx index 33c17abe0506..7f129ed08d41 100644 --- a/oox/source/drawingml/diagram/diagram.cxx +++ b/oox/source/drawingml/diagram/diagram.cxx @@ -313,7 +313,7 @@ void SmartArtDiagram::writeDiagramOOXData(DrawingML& rOriginalDrawingML, uno::Re getData()->writeDiagramData(rOriginalDrawingML, aFS, rDrawingRelId); // this call is *important*, without it xDocBuilder->parse below fails and some strange - // and wrong assertion gets thrown in ~FastSerializerHelper that shall get called + // and wrong assertion gets thrown in ~FastSerializerHelper that shall get called xOutputStream->closeOutput(); #ifdef DBG_UTIL @@ -353,7 +353,7 @@ void SmartArtDiagram::writeDiagramOOXDrawing(DrawingML& rOriginalDrawingML, uno: getData()->writeDiagramReplacement(rOriginalDrawingML, aFS); // this call is *important*, without it xDocBuilder->parse below fails and some strange - // and wrong assertion gets thrown in ~FastSerializerHelper that shall get called + // and wrong assertion gets thrown in ~FastSerializerHelper that shall get called xOutputStream->closeOutput(); #ifdef DBG_UTIL @@ -419,7 +419,7 @@ void SmartArtDiagram::addDiagramModelData(boost::property_tree::ptree& rTarget) // needs to be created. // Similar with OOXDrawing: This contains parts of ModelData, e.g. Text and // Attributes represented by the XShapes/Sdrobjects, so for internal formats - // this is not needed to be saved. This also true for OOXDrawingImageRels + // this is not needed to be saved. This is also true for OOXDrawingImageRels // and OOXDrawingHlinkRels. // We *do* import OOXLayoutDomTree/ModelInfo and this is used in the layouting // mechanism (reLayout), but it is not changed. We could add an export of that diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx index 4c9c7a1f2926..fd48d75b7980 100644 --- a/oox/source/drawingml/textfield.cxx +++ b/oox/source/drawingml/textfield.cxx @@ -54,8 +54,8 @@ TextField::TextField() namespace { -/** instantiate the textfields. Because of semantics difference between - * OpenXML and OpenOffice, some OpenXML field might cause two fields to be created. +/** instantiate the textfields. Because of semantic differences between + * OpenXML and OpenOffice, some OpenXML fields might cause two fields to be created. * @param aFields the created fields. The list is empty if no field has been created. * @param xModel the model * @param sType the OpenXML field type. diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 50746c2ab00b..afdbb12509cf 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -517,7 +517,7 @@ void DrawingML::WriteSolidFill( const Reference< XPropertySet >& rXPropSet ) bNeedGradientFill = !aTransparenceGradient.GetColorStops().isSingleColor(aSingleColor); // we no longer need to 'guess' if FillTransparenceGradient is used by - // comparing it's 1st color to COL_BLACK after having tested that the + // comparing its 1st color to COL_BLACK after having tested that the // FillTransparenceGradientName is set if (!bNeedGradientFill) { @@ -662,7 +662,7 @@ void DrawingML::WriteGradientFill( const Reference< XPropertySet >& rXPropSet ) // only for DOCX. if (aOriginalGradient == aGradient && GetDocumentType() == DOCUMENT_DOCX) { - // If we have no gradient stops that means original gradient were defined by a theme. + // If we have no gradient stops that means original gradient was defined by a theme. if( aGradientStops.hasElements() ) { mpFS->startElementNS(XML_a, XML_gradFill, XML_rotWithShape, "0"); @@ -1136,7 +1136,7 @@ void DrawingML::WriteOutline( const Reference& rXPropSet, Referenc bool bIsRelative(aLineDash.Style == DashStyle_RECTRELATIVE || aLineDash.Style == DashStyle_ROUNDRELATIVE); if ( bIsRelative && aLineDash.Dots == 1) - { // The length were tweaked on import in case of prstDash. Revert it here. + { // The lengths were tweaked on import in case of prstDash. Revert it here. sal_uInt32 nDotLen = aLineDash.DotLen; sal_uInt32 nDashLen = aLineDash.DashLen; sal_uInt32 nDistance = aLineDash.Distance; @@ -1148,7 +1148,7 @@ void DrawingML::WriteOutline( const Reference& rXPropSet, Referenc nDashLen += 99; } // LO uses length 0 for 100%, if the attribute is missing in ODF. - // Other applications might write 100%. Make is unique for the conditions. + // Other applications might write 100%. Make it unique for the conditions. if (nDotLen == 0) nDotLen = 100; if (nDashLen == 0 && aLineDash.Dashes > 0) diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 37c91384e0e0..367803ac2d72 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -1616,6 +1616,6 @@ Reference< XShape > GroupShape::implConvertAndInsert( const Reference< XShapes > return xGroupShape; } -} // namespace oox +} // namespace oox::vml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx index a023d1beb1f6..9672a57eb720 100644 --- a/oox/source/vml/vmlshapecontext.cxx +++ b/oox/source/vml/vmlshapecontext.cxx @@ -622,7 +622,7 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 nElement, const Attri u"com.sun.star.drawing.TextShape"_ustr); } else - // FIXME: without this we does not handle some properties like shadow + // FIXME: without this we do not handle some properties like shadow dynamic_cast(mrShape).setService(u"com.sun.star.text.TextFrame"_ustr); } return new TextBoxContext( *this, mrShapeModel.createTextBox(mrShape.getTypeModel()), rAttribs, @@ -808,6 +808,6 @@ ControlShapeContext::ControlShapeContext( ::oox::core::ContextHandler2Helper con rShapes.getDrawing().registerControl(aInfo); } -} // namespace oox +} // namespace oox::vml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index a8e2a3d632a6..e65cd7a15678 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -100,7 +100,7 @@ packimages_icon_themes := $(filter %/,$(wildcard $(SRCDIR)/icon-themes/*/)) # on the full list, and similarly the recursive filtering call from the initial # version of the patch also fails on windows for some reason # so don't try to be clever and do it in this awkward/tedious way. -# all this does is filtering everything for png/svg files that have /cmd/ as +# all this does is filter everything for png/svg files that have /cmd/ as # part of their path and then replacing the path to the theme-directory with # %MODULE% - the surrounding sort not only sorts the lists, but gets rid of # duplicate filenames that are left after the %MODULE% replacement diff --git a/postprocess/packimages/README b/postprocess/packimages/README index 7779b8ddb0c2..c955e7dce5f3 100644 --- a/postprocess/packimages/README +++ b/postprocess/packimages/README @@ -5,10 +5,10 @@ This script takes several sources of information: * the list of images used in every .src file that is compiled * the configuration XML describing every command that is used -* [[postprocess/packimages/image-sort.lst]] which provides a profile based +* [[postprocess/packimages/image-sort.lst]] which provides a profile-based ordering of images. -It then tries to pack the images together into the .zip file into an +It then tries to pack the images together into the .zip file in an order that matches / is similar to that which we want at run-time, ie. an entire toolbar's images should (ideally) be next to each other in a nice linear run, to reduce LibreOffice's working set, and improve diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx index d75631711428..c8a12f1b82ae 100644 --- a/pyuno/source/module/pyuno_impl.hxx +++ b/pyuno/source/module/pyuno_impl.hxx @@ -264,7 +264,6 @@ class Adapter : public cppu::WeakImplHelper< private: css::uno::Sequence< sal_Int16 > getOutIndexes( const OUString & functionName ); -public: public: Adapter( PyRef obj, const css::uno::Sequence< css::uno::Type > & types ); diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index 99c05ce6c4e5..75b354dd76ac 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -202,7 +202,7 @@ OUString getLibDirImpl() { OUString libDir; - // workarounds the $(ORIGIN) until it is available + // workaround the $(ORIGIN) until it is available if (Module::getUrlFromAddress(reinterpret_cast(getLibDir), libDir)) { libDir = libDir.copy(0, libDir.lastIndexOf('/')); @@ -592,7 +592,7 @@ static PyObject *getConstantByName( typeName) >>= td)) { - throw RuntimeException( "pyuno.getConstantByName: " + typeName + "is not a constant" ); + throw RuntimeException( "pyuno.getConstantByName: " + typeName + " is not a constant" ); } PyRef constant = runtime.any2PyObject( td->getConstantValue() ); ret = constant.getAcquired(); diff --git a/qadevOOo/runner/org/openoffice/RunnerService.java b/qadevOOo/runner/org/openoffice/RunnerService.java index d62b24540dbb..e0cfef1b6525 100644 --- a/qadevOOo/runner/org/openoffice/RunnerService.java +++ b/qadevOOo/runner/org/openoffice/RunnerService.java @@ -256,7 +256,7 @@ public class RunnerService implements XJob, XServiceInfo, * Gives a factory for creating the service. * This method is called by the JavaLoader *

- * @return returns a XSingleServiceFactory for creating the component + * @return returns an XSingleServiceFactory for creating the component * @param implName the name of the implementation for which a service is desired * @param multiFactory the service manager to be used if needed * @param regKey the registryKey diff --git a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java index e44df5e10985..72cf2ce186e4 100644 --- a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java +++ b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java @@ -131,7 +131,7 @@ public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider, * Gives a factory for creating the service. * This method is called by the JavaLoader *

- * @return returns a XSingleServiceFactory for creating the component + * @return returns an XSingleServiceFactory for creating the component * @param implName the name of the implementation for which a service is desired * @param multiFactory the service manager to be used if needed * @param regKey the registryKey @@ -215,7 +215,7 @@ public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider, "com.sun.star.comp.configuration.backend.LayerDescriber")); } catch (com.sun.star.uno.Exception e) { throw new com.sun.star.lang.NullPointerException(e, - "exception while creating LayerDesccriber"); + "exception while creating LayerDescriber"); } if (xLayerContentDescriber == null) {