typo: Lable -> Label
Change-Id: I8b9e9f75dd22ee5bff678c5bc0e1fa9381a103de
This commit is contained in:
@@ -307,7 +307,7 @@ B2DVector lcl_getLabelsDistance( TickIter& rIter, const B2DVector& rDistanceTick
|
|||||||
return aRet;
|
return aRet;
|
||||||
}
|
}
|
||||||
|
|
||||||
void lcl_shiftLables( TickIter& rIter, const B2DVector& rStaggerDistance )
|
void lcl_shiftLabels( TickIter& rIter, const B2DVector& rStaggerDistance )
|
||||||
{
|
{
|
||||||
if(rStaggerDistance.getLength()==0.0)
|
if(rStaggerDistance.getLength()==0.0)
|
||||||
return;
|
return;
|
||||||
@@ -1352,7 +1352,7 @@ void VCartesianAxis::doStaggeringOfLabels( const AxisLabelProperties& rAxisLabel
|
|||||||
double fRotationAngleDegree = m_aAxisLabelProperties.fRotationAngleDegree;
|
double fRotationAngleDegree = m_aAxisLabelProperties.fRotationAngleDegree;
|
||||||
if( nTextLevel>0 )
|
if( nTextLevel>0 )
|
||||||
{
|
{
|
||||||
lcl_shiftLables( *apTickIter.get(), aCummulatedLabelsDistance );
|
lcl_shiftLabels( *apTickIter.get(), aCummulatedLabelsDistance );
|
||||||
fRotationAngleDegree = 0.0;
|
fRotationAngleDegree = 0.0;
|
||||||
}
|
}
|
||||||
aCummulatedLabelsDistance += lcl_getLabelsDistance( *apTickIter.get()
|
aCummulatedLabelsDistance += lcl_getLabelsDistance( *apTickIter.get()
|
||||||
@@ -1368,7 +1368,7 @@ void VCartesianAxis::doStaggeringOfLabels( const AxisLabelProperties& rAxisLabel
|
|||||||
LabelIterator aInnerIter( m_aAllTickInfos[0], rAxisLabelProperties.eStaggering, true );
|
LabelIterator aInnerIter( m_aAllTickInfos[0], rAxisLabelProperties.eStaggering, true );
|
||||||
LabelIterator aOuterIter( m_aAllTickInfos[0], rAxisLabelProperties.eStaggering, false );
|
LabelIterator aOuterIter( m_aAllTickInfos[0], rAxisLabelProperties.eStaggering, false );
|
||||||
|
|
||||||
lcl_shiftLables( aOuterIter
|
lcl_shiftLabels( aOuterIter
|
||||||
, lcl_getLabelsDistance( aInnerIter
|
, lcl_getLabelsDistance( aInnerIter
|
||||||
, pTickFactory2D->getDistanceAxisTickToText( m_aAxisProperties ), 0.0 ) );
|
, pTickFactory2D->getDistanceAxisTickToText( m_aAxisProperties ), 0.0 ) );
|
||||||
}
|
}
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
Important: The handler component extensionoptions.jar in the extensions may not
|
Important: The handler component extensionoptions.jar in the extensions may not
|
||||||
contain exactly the same sources as the one build in the handler directory. To
|
contain exactly the same sources as the one build in the handler directory. To
|
||||||
make sure that debugging works build the handler directory and put the
|
make sure that debugging works build the handler directory and put the
|
||||||
extensionoptions.jar into the extension.
|
extensionoptions.jar into the extension.
|
||||||
|
|
||||||
|
|
||||||
@@ -13,19 +13,19 @@ leaf1mod.oxt: Defines a leaf under the node WriterNode
|
|||||||
It has a duplicate entry in the manifest.xml (OptionsDialog.xcu). This would cause a DisposedException when uninstalling on OOo 3.0 and prevent the extension from being uninstalled. This is actually a bug of the extensions. However, the error is difficult to investigate. Therefore this was fixed to make OOo more robust (i96690).
|
It has a duplicate entry in the manifest.xml (OptionsDialog.xcu). This would cause a DisposedException when uninstalling on OOo 3.0 and prevent the extension from being uninstalled. This is actually a bug of the extensions. However, the error is difficult to investigate. Therefore this was fixed to make OOo more robust (i96690).
|
||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
leaf2.oxt: Defines a leaf under a node that has a name which requires special
|
leaf2.oxt: Defines a leaf under a node that has a name which requires special
|
||||||
"xml encoding". The name is "My Writer's & Settings". The node is not assigned
|
"xml encoding". The name is "My Writer's & Settings". The node is not assigned
|
||||||
to a Module and the Node/AllModules property is not true. This is a typical
|
to a Module and the Node/AllModules property is not true. This is a typical
|
||||||
scenario when a Node had been added to an existing Module and later the Module
|
scenario when a Node had been added to an existing Module and later the Module
|
||||||
was removed. This is a situation which actually should not occur. In this case
|
was removed. This is a situation which actually should not occur. In this case
|
||||||
DO NOT show the Node in the OOo's options dialog, because it shows only nodes
|
DO NOT show the Node in the OOo's options dialog, because it shows only nodes
|
||||||
for a particular module and in this case the Module for the Node is unknown.
|
for a particular module and in this case the Module for the Node is unknown.
|
||||||
In the Extension Manager's
|
In the Extension Manager's
|
||||||
options dialog this Node can be shown because the Module is irrelevant.
|
options dialog this Node can be shown because the Module is irrelevant.
|
||||||
See also nodes5.oxt.
|
See also nodes5.oxt.
|
||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
leaves1.oxt: multiple ordered leaves under available nodes. The leaves Lables are
|
leaves1.oxt: multiple ordered leaves under available nodes. The leaves Labels are
|
||||||
localized for en-US and de. The following leaves should appear:
|
localized for en-US and de. The following leaves should appear:
|
||||||
|
|
||||||
Writer:
|
Writer:
|
||||||
@@ -46,18 +46,18 @@ Draw:
|
|||||||
If a german office is used then the strings contain "de" instead of "en-US".
|
If a german office is used then the strings contain "de" instead of "en-US".
|
||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
leaves2.oxt: Same as leaves1.oxt. Use together with leaves1.oxt to test the
|
leaves2.oxt: Same as leaves1.oxt. Use together with leaves1.oxt to test the
|
||||||
grouping of leaves.
|
grouping of leaves.
|
||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
leaves3.oxt: Same as leaves1.oxt, but the leaves are not ordered.
|
leaves3.oxt: Same as leaves1.oxt, but the leaves are not ordered.
|
||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
nodes1.oxt: Defines one node which has AllModules set and which has
|
nodes1.oxt: Defines one node which has AllModules set and which has
|
||||||
no children. Therefore this node should not be displayed.
|
no children. Therefore this node should not be displayed.
|
||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
nodes2.oxt: Defines 3 nodes which use AllModules and which form an
|
nodes2.oxt: Defines 3 nodes which use AllModules and which form an
|
||||||
ordered group. Every node defines also 3 nodes which have a determined order.
|
ordered group. Every node defines also 3 nodes which have a determined order.
|
||||||
|
|
||||||
-nodes2 node 1 en-US
|
-nodes2 node 1 en-US
|
||||||
@@ -77,7 +77,7 @@ ordered group. Every node defines also 3 nodes which have a determined order.
|
|||||||
|
|
||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
nodes3.oxt: Defines 3 nodes which are placed under different existing Modules.
|
nodes3.oxt: Defines 3 nodes which are placed under different existing Modules.
|
||||||
The nodes and there leaves are ordered.
|
The nodes and there leaves are ordered.
|
||||||
|
|
||||||
Context Writer:
|
Context Writer:
|
||||||
@@ -115,24 +115,24 @@ Context Draw:
|
|||||||
|
|
||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
nodes4.oxt: Same as nodes3.oxt. Use together with nodes3.txt to test the
|
nodes4.oxt: Same as nodes3.oxt. Use together with nodes3.txt to test the
|
||||||
grouping of nodes.
|
grouping of nodes.
|
||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
nodes5.oxt: Defines a node which in turn defines 3 leaves. The Node
|
nodes5.oxt: Defines a node which in turn defines 3 leaves. The Node
|
||||||
is not assigned to a Module and the AllModule property is false (which is the
|
is not assigned to a Module and the AllModule property is false (which is the
|
||||||
default).This may happen when a node
|
default).This may happen when a node
|
||||||
had been added to an already existing Module and then this Module was removed. For
|
had been added to an already existing Module and then this Module was removed. For
|
||||||
example, an extension adds a node to the "Writer Module" and the
|
example, an extension adds a node to the "Writer Module" and the
|
||||||
next office update removes the "Writer Module" (which is rather inconceivable).
|
next office update removes the "Writer Module" (which is rather inconceivable).
|
||||||
Then the node and its leaves MUST NOT be displayed in OOo's options dialog,
|
Then the node and its leaves MUST NOT be displayed in OOo's options dialog,
|
||||||
because the Module is not known. However, it can be displayed in the
|
because the Module is not known. However, it can be displayed in the
|
||||||
options dialog of the Extension Manager. See also the description for leaf2.oxt.
|
options dialog of the Extension Manager. See also the description for leaf2.oxt.
|
||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
modules1.oxt: Defines two Modules and three Nodes. The Nodes may not
|
modules1.oxt: Defines two Modules and three Nodes. The Nodes may not
|
||||||
be displayed in OOo's options dialog because there is currently no application
|
be displayed in OOo's options dialog because there is currently no application
|
||||||
which uses this Module. However the Nodes are displayed in the options dialog
|
which uses this Module. However the Nodes are displayed in the options dialog
|
||||||
of the Extension Manager.
|
of the Extension Manager.
|
||||||
There are three Nodes defined. The relation ship is this:
|
There are three Nodes defined. The relation ship is this:
|
||||||
|
|
||||||
@@ -175,7 +175,7 @@ The options dialog of the Extension Manager shall display only three nodes:
|
|||||||
-leaf 2
|
-leaf 2
|
||||||
-leaf 3
|
-leaf 3
|
||||||
|
|
||||||
or
|
or
|
||||||
|
|
||||||
-node 1
|
-node 1
|
||||||
-leaf 1
|
-leaf 1
|
||||||
@@ -190,11 +190,11 @@ or
|
|||||||
-leaf 2
|
-leaf 2
|
||||||
-leaf 3
|
-leaf 3
|
||||||
|
|
||||||
Since the order of Module|s is not defined, the dialog may display first the
|
Since the order of Module|s is not defined, the dialog may display first the
|
||||||
Nodes from module2 and then from module1. If a node is already displayed then
|
Nodes from module2 and then from module1. If a node is already displayed then
|
||||||
it is not shown again.
|
it is not shown again.
|
||||||
|
|
||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
modules2.oxt: Same as modules1, except that the order of nodes and leaves
|
modules2.oxt: Same as modules1, except that the order of nodes and leaves
|
||||||
is not defined.
|
is not defined.
|
||||||
|
@@ -61,7 +61,7 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
/** This is the preferred constructor that allows the created
|
/** This is the preferred constructor that allows the created
|
||||||
controller item to return non-empty values for GetLable() and
|
controller item to return non-empty values for GetLabel() and
|
||||||
GetIcon() calls.
|
GetIcon() calls.
|
||||||
*/
|
*/
|
||||||
ControllerItem (
|
ControllerItem (
|
||||||
|
@@ -37,11 +37,11 @@ import com.sun.star.uno.XInterface;
|
|||||||
* <li> <code>'FL'</code> as <code>com.sun.star.form.XLoadable</code>
|
* <li> <code>'FL'</code> as <code>com.sun.star.form.XLoadable</code>
|
||||||
* implementation : used to connect control to data source. </li>
|
* implementation : used to connect control to data source. </li>
|
||||||
* <li> <code>'LC'</code> as <code>com.sun.star.uno.XInterface</code>
|
* <li> <code>'LC'</code> as <code>com.sun.star.uno.XInterface</code>
|
||||||
* implementation : as value for LableControl property (see property
|
* implementation : as value for LabelControl property (see property
|
||||||
* documentation). </li>
|
* documentation). </li>
|
||||||
* <li> <code>'DataAwareControlModel.NewFieldName'</code> :
|
* <li> <code>'DataAwareControlModel.NewFieldName'</code> :
|
||||||
* <b>optional</b> <code>String</code> relation which is used
|
* <b>optional</b> <code>String</code> relation which is used
|
||||||
* for new value of DataFiled proeprty.</li>
|
* for new value of DataField property.</li>
|
||||||
* <ul> <p>
|
* <ul> <p>
|
||||||
* Test is <b> NOT </b> multithread compliant. <p>
|
* Test is <b> NOT </b> multithread compliant. <p>
|
||||||
* After test completion object environment has to be recreated.
|
* After test completion object environment has to be recreated.
|
||||||
|
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user