Fix typos in code and comments + some reformatting.
Change-Id: I5b6d62104e46c6eb5d142e7e11666806383eed09 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/210566 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
This commit is contained in:
committed by
Julien Nabet
parent
6410690a38
commit
850aab7852
@@ -69,7 +69,7 @@ published service DataForm
|
|||||||
|
|
||||||
<p>One main difference between XLoadable::load() and com::sun::star::sdbc::XRowSet::execute()
|
<p>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
|
is that if you use the former, the row set is positioned on the first record, while in the latter case
|
||||||
it is position <em>before</em> the it.</p>
|
it is positioned <em>before</em> it.</p>
|
||||||
*/
|
*/
|
||||||
interface com::sun::star::form::XLoadable;
|
interface com::sun::star::form::XLoadable;
|
||||||
|
|
||||||
@@ -126,7 +126,7 @@ published service DataForm
|
|||||||
the corresponding master field.<br/>
|
the corresponding master field.<br/>
|
||||||
Alternatively, you could simply base your form on the table <code>invoices</code>,
|
Alternatively, you could simply base your form on the table <code>invoices</code>,
|
||||||
and add the column name <code>cust_ref</code> to the DetailFields. In this case,
|
and add the column name <code>cust_ref</code> to the DetailFields. In this case,
|
||||||
and implicit filter clause <code>WHERE cust_ref = :<new_param_name></code> will
|
an implicit filter clause <code>WHERE cust_ref = :<new_param_name></code> will
|
||||||
be created, and the artificial parameter will be filled from the corresponding
|
be created, and the artificial parameter will be filled from the corresponding
|
||||||
master field.<br/>
|
master field.<br/>
|
||||||
If a string in this property denotes both a column name and a parameter name, it
|
If a string in this property denotes both a column name and a parameter name, it
|
||||||
|
|||||||
@@ -141,7 +141,7 @@ interface XReportComponent
|
|||||||
the corresponding master field.<br/>
|
the corresponding master field.<br/>
|
||||||
Alternatively, you could simply base your report on the table <code>invoices</code>,
|
Alternatively, you could simply base your report on the table <code>invoices</code>,
|
||||||
and add the column name <code>cust_ref</code> to the DetailFields. In this case,
|
and add the column name <code>cust_ref</code> to the DetailFields. In this case,
|
||||||
and implicit filter clause <code>WHERE cust_ref = :<new_param_name></code> will
|
an implicit filter clause <code>WHERE cust_ref = :<new_param_name></code> will
|
||||||
be created, and the artificial parameter will be filled from the corresponding
|
be created, and the artificial parameter will be filled from the corresponding
|
||||||
master field.<br/>
|
master field.<br/>
|
||||||
If a string in this property denotes both a column name and a parameter name, it
|
If a string in this property denotes both a column name and a parameter name, it
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ published service HierarchyDataReadWriteAccess
|
|||||||
must remove data members. However, the mandatory data members (Title,
|
must remove data members. However, the mandatory data members (Title,
|
||||||
TargetURL, Children) must never be removable.
|
TargetURL, Children) must never be removable.
|
||||||
|
|
||||||
<p>Replacing and getting values must be supported be every data node.
|
<p>Replacing and getting values must be supported by every data node.
|
||||||
*/
|
*/
|
||||||
interface com::sun::star::container::XNameContainer;
|
interface com::sun::star::container::XNameContainer;
|
||||||
|
|
||||||
|
|||||||
@@ -1172,7 +1172,7 @@
|
|||||||
</prop>
|
</prop>
|
||||||
<prop oor:name="SkipEmptyCells" oor:type="xs:boolean" oor:nillable="false">
|
<prop oor:name="SkipEmptyCells" oor:type="xs:boolean" oor:nillable="false">
|
||||||
<info>
|
<info>
|
||||||
<desc>If true, Calc preserves previous content of cells when pasting empty ones. If false, Calc delete content of previous cells.</desc>
|
<desc>If true, Calc preserves previous content of cells when pasting empty ones. If false, Calc deletes content of previous cells.</desc>
|
||||||
<label>SkipEmptyCells</label>
|
<label>SkipEmptyCells</label>
|
||||||
</info>
|
</info>
|
||||||
<value>true</value>
|
<value>true</value>
|
||||||
@@ -1286,7 +1286,7 @@
|
|||||||
</prop>
|
</prop>
|
||||||
<prop oor:name="SkipEmptyCells" oor:type="xs:boolean" oor:nillable="false">
|
<prop oor:name="SkipEmptyCells" oor:type="xs:boolean" oor:nillable="false">
|
||||||
<info>
|
<info>
|
||||||
<desc>If true, Calc preserves previous content of cells when pasting empty ones. If false, Calc delete content of previous cells.</desc>
|
<desc>If true, Calc preserves previous content of cells when pasting empty ones. If false, Calc deletes content of previous cells.</desc>
|
||||||
<label>SkipEmptyCells</label>
|
<label>SkipEmptyCells</label>
|
||||||
</info>
|
</info>
|
||||||
<value>false</value>
|
<value>false</value>
|
||||||
@@ -1959,7 +1959,7 @@
|
|||||||
</group>
|
</group>
|
||||||
<prop oor:name="Links" oor:type="xs:boolean" oor:nillable="false">
|
<prop oor:name="Links" oor:type="xs:boolean" oor:nillable="false">
|
||||||
<info>
|
<info>
|
||||||
<desc>Insert link for the cell, instead of text fields in a cell.(Excel interopability options)</desc>
|
<desc>Insert link for the cell, instead of text fields in a cell.(Excel interoperability options)</desc>
|
||||||
<label>Links like Excel</label>
|
<label>Links like Excel</label>
|
||||||
</info>
|
</info>
|
||||||
<value>false</value>
|
<value>false</value>
|
||||||
|
|||||||
@@ -638,7 +638,7 @@
|
|||||||
<prop oor:name="SelectionMaximumLuminancePercent" oor:type="xs:short" oor:nillable="false">
|
<prop oor:name="SelectionMaximumLuminancePercent" oor:type="xs:short" oor:nillable="false">
|
||||||
<info>
|
<info>
|
||||||
<desc>Specifies the maximum allowed luminance the system's selection
|
<desc>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
|
(luminance is bigger), it will be scaled to a luminance of exactly
|
||||||
this given value.</desc>
|
this given value.</desc>
|
||||||
<label>Specifies the maximum allowed luminance for the system's
|
<label>Specifies the maximum allowed luminance for the system's
|
||||||
|
|||||||
@@ -59,7 +59,7 @@
|
|||||||
</prop>
|
</prop>
|
||||||
<prop oor:name="MaskFileName" oor:type="xs:string">
|
<prop oor:name="MaskFileName" oor:type="xs:string">
|
||||||
<info>
|
<info>
|
||||||
<desc>The file name of the mask bitmap. Use red for pixel outside of
|
<desc>The file name of the mask bitmap. Use red for pixels outside of
|
||||||
the border and blue for inside pixels.</desc>
|
the border and blue for inside pixels.</desc>
|
||||||
</info>
|
</info>
|
||||||
<value/>
|
<value/>
|
||||||
@@ -90,8 +90,8 @@
|
|||||||
</prop>
|
</prop>
|
||||||
<prop oor:name="ReplacementColor" oor:type="xs:hexBinary">
|
<prop oor:name="ReplacementColor" oor:type="xs:hexBinary">
|
||||||
<info>
|
<info>
|
||||||
<desc>Color that is used as replacement for the bitmap when the later
|
<desc>Color that is used as replacement for the bitmap when the latter
|
||||||
can for some reason not be used.</desc>
|
cannot be used for some reason.</desc>
|
||||||
</info>
|
</info>
|
||||||
</prop>
|
</prop>
|
||||||
<prop oor:name="HorizontalTexturingMode" oor:type="xs:string">
|
<prop oor:name="HorizontalTexturingMode" oor:type="xs:string">
|
||||||
|
|||||||
@@ -318,23 +318,23 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern
|
|||||||
if ( mrModel.mbPivotChart )
|
if ( mrModel.mbPivotChart )
|
||||||
{
|
{
|
||||||
PropertySet aProps( getChartDocument() );
|
PropertySet aProps( getChartDocument() );
|
||||||
aProps.setProperty( PROP_DisableDataTableDialog , true );
|
aProps.setProperty( PROP_DisableDataTableDialog, true );
|
||||||
aProps.setProperty( PROP_DisableComplexChartTypes , true );
|
aProps.setProperty( PROP_DisableComplexChartTypes, true );
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!mrModel.maSheetPath.isEmpty() )
|
if (!mrModel.maSheetPath.isEmpty())
|
||||||
{
|
{
|
||||||
Reference< css::chart::XChartDocument > xChartDoc( getChartDocument(), UNO_QUERY );
|
Reference< css::chart::XChartDocument > xChartDoc( getChartDocument(), UNO_QUERY );
|
||||||
PropertySet aProps( xChartDoc->getDiagram() );
|
PropertySet aProps( xChartDoc->getDiagram() );
|
||||||
aProps.setProperty( PROP_ExternalData , uno::Any(mrModel.maSheetPath) );
|
aProps.setProperty( PROP_ExternalData, uno::Any(mrModel.maSheetPath) );
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mrModel.mbDate1904) {
|
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;
|
Any aAny;
|
||||||
aAny <<= aNullDate;
|
aAny <<= aNullDate;
|
||||||
Reference< css::chart::XChartDocument > xChartDoc( getChartDocument(), UNO_QUERY );
|
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);
|
xDocPropSet->setPropertyValue(u"NullDate"_ustr, aAny);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -217,7 +217,7 @@ void AxesSetConverter::convertFromModel( const Reference< XDiagram >& rxDiagram,
|
|||||||
// convert all chart type groups, this converts all series data and formatting
|
// convert all chart type groups, this converts all series data and formatting
|
||||||
for (auto const& typeGroup : aTypeGroups)
|
for (auto const& typeGroup : aTypeGroups)
|
||||||
typeGroup->convertFromModel( rxDiagram, xCoordSystem,
|
typeGroup->convertFromModel( rxDiagram, xCoordSystem,
|
||||||
nAxesSetIdx,bSupportsVaryColorsByPoint );
|
nAxesSetIdx, bSupportsVaryColorsByPoint );
|
||||||
|
|
||||||
// convert all axes (create missing axis models)
|
// convert all axes (create missing axis models)
|
||||||
ModelRef< AxisModel > xXAxis = lclGetOrCreateAxis( mrModel.maAxes,
|
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: */
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||||
|
|||||||
@@ -259,7 +259,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram,
|
|||||||
cssc2::LegendPosition eLegendPos = cssc2::LegendPosition_LINE_END;
|
cssc2::LegendPosition eLegendPos = cssc2::LegendPosition_LINE_END;
|
||||||
cssc::ChartLegendExpansion eLegendExpand = cssc::ChartLegendExpansion_CUSTOM;
|
cssc::ChartLegendExpansion eLegendExpand = cssc::ChartLegendExpansion_CUSTOM;
|
||||||
RelativePosition eRelPos;
|
RelativePosition eRelPos;
|
||||||
bool bTopRight=false;
|
bool bTopRight = false;
|
||||||
switch( mrModel.mnPosition )
|
switch( mrModel.mnPosition )
|
||||||
{
|
{
|
||||||
case XML_l:
|
case XML_l:
|
||||||
@@ -272,9 +272,9 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram,
|
|||||||
break;
|
break;
|
||||||
case XML_tr: // top-right not supported
|
case XML_tr: // top-right not supported
|
||||||
eRelPos.Primary = 1;
|
eRelPos.Primary = 1;
|
||||||
eRelPos.Secondary =0;
|
eRelPos.Secondary = 0;
|
||||||
eRelPos.Anchor = Alignment_TOP_RIGHT;
|
eRelPos.Anchor = Alignment_TOP_RIGHT;
|
||||||
bTopRight=true;
|
bTopRight = true;
|
||||||
break;
|
break;
|
||||||
case XML_t:
|
case XML_t:
|
||||||
eLegendPos = cssc2::LegendPosition_PAGE_START;
|
eLegendPos = cssc2::LegendPosition_PAGE_START;
|
||||||
@@ -285,7 +285,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram,
|
|||||||
eLegendExpand = cssc::ChartLegendExpansion_WIDE;
|
eLegendExpand = cssc::ChartLegendExpansion_WIDE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
bool bManualLayout=false;
|
bool bManualLayout = false;
|
||||||
// manual positioning and size
|
// manual positioning and size
|
||||||
if( mrModel.mxLayout )
|
if( mrModel.mxLayout )
|
||||||
{
|
{
|
||||||
@@ -303,7 +303,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram,
|
|||||||
aPropSet.setProperty( PROP_Expansion, eLegendExpand );
|
aPropSet.setProperty( PROP_Expansion, eLegendExpand );
|
||||||
|
|
||||||
if (bTopRight && !bManualLayout)
|
if (bTopRight && !bManualLayout)
|
||||||
aPropSet.setProperty( PROP_RelativePosition , Any(eRelPos));
|
aPropSet.setProperty( PROP_RelativePosition, Any(eRelPos));
|
||||||
|
|
||||||
aPropSet.setProperty(PROP_Overlay, mrModel.mbOverlay);
|
aPropSet.setProperty(PROP_Overlay, mrModel.mbOverlay);
|
||||||
|
|
||||||
|
|||||||
@@ -419,7 +419,7 @@ void SmartArtDiagram::addDiagramModelData(boost::property_tree::ptree& rTarget)
|
|||||||
// needs to be created.
|
// needs to be created.
|
||||||
// Similar with OOXDrawing: This contains parts of ModelData, e.g. Text and
|
// Similar with OOXDrawing: This contains parts of ModelData, e.g. Text and
|
||||||
// Attributes represented by the XShapes/Sdrobjects, so for internal formats
|
// 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.
|
// and OOXDrawingHlinkRels.
|
||||||
// We *do* import OOXLayoutDomTree/ModelInfo and this is used in the layouting
|
// 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
|
// mechanism (reLayout), but it is not changed. We could add an export of that
|
||||||
|
|||||||
@@ -54,8 +54,8 @@ TextField::TextField()
|
|||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
/** instantiate the textfields. Because of semantics difference between
|
/** instantiate the textfields. Because of semantic differences between
|
||||||
* OpenXML and OpenOffice, some OpenXML field might cause two fields to be created.
|
* 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 aFields the created fields. The list is empty if no field has been created.
|
||||||
* @param xModel the model
|
* @param xModel the model
|
||||||
* @param sType the OpenXML field type.
|
* @param sType the OpenXML field type.
|
||||||
|
|||||||
@@ -517,7 +517,7 @@ void DrawingML::WriteSolidFill( const Reference< XPropertySet >& rXPropSet )
|
|||||||
bNeedGradientFill = !aTransparenceGradient.GetColorStops().isSingleColor(aSingleColor);
|
bNeedGradientFill = !aTransparenceGradient.GetColorStops().isSingleColor(aSingleColor);
|
||||||
|
|
||||||
// we no longer need to 'guess' if FillTransparenceGradient is used by
|
// 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
|
// FillTransparenceGradientName is set
|
||||||
if (!bNeedGradientFill)
|
if (!bNeedGradientFill)
|
||||||
{
|
{
|
||||||
@@ -662,7 +662,7 @@ void DrawingML::WriteGradientFill( const Reference< XPropertySet >& rXPropSet )
|
|||||||
// only for DOCX.
|
// only for DOCX.
|
||||||
if (aOriginalGradient == aGradient && GetDocumentType() == DOCUMENT_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() )
|
if( aGradientStops.hasElements() )
|
||||||
{
|
{
|
||||||
mpFS->startElementNS(XML_a, XML_gradFill, XML_rotWithShape, "0");
|
mpFS->startElementNS(XML_a, XML_gradFill, XML_rotWithShape, "0");
|
||||||
@@ -1136,7 +1136,7 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet, Referenc
|
|||||||
|
|
||||||
bool bIsRelative(aLineDash.Style == DashStyle_RECTRELATIVE || aLineDash.Style == DashStyle_ROUNDRELATIVE);
|
bool bIsRelative(aLineDash.Style == DashStyle_RECTRELATIVE || aLineDash.Style == DashStyle_ROUNDRELATIVE);
|
||||||
if ( bIsRelative && aLineDash.Dots == 1)
|
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 nDotLen = aLineDash.DotLen;
|
||||||
sal_uInt32 nDashLen = aLineDash.DashLen;
|
sal_uInt32 nDashLen = aLineDash.DashLen;
|
||||||
sal_uInt32 nDistance = aLineDash.Distance;
|
sal_uInt32 nDistance = aLineDash.Distance;
|
||||||
@@ -1148,7 +1148,7 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet, Referenc
|
|||||||
nDashLen += 99;
|
nDashLen += 99;
|
||||||
}
|
}
|
||||||
// LO uses length 0 for 100%, if the attribute is missing in ODF.
|
// 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)
|
if (nDotLen == 0)
|
||||||
nDotLen = 100;
|
nDotLen = 100;
|
||||||
if (nDashLen == 0 && aLineDash.Dashes > 0)
|
if (nDashLen == 0 && aLineDash.Dashes > 0)
|
||||||
|
|||||||
@@ -1616,6 +1616,6 @@ Reference< XShape > GroupShape::implConvertAndInsert( const Reference< XShapes >
|
|||||||
return xGroupShape;
|
return xGroupShape;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace oox
|
} // namespace oox::vml
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||||
|
|||||||
@@ -622,7 +622,7 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 nElement, const Attri
|
|||||||
u"com.sun.star.drawing.TextShape"_ustr);
|
u"com.sun.star.drawing.TextShape"_ustr);
|
||||||
}
|
}
|
||||||
else
|
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<SimpleShape&>(mrShape).setService(u"com.sun.star.text.TextFrame"_ustr);
|
dynamic_cast<SimpleShape&>(mrShape).setService(u"com.sun.star.text.TextFrame"_ustr);
|
||||||
}
|
}
|
||||||
return new TextBoxContext( *this, mrShapeModel.createTextBox(mrShape.getTypeModel()), rAttribs,
|
return new TextBoxContext( *this, mrShapeModel.createTextBox(mrShape.getTypeModel()), rAttribs,
|
||||||
@@ -808,6 +808,6 @@ ControlShapeContext::ControlShapeContext( ::oox::core::ContextHandler2Helper con
|
|||||||
rShapes.getDrawing().registerControl(aInfo);
|
rShapes.getDrawing().registerControl(aInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace oox
|
} // namespace oox::vml
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||||
|
|||||||
@@ -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
|
# on the full list, and similarly the recursive filtering call from the initial
|
||||||
# version of the patch also fails on windows for some reason
|
# 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.
|
# 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
|
# 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
|
# %MODULE% - the surrounding sort not only sorts the lists, but gets rid of
|
||||||
# duplicate filenames that are left after the %MODULE% replacement
|
# duplicate filenames that are left after the %MODULE% replacement
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ This script takes several sources of information:
|
|||||||
|
|
||||||
* the list of images used in every .src file that is compiled
|
* the list of images used in every .src file that is compiled
|
||||||
* the configuration XML describing every command that is used
|
* 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.
|
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.
|
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
|
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
|
nice linear run, to reduce LibreOffice's working set, and improve
|
||||||
|
|||||||
@@ -264,7 +264,6 @@ class Adapter : public cppu::WeakImplHelper<
|
|||||||
private:
|
private:
|
||||||
css::uno::Sequence< sal_Int16 > getOutIndexes( const OUString & functionName );
|
css::uno::Sequence< sal_Int16 > getOutIndexes( const OUString & functionName );
|
||||||
|
|
||||||
public:
|
|
||||||
public:
|
public:
|
||||||
Adapter( PyRef obj,
|
Adapter( PyRef obj,
|
||||||
const css::uno::Sequence< css::uno::Type > & types );
|
const css::uno::Sequence< css::uno::Type > & types );
|
||||||
|
|||||||
@@ -202,7 +202,7 @@ OUString getLibDirImpl()
|
|||||||
{
|
{
|
||||||
OUString libDir;
|
OUString libDir;
|
||||||
|
|
||||||
// workarounds the $(ORIGIN) until it is available
|
// workaround the $(ORIGIN) until it is available
|
||||||
if (Module::getUrlFromAddress(reinterpret_cast<oslGenericFunction>(getLibDir), libDir))
|
if (Module::getUrlFromAddress(reinterpret_cast<oslGenericFunction>(getLibDir), libDir))
|
||||||
{
|
{
|
||||||
libDir = libDir.copy(0, libDir.lastIndexOf('/'));
|
libDir = libDir.copy(0, libDir.lastIndexOf('/'));
|
||||||
@@ -592,7 +592,7 @@ static PyObject *getConstantByName(
|
|||||||
typeName)
|
typeName)
|
||||||
>>= td))
|
>>= 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() );
|
PyRef constant = runtime.any2PyObject( td->getConstantValue() );
|
||||||
ret = constant.getAcquired();
|
ret = constant.getAcquired();
|
||||||
|
|||||||
@@ -256,7 +256,7 @@ public class RunnerService implements XJob, XServiceInfo,
|
|||||||
* Gives a factory for creating the service.
|
* Gives a factory for creating the service.
|
||||||
* This method is called by the <code>JavaLoader</code>
|
* This method is called by the <code>JavaLoader</code>
|
||||||
* <p>
|
* <p>
|
||||||
* @return returns a <code>XSingleServiceFactory</code> for creating the component
|
* @return returns an <code>XSingleServiceFactory</code> for creating the component
|
||||||
* @param implName the name of the implementation for which a service is desired
|
* @param implName the name of the implementation for which a service is desired
|
||||||
* @param multiFactory the service manager to be used if needed
|
* @param multiFactory the service manager to be used if needed
|
||||||
* @param regKey the registryKey
|
* @param regKey the registryKey
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider,
|
|||||||
* Gives a factory for creating the service.
|
* Gives a factory for creating the service.
|
||||||
* This method is called by the <code>JavaLoader</code>
|
* This method is called by the <code>JavaLoader</code>
|
||||||
* <p>
|
* <p>
|
||||||
* @return returns a <code>XSingleServiceFactory</code> for creating the component
|
* @return returns an <code>XSingleServiceFactory</code> for creating the component
|
||||||
* @param implName the name of the implementation for which a service is desired
|
* @param implName the name of the implementation for which a service is desired
|
||||||
* @param multiFactory the service manager to be used if needed
|
* @param multiFactory the service manager to be used if needed
|
||||||
* @param regKey the registryKey
|
* @param regKey the registryKey
|
||||||
@@ -215,7 +215,7 @@ public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider,
|
|||||||
"com.sun.star.comp.configuration.backend.LayerDescriber"));
|
"com.sun.star.comp.configuration.backend.LayerDescriber"));
|
||||||
} catch (com.sun.star.uno.Exception e) {
|
} catch (com.sun.star.uno.Exception e) {
|
||||||
throw new com.sun.star.lang.NullPointerException(e,
|
throw new com.sun.star.lang.NullPointerException(e,
|
||||||
"exception while creating LayerDesccriber");
|
"exception while creating LayerDescriber");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (xLayerContentDescriber == null) {
|
if (xLayerContentDescriber == null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user